home: moved home and repo group views into pyramid.

- fixed lots of tests related to those changes
- now main and subrepo group views are handled by pyramid.

rhodecode/apps/repo_group/__init__.py

@@ -0,0 +1,33
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+from rhodecode.apps._base import add_route_with_slash
+
+
+def includeme(config):
+
+    # Summary
+    add_route_with_slash(
+        config,
+        name='repo_group_home',
+        pattern='/{repo_group_name:.*?[^/]}', repo_group_route=True)
+
+    # Scan module for configuration decorators.
+    config.scan()
+

rhodecode/api/tests/test_get_gist.py

@@ -28,7 +28,7
 
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestApiGetGist(object):
-    def test_api_get_gist(self, gist_util):
+    def test_api_get_gist(self, gist_util, http_host_stub):
         gist = gist_util.create_gist()
         gist_id = gist.gist_access_id
         gist_created_on = gist.created_on
@@ -45,14 +45,14
             'expires': -1.0,
             'gist_id': int(gist_id),
             'type': 'public',
-            'url': 'http://test.example.com:80/_admin/gists/%s' % (gist_id,),
+            'url': 'http://%s/_admin/gists/%s' % (http_host_stub, gist_id,),
             'acl_level': Gist.ACL_LEVEL_PUBLIC,
             'content': None,
         }
 
         assert_ok(id_, expected, given=response.body)
 
-    def test_api_get_gist_with_content(self, gist_util):
+    def test_api_get_gist_with_content(self, gist_util, http_host_stub):
         mapping = {
             u'filename1.txt': {'content': u'hello world'},
             u'filename1ą.txt': {'content': u'hello worldę'}
@@ -73,7 +73,7
             'expires': -1.0,
             'gist_id': int(gist_id),
             'type': 'public',
-            'url': 'http://test.example.com:80/_admin/gists/%s' % (gist_id,),
+            'url': 'http://%s/_admin/gists/%s' % (http_host_stub, gist_id,),
             'acl_level': Gist.ACL_LEVEL_PUBLIC,
             'content': {
                 u'filename1.txt': u'hello world',

rhodecode/api/tests/test_get_pull_request.py

@@ -19,13 +19,13
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-import mock
 import pytest
 import urlobject
 from pylons import url
 
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok)
+from rhodecode.lib.utils2 import safe_unicode
 
 pytestmark = pytest.mark.backends("git", "hg")
 
@@ -33,7 +33,7
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestGetPullRequest(object):
 
-    def test_api_get_pull_request(self, pr_util):
+    def test_api_get_pull_request(self, pr_util, http_host_stub, http_host_only_stub):
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = pr_util.create_pull_request(mergeable=True)
         id_, params = build_data(
@@ -50,16 +50,16
                 'pullrequest_show',
                 repo_name=pull_request.target_repo.repo_name,
                 pull_request_id=pull_request.pull_request_id, qualified=True))
-        pr_url = unicode(
-            url_obj.with_netloc('test.example.com:80'))
-        source_url = unicode(
-            pull_request.source_repo.clone_url()
-                .with_netloc('test.example.com:80'))
-        target_url = unicode(
-            pull_request.target_repo.clone_url()
-                .with_netloc('test.example.com:80'))
-        shadow_url = unicode(
+
+        pr_url = safe_unicode(
+            url_obj.with_netloc(http_host_stub))
+        source_url = safe_unicode(
+            pull_request.source_repo.clone_url().with_netloc(http_host_only_stub))
+        target_url = safe_unicode(
+            pull_request.target_repo.clone_url().with_netloc(http_host_only_stub))
+        shadow_url = safe_unicode(
             PullRequestModel().get_shadow_clone_url(pull_request))
+
         expected = {
             'pull_request_id': pull_request.pull_request_id,
             'url': pr_url,

rhodecode/api/tests/test_update_repo.py

@@ -26,7 +26,7
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash, jsonify)
 from rhodecode.tests.fixture import Fixture
-
+from rhodecode.tests.plugin import http_host_stub, http_host_only_stub
 
 fixture = Fixture()
 
@@ -71,14 +71,15
         ({'repo_name': 'new_repo_name'},
          {
             'repo_name': 'new_repo_name',
-            'url': 'http://test.example.com:80/new_repo_name'
+            'url': 'http://{}/new_repo_name'.format(http_host_only_stub())
          }),
 
         ({'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
           '_group': 'test_group_for_update'},
          {
             'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
-            'url': 'http://test.example.com:80/test_group_for_update/{}'.format(UPDATE_REPO_NAME)
+            'url': 'http://{}/test_group_for_update/{}'.format(
+                http_host_only_stub(), UPDATE_REPO_NAME)
          }),
     ])
     def test_api_update_repo(self, updates, expected, backend):

rhodecode/apps/__init__.py

@@ -0,0 +1,19
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/

rhodecode/apps/_base/__init__.py

@@ -29,6 +29,7
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.lib.ext_json import json
 from rhodecode.model import repo
+from rhodecode.model import repo_group
 from rhodecode.model.db import User
 from rhodecode.model.scm import ScmModel
 
@@ -39,6 +40,12
 STATIC_FILE_PREFIX = '/_static'
 
 
+def add_route_with_slash(config,name, pattern, **kw):
+    config.add_route(name, pattern, **kw)
+    if not pattern.endswith('/'):
+        config.add_route(name + '_slash', pattern + '/', **kw)
+
+
 def get_format_ref_id(repo):
     """Returns a `repo` specific reference formatter function"""
     if h.is_svn(repo):
@@ -253,8 +260,7
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
         by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
-        # if we match quickly from database, short circuit the operation,
-        # and validate repo based on the type.
+
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo = by_name_match
@@ -300,9 +306,33
             return False
 
 
+class RepoGroupRoutePredicate(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'repo_group_route = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        repo_group_name = info['match']['repo_group_name']
+        repo_group_model = repo_group.RepoGroupModel()
+        by_name_match = repo_group_model.get_by_group_name(
+            repo_group_name, cache=True)
+
+        if by_name_match:
+            # register this as request object we can re-use later
+            request.db_repo_group = by_name_match
+            return True
+
+        return False
+
 
 def includeme(config):
     config.add_route_predicate(
         'repo_route', RepoRoutePredicate)
     config.add_route_predicate(
-        'repo_accepted_types', RepoTypeRoutePredicate)
  No newline at end of file
+        'repo_accepted_types', RepoTypeRoutePredicate)
+    config.add_route_predicate(
+        'repo_group_route', RepoGroupRoutePredicate)

rhodecode/apps/home/tests/test_home.py

@@ -28,18 +28,25
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
-from rhodecode.tests import TestController, url
+from rhodecode.tests import TestController
 from rhodecode.tests.fixture import Fixture
 
 
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+        'repo_group_home': '/{repo_group_name}'
+    }[name].format(**kwargs)
+
+
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         # if global permission is set
         response.mustcontain('Add Repository')
 
@@ -49,7 +56,7
 
     def test_index_contains_statics_with_ver(self):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
 
         rhodecode_version_hash = c.rhodecode_version_hash
         response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
@@ -57,7 +64,7
 
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         tip = backend.repo.get_commit().raw_id
 
         # html in javascript variable:
@@ -69,17 +76,16
 
     def test_index_with_anonymous_access_disabled(self):
         with fixture.anon_access(False):
-            response = self.app.get(url(controller='home', action='index'),
-                                    status=302)
+            response = self.app.get(route_path('home'), status=302)
             assert 'login' in response.location
 
     def test_index_page_on_groups(self, autologin_user, repo_group):
-        response = self.app.get(url('repo_group_home', group_name='gr1'))
+        response = self.app.get(route_path('repo_group_home', repo_group_name='gr1'))
         response.mustcontain("gr1/repo_in_group")
 
     def test_index_page_on_group_with_trailing_slash(
             self, autologin_user, repo_group):
-        response = self.app.get(url('repo_group_home', group_name='gr1') + '/')
+        response = self.app.get(route_path('repo_group_home', repo_group_name='gr1') + '/')
         response.mustcontain("gr1/repo_in_group")
 
     @pytest.fixture(scope='class')
@@ -93,15 +99,17
             RepoGroupModel().delete(repo_group='gr1', force_delete=True)
             Session().commit()
 
-    def test_index_with_name_with_tags(self, autologin_user):
-        user = User.get_by_username('test_admin')
+    def test_index_with_name_with_tags(self, user_util, autologin_user):
+        user = user_util.create_user()
+        username = user.username
         user.name = '<img src="/image1" onload="alert(\'Hello, World!\');">'
         user.lastname = (
             '<img src="/image2" onload="alert(\'Hello, World!\');">')
         Session().add(user)
         Session().commit()
+        user_util.create_repo(owner=username)
 
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         response.mustcontain(
             '&lt;img src=&#34;/image1&#34; onload=&#34;'
             'alert(&#39;Hello, World!&#39;);&#34;&gt;')
@@ -122,7 +130,7
         Session().commit()
         SettingsModel().invalidate_settings_cache()
 
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         if state is True:
             response.mustcontain(version_string)
         if state is False:

rhodecode/apps/home/views.py

@@ -25,12 +25,15
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
-from rhodecode.lib.auth import LoginRequired, NotAnonymous
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, \
+    HasRepoGroupPermissionAnyDecorator
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.lib.utils2 import safe_unicode, str2bool
+from rhodecode.lib.ext_json import json
 from rhodecode.model.db import func, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.repo_group import RepoGroupModel
+from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList
 from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
 
@@ -143,7 +146,7
                 'text': obj.group_name,
                 'type': 'group',
                 'obj': {},
-                'url': h.url('repo_group_home', group_name=obj.group_name)
+                'url': h.route_path('repo_group_home', repo_group_name=obj.group_name)
             }
             for obj in repo_groups_iter]
 
@@ -246,3 +249,56
             'results': res
         }
         return data
+
+    def _get_groups_and_repos(self, repo_group_id=None):
+        # repo groups groups
+        repo_group_list = RepoGroup.get_all_repo_groups(group_id=repo_group_id)
+        _perms = ['group.read', 'group.write', 'group.admin']
+        repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
+        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
+            repo_group_list=repo_group_list_acl, admin=False)
+
+        # repositories
+        repo_list = Repository.get_all_repos(group_id=repo_group_id)
+        _perms = ['repository.read', 'repository.write', 'repository.admin']
+        repo_list_acl = RepoList(repo_list, perm_set=_perms)
+        repo_data = RepoModel().get_repos_as_dict(
+            repo_list=repo_list_acl, admin=False)
+
+        return repo_data, repo_group_data
+
+    @LoginRequired()
+    @view_config(
+        route_name='home', request_method='GET',
+        renderer='rhodecode:templates/index.mako')
+    def main_page(self):
+        c = self.load_default_context()
+        c.repo_group = None
+
+        repo_data, repo_group_data = self._get_groups_and_repos()
+        # json used to render the grids
+        c.repos_data = json.dumps(repo_data)
+        c.repo_groups_data = json.dumps(repo_group_data)
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoGroupPermissionAnyDecorator(
+        'group.read', 'group.write', 'group.admin')
+    @view_config(
+        route_name='repo_group_home', request_method='GET',
+        renderer='rhodecode:templates/index_repo_group.mako')
+    @view_config(
+        route_name='repo_group_home_slash', request_method='GET',
+        renderer='rhodecode:templates/index_repo_group.mako')
+    def repo_group_main_page(self):
+        c = self.load_default_context()
+        c.repo_group = self.request.db_repo_group
+        repo_data, repo_group_data = self._get_groups_and_repos(
+            c.repo_group.group_id)
+
+        # json used to render the grids
+        c.repos_data = json.dumps(repo_data)
+        c.repo_groups_data = json.dumps(repo_group_data)
+
+        return self._get_template_context(c)

rhodecode/apps/login/views.py

@@ -25,7 +25,6
 import logging
 import urlparse
 
-from pylons import url
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from recaptcha.client.captcha import submit
@@ -91,20 +90,21
     came_from = safe_str(request.GET.get('came_from', ''))
     parsed = urlparse.urlparse(came_from)
     allowed_schemes = ['http', 'https']
+    default_came_from = h.route_path('home')
     if parsed.scheme and parsed.scheme not in allowed_schemes:
         log.error('Suspicious URL scheme detected %s for url %s' %
                   (parsed.scheme, parsed))
-        came_from = url('home')
+        came_from = default_came_from
     elif parsed.netloc and request.host != parsed.netloc:
         log.error('Suspicious NETLOC detected %s for url %s server url '
                   'is: %s' % (parsed.netloc, parsed, request.host))
-        came_from = url('home')
+        came_from = default_came_from
     elif any(bad_str in parsed.path for bad_str in ('\r', '\n')):
         log.error('Header injection detected `%s` for url %s server url ' %
                   (parsed.path, parsed))
-        came_from = url('home')
+        came_from = default_came_from
 
-    return came_from or url('home')
+    return came_from or default_came_from
 
 
 class LoginView(BaseAppView):
@@ -215,7 +215,7
             action='user.logout', action_data=action_data,
             user=auth_user, commit=True)
         self.session.delete()
-        return HTTPFound(url('home'))
+        return HTTPFound(h.route_path('home'))
 
     @HasPermissionAnyDecorator(
         'hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')

rhodecode/apps/my_account/tests/test_my_account_password.py

@@ -132,6 +132,7
         self.app.post(route_path('my_account_password'), form_data)
 
         response = self.app.get(route_path('home'))
-        new_password_hash = response.session['rhodecode_user']['password']
+        session = response.get_session_from_response()
+        new_password_hash = session['rhodecode_user']['password']
 
         assert old_password_hash != new_password_hash
  No newline at end of file

rhodecode/apps/repository/__init__.py

@@ -23,6 +23,10
 
     # Summary
     config.add_route(
+        name='repo_summary',
+        pattern='/{repo_name:.*?[^/]}', repo_route=True)
+
+    config.add_route(
         name='repo_summary_explicit',
         pattern='/{repo_name:.*?[^/]}/summary', repo_route=True)
 

rhodecode/config/middleware.py

@@ -292,6 +292,7
     config.include('rhodecode.apps.login')
     config.include('rhodecode.apps.home')
     config.include('rhodecode.apps.repository')
+    config.include('rhodecode.apps.repo_group')
     config.include('rhodecode.apps.search')
     config.include('rhodecode.apps.user_profile')
     config.include('rhodecode.apps.my_account')

rhodecode/config/routing.py

@@ -184,9 +184,6
     # CUSTOM ROUTES HERE
     #==========================================================================
 
-    # MAIN PAGE
-    rmap.connect('home', '/', controller='home', action='index')
-
     # ping and pylons error test
     rmap.connect('ping', '%s/ping' % (ADMIN_PREFIX,), controller='home', action='ping')
     rmap.connect('error_test', '%s/error_test' % (ADMIN_PREFIX,), controller='home', action='error_test')
@@ -1002,13 +999,6
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    # must be here for proper group/repo catching pattern
-    _connect_with_slash(
-        rmap, 'repo_group_home', '/{group_name}',
-        controller='home', action='index_repo_group',
-        conditions={'function': check_group},
-        requirements=URL_NAME_REQUIREMENTS)
-
     # catch all, at the end
     _connect_with_slash(
         rmap, 'summary_home', '/{repo_name}', jsroute=True,

rhodecode/controllers/admin/repo_groups.py

@@ -193,10 +193,10
             _new_group_name = form_result['group_name_full']
             repo_group_url = h.link_to(
                 _new_group_name,
-                h.url('repo_group_home', group_name=_new_group_name))
+                h.route_path('repo_group_home', repo_group_name=_new_group_name))
             h.flash(h.literal(_('Created repository group %s')
                     % repo_group_url), category='success')
-            # TODO: in futureaction_logger(, '', '', '', self.sa)
+            # TODO: in future action_logger(, '', '', '', self.sa)
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/repo_groups/repo_group_add.mako'),
@@ -234,7 +234,6
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME), method='put')
-        # url('repo_group_home', group_name=GROUP_NAME)
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         can_create_in_root = self._can_create_repo_group()
@@ -284,7 +283,6
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME), method='delete')
-        # url('repo_group_home', group_name=GROUP_NAME)
 
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()

rhodecode/controllers/admin/repos.py

@@ -185,7 +185,7
         except Exception as e:
             msg = self._log_creation_exception(e, form_result.get('repo_name'))
             h.flash(msg, category='error')
-            return redirect(url('home'))
+            return redirect(h.route_path('home'))
 
         return redirect(h.url('repo_creating_home',
                               repo_name=form_result['repo_name_full'],
@@ -265,7 +265,7
                 if task.failed():
                     msg = self._log_creation_exception(task.result, c.repo)
                     h.flash(msg, category='error')
-                    return redirect(url('home'), code=501)
+                    return redirect(h.route_path('home'), code=501)
 
         repo = Repository.get_by_repo_name(repo_name)
         if repo and repo.repo_state == Repository.STATE_CREATED:

rhodecode/controllers/forks.py

@@ -139,7 +139,7
         c.repo_info = Repository.get_by_repo_name(repo_name)
         if not c.repo_info:
             h.not_mapped_error(repo_name)
-            return redirect(url('home'))
+            return redirect(h.route_path('home'))
 
         defaults = self.__load_data(repo_name)
 

rhodecode/controllers/home.py

@@ -65,46 +65,3
         msg = ('RhodeCode Enterprise %s test exception. Generation time: %s'
                % (c.rhodecode_name, time.time()))
         raise TestException(msg)
-
-    def _get_groups_and_repos(self, repo_group_id=None):
-        # repo groups groups
-        repo_group_list = RepoGroup.get_all_repo_groups(group_id=repo_group_id)
-        _perms = ['group.read', 'group.write', 'group.admin']
-        repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
-        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
-            repo_group_list=repo_group_list_acl, admin=False)
-
-        # repositories
-        repo_list = Repository.get_all_repos(group_id=repo_group_id)
-        _perms = ['repository.read', 'repository.write', 'repository.admin']
-        repo_list_acl = RepoList(repo_list, perm_set=_perms)
-        repo_data = RepoModel().get_repos_as_dict(
-            repo_list=repo_list_acl, admin=False)
-
-        return repo_data, repo_group_data
-
-    @LoginRequired()
-    def index(self):
-        c.repo_group = None
-