Merge pull request #29 from tino097/wip

Updating the extension

.gitignore

@@ -41,3 +41,4 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 .vscode/
+.DS_Store

ckanext/officedocs/plugin.py

@@ -26,8 +26,10 @@ def info(self):
 
     def setup_template_variables(self, context, data_dict):
         url = quote_plus(data_dict["resource"]["url"])
+        private_package = data_dict["package"]["private"]
         return {
-            "resource_url": url
+            "resource_url": url,
+            "private_package": private_package
         }
 
     def can_view(self, data_dict):

ckanext/officedocs/templates/officedocs/preview.html

@@ -1,3 +1,6 @@
+{% if private_package %}
+<div style="text-align:center;">This resource view will render once the dataset is made public. Microsoft Office preview is unable to access and display private resources.</div>
+{% else %}
 <button id="fullscreeniframe" class="btn" style="position:absolute; right:5px; top:20px">Fullscreen</button>
 <iframe id="cvframe" src="//view.officeapps.live.com/op/view.aspx?src={{resource_url}}" frameborder="0" allowfullscreen="" width="100%" height="400px"></iframe>
 <script>
@@ -41,3 +44,4 @@
         }, false);
     })(this, this.document);
 </script>
+{% endif %}

ckanext/officedocs/tests/test_view.py

@@ -0,0 +1,24 @@
+import ckan.plugins as p
+from ckan.tests import factories
+
+def test_view_on_resource_page():
+    sysadmin = factories.Sysadmin()
+    dataset = factories.Dataset()
+    resource = factories.Resource(
+        package_id = dataset['id'],
+        url = 'http://link.to.some.data',
+        format = 'XLS'
+    )
+    resource_view = factories.ResourceView(
+        resource_id = resource['id'],
+        title = 'Preview',
+        view_type = 'officedocs_view'
+    )
+
+    response = p.toolkit.get_action('resource_view_show')(
+        {'user': sysadmin.get('name')},
+        {'id': resource_view.get('id')}
+    )
+
+    assert response.get('title') == 'Preview'
+    assert response.get('view_type') == 'officedocs_view'