molecule 0.3.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 880dd96fcd18724b9aeee6af621dcd630bd2d4c6aba57b226cc9fb2fedafbce6
-  data.tar.gz: 11ce6b4b128b418bb8f890bf7b168dd750f1f7f205470e9baf9997034508b9a0
+  metadata.gz: 89f39d6db182600e792cf8c05fdc74461997e63c7e42b8b7790944815d92eee1
+  data.tar.gz: 0c57c03f0caf64bdd4394fbd2a94c4cdd2cb7f64391eb92e4cf427f7afea82ba
 SHA512:
-  metadata.gz: accb019319bf639930bcd5d7fb62efa506cb21aaad457151af46c94202b323de4eb4df55a2a02e6c6dfe5a884c994ad713c08734130344daf0bfa584f1dca15e
-  data.tar.gz: 19ebeb0970d2aa1f315f02482729b54c974d5f521f38b29a1dd8bd75eef56f11bacab36ed8cdb896bf08107e6ba576bf5c26b83598918022e88f8a277245cb7d
+  metadata.gz: '00978af2e916b035d816782ea5ca1e078fc611f138c0f303ab9196b96e1fbe4adcbbd8197fd3f764bb5c0093508453f1df3946f1ef2a28fb3c4864f184bbc5c0'
+  data.tar.gz: 1e1008d2fd584c0dca2b41ceb8ac22094c8b9f92e553a11a45b0fb91ec85a00033aa3e4b6abb862a6543b53bf7cbabd01352b300e9344cfbc761f24767950989

data/lib/molecule/helper.rb

@@ -2,30 +2,30 @@ module Molecule
 
   module Helper
 
-    def molecule_inline_style molecule_name
+    def molecule_inline_style molecule_name = default_molecule_name
       content_tag(:style, molecule_asset_contents(molecule_name, 'inline', 'styles')).html_safe
     end
 
-    def molecule_inline_script molecule_name
+    def molecule_inline_script molecule_name = default_molecule_name
       content_tag(:script, molecule_asset_contents(molecule_name, 'inline', 'scripts')).html_safe
     rescue
       Rails.logger.warn "no inline script for '#{molecule_name}'"
       ''
     end
 
-    def molecule_defer_style molecule_name
+    def molecule_defer_style molecule_name = default_molecule_name
       relative_link = molecule_relative_path(molecule_name, 'defer', 'styles')
       content_tag(:noscript, class: 'defered-style') do
         content_tag(:link, '', {rel: :stylesheet, type: 'text/css', href: relative_link}).html_safe
       end.html_safe
     end
 
-    def molecule_defer_script molecule_name
+    def molecule_defer_script molecule_name = default_molecule_name
       relative_link = molecule_relative_path(molecule_name, 'defer', 'scripts')
       content_tag(:script, '', {defer: :defer, src: relative_link}).html_safe
     end
 
-    def molecule_inject_script_name molecule_name
+    def molecule_inject_script_name molecule_name = default_molecule_name
       relative_link = molecule_relative_path(molecule_name, 'defer', 'scripts')
       content_tag(:script, "window.script_name='#{relative_link}';".html_safe).html_safe
     rescue
@@ -60,10 +60,14 @@ module Molecule
     private
 
 
+    def default_molecule_name
+      "#{controller_name}_#{action_name}"
+    end
+
     def find_asset molecule_name, asset_group, asset_type
       config = load_manifest(molecule_name, asset_group, asset_type)
       suffix = suffix_for_type(asset_type)
-      asset_slug = "#{molecule_name}-#{asset_group}.#{suffix}"
+      asset_slug = "#{molecule_name}-#{asset_type}-#{asset_group}.#{suffix}"
       asset = config[asset_slug]
       return suffix, asset
     end
@@ -90,7 +94,7 @@ module Molecule
     end
 
     def manifest_path molecule_name, asset_group, asset_type
-      Rails.root.join('public', 'manifests', "#{molecule_name}/#{asset_group}-#{asset_type}.json")
+      Rails.root.join('public', 'manifests', "#{molecule_name}/#{asset_type}-#{asset_group}.json")
     end
   end
 

data/lib/molecule/renderer.rb

@@ -6,13 +6,13 @@ module Molecule
   class Renderer < ::ActionView::PartialRenderer
 
     # narrow template lookup path to the provided molecule
-    def render context, options, &block
+    def render context, &block
       @@stack ||= ::Molecule::Stack.new
-      with_member_override(:view_paths, molecule_view_paths(options)) do
-        with_member_override(:prefixes, [molecule_prefix(options)]) do
-          with_dependency_check(options[:molecule]) do
-            with_new_molecule(options[:molecule]) do
-              result = super(context, options, block).body
+      with_member_override(:view_paths, molecule_view_paths) do
+        with_member_override(:prefixes, [molecule_prefix]) do
+          with_dependency_check(@options[:molecule]) do
+            with_new_molecule(@options[:molecule]) do
+              result = super(@options[:molecule], context, block).body
             end
           end
         end
@@ -58,18 +58,18 @@ module Molecule
       @lookup_context.find_template(path, prefixes, false, locals, @details)
     end
 
-    def molecule_view_paths options
-      ::ActionView::PathSet.new([molecule_template_path(options)])
+    def molecule_view_paths
+      ::ActionView::PathSet.new([molecule_template_path])
     end
 
     # molecules path
-    def molecule_template_path options
+    def molecule_template_path
       Rails.root.join('app', 'molecules')
     end
 
     # path for current molecule
-    def molecule_prefix options
-      "#{options[:molecule].to_s}/views"
+    def molecule_prefix
+      "#{@options[:molecule].to_s}/views"
     end
 
     # default template entrypoint
@@ -80,3 +80,4 @@ module Molecule
   end
 
 end
+

data/lib/molecule/renderer_extension.rb

@@ -6,7 +6,7 @@ module Molecule
 
     def render(context, options)
       if options.key?(:molecule)
-        ::Molecule::Renderer.new(@lookup_context).render(context, options)
+        ::Molecule::Renderer.new(@lookup_context, options).render(context)
       else
         super
       end

data/lib/molecule/version.rb

@@ -1,3 +1,3 @@
 module Molecule
-  VERSION = '0.3.0'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: molecule
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Dirk Gustke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 description: provide and use template and assets in a self-contained way
 email:
 - code+molecule@asm68k.org
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: provide and use template and assets in a self-contained way