polaris_form_builder 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6bcd0b60a0df4d1edc4b00f89144a17eab765a8d51e3374abc4fc37c4dbc8a5
-  data.tar.gz: d641170ee84b65b7cfc22852674fedc102d86629128a5945b90d03a851095a09
+  metadata.gz: a4af632b1d028e2adca5c77ef12e64bfdf3b031322dd31339d3b9999be009f0e
+  data.tar.gz: 8303bdedb09f4c716d9f5114e67c00b02e9f7c6ce5f2f5b635c00b858cc513b2
 SHA512:
-  metadata.gz: 65edcb87ea84066e95edcf7a52286b54a98135b97b82aa44c8b9fcb245dae6ba36f4e9bf40bbefa6bb33f9e923fa861ca63d9e70807a7bc4978a4cd0f751380e
-  data.tar.gz: 2a6a77e9e8582b672e6bef9386bf9ff4e0ce838365e993f91168cae34a3ad72e7c8dc13acfe4daba6dd0afc7454edec722774ee0282cec2e95d5257d7570fcea
+  metadata.gz: c1f62dc62a10bca07e74f5c61fc4393534f5b627501dbed88a5d98f857da19a62560fb00b9c1effb1e86f7e0e4ce92f78c76ff751c121916ba3d6c4b91edc5eb
+  data.tar.gz: acc679cfdf24f1fad0d2691c2f79f38957807564aa00a9485fd06a94d9766d86f93f59bc6442150041a02c7eb933c0308da938845b0385605e354644824a3990

data/lib/polaris_form_builder/form_builder.rb

@@ -66,7 +66,7 @@ module PolarisFormBuilder
         super(method, choices, options.merge(attrs), html_options)
       end
 
-      content = capture_block(&block)
+      content = @template.capture(&block) if block_given?
 
       select_tag = Tag.new("s-select", "select")
       select_tag.attr("value", object.send(method)) if object.respond_to?(method)
@@ -117,7 +117,14 @@ module PolarisFormBuilder
     end
 
     def choice_list(method, options = {}, &block)
-      select(method, options.delete(:choices), options, &block)
+      options = options.dup
+      choices = options.delete(:choices)
+      error = method_error(method)
+      attrs = options.merge(name: @template.field_name(object_name, method))
+      attrs[:error] = error if error
+      content = choice_list_content(choices, &block)
+
+      @template.content_tag("s-choice-list", content, attrs)
     end
 
     private
@@ -138,22 +145,26 @@ module PolarisFormBuilder
 
     def polaris_input(tag_name, html, &block)
       tag = Tag.new(tag_name, "input", remove_attributes: %w[type size])
-      @template.raw tag.apply(html, capture_block(&block))
+      content = @template.capture(&block) if block_given?
+      @template.raw tag.apply(html, content)
     end
 
-    def capture_block(&block)
-      return unless block_given?
-
-      # Use the buffer from the block's binding to avoid writing to a different
-      # output buffer and duplicating content when the builder is reused.
-      capture_buffer = block.binding.eval("@output_buffer") rescue nil
-      capture_buffer ||= @template.output_buffer
+    def choice_list_content(choices, &block)
+      if block_given?
+        @template.capture(&block)
+      elsif choices.present?
+        @template.safe_join(choices.map { |choice| choice_list_item(choice) })
+      end
+    end
 
-      if capture_buffer.respond_to?(:capture)
-        capture_buffer.capture(&block)
+    def choice_list_item(choice)
+      label, value = if choice.is_a?(Array)
+        [ choice[0], choice[1] ]
       else
-        @template.capture(&block)
+        [ choice, choice ]
       end
+
+      @template.content_tag("s-choice", label, value: value)
     end
   end
 end

data/lib/polaris_form_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PolarisFormBuilder
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polaris_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lex Cao