simple_params 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjYyNWJhNWU2ZmNkMGMxZWFjMmEzMjM3OWQyNWY0ZWZhNzY2N2ZhNw==
+    NzM2MTE0ZTVmMmFkMDNlOGQ5YjZiMDQ5MDc2NGIxNDIzOGU0YTI0ZA==
   data.tar.gz: !binary |-
-    NzllYWUzNDJjMDRkNTM5YzIwODMyYWRiYzhmOTU4M2NkNTczNGE0NA==
+    OTFiZGUxYTM0MzI4MWQyZGE3OWZiMDFkNzk3YzNmNmM5YTQ2OWYwZA==
 SHA512:
   metadata.gz: !binary |-
-    ZTNkMzU1YjhkMjdjNzg0MWFkZDhmNTUzYmU3OGVhZmNlOTBiYjM0NWRiMjRl
-    YWRiMTkzNTBiNjY3MDBiODAzOGUxYzk0MDY0YzJiNTUwNGRlNThmMTM0ODg0
-    MDc5MGU5MTgxNjQzMWY4ZjQ0MTc2OWQ5MTI3ZjUyNmVjM2ZiZTk=
+    MjgyZWJhMDE2OTcxMjc1ZTA0NzM0NDYwYzU3MDI0NTZmNTdhYmZiYjU5ZDc3
+    ODQxNDQ0NTkzMTQ0MTIyMjAxZjZjYzEzOWE3NDJjYWIyZGZkYzcyY2JhYzIw
+    MTA3MDBiNjJjMGQyMWM3ZjQyNzViODczOTJjYjdiN2M5NjUwMDU=
   data.tar.gz: !binary |-
-    N2ExNzhkZjk0MmM4YTM4ZWQ2YjYwZGVjZTJlMDBiNjVmMGVkYzE1NWVlMDA0
-    Y2IwMWFjNjAyMjE1MWE2MDk5ZDY4NWNlODAxMDEyOGNiZjgxMTJlYzg4ZWZk
-    ZTE5N2E2ZTFhZTcxZDY0OWJiZjViNzZiOGE0NTNjMTZmNWZlNzY=
+    ZDEwNzA0MDVjMzVkNjY4NzNmNjFjZDVhZTliNzFiNWYzZGZmNGFjZDJiMDNl
+    Mzk5ZGRmM2Q0MDk4ZDUyY2M4MDZlODBhYWQzNmRiOWJkNTg0Njk1M2Y3MWE2
+    ODM2NmRmODhjYWE2YjAwYjRlNjA0NzJiYTNhODE4MmRjNjM3YTQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_params (1.1.2)
+    simple_params (1.2.0)
       activemodel (>= 3.0, < 5.0)
       shoulda-matchers (~> 2.8)
       virtus (>= 1.0.0)

data/lib/simple_params/concerns/rails_helpers.rb

@@ -5,10 +5,28 @@ module SimpleParams
     extend ActiveSupport::Concern
     included do
       # Required for ActiveModel
-      def persisted?; false end
+      def persisted?
+        false
+      end
     end
 
     module ClassMethods
+      # http://apidock.com/rails/ActiveRecord/Reflection/AssociationReflection/klass
+      # class Author < ActiveRecord::Base
+      #   has_many :books
+      # end
+
+      # Author.reflect_on_association(:books).klass
+      # # => Book
+      def reflect_on_association(assoc_sym)
+        nested_classes[assoc_sym]
+      end
+
+      # Used with reflect_on_association
+      def klass
+        self
+      end
+
       def define_rails_helpers(name, klass)
         # E.g. if we have a nested_class named :phones, then we need:
         #  - a method called :phones_attributes that also sets :phones

data/lib/simple_params/concerns/validations.rb

@@ -34,7 +34,7 @@ module SimpleParams
         #  necessarily call valid? on every object
         nested_class.map(&:valid?).all?
       else
-        nested_class.valid?
+        nested_class.present? ? nested_class.valid? : true
       end
     end
   end

data/lib/simple_params/errors.rb

@@ -35,14 +35,20 @@ module SimpleParams
     def clear
       super
       @nested_classes.map do |attribute, klass| 
-        run_or_mapped_run(klass) { |k| k.errors.clear }
+        run_or_mapped_run(klass) do |k| 
+          if k.present?
+            k.errors.clear
+          end
+        end
       end
     end
 
     def empty?
       super &&
       @nested_classes.all? do |attribute, klass|
