actionview_precompiler 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f61275e9c390cf6a14ce7a3fa9bc4fb4473887547e7da8f07587cd26144b8c7
-  data.tar.gz: c125ff85f50d91ca77b80ee0eef47cb51e70373a17e2fc8c99d3b826e1176348
+  metadata.gz: 6c8e4204b2ff2f95e85606497693d399460c4c31a8f946706a503be04b03d5f8
+  data.tar.gz: 8aa824e50eaa357b9f0084756c9399f928b8ead2e2a04fe24ab2bbbe4b611400
 SHA512:
-  metadata.gz: 9e6d53ba2a4eb030cff6d57635a7d0e77eec0016e1c1af6255f9f134d438030ec4f45669bcd506dd00b1f8d36a64138b9690c3cd4f17dcfc4fe9e7c7562ec72f
-  data.tar.gz: bcc61e6a911a98886b74bfc8df1c29b6b6b3efabfbc50bf0178b34f3a7948867bfeaa7f2aec79945363fa34146b974909893c3e405033540b2bbcee0024c74cc
+  metadata.gz: dbfa31585cea6678aec9b4e0b7fa592f439e4d2f3aa9428faa7583a9c32a701a880343e66843c8ef7afa9d146b8a2542a078c2de622211750fe8c516ddbe0bed
+  data.tar.gz: b1655ba9a3639df1ac3d26b15297d3909e1fbfb6f323152f3a8bf3aca956d229d7d848bbc291a438c2aa5069a0d889f4f1c4b14280868ab33011160611847219

data/lib/actionview_precompiler/precompiler.rb

@@ -78,8 +78,14 @@ module ActionviewPrecompiler
       @templates.each do |template|
         parser = TemplateParser.new(template.fullpath)
         parser.render_calls.each do |render_call|
-          @locals_sets[render_call.virtual_path] ||= []
-          @locals_sets[render_call.virtual_path] << render_call.locals_keys.map(&:to_s).sort
+          virtual_path = render_call.virtual_path
+          unless virtual_path.include?("/")
+            # Not necessarily true, since the perfix is based on the current
+            # controller, but is a safe bet most of the time.
+            virtual_path = "#{template.prefix}/#{virtual_path}"
+          end
+          @locals_sets[virtual_path] ||= []
+          @locals_sets[virtual_path] << render_call.locals_keys.map(&:to_s).sort
         end
       end
 

data/lib/actionview_precompiler/render_parser.rb

@@ -2,7 +2,7 @@ module ActionviewPrecompiler
   RenderCall = Struct.new(:render_type, :template, :locals, :locals_keys) do
     def virtual_path
       if render_type == :partial
-        @virtual_path ||= template.gsub(%r{/([^/]*)\z}, '/_\1')
+        @virtual_path ||= template.gsub(%r{(/|^)([^/]*)\z}, '\1_\2')
       else
         template
       end
@@ -61,7 +61,7 @@ module ActionviewPrecompiler
 
     RENDER_TYPE_KEYS = [:partial, :template, :layout]
     IGNORED_KEYS = [:formats]
-    ALL_KNOWN_KEYS = [*RENDER_TYPE_KEYS, *IGNORED_KEYS, :locals]
+    ALL_KNOWN_KEYS = [*RENDER_TYPE_KEYS, *IGNORED_KEYS, :locals, :object, :collection, :as]
 
     def parse_render_from_options(options_hash)
       keys = options_hash.keys
@@ -93,6 +93,25 @@ module ActionviewPrecompiler
         locals_keys = []
       end
 
+      if options_hash.key?(:object) || options_hash.key?(:collection)
+        return nil if options_hash.key?(:object) && options_hash.key?(:collection)
+        return nil unless options_hash.key?(:partial)
+
+        as = if options_hash.key?(:as)
+               parse_str(options_hash[:as]) || parse_sym(options_hash[:as])
+             elsif File.basename(template) =~ /\A_?(.*?)(?:\.\w+)*\z/
+               $1
+             end
+
+        return nil unless as
+
+        locals_keys << as.to_sym
+        if options_hash.key?(:collection)
+          locals_keys << :"#{as}_counter"
+          locals_keys << :"#{as}_iteration"
+        end
+      end
+
       RenderCall.new(render_type, template, locals, locals_keys)
     end
 

data/lib/actionview_precompiler/template_parser.rb

@@ -7,6 +7,10 @@ module ActionviewPrecompiler
     attr_reader :filename, :basename, :handler
 
     class FakeTemplate
+      def identifier
+        "fake_template"
+      end
+
       def type
         nil
       end

data/lib/actionview_precompiler/version.rb

@@ -1,3 +1,3 @@
 module ActionviewPrecompiler
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview_precompiler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview