spark_components 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c1b5a00060124a21b830e051e3671599e9b6e76454946074dcd8bad037b0ad
-  data.tar.gz: e46556296c8b22e4d8b65a9a29f14ab8505392553d8dcf640aa576cd6a29312d
+  metadata.gz: 704f5cb250fa2871cd46c09bba22444ccff15f0a65628ba9d1f775074c834c9d
+  data.tar.gz: 4f02e1ceafb246bfb47c9e71b5b85d5071135c2a42755aee1b242fce8ff6ee32
 SHA512:
-  metadata.gz: 4361c1d798e4fbfaba12bbbbe78ea9eb9c1f28b5d86aa3844fa358818da67613ca7abfaaab4ba772475c6bc9fd4f14415d9cac1517ff2c0eb86de56513c95d4b
-  data.tar.gz: d039b381910e4b7246765c7fcfbb684f6e1cf1abcd6ec4fd95aa429425205a33eba696883cbe534199bc65d36f50c3cff4d8a2599ee04b007fa649f0b781af47
+  metadata.gz: 3fb2ec83c0d223310322b5fb65dbe243338ee2010f9270960aaeb448c37927bcdae7b19369b14f7a4edbd9de79026ca424664587d6d782f7b5a36ab4d8baaa23
+  data.tar.gz: 346da75ed6aeaceefac656133870c4834149be7a7d048ed90e9a507b2da12ea24e50337f5189b0d457df9f1c760830ffd5b7fa543d7dcfeb5dd36350932972ec

data/lib/spark_components/element.rb

@@ -66,13 +66,21 @@ module SparkComponents
       @tag_attrs ||= SparkComponents::Attributes::Tag.new
     end
 
-    def self.validates_choice(name, choices)
-      validates(name,
-                inclusion: {
-                  presence: true,
-                  in: choices,
-                  message: "\"%{value}\" is not a valid option. Options include: #{choices.join(', ')}"
-                })
+    def self.validates_choice(name, choices, required: true)
+      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 })
     end
 
     # rubocop:disable Metrics/AbcSize

data/lib/spark_components/engine.rb

@@ -8,8 +8,8 @@ module SparkComponents
       app.config.assets.paths << SparkComponents.components_path if app.config.respond_to?(:assets)
     end
 
-    initializer 'components.autoload', :before => :set_autoload_paths do |app|
-      app.config.autoload_paths << File.join(app.root, 'app/components')
+    initializer "components.autoload", before: :set_autoload_paths do |app|
+      app.config.autoload_paths << File.join(app.root, "app/components")
     end
 
     initializer "components.view_helpers" do

data/lib/spark_components/version.rb

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

metadata

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