-        run_or_mapped_run(klass) { |k| k.errors.empty? }
+        run_or_mapped_run(klass) do |k| 
+          k.nil? || k.errors.empty?
+        end
       end
     end
     alias_method :blank?, :empty? 
@@ -80,7 +86,11 @@ module SimpleParams
       msgs = get_messages(self, full_messages)
 
       @nested_classes.map do |attribute, klass|
-        nested_msgs = run_or_mapped_run(klass) { |k| get_messages(k.errors, full_messages) }
+        nested_msgs = run_or_mapped_run(klass) do |k| 
+          unless k.nil?
+            get_messages(k.errors, full_messages)
+          end
+        end
         unless empty_messages?(nested_msgs)
           msgs.merge!(attribute.to_sym => nested_msgs)
         end
@@ -104,7 +114,7 @@ module SimpleParams
 
     def set_nested(attribute)
       klass = nested_class(attribute)
-      errors = run_or_mapped_run(klass) { |k| k.errors }
+      errors = run_or_mapped_run(klass) { |k| k.errors if k.present? }
       set(attribute.to_sym, errors)
     end
 

data/lib/simple_params/params.rb

@@ -44,30 +44,33 @@ module SimpleParams
 
       def nested_hash(name, opts={}, &block)
         klass = NestedParams.define_new_hash_class(self, name, opts, &block)
-        add_nested_class(name, klass)
+        add_nested_class(name, klass, opts)
       end
       alias_method :nested_param, :nested_hash
       alias_method :nested, :nested_hash
 
       def nested_array(name, opts={}, &block)
         klass = NestedParams.define_new_array_class(self, name, opts, &block)
-        add_nested_class(name, klass)
+        add_nested_class(name, klass, opts)
       end
 
       private
-      def add_nested_class(name, klass)
+      def add_nested_class(name, klass, opts)
         @nested_classes ||= {}
         @nested_classes[name.to_sym] = klass
-        define_nested_accessor(name, klass)
+        define_nested_accessor(name, klass, opts)
         define_rails_helpers(name, klass)
       end
 
-      def define_nested_accessor(name, klass)
+      def define_nested_accessor(name, klass, opts)
         define_method("#{name}") do
           if instance_variable_defined?("@#{name}")
             instance_variable_get("@#{name}")
           else
-            init_value = klass.hash? ? klass.new({}, self) : []
+            # This logic basically sets the nested class to an instance of itself, unless
+            #  it is optional.
+            init_value = opts[:optional] ? nil : klass.new({}, self)
+            init_value = klass.hash? ? init_value : [init_value]
             instance_variable_set("@#{name}", init_value)
           end
         end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/acceptance_spec.rb

@@ -19,6 +19,10 @@ class AcceptanceParams < SimpleParams::Params
     param :company, optional: true
   end
 
+  nested_hash :phone, optional: true do
+    param :phone_number
+  end
+
   nested_array :dogs do
     param :name
     param :age, type: :integer, validations: { inclusion: { in: 1..20 } }
@@ -40,6 +44,18 @@ describe SimpleParams::Params do
     end
   end
 
+  describe "reflect_on_association", reflect_on_association: true do
+    it "can get hash association classes" do
+      klass = AcceptanceParams.reflect_on_association(:address).klass
+      klass.should eq(AcceptanceParams::Address)
+    end
+
+    it "can get array association classes" do
+      klass = AcceptanceParams.reflect_on_association(:dogs).klass
+      klass.should eq(AcceptanceParams::Dogs)
+    end
+  end
+
   describe "original_params", original_params: true do
     it "returns symbolized params hash" do
       params = AcceptanceParams.new(name: "Tom", address: { "street" => "1 Main St."} )
@@ -89,6 +105,7 @@ describe SimpleParams::Params do
           state: "North Carolina",
           company: nil
         },
+        phone: nil,
         dogs: [
           {
             name: "Spot",
@@ -187,7 +204,7 @@ describe SimpleParams::Params do
   describe "attributes", attributes: true do
     it "returns array of attribute symbols" do
       params = AcceptanceParams.new
-      params.attributes.should eq([:reference, :name, :date_of_birth, :current_time, :age, :color, :sibling_names, :address, :dogs])
+      params.attributes.should eq([:reference, :name, :date_of_birth, :current_time, :age, :color, :sibling_names, :address, :phone, :dogs])
     end
 
     it "returns array of attribute symbols for nested class" do
@@ -308,36 +325,79 @@ describe SimpleParams::Params do
 
       it "raises error with validation descriptions" do
         expect { params.validate! }.to raise_error(SimpleParamsError,
-          "{:name=>[\"can't be blank\"], :address=>{:street=>[\"can't be blank\"], :city=>[\"is too short (minimum is 4 characters)\", \"can't be blank\"]}}"
+          "{:name=>[\"can't be blank\"], :address=>{:street=>[\"can't be blank\"], :city=>[\"is too short (minimum is 4 characters)\", \"can't be blank\"]}, :dogs=>[{:name=>[\"can't be blank\"], :age=>[\"is not included in the list\", \"can't be blank\"]}]}"
         )
       end
     end
 
     describe "acceptance cases" do
-      let(:params) do
-        {
-          name: "Tom", 
-          age: 41,
-          address: { 
-            street: "1 Main St.",
-            city: "Chicago",
-            state: "IL",
-            zip_code: 33440
+      context "without phone" do
+        let(:params) do
+          {
+            name: "Tom", 
+            age: 41,
+            address: { 
+              street: "1 Main St.",
+              city: "Chicago",
+              state: "IL",
+              zip_code: 33440
+            },
+            dogs: [
+              name: "Spot",
+              age: 6
+            ]
           }
-        }
-      end
+        end
 
-      it "is valid after multiple times" do
-        acceptance_params = AcceptanceParams.new(params)
-        acceptance_params.should be_valid
-        acceptance_params.should be_valid
+        it "is valid after multiple times", failing: true do
+          acceptance_params = AcceptanceParams.new(params)
+          acceptance_params.valid?
+          acceptance_params.should be_valid
+          acceptance_params.should be_valid
+        end
+
+        it "is invalidated if validity changes after initial assignment" do
+          acceptance_params = AcceptanceParams.new(params)
+          acceptance_params.should be_valid
+          acceptance_params.name = nil
+          acceptance_params.should_not be_valid
+        end
       end
 
-      it "is invalidated if validity changes after initial assignment" do
-        acceptance_params = AcceptanceParams.new(params)
-        acceptance_params.should be_valid
-        acceptance_params.name = nil
-        acceptance_params.should_not be_valid
+      context "with phone" do
+        let(:params) do
+          {
+            name: "Tom", 
+            age: 41,
+            address: { 
+              street: "1 Main St.",
+              city: "Chicago",
+              state: "IL",
+              zip_code: 33440
+            },
+            phone: {
+              phone_number: "234"
+            },
+            dogs: [
+              name: "Spot",
+              age: 6
+            ]
+          }
+        end
+
+        it "is valid after multiple times", failing: true do
+          acceptance_params = AcceptanceParams.new(params)
+          acceptance_params.valid?
+          acceptance_params.should be_valid
+          acceptance_params.should be_valid
+        end
+
+        it "is invalidated if validity changes after initial assignment" do
+          acceptance_params = AcceptanceParams.new(params)
+          acceptance_params.should be_valid
+          acceptance_params.name = nil
+          acceptance_params.should_not be_valid
+        end
       end
     end
   end
@@ -380,6 +440,9 @@ describe SimpleParams::Params do
           param :state, String, desc: '', required: false
           param :company, String, desc: '', required: false
         end
+        param :phone, Hash, desc: '', required: false do
+          param :phone_number, String, desc: '', required: true
+        end
         param :dogs, Array, desc: '', required: true do
           param :name, String, desc: '', required: true
           param :age, Integer, desc: '', required: true

data/spec/params_spec.rb

@@ -77,23 +77,21 @@ describe SimpleParams::Params do
 
     describe "nested arrays", nested: true do
       it "can access nested arrays as arrays" do
-        params.dogs.should respond_to(:first)
-        params.dogs.first.should be_nil
+        params.dogs[0].should_not be_nil
+        params.dogs[0].name.should be_nil
+        params.dogs[0].age.should be_nil
       end
 
       it "can access nested arrays as arrays with data" do
         params = DummyParams.new(dogs: [{ name: "Spot", age: 20 }])
-        params.dogs.should respond_to(:first)
-        params.dogs.first.should_not be_nil
-        params.dogs.first.name.should eq("SPOT")
+        params.dogs[0].name.should eq("SPOT")
       end
 
       it "can set nested arrays with arrays" do
         params.dogs = [{ name: "Spot", age: 20 }]
         params.dogs.count.should eq(1)
-        params.dogs.first.should_not be_nil
-        params.dogs.first.name.should eq("SPOT")
-        params.dogs.first.age.should eq(20)
+        params.dogs[0].name.should eq("SPOT")
+        params.dogs[0].age.should eq(20)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel