view_partial_form_builder 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d222cf5e301a82aad3e0b9ecfd1bb379bcd569acaa49142d1a8da4397c5f5a01
-  data.tar.gz: 3258a1ba69cd315e37ef00af032ed439aa80802ea77aa05a2ebaab1572bda6fc
+  metadata.gz: 2bad5344dd2dcb3ff6332ccce094cafee462d8dad93253e40002d90869908c7d
+  data.tar.gz: 75733a62d1ec0c8266e2577380a70d7459942a4b908ae17e5d98b25cdb6bfb0f
 SHA512:
-  metadata.gz: 6708f5a86457c43e92a340d492251a3c05158afdc373f4dcf223b636b7ef094163c6d400f1f5845b5afba542edeb142e98bb367bd1d95043987edcc368a97744
-  data.tar.gz: 41e75ce219a6c305a67c29656fc2e8b0561cda2f5e8e4196d2437de39f646e9e3388664e7c421471b4b374ae2e4b735716647f1a8ec0cb1d50cfd13cc8b2afad
+  metadata.gz: f847a1f3ceb8b4c390e94575fd6aeb0b37bf93daf49804c4fbc125b476f896250b14a80cb522c76ce32e33e31457f30cb222f28b978851f58ccaa68f19aa76ed
+  data.tar.gz: 682356c76cf59d62ad176adc0166e6e1ec4c8102b89d3214567cd2abea2721f5d6fdb70259f53b55aed6a955adcbf7f7c48275a37159fdb545caad23275df6cb

data/lib/view_partial_form_builder/form_builder.rb

@@ -1,4 +1,4 @@
-require "view_partial_form_builder/lookup_context"
+require "view_partial_form_builder/lookup_override"
 require "view_partial_form_builder/html_attributes"
 
 module ViewPartialFormBuilder
@@ -14,9 +14,9 @@ module ViewPartialFormBuilder
         @template,
         options,
       )
-      @lookup_context = LookupContext.new(
-        overridden_context: @template.lookup_context,
-        object_name: object_name,
+      @lookup_override = LookupOverride.new(
+        prefixes: @template.lookup_context.prefixes,
+        object_name: @object_name,
         view_partial_directory: ViewPartialFormBuilder.view_partial_directory,
       )
     end
@@ -173,6 +173,17 @@ module ViewPartialFormBuilder
       render_partial("time_zone_select", locals, fallback: -> { super })
     end
 
+    def date_select(method, options = {}, **html_options)
+      locals = {
+        method: method,
+        options: options,
+        html_options: HtmlAttributes.new(html_options),
+        arguments: [method, options, html_options],
+      }
+
+      render_partial("date_select", locals, fallback: -> { super })
+    end
+
     def hidden_field(method, **options)
       @emitted_hidden_id = true if method == :id
 
@@ -247,55 +258,55 @@ module ViewPartialFormBuilder
 
     private
 
-    attr_reader :lookup_context
-
     def render_partial(field, locals, fallback:, &block)
       options = locals.fetch(:options, {})
       partial_override = options.delete(:partial)
+      locals = objectify_options(options).merge(locals, form: self)
 
-      if about_to_recurse_infinitely?(field, partial_override)
+      partial = if partial_override.present?
+        find_partial(partial_override, locals, prefixes: [])
+      else
+        find_partial(field, locals, prefixes: prefixes_after(field))
+      end
+
+      if partial.nil? || about_to_recurse_infinitely?(partial)
         fallback.call
       else
-        locals = objectify_options(options).merge(locals, form: self)
-
-        lookup_context.override do
-          if partial_override.present?
-            render(partial_override, locals, &block)
-          elsif partial_exists?(field)
-            render(field, locals, &block)
-          else
-            fallback.call
-          end
-        end
+        partial.render(@template, locals, &block)
       end
     end
 
-    def partial_exists?(template_name)
+    def find_partial(template_name, locals, prefixes:)
       template_is_partial = true
 
-      lookup_context.template_exists?(
+      @template.lookup_context.find_all(
         template_name,
-        lookup_context.prefixes,
+        prefixes,
         template_is_partial,
-      )
+        locals.keys,
+      ).first
     end
 
-    def render(partial_name, locals, &block)
-      if block.present?
-        @template.render(layout: partial_name, locals: locals, &block)
+    def prefixes_after(template_name)
+      prefixes = @lookup_override.prefixes
+      current_prefix = current_virtual_path.delete_suffix("/_#{template_name}")
+
+      if prefixes.include?(current_prefix)
+        prefixes.from(prefixes.index(current_prefix).to_i + 1)
       else
-        @template.render(partial: partial_name, locals: locals)
+        prefixes
       end
     end
 
-    def about_to_recurse_infinitely?(field, partial_override)
-      @template.instance_eval do
-        partial_name = "/#{field}"
-        current_partial = @virtual_path.gsub("/_", "/")
-        currently_rendering_field = current_partial.end_with?(partial_name)
+    def about_to_recurse_infinitely?(partial)
+      partial.virtual_path == current_virtual_path
+    end
 
-        return true if currently_rendering_field && partial_override.nil?
-        return true if currently_rendering_field && partial_override == current_partial
+    def current_virtual_path
+      if (current_template = @template.instance_values["current_template"])
+        current_template.virtual_path.to_s
+      else
+        @template.instance_values["virtual_path"].to_s
       end
     end
   end

data/lib/view_partial_form_builder/{lookup_context.rb → lookup_override.rb}

@@ -1,29 +1,12 @@
 module ViewPartialFormBuilder
-  class LookupContext
-    delegate_missing_to :overridden_context
-
-    def initialize(overridden_context:, object_name:, view_partial_directory:)
+  class LookupOverride
+    def initialize(prefixes:, object_name:, view_partial_directory:)
       @object_name = object_name.to_s.pluralize
-      @overridden_context = overridden_context
-      @prefixes = overridden_context.prefixes.dup.freeze
+      @prefixes = prefixes
       @view_partial_directory = view_partial_directory
     end
 
-    def override(&block)
-      previous_prefixes = overridden_context.prefixes
-
-      overridden_context.prefixes = prefix_overrides
-
-      yield
-    ensure
-      overridden_context.prefixes = previous_prefixes
-    end
-
-    private
-
-    attr_reader :overridden_context, :object_name, :view_partial_directory
-
-    def prefix_overrides
+    def prefixes
       *overridden_prefixes, root_prefix = @prefixes.dup
 
       prefixes = [
@@ -49,5 +32,9 @@ module ViewPartialFormBuilder
 
       prefixes.uniq
     end
+
+    private
+
+    attr_reader :object_name, :view_partial_directory
   end
 end

data/lib/view_partial_form_builder/version.rb

@@ -1,3 +1,3 @@
 module ViewPartialFormBuilder
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_partial_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sean Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -94,7 +94,7 @@ files:
 - lib/view_partial_form_builder/engine.rb
 - lib/view_partial_form_builder/form_builder.rb
 - lib/view_partial_form_builder/html_attributes.rb
-- lib/view_partial_form_builder/lookup_context.rb
+- lib/view_partial_form_builder/lookup_override.rb
 - lib/view_partial_form_builder/version.rb
 homepage: https://github.com/seanpdoyle/view_partial_form_builder
 licenses: