props_template 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e014144b689057bd6e6cc96a007b17263a2eab2a84890dd822056c2a4e258d
-  data.tar.gz: bba7578e983913d2eeeb15fc12026bb66b25c6da5a8df52c4d2003e8615a2eba
+  metadata.gz: fe0d4afac65f1f86e1adfdcc956cc21d6df96a54e55e1ab26c8fa450c6a2a7be
+  data.tar.gz: ea96579bc3d06512867d4c11ee619051a205d64e814e5fe643debd5085d2b56e
 SHA512:
-  metadata.gz: d1adee8973b67e46c8c2169a7664ec92c0ee52e21451108b449888b8a8dd89221b46d2918da2ace75e016530a7654ce03a513f4f761cb2f6fa938dd76d4a18ed
-  data.tar.gz: 2bc87b68c92e21f4755bf4a41c8ea1290bbfcd94f570fa2cf98b86fc2eecaa9ae83eae0f58042c3ae18cfd9c9f0d0c54caa23b5cff4c92814dfd81b3e306baa0
+  metadata.gz: 363ed26b474344ec9e17b328521d10a2e226761272e80f49e72b32e6943f47e3e970d7939e0923548984e96a1cb361ff3e74beebfa058dabe86db4a683e48746
+  data.tar.gz: d99478adad2b0980ce471f992c32d8a8fb0ee4348c469cb7e25b3752c6e44c0181f4beb31bc14a65efafe4d3250588ad8b0d9713eade62ee48107a3072dafbfa

data/lib/props_template/extensions/partial_renderer.rb

@@ -17,6 +17,14 @@ module Props
 
   class Partialer
     INVALID_PARTIAL_MESSAGE = "The partial name must be a string, but received (%s)."
+    OPTION_AS_ERROR_MESSAGE  = "The value (%s) of the option `as` is not a valid Ruby identifier; " \
+                               "make sure it starts with lowercase letter, " \
+                               "and is followed by any combination of letters, numbers and underscores."
+    IDENTIFIER_ERROR_MESSAGE = "The partial name (%s) is not a valid Ruby identifier; " \
+                               "make sure your partial name starts with underscore."
+
+    INVALID_PARTIAL_MESSAGE = "The partial name must be a string, but received (%s)."
+
 
     def initialize(base, context, builder)
       @context = context
@@ -24,30 +32,28 @@ module Props
       @base = base
     end
 
-    def extract_details(options) # :doc:
-      @context.lookup_context.registered_details.each_with_object({}) do |key, details|
+    def extract_details(options)
+      registered_details.each_with_object({}) do |key, details|
         value = options[key]
 
         details[key] = Array(value) if value
       end
     end
 
+    def registered_details
+      if ActionView.version.to_s >= "7"
+        ActionView::LookupContext.registered_details
+      else
+        @context.lookup_context.registered_details
+      end
+    end
+
     def find_and_add_template(all_options)
       first_opts = all_options[0]
 
       if first_opts[:partial]
         partial_opts = block_opts_to_render_opts(@builder, first_opts)
-          .merge(formats: [:json])
-        partial_opts.delete(:handlers)
-        partial = partial_opts[:partial]
-
-        if !(String === partial)
-          raise ArgumentError.new(INVALID_PARTIAL_MESSAGE % (partial.inspect))
-        end
-
-        template_keys = retrieve_template_keys(partial_opts)
-        details = extract_details(partial_opts)
-        template = find_template(partial, template_keys, details)
+        template = find_template(partial_opts)
 
         all_options.map do |opts|
           opts[:_template] = template
@@ -58,9 +64,13 @@ module Props
       end
     end
 
-    def find_template(path, locals, details)
-      prefixes = path.include?(?/) ? [] : @context.lookup_context.prefixes
-      @context.lookup_context.find_template(path, prefixes, true, locals, details)
+    def find_template(partial_opts)
+      partial = partial_opts[:partial]
+      template_keys = retrieve_template_keys(partial_opts)
+      details = extract_details(partial_opts)
+
+      prefixes = partial.include?(?/) ? [] : @context.lookup_context.prefixes
+      @context.lookup_context.find_template(partial, prefixes, true, template_keys, details)
     end
 
     def retrieve_template_keys(options)
@@ -75,24 +85,24 @@ module Props
       pass_opts[:locals] ||= {}
       pass_opts[:locals][:json] = @builder
       pass_opts[:partial] = partial
+      pass_opts[:formats] = [:json]
+      pass_opts.delete(:handlers)
 
-      pass_opts
-    end
+      if !(String === partial)
+        raise ArgumentError.new(INVALID_PARTIAL_MESSAGE % (partial.inspect))
+      end
 
-    def refine_options(options, item = nil)
-      PartialRenderer.refine_options(options, item)
+      pass_opts
     end
 
     def handle(options)
-      pass_opts = block_opts_to_render_opts(@builder, options)
-      renderer = PartialRenderer.new(@context, pass_opts)
-      template = options[:_template] || renderer.template
+      partial_opts = block_opts_to_render_opts(@builder, options)
+      template = options[:_template] || find_template(partial_opts)
 
-      renderer.render(template, pass_opts)
+      render_partial(template, @context, partial_opts)
     end
 
-    def render(template, options)
-      view = @context
+    def render_partial(template, view, options)
       instrument(:partial, identifier: template.identifier) do |payload|
         locals = options[:locals]
         content = template.render(view, locals)
@@ -101,33 +111,32 @@ module Props
         build_rendered_template(content, template)
       end
     end
-  end
 
-  class PartialRenderer
-    OPTION_AS_ERROR_MESSAGE  = "The value (%s) of the option `as` is not a valid Ruby identifier; " \
-                               "make sure it starts with lowercase letter, " \
-                               "and is followed by any combination of letters, numbers and underscores."
-    IDENTIFIER_ERROR_MESSAGE = "The partial name (%s) is not a valid Ruby identifier; " \
-                               "make sure your partial name starts with underscore."
-
-    INVALID_PARTIAL_MESSAGE = "The partial name must be a string, but received (%s)."
+    def build_rendered_template(content, template, layout = nil)
+      RenderedTemplate.new content, layout, template
+    end
 
+    def instrument(name, **options) # :doc:
+      ActiveSupport::Notifications.instrument("render_#{name}.action_view", options) do |payload|
+        yield payload
+      end
+    end
 
-    def self.raise_invalid_option_as(as)
+    def raise_invalid_option_as(as)
       raise ArgumentError.new(OPTION_AS_ERROR_MESSAGE % (as))
     end
 
-    def self.raise_invalid_identifier(path)
+    def raise_invalid_identifier(path)
       raise ArgumentError.new(IDENTIFIER_ERROR_MESSAGE % (path))
     end
 
-    def self.retrieve_variable(path)
+    def retrieve_variable(path)
       base = path[-1] == "/" ? "" : File.basename(path)
       raise_invalid_identifier(path) unless base =~ /\A_?(.*?)(?:\.\w+)*\z/
       $1.to_sym
     end
 
-    def self.refine_options(options, item = nil)
+    def refine_options(options, item = nil)
       return options if !options[:partial]
 
       partial, rest = [*options[:partial]]
@@ -156,78 +165,5 @@ module Props
 
       pass_opts
     end
-
-    attr_reader :template
-
-    def initialize(context, options)
-      @context = context
-      @options = options.merge(formats: [:json])
-      @options.delete(:handlers)
-      @details = extract_details(@options)
-
-      partial = @options[:partial]
-
-      if !(String === partial)
-        raise_invalid_partial(partial.inspect)
-      end
-
-      @path = partial
-
-      template_keys = retrieve_template_keys(@options)
-      @template = find_template(@path, template_keys)
-    end
-
-    def render(template, options)
-      #remove this later
-
-      render_partial(template, @context, @options)
-    end
-
-    private
-      def extract_details(options) # :doc:
-        @context.lookup_context.registered_details.each_with_object({}) do |key, details|
-          value = options[key]
-
-          details[key] = Array(value) if value
-        end
-      end
-
-      def instrument(name, **options) # :doc:
-        ActiveSupport::Notifications.instrument("render_#{name}.action_view", options) do |payload|
-          yield payload
-        end
-      end
-
-      def render_partial(template, view, options)
-        template ||= @template
-        # @variable ||= template.variable
-
-        instrument(:partial, identifier: @template.identifier) do |payload|
-          locals = options[:locals]
-          content = template.render(view, locals)
-
-          payload[:cache_hit] = view.view_renderer.cache_hits[template.virtual_path]
-          build_rendered_template(content, template)
-        end
-      end
-
-      def build_rendered_template(content, template, layout = nil)
-        RenderedTemplate.new content, layout, template
-      end
-
-      def find_template(path, locals)
-        prefixes = path.include?(?/) ? [] : @context.lookup_context.prefixes
-        @context.lookup_context.find_template(path, prefixes, true, locals, @details)
-      end
-
-      def retrieve_template_keys(options)
-        template_keys = options[:locals].keys
-        template_keys << options[:as] if options[:as]
-        template_keys
-      end
-
-      def raise_invalid_partial(path)
-        raise ArgumentError.new(INVALID_PARTIAL_MESSAGE % (path))
-      end
   end
 end

data/lib/props_template/version.rb

@@ -1,3 +1,3 @@
 module Props
-  VERSION = "0.21.0".freeze
+  VERSION = "0.21.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: props_template
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport