Refactored views and blueprint loading

ckanext/odsh/plugin.py

@@ -46,46 +46,12 @@ class OdshPlugin(p.SingletonPlugin, DefaultTranslation, tk.DefaultDatasetForm):
     def get_blueprint(self):
         log.debug("OdshPlugin::get_blueprint")
 
-        # Default
-        bp_default = default.blueprint
-        rules = [
-            ('/info_page', 'info_page', default.info_page),
-            ('/home', 'start', default.start),
-            ('/robots.txt', 'robots_txt', default.robots_txt),
-            ('/not_found', 'not_found', default.not_found), ]
-        for rule in rules:
-            bp_default.add_url_rule(*rule)
-
-        # DCAT
-        # if tk.asbool(tk.config.get('ckanext.dcat.enable_rdf_endpoints', True)):
-        #     helpers_odsh.odsh_remove_route(map, 'dcat_catalog')
-        #     bp_default.add_url_rule('/catalog.<any("xml", "rdf", "n3", "ttl", "jsonld"):_format>', view_func=dcat_view.read_catalog, defaults={'_format': 'xml'}, methods=['GET'])
-
-        # Package
-        # bp_package = package.blueprint
-        # rules = [
-        #     ('/dataset/<id>/resource/<resource_id>', 'redirect_dataset_resource', package.redirect_dataset_resource), ]
-        # for rule in rules:
-        #     bp_package.add_url_rule(*rule)
-
-        # User
-        bp_user = user.blueprint
-        bp_user.add_url_rule(u'/user', endpoint='user_index',
-                             view_func=user.index, strict_slashes=False)
-        # bp_user.add_url_rule(u'/user/register', view_func=user.register)
-
-        # Harvest
-        bp_harvest = harvest.blueprint
-        bp_harvest.add_url_rule(u'/harvest', view_func=harvest.search, strict_slashes=False)
-        bp_harvest.add_url_rule(u'/harvest/new', view_func=harvest.new)
-        bp_harvest.add_url_rule(u'/harvest/<id>', view_func=harvest.read)
-        bp_harvest.add_url_rule(u'/harvest/about/<id>', view_func=harvest.about)
-
-        # Feed
-        bp_feed = feed.blueprint
-        bp_feed.add_url_rule(u'/feeds/custom.atom', methods=[u'GET'], view_func=feed.custom)
-
-        return [bp_default, bp_user, bp_harvest, bp_feed] # bp_package
+        bp_default = default.get_blueprint()
+        bp_user = user.get_blueprint()
+        bp_harvest = harvest.get_blueprint()
+        bp_feed = feed.get_blueprint()
+
+        return [bp_default, bp_user, bp_harvest, bp_feed]
 
     # IActions
 

ckanext/odsh/views/default.py

@@ -24,3 +24,14 @@ def robots_txt():
     resp = make_response(base.render('home/robots.txt'))
     resp.headers['Content-Type'] = "text/plain; charset=utf-8"
     return resp
+
+rules = [
+    ('/info_page', 'info_page', info_page),
+    ('/home', 'start', start),
+    ('/robots.txt', 'robots_txt', robots_txt),
+    ('/not_found', 'not_found', not_found), ]
+for rule in rules:
+    blueprint.add_url_rule(*rule)
+
+def get_blueprint():
+    return blueprint
\ No newline at end of file

ckanext/odsh/views/feed.py

@@ -65,3 +65,8 @@ def custom():
                           feed_guid=ckan_feed._create_atom_id(atom_url),
                           feed_url=feed_url,
                           navigation_urls=navigation_urls)
+
+blueprint.add_url_rule(u'/feeds/custom.atom', methods=[u'GET'], view_func=custom)
+
+def get_blueprint():
+    return blueprint
\ No newline at end of file

ckanext/odsh/views/harvest.py

@@ -40,3 +40,11 @@ def about(id):
     if not is_sysadmin:
         toolkit.abort(403)
     return dataset.about(id)
+
+blueprint.add_url_rule(u'/harvest', view_func=search, strict_slashes=False)
+blueprint.add_url_rule(u'/harvest/new', view_func=new)
+blueprint.add_url_rule(u'/harvest/<id>', view_func=read)
+blueprint.add_url_rule(u'/harvest/about/<id>', view_func=about)
+
+def get_blueprint():
+    return blueprint
\ No newline at end of file

ckanext/odsh/views/user.py

@@ -33,3 +33,10 @@ def read(id=None):
     if not g.user:
         return ckan_user_view.login()
     return ckan_user_view.read(id)
+
+blueprint.add_url_rule(u'/user', endpoint='user_index',
+                             view_func=index, strict_slashes=False)
+# blueprint.add_url_rule(u'/user/register', view_func=user.register)
+
+def get_blueprint():
+    return blueprint
\ No newline at end of file