spark_components 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 704f5cb250fa2871cd46c09bba22444ccff15f0a65628ba9d1f775074c834c9d
-  data.tar.gz: 4f02e1ceafb246bfb47c9e71b5b85d5071135c2a42755aee1b242fce8ff6ee32
+  metadata.gz: 8fe4b2f67b278a268d99b228cba7b17eb7309c5e2ac8fadf1fff01f9e160e41f
+  data.tar.gz: 27ffcdd80392e749bbbbe7fa200f112086388f959f877a7adc18342f22a0f539
 SHA512:
-  metadata.gz: 3fb2ec83c0d223310322b5fb65dbe243338ee2010f9270960aaeb448c37927bcdae7b19369b14f7a4edbd9de79026ca424664587d6d782f7b5a36ab4d8baaa23
-  data.tar.gz: 346da75ed6aeaceefac656133870c4834149be7a7d048ed90e9a507b2da12ea24e50337f5189b0d457df9f1c760830ffd5b7fa543d7dcfeb5dd36350932972ec
+  metadata.gz: a0c99f05d18e7bbf5c9ed044d6886b8b0b754a5dfbf9cf3d4e435d993128cf13dc108aac6c08326a773a7eb08744b54c11dbb0ded835fc7345a87903251911a4
+  data.tar.gz: ebebbc531b4214fa05e2c5bf19b02a7355439880d14cc2af839350269b6a0ba6b8aae3ffde023e4325328c65403721ab62ac0a29364011d556084a4ccc2fe23b

data/lib/spark_components/element.rb

@@ -67,20 +67,14 @@ module SparkComponents
     end
 
     def self.validates_choice(name, choices, required: true)
+      choices = choices.dup
       choices = [choices] unless choices.is_a?(Array)
       supported_choices = choices.map { |c| c.is_a?(String) ? c.to_sym : c.to_s }.concat(choices)
 
-      unless required
-        # Allow nil if option is not required
-        supported_choices.unshift(nil)
-        # Add `nil` to the error messsages list of valid options
-        choices.push("nil")
-      end
-
       choices = choices.to_sentence(last_word_connector: ", or ")
       message = "\"%<value>s\" is not valid. Options for #{name} include: #{choices}"
 
-      validates(name, inclusion: { in: supported_choices, message: message })
+      validates(name, inclusion: { in: supported_choices, message: message }, allow_blank: !required)
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -94,7 +88,7 @@ module SparkComponents
       component = "#{component}_component".classify.constantize if component.is_a?(String)
 
       elements[name] = {
-        multiple: plural_name || false, class: Class.new(component || Element, &config)
+        multiple: plural_name || false, class: Class.new((component || Element), &config)
       }
 
       define_method_or_raise(name) do |attributes = nil, &block|
@@ -155,10 +149,6 @@ module SparkComponents
       validate!
     end
 
-    def render_block(&block)
-      block_given? ? @view.capture(self, &block) : nil
-    end
-
     def after_init; end
 
     def before_render; end
@@ -215,6 +205,12 @@ module SparkComponents
       @yield.blank?
     end
 
+    private
+
+    def render_block(&block)
+      block_given? ? @view.capture(self, &block) : nil
+    end
+
     protected
 
     # Set tag attribute values from from parameters
@@ -258,8 +254,6 @@ module SparkComponents
       end
     end
 
-    private
-
     # Define common view methods to "alias"
     def view_methods
       %i[tag content_tag image_tag concat content_for link_to component capture]

data/lib/spark_components/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SparkComponents
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spark_components
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails