molecule 1.2.0 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f75a001199a4d45db2e9a412bdff64b3af5b3087819573ffee9a83615718d80
-  data.tar.gz: 7a98d48be722b583bb2bd092c3ed13d1af25ac3dc3420cca2dd657ef20d37ab1
+  metadata.gz: 4a978259cf3323495472bc58a692c9538a297a435829e18ae9570f383d154825
+  data.tar.gz: b65ad9f0a0ca5afcf16c9ff844d0c463c0aebd2ff53ec11b7ed2013ff8eb8293
 SHA512:
-  metadata.gz: 977a414d219aa91d76776171c587b19279e8646a97cd31af447796ec9433e39979ec18b266d98b16d64a9974c7acfc1c23a82f1504435c9aab63d1bd0cf80e79
-  data.tar.gz: 65ebe71a6410afb0eab05e45b67f9d4b93b388b4bb938e76ddd988abd64f590b5f1bcb1be3ee7c443480b34b4a6f382922cb7b0091c832a61f2976ded5c06584
+  metadata.gz: da7de52a4b454f9fce7f38056e5390032e4fa4e1339c06581eaae1009ec5e4a74c6a18baeb04ef9d9a17329de2537d9cac27a9085de5c324043172d05ff70749
+  data.tar.gz: 4379b63f9155bab1d2dc3a0b4d5540f263dd2bdeea70038eefd3d62b4d028996bfb111f929a80a8b4f67fbbe460ccaffeb69c4ba33b4da55a127cc30de5ddf6f

data/lib/molecule/helper.rb

@@ -2,31 +2,31 @@ module Molecule
 
   module Helper
 
-    def molecule_inline_style molecule_name
-      content_tag(:style, molecule_asset_contents(molecule_name, 'styles', 'inline')).html_safe
+    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
-      content_tag(:script, molecule_asset_contents(molecule_name, 'scripts', 'inline')).html_safe
+    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
-      relative_link = molecule_relative_path(molecule_name, 'styles', 'defer')
+    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
-      relative_link = molecule_relative_path(molecule_name, 'scripts', 'defer')
+    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
-      relative_link = molecule_relative_path(molecule_name, 'scripts', 'defer')
+    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
       Rails.logger.warn "no inline script name for '#{molecule_name}'"
@@ -42,7 +42,7 @@ module Molecule
       "/assets/#{suffix}/#{asset}"
     end
 
-    def molecule_inline_sprite molecule_name
+    def molecule_inline_sprite molecule_name = default_molecule_name
       manifest_path = Rails.root.join('public', 'manifests', "#{molecule_name}/icons.json")
 
       unless ::File.exists?(manifest_path)
@@ -56,6 +56,10 @@ module Molecule
       ::File.read(asset_path).html_safe
     end
 
+    def default_molecule_name
+      "#{controller_name}_#{action_name}"
+    end
+
 
     private
 
@@ -63,7 +67,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
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module Molecule
-  VERSION = '1.2.0'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molecule
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Dirk Gustke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails