From ef7b3e94c3bc09d60086bbc4ae8b320ad8c61b94 Mon Sep 17 00:00:00 2001
From: Dominik Moritz <domoritz@gmail.com>
Date: Sun, 25 Aug 2013 11:13:21 +0200
Subject: [PATCH] [#1183] Remove datapusher_enabled action and move before_show
 to datstore. Instead of using the action or the template helper, check
 whether the plugin is enabled. Moved the action so that changing the url
 works even if the datapusher is disabled.

---
 ckan/templates/package/resource_read.html     |  4 +++-
 .../templates/snippets/datapusher_status.html | 14 +++++------
 ckanext/datapusher/helpers.py                 |  4 ----
 ckanext/datapusher/logic/action.py            | 10 --------
 ckanext/datapusher/plugin.py                  | 24 +++++++------------
 ckanext/datastore/logic/action.py             | 17 +++++++++----
 ckanext/datastore/plugin.py                   | 13 +++++++++-
 7 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index d4433d4a4a8..f914780d179 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -27,7 +27,9 @@
           <ul>
             {% block resource_actions_inner %}
             {% if h.check_access('package_update', {'id':pkg.id }) %}
-              <li>{% snippet 'snippets/datapusher_status.html', resource=res %}</li>
+              {% if 'datapusher' in g.plugins %}
+                <li>{% snippet 'snippets/datapusher_status.html', resource=res %}</li>
+              {% endif %}
               <li>{% link_for _('Edit'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %}</li>
             {% endif %}
             {% if res.url %}
diff --git a/ckan/templates/snippets/datapusher_status.html b/ckan/templates/snippets/datapusher_status.html
index 863faeee491..3aa8908aef8 100644
--- a/ckan/templates/snippets/datapusher_status.html
+++ b/ckan/templates/snippets/datapusher_status.html
@@ -4,13 +4,11 @@
 
 #}
 {% if resource.datastore_active %}
-	{% if h.datapusher_enabled() %}
-		{% set job = h.datapusher_status(resource.id) %}
-	  {% set title =  _('Datapusher status: {status}.').format(status=job.status) %}
-	  {% if job.status == 'unknown' %}
-	  	<i title="{{ _(title) }}" class="datapusher-status status-{{ job.status }} icon-circle icon-large"></i>
-	  {% else %}
-	  	<a href="{{ job.job_url }}" class="datapusher-status-link" title="{{ _(title) }}"><i class="datapusher-status status-{{ job.status }} icon-circle icon-large"></i></a>
-  	{% endif %}
+  {% set job = h.datapusher_status(resource.id) %}
+  {% set title =  _('Datapusher status: {status}.').format(status=job.status) %}
+  {% if job.status == 'unknown' %}
+    <i title="{{ _(title) }}" class="datapusher-status status-{{ job.status }} icon-circle icon-large"></i>
+  {% else %}
+    <a href="{{ job.job_url }}" class="datapusher-status-link" title="{{ _(title) }}"><i class="datapusher-status status-{{ job.status }} icon-circle icon-large"></i></a>
   {% endif %}
 {% endif %}
diff --git a/ckanext/datapusher/helpers.py b/ckanext/datapusher/helpers.py
index bf06b2e063a..d5291425b28 100644
--- a/ckanext/datapusher/helpers.py
+++ b/ckanext/datapusher/helpers.py
@@ -9,7 +9,3 @@ def datapusher_status(resource_id):
         return {
             'status': 'unknown'
         }
-
-
-def datapusher_enabled():
-    return toolkit.get_action('datapusher_enabled')({})
diff --git a/ckanext/datapusher/logic/action.py b/ckanext/datapusher/logic/action.py
index c7161a9ccc5..41d3e063284 100644
--- a/ckanext/datapusher/logic/action.py
+++ b/ckanext/datapusher/logic/action.py
@@ -16,13 +16,6 @@
 _validate = ckan.lib.navl.dictization_functions.validate
 
 
-def datapusher_enabled(context, data_dict):
-    ''' Returns True if the DataPusher is configured '''
-
-    datapusher_url = pylons.config.get('datapusher.url')
-    return True if datapusher_url else False
-
-
 def datapusher_submit(context, data_dict):
     ''' Submit a job to the datapusher. The datapusher is a service that
     imports tabular data into the datastore.
@@ -50,9 +43,6 @@ def datapusher_submit(context, data_dict):
 
     p.toolkit.check_access('datapusher_submit', context, data_dict)
 
-    if not p.toolkit.get_action('datapusher_enabled')(context):
-        return False
-
     datapusher_url = pylons.config.get('ckan.datapusher.url')
 
     callback_url = p.toolkit.url_for(
diff --git a/ckanext/datapusher/plugin.py b/ckanext/datapusher/plugin.py
index 650282ea9e1..b20f464d789 100644
--- a/ckanext/datapusher/plugin.py
+++ b/ckanext/datapusher/plugin.py
@@ -23,7 +23,6 @@ class DatapusherPlugin(p.SingletonPlugin):
     p.implements(p.IAuthFunctions)
     p.implements(p.IResourceUrlChange)
     p.implements(p.IDomainObjectModification, inherit=True)
-    p.implements(p.IResourceController, inherit=True)
     p.implements(p.ITemplateHelpers)
 
     legacy_mode = False
@@ -32,9 +31,14 @@ class DatapusherPlugin(p.SingletonPlugin):
     def configure(self, config):
         self.config = config
 
-        datapusher_formats = config.get('datapusher.formats', '').split()
+        datapusher_formats = config.get('ckan.datapusher.formats', '').split()
         self.datapusher_formats = datapusher_formats or DEFAULT_FORMATS
 
+        datapusher_url = config.get('ckan.datapusher.url')
+        if not datapusher_url:
+            raise Exception(
+                'Config option `ckan.datapusher.url` has to be set.')
+
     def notify(self, entity, operation=None):
         if isinstance(entity, model.Resource):
             if (operation == model.domain_object.DomainObjectOperation.new
@@ -54,8 +58,7 @@ def notify(self, entity, operation=None):
                     })
 
     def get_actions(self):
-        return {'datapusher_enabled': action.datapusher_enabled,
-                'datapusher_submit': action.datapusher_submit,
+        return {'datapusher_submit': action.datapusher_submit,
                 'datapusher_hook': action.datapusher_hook,
                 'datapusher_status': action.datapusher_status}
 
@@ -63,17 +66,6 @@ def get_auth_functions(self):
         return {'datapusher_submit': auth.datapusher_submit,
                 'datapusher_status': auth.datapusher_status}
 
-    def before_show(self, resource_dict):
-        ''' Modify the resource url of datastore resources so that
-        they link to the datastore dumps.
-        '''
-        if resource_dict['url_type'] == 'datastore':
-            resource_dict['url'] = p.toolkit.url_for(
-                controller='ckanext.datastore.controller:DatastoreController',
-                action='dump', resource_id=resource_dict['id'])
-        return resource_dict
-
     def get_helpers(self):
         return {
-            'datapusher_status': helpers.datapusher_status,
-            'datapusher_enabled': helpers.datapusher_enabled}
+            'datapusher_status': helpers.datapusher_status}
diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
index ee2a44e9e4a..742462ba8ae 100644
--- a/ckanext/datastore/logic/action.py
+++ b/ckanext/datastore/logic/action.py
@@ -88,20 +88,27 @@ def datastore_create(context, data_dict):
 
     if 'resource' in data_dict:
         has_url = 'url' in data_dict['resource']
-        data_dict['resource'].setdefault('url', '_tmp')
+        # A datastore only resource does not have a url in the db
+        data_dict['resource'].setdefault('url', '_datastore_only_resource')
         res = p.toolkit.get_action('resource_create')(context,
                                                       data_dict['resource'])
         data_dict['resource_id'] = res['id']
 
         # create resource from file
         if has_url:
-            p.toolkit.get_action('datapusher_submit')(context, {
-                'resource_id': res['id'],
-                'set_url_type': True
-            })
+            try:
+                p.toolkit.get_action('datapusher_submit')(context, {
+                    'resource_id': res['id'],
+                    'set_url_type': True
+                })
+            except KeyError:
+                raise p.toolkit.ValidationError({'resource': [
+                    'The datapusher has to be enabled.']})
+
             # since we'll overwrite the datastore resource anyway, we
             # don't need to create it here
             return
+
         # create empty resource
         else:
             # no need to set the full url because it will be set in before_show
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
index 8eb753f8e46..61cdd783d81 100644
--- a/ckanext/datastore/plugin.py
+++ b/ckanext/datastore/plugin.py
@@ -25,6 +25,7 @@ class DatastorePlugin(p.SingletonPlugin):
     p.implements(p.IResourceUrlChange)
     p.implements(p.IDomainObjectModification, inherit=True)
     p.implements(p.IRoutes, inherit=True)
+    p.implements(p.IResourceController, inherit=True)
 
     legacy_mode = False
     resource_show_action = None
@@ -250,4 +251,14 @@ def before_map(self, m):
         m.connect('/datastore/dump/{resource_id}',
                   controller='ckanext.datastore.controller:DatastoreController',
                   action='dump')
-        return m
\ No newline at end of file
+        return m
+
+    def before_show(self, resource_dict):
+        ''' Modify the resource url of datastore resources so that
+        they link to the datastore dumps.
+        '''
+        if resource_dict['url_type'] == 'datastore':
+            resource_dict['url'] = p.toolkit.url_for(
+                controller='ckanext.datastore.controller:DatastoreController',
+                action='dump', resource_id=resource_dict['id'])
+        return resource_dict