simple_params 1.6.9 → 2.0.4

data/gemfiles/activemodel_5_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", ">= 5.1"
+gem "shoulda-matchers", ">= 3.0"
+
+gemspec path: "../"

data/gemfiles/activemodel_5_1.gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: ..
+  specs:
+    simple_params (2.0.3)
+      activemodel (>= 3.0, <= 7.0)
+      shoulda-matchers (>= 2.8)
+      virtus (>= 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coderay (1.1.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.1.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    equalizer (0.0.11)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    pry (0.12.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.4.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (>= 5.1)
+  appraisal
+  bundler (>= 1.5)
+  pry
+  rake (>= 10.1)
+  rspec (>= 2.6)
+  shoulda-matchers (>= 3.0)
+  simple_params!
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/activemodel_5_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", ">= 5.2"
+gem "shoulda-matchers", ">= 3.0"
+
+gemspec path: "../"

data/gemfiles/activemodel_5_2.gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: ..
+  specs:
+    simple_params (2.0.3)
+      activemodel (>= 3.0, <= 7.0)
+      shoulda-matchers (>= 2.8)
+      virtus (>= 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coderay (1.1.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.1.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    equalizer (0.0.11)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    pry (0.12.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.4.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (>= 5.2)
+  appraisal
+  bundler (>= 1.5)
+  pry
+  rake (>= 10.1)
+  rspec (>= 2.6)
+  shoulda-matchers (>= 3.0)
+  simple_params!
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/activemodel_6_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", ">= 6.0"
+gem "shoulda-matchers", ">= 3.0"
+
+gemspec path: "../"

data/gemfiles/activemodel_6_0.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ..
+  specs:
+    simple_params (2.0.3)
+      activemodel (>= 3.0, <= 7.0)
+      shoulda-matchers (>= 2.8)
+      virtus (>= 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coderay (1.1.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.1.6)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    equalizer (0.0.11)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    shoulda-matchers (4.3.0)
+      activesupport (>= 4.2.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    zeitwerk (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (>= 6.0)
+  appraisal
+  bundler (>= 1.5)
+  pry
+  rake (>= 10.1)
+  rspec (>= 2.6)
+  shoulda-matchers (>= 3.0)
+  simple_params!
+
+BUNDLED WITH
+   2.1.4

data/lib/simple_params/concerns/hash_helpers.rb

@@ -6,7 +6,7 @@ module SimpleParams
 
       private
       def hash_to_symbolized_hash(hash)
-        hash.inject({}){|result, (key, value)|
+        hash.to_h.inject({}){|result, (key, value)|
           new_key = case key
                     when String then key.to_sym
                     else key

data/lib/simple_params/errors.rb

@@ -15,7 +15,7 @@ module SimpleParams
       if nested_attribute?(attribute)
         set_nested(attribute)
       else
-        get(attribute.to_sym) || set(attribute.to_sym, [])
+        super(attribute)
       end
     end
 
@@ -24,6 +24,7 @@ module SimpleParams
     end
 
     def add(attribute, message = :invalid, options = {})
+      message = message.call if message.respond_to?(:call)
       message = normalize_message(attribute, message, options)
       if exception = options[:strict]
         exception = ActiveModel::StrictValidationFailed if exception == true
@@ -42,7 +43,7 @@ module SimpleParams
       super &&
       nested_instances.all? { |i| i.errors.empty? }
     end
-    alias_method :blank?, :empty? 
+    alias_method :blank?, :empty?
 
     def include?(attribute)
       if nested_attribute?(attribute)
@@ -51,7 +52,7 @@ module SimpleParams
         messages[attribute].present?
       end
     end
-    alias_method :has_key?, :include? 
+    alias_method :has_key?, :include?
     alias_method :key?, :include?
 
     def values
@@ -61,18 +62,22 @@ module SimpleParams
 
     def full_messages
       parent_messages = map { |attribute, message| full_message(attribute, message) }
-      nested_messages = nested_instances.map do |i| 
+      nested_messages = nested_instances.map do |i|
         i.errors.full_messages.map { |message| "#{i.parent_attribute_name} " + message }
       end
 
       (parent_messages + nested_messages).flatten
     end
 
+    def to_a
+      full_messages
+    end
+
     def to_hash(full_messages = false)
       msgs = get_messages(self, full_messages)
 
       @nested_classes.map do |attribute, klass|
-        nested_msgs = run_or_mapped_run(klass) do |k| 
+        nested_msgs = run_or_mapped_run(klass) do |k|
           unless k.nil?
             get_messages(k.errors, full_messages)
           end
@@ -99,22 +104,22 @@ module SimpleParams
       @nested_classes.keys.include?(attribute.to_sym)
     end
 
-
-    def add_error_to_attribute(attribute, error)
+    def add_error_to_attribute(attribute, message)
       if nested_attribute?(attribute)
-        @nested_classes[attribute].errors.add(:base, error)
+        @nested_classes[attribute].errors.add(:base, message)
       else
-        self[attribute] << error
+        self[attribute] << message
       end
     end
 
     def get_messages(object, full_messages = false)
+      valid_messages = object.messages.reject { |key, val| empty_messages?(val) }
       if full_messages
-        object.messages.each_with_object({}) do |(attribute, array), messages|
+        valid_messages.each_with_object({}) do |(attribute, array), messages|
           messages[attribute] = array.map { |message| object.full_message(attribute, message) }
         end
       else
-        object.messages.dup
+        valid_messages
       end
     end
 
@@ -137,7 +142,11 @@ module SimpleParams
     def set_nested(attribute)
       klass = nested_class(attribute)
       errors = run_or_mapped_run(klass) { |k| k.errors if k.present? }
-      set(attribute.to_sym, errors)
+      if respond_to?(:normalize_detail)
+        detail  = normalize_detail(errors, {})
+        details[attribute.to_sym] = detail
+      end
+      messages[attribute.to_sym] = errors
     end
 
     def nested_instances

data/lib/simple_params/nested_class_list.rb

@@ -21,7 +21,7 @@ module SimpleParams
     end
 
     def class_instances
-      nested_class_hash.each_pair.inject([]) do |array, (key, value)|
+      nested_class_hash.each_pair.inject([]) do |array, (_key, value)|
         array << value
         array.flatten.compact
       end

data/lib/simple_params/nested_errors.rb

@@ -18,7 +18,7 @@ module SimpleParams
     end
 
     def [](attribute)
-      get(attribute.to_sym) || set(attribute.to_sym, [])
+      super(attribute)
     end
 
     def []=(attribute, error)
@@ -58,6 +58,10 @@ module SimpleParams
       map { |attribute, message| full_message(attribute, message) }
     end
 
+    def to_a
+      full_messages
+    end
+
     def to_hash(full_messages = false)
       get_messages(self, full_messages)
     end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.6.9"
+  VERSION = "2.0.4"
 end

data/simple_params.gemspec

@@ -4,25 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simple_params/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "simple_params"
+  spec.name = 'simple_params'
   spec.version = SimpleParams::VERSION
-  spec.authors = ["brycesenz"]
-  spec.email = ["bryce.senz@gmail.com"]
+  spec.authors = ['brycesenz']
+  spec.email = ['bryce.senz@gmail.com']
   spec.description = %q{Simple way to specify API params}
   spec.summary = %q{A DSL for specifying params, including type coercion and validation}
-  spec.homepage = "https://github.com/brycesenz/simple_params"
-  spec.license = "MIT"
+  spec.homepage = 'https://github.com/brycesenz/simple_params'
+  spec.license = 'MIT'
 
   spec.files = `git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activemodel", ">= 3.0", "< 5.0"
-  spec.add_dependency "virtus", ">= 1.0.0"
-  spec.add_dependency "shoulda-matchers", "~> 2.8"
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 2.6"
-  spec.add_development_dependency "pry"
+  spec.add_dependency 'activemodel', '>= 3.0', '<= 7.0'
+  spec.add_dependency 'virtus', '>= 1.0.0'
+  spec.add_dependency 'shoulda-matchers', '>= 2.8'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler', '>= 1.5'
+  spec.add_development_dependency 'rake', '>= 10.1'
+  spec.add_development_dependency 'rspec', '>= 2.6'
+  spec.add_development_dependency 'pry'
 end