molecule 0.2.4 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f61bb41f5c639e0dcad823a22bbc34f4c9bfcf3ae4b45f9746b5d0c49a10077
-  data.tar.gz: 577575e585a397a50e167bf440280241c9cad00102fdeada6a163f13cf10f698
+  metadata.gz: 17ba548775d6f7ef8bd2b0c1ecc659d1fb919968c58b20249ed0ad7bb829df98
+  data.tar.gz: 53f89520ea0ea4305a92f72264f6a3db85a8948d7181606caa9ef5af89f733b0
 SHA512:
-  metadata.gz: e10d10a9535c08cacbf495d564a2d7228e95e320f8183249e3aee5a317d885d0e41278fa692978278128cffee75e5bd3945b69393be1b4dceaddc100e76526ee
-  data.tar.gz: 4b9b98d18375da1c929aa9c67186b5cb75c750f40441e6e10d341450332a0f2e6a65ce45a02e6a7bdaef953ba9ae6fe4b6e478d111997b5fe99275adb5b2f2f7
+  metadata.gz: 1e8a0fbd4b803fa476acc10b9ba1c20559b6228350a97b1d2861da4d270374429961f5f27832ac4b3456ce0589cc19055a401130d5ec0d3f27e1e6e088a75941
+  data.tar.gz: 4d44e38691a1ad5464e0e3d6c1f4e9a5b5ccb5c7cfb7897a878b18d3a2ec68f25a19c299a3b0eb0f65e94bc5a8135cc4ea607e3e22ee5f643199c6b774700e5b

data/README.md

@@ -8,7 +8,7 @@ How to use my plugin.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'molecular_renderer'
+gem 'molecule'
 ```
 
 And then execute:

data/lib/molecule/helper.rb

@@ -8,6 +8,9 @@ module Molecule
 
     def molecule_inline_script 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
@@ -22,6 +25,14 @@ module Molecule
       content_tag(:script, '', {defer: :defer, src: relative_link}).html_safe
     end
 
+    def molecule_inject_script_name molecule_name
+      relative_link = molecule_relative_path(molecule_name, 'defer', 'scripts')
+      content_tag(:script, "window.script_name='#{relative_link}';".html_safe).html_safe
+    rescue
+      Rails.logger.warn "no inline script name for '#{molecule_name}'"
+      ''
+    end
+
     def molecule_asset_contents molecule_name, asset_group, asset_type
       ::File.read(abolute_asset_path(molecule_name, asset_group, asset_type)).html_safe
     end
@@ -33,6 +44,12 @@ module Molecule
 
     def molecule_inline_sprite molecule_name
       manifest_path = Rails.root.join('public', 'manifests', "#{molecule_name}/icons.json")
+
+      unless ::File.exists?(manifest_path)
+        Rails.logger.warn("asset manifest not found: '#{manifest_path}'")
+        return ''
+      end
+
       manifest = ::File.read(manifest_path)
       json = JSON.parse(manifest);
       asset_path = Rails.root.join('public', 'assets', 'svg', json["#{molecule_name}.svg"])
@@ -46,7 +63,7 @@ module Molecule
     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
@@ -73,7 +90,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.2.4'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: molecule
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.2.2
 platform: ruby
 authors:
 - Dirk Gustke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-12-30 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