view_partial_form_builder 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e30eab928ee84a6217afbabc1c746aa7a7906efa5417fc323f6b78e476aa3fbb
-  data.tar.gz: 21af6978419ac00cebba9989b86943eb2d4d102397d880cee50acb8a7ef11c7c
+  metadata.gz: eccf5b9ceb2917549fa81592dc4cb2a905b0ac4af8cd4a58a770b0b505905f0f
+  data.tar.gz: b554c6fcc8f97fee666a6e587351f6b37f8ba6bf0b4eececf63224d1f368f111
 SHA512:
-  metadata.gz: 848d4ddf155cb750a63400e9a5aaa3ea062a4d01b3041294c6ddbf64c3570882e28052d6b55066c731320daae6b43e7fa53c47f1a89924603bab50c3ba3885be
-  data.tar.gz: 05e69629609a81b0563bc5a234c3305dc0355e6f0b458d6aea41e75d49009d26a1e274a9ce7e4ccf6b50aa4ff90afa79c30220f44d97a4c754d9988fd9476046
+  metadata.gz: b5093c0eb1fc40b602233db5041fb3cd11b8bc7aef584c8c50f7246f92550cbe002c58d87d4906cc508187e3a77273791435fbd74b3f7d41dcfa014304b89a21
+  data.tar.gz: b0b9db9047dd007e45341866ac2fc54eb91ccff09df57bf86420b587369be7173f5051a82ca9e83c82d20e7dff32e98df60ac6c87591df9c5c83eeec811a62e3

data/README.md

@@ -240,6 +240,59 @@ as the `partial:` option:
 <% end %>
 ```
 
+#### Composing partials
+
+Passing a `partial:` key can be useful for layering partials on top of one
+another. For instance, consider an administrative interface that shares styles
+with a consumer facing site, but has additional bells and whistles.
+
+Declare the consumer facing inputs (in this example, `<input type="search">`):
+
+```html+erb
+<%# app/views/form_builder/_search_field.html.erb %>
+
+<%= form.search_field(
+  *arguments,
+  **options.merge_token_lists(
+    class: "search-field",
+    "data-controller": "input->search#executeQuery",
+  ),
+) %>
+```
+
+Then, declare the administrative interface's inputs, in terms of overriding the
+foundation built by the more general definitions:
+
+```html+erb
+<%# app/views/admin/form_builder/_search_field.html.erb %>
+
+<%= form.search_field(
+  *arguments,
+  partial: "form_builder/search_field",
+  **options.merge_token_lists(
+    class: "search-field--admin",
+    "data-controller": "focus->admin-search#clearResults",
+  ),
+) %>
+```
+
+The rendered `admin/form_builder/search_field` partial combines options and
+arguments from both partials:
+
+```html
+<input
+  type="search"
+  class="
+    search-field
+    search-field--admin
+  "
+  data-controller="
+    input->search#executeQuery
+    focus->admin-search#clearResults
+  "
+>
+```
+
 ### Configuration
 
 View partials lookup and resolution will be scoped to the

data/lib/view_partial_form_builder/form_builder.rb

@@ -250,19 +250,22 @@ module ViewPartialFormBuilder
     attr_reader :lookup_context
 
     def render_partial(field, locals, fallback:, &block)
-      return fallback.call if about_to_recurse_infinitely?(field)
-
       options = locals.fetch(:options, {})
       partial_override = options.delete(:partial)
-      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
+
+      if about_to_recurse_infinitely?(field, partial_override)
+        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
       end
     end
@@ -285,11 +288,13 @@ module ViewPartialFormBuilder
       end
     end
 
-    def about_to_recurse_infinitely?(field)
+    def about_to_recurse_infinitely?(field, partial_override)
       @template.instance_eval do
-        *, partial = @virtual_path.split("/")
+        current_partial = @virtual_path.gsub("/_", "/")
+        currently_rendering_field = current_partial.end_with?(field)
 
-        partial == "_#{field}"
+        return true if currently_rendering_field && partial_override.nil?
+        return true if currently_rendering_field && partial_override == current_partial
       end
     end
   end

data/lib/view_partial_form_builder/version.rb

@@ -1,3 +1,3 @@
 module ViewPartialFormBuilder
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_partial_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sean Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview