express_templates 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25344efbf662faf81ee38e848bbee57bcbff4bbe
-  data.tar.gz: 58c5eadf5990d90c894c204578279c88f328a1ec
+  metadata.gz: de55b6283d4cd228ad658ff1829a4902589af9ed
+  data.tar.gz: 5299e6fa7ca41ccf78778c0ed61b5eb6ba0b070f
 SHA512:
-  metadata.gz: 766f6ec66e155b356b621bd49b39bef4f9b2512912f574a94fbd69f564c8c2585324320f279c038bf034f6b74e98a01ab685cfdcc4d0871c24b7e423a440a8c4
-  data.tar.gz: e47c8531c5ba75cb423b4efebf20139ea39e24b38c3a6c73518c54f210ab91cfa79a750098d32e959059ecdf28a464d1615b6bbb422c03319b232064affd971d
+  metadata.gz: bdf9b62c3e514c77747efa39d7f8b5c738a04ee536cf9868e14b88b40f594dd1fd39ebfc511732aff8cae1d2282961c002599135135358a7e66ae0744e96282b
+  data.tar.gz: abb4d01b06ca7435521c44aec3ec4a0c9a06c2ac298367f49588331ef05282fe4da5548d6768baab4d2c923809318814dc87f46696ee335714160102855e59d1

data/lib/express_templates/components.rb

@@ -7,5 +7,6 @@ require 'express_templates/components/base'
 require 'express_templates/components/configurable'
 require 'express_templates/components/container'
 require 'express_templates/components/tree_for'
+require 'express_templates/components/content_for'
 require 'express_templates/components/forms'
 require 'express_templates/components/all'

data/lib/express_templates/components/configurable.rb

@@ -22,6 +22,8 @@ module ExpressTemplates
     # Options specified as required must be supplied.
     #
     # Default values may be supplied for options with a default: keyword.
+    # The value may be a proc. Useful for instances where you want a different
+    # value every time.
     #
     # Options may be passed as html attributes with attribute: true
     #
@@ -85,11 +87,12 @@ module ExpressTemplates
 
         def _set_defaults
           _default_options.each do |key, value|
+            default_value = value[:default].respond_to?(:call) ? value[:default].call : value[:default]
             if !!value[:attribute]
-              set_attribute key, value[:default]
+              set_attribute key, default_value
             else
               if config[key].nil?
-                config[key] = value[:default]
+                config[key] = default_value
               end
             end
           end

data/lib/express_templates/components/content_for.rb

@@ -0,0 +1,29 @@
+# Proxy component for content_for to prevent it from inserting the block's
+# value into its location.
+class ContentForProxy < Arbre::HTML::Tag
+  builder_method :content_for
+
+  def build(key, content = nil, &block)
+    @value = helpers.content_for(key, content, &block)
+  end
+
+  def to_s
+    @value
+  end
+end
+
+# Patch to #capture to support Arbre::Element
+module ActionView
+  module Helpers
+    module CaptureHelper
+      def capture(*args)
+        value = nil
+        buffer = with_output_buffer { value = yield(*args) }
+        value = value.to_s if value.is_a? Arbre::Element
+        if string = buffer.presence || value and string.is_a?(String)
+          ERB::Util.html_escape string
+        end
+      end
+    end
+  end
+end

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.11.6"
+  VERSION = "0.11.7"
 end

data/test/components/configurable_test.rb

@@ -51,11 +51,24 @@ class ConfigurableTest < ActiveSupport::TestCase
     has_option :rows, 'Number of rows', type: :integer, default: 5, attribute: true
   end
 
+  class ConfigWithDefaultProcOption < ETCC
+    has_option(:rows, 'Number of rows', {
+      type: :integer,
+      default: -> { %w(some random word).sample },
+      attribute: true,
+    })
+  end
+
   test "default values are supported" do
     markup = render { config_with_default_option }
     assert_equal %Q(<div class="config-with-default-option" rows="5"></div>\n), markup
   end
 
+  test "default values which are procs are supported" do
+    markup = render { config_with_default_proc_option }
+    assert_match /(some|random|word)/, markup
+  end
+
   test "default values for attributes can be overridden" do
     markup = render { config_with_default_option(rows: 999) }
     assert_equal %Q(<div class="config-with-default-option" rows="999"></div>\n), markup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -189,6 +189,7 @@ files:
 - lib/express_templates/components/capabilities/resourceful.rb
 - lib/express_templates/components/configurable.rb
 - lib/express_templates/components/container.rb
+- lib/express_templates/components/content_for.rb
 - lib/express_templates/components/forms.rb
 - lib/express_templates/components/forms/basic_fields.rb
 - lib/express_templates/components/forms/checkbox.rb