Clean up and refactor

- move static directory inside browser module - update tests
collective · Sep 6, 2018 · ff89815 · ff89815
1 parent 03446c8
commit ff89815
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/src/collective/lazysizes/browser/__init__.py b/src/collective/lazysizes/browser/__init__.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
-from collective.lazysizes.config import JS
 from plone.app.layout.viewlets import ViewletBase
 
 
 class ResourcesViewlet(ViewletBase):
     """This viewlet inserts static resources on page header."""
-
-    def js(self):
-        return self.site_url + '/' + JS
diff --git a/src/collective/lazysizes/browser/configure.zcml b/src/collective/lazysizes/browser/configure.zcml
@@ -3,11 +3,17 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="collective.lazysizes">
 
+  <browser:resourceDirectory
+      name="collective.lazysizes"
+      directory="static"
+      layer="collective.lazysizes.interfaces.ILazySizesLayer"
+      />
+
   <browser:viewlet
       name="collective.lazysizes.resources"
       manager="plone.app.layout.viewlets.interfaces.IHtmlHead"
       class=".ResourcesViewlet"
-      template="../static/resources.pt"
+      template="static/resources.pt"
       permission="zope2.Public"
       />
 

diff --git a/src/collective/lazysizes/static/README.rst → ...ctive/lazysizes/browser/static/README.rst b/src/collective/lazysizes/static/README.rst → ...ctive/lazysizes/browser/static/README.rst
diff --git a/src/collective/lazysizes/config.py b/src/collective/lazysizes/config.py
@@ -4,6 +4,4 @@
 
 PROJECTNAME = 'collective.lazysizes'
 
-JS = '++resource++collective.lazysizes/lazysizes.js'
-
 IS_PLONE_5 = api.env.plone_version().startswith('5')
diff --git a/src/collective/lazysizes/configure.zcml b/src/collective/lazysizes/configure.zcml
@@ -24,12 +24,6 @@
       permission="collective.lazysizes.Setup"
       />
 
-  <browser:resourceDirectory
-      name="collective.lazysizes"
-      directory="static"
-      layer="collective.lazysizes.interfaces.ILazySizesLayer"
-      />
-
   <adapter
       for="* .interfaces.ILazySizesLayer"
       name="collective.lazysizes"

diff --git a/src/collective/lazysizes/tests/test_resources_viewlet.py b/src/collective/lazysizes/tests/test_resources_viewlet.py
@@ -33,9 +33,8 @@ def get_viewlet(self, context, name='collective.lazysizes.resources'):
         return viewlet[0]
 
     def test_viewlet(self):
-        from collective.lazysizes.config import JS
         html = etree.HTML(self.viewlet())
         self.assertIn('async', html.xpath('//script')[0].attrib)
-        self.assertTrue(
-            html.xpath('//script')[0].attrib['src'],
-            'http://nohost/plone/' + JS)
+        regexp = r'lazysizes-[\da-f]{7}\.js$'
+        self.assertRegexpMatches(
+            html.xpath('//script')[0].attrib['src'], regexp)
diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js
@@ -6,8 +6,8 @@ const gitCmd = 'git rev-list -1 HEAD --abbrev-commit $(pwd)'
 const gitHash = childProcess.execSync(gitCmd).toString().substring(0, 7);
 
 // clean up old resources
-const path = `${__dirname}/../src/collective/lazysizes/static`
-childProcess.execSync(`rm -f ${path}/lazysizes*`);
+const path = `${__dirname}/../src/collective/lazysizes/browser/static`
+childProcess.execSync(`rm -f ${path}/lazysizes-*`);
 
 module.exports = {
   entry: [