simple_params 1.3.6 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRhYmJhYzhiMmMwMDk5MTE2Njk1OWUwOTdkMjJkMGRkYTYxNjU3Ng==
+    N2FhZWYzZTAzNmJhMmE3YjYxOThlNDhkMzM5NzlhYmQxNTMxOTQ5OQ==
   data.tar.gz: !binary |-
-    MDgwZmUwNDRhYWU2NGMxZTYwMTBjYzFkYjNhMzAyZTBjYjk1ZmU2Mw==
+    OWQ3NmQwYzA2OGZlNTNkNTM4MTY3ZjQ5M2FjNDU3YWU0ODRkZTE5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWJjMGRhNmYwZTJkMWU1ZTNmMjBiYmRhZGYzMGE2ZmQ1NjRjODQ2MDIzZTIx
-    YWJkMWM3YTViNTdiYzA1MTFmYzViZDg1MmNmNDU4M2M2NTQ2ZDQ0MzYzMDE3
-    MzI0MDRlMDY0ZWRlYzQ4NjBmOWU0Nzc3ZTI5NmU4NTc2Y2Y4ZjU=
+    ZDQwMDY2MzZjMTAxNmI1OTAzM2Q5M2VjY2M3YjgzY2E5NzI4ODM1Njk3YTYw
+    MzQxZWI0N2VjNDg3YTA3Y2MxOGVlMGMxYWM1OWJlNGQ2MzJhYjM1MzExMjU2
+    YWEwMTk5M2Q4NmE1ZTY0YWJkZWFmZjIyY2JkNWE4MWViYWQ1Y2I=
   data.tar.gz: !binary |-
-    NjY4NWJhZjExYzAxNzNkM2UwMTU2NTY3ZmQ3ZGQ1ZWM0MTVkNTJjZGFmOWEx
-    M2ZkMWRkMmNiYjBhY2RjYzIzN2Q2NTgxNzM0ZDc3MzdlOTNmMTcxMGQ4Nzkx
-    NDdhZGVlNWJiZmY3OTU4MGE1MTM3YjhhOTQyYzhhNzQ2Yzg4OTI=
+    NzQ1N2U2MWMxNTg4OGQwMWViYmZlOTFlOGQ2ZjMyNjQyY2JjMDJlZDYwZDBm
+    NjJiNWQzZDdkMzYxMThlYTViNDMyNTM3NGNlZjc1ZmQ2Yjg3YWI4MzBiMmVi
+    MTU5N2QyMTM1ZWFmMDQwZGQ3OGZmMDRiMzJhODc2NzE5ODJlNWE=

data/Gemfile.lock

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

data/lib/simple_params/nested_params.rb

@@ -38,14 +38,17 @@ module SimpleParams
               #{parent}
             end
           DEF
+          extend ActiveModel::Naming
+          klass.class_eval(&block)
+          klass.class_eval("self.options = #{options}")
           if klass.parent_class.using_rails_helpers?
             klass.instance_eval("with_rails_helpers")
-            # define a _destroy param (Boolean, default: false)
+          end
+
+          # define a _destroy param (Boolean, default: false)
+          if klass.using_rails_helpers?
             klass.send(:define_attribute, :_destroy, {type: :boolean, default: false})
           end
-          extend ActiveModel::Naming
-          klass.class_eval(&block)
-          klass.class_eval("self.options = #{options}")
         end
       end
     end

data/lib/simple_params/params.rb

@@ -86,7 +86,15 @@ module SimpleParams
           init_value = if initializer.is_a?(Array)
             if klass.with_ids?
               initializer.first.each_pair.inject([]) do |array, (key, val)|
-                array << klass.new({key => val}, self)
+                destroyed = if val.has_key?(:_destroy)
+                  val[:_destroy]
+                elsif val.has_key?("_destroy")
+                  val["_destroy"]
+                end
+                unless [true, "1"].include?(destroyed)
+                  array << klass.new({key => val}, self)
+                end
+                array
               end
             else
               initializer.map { |val| klass.new(val, self) }

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.3.6"
+  VERSION = "1.4.0"
 end

data/spec/acceptance_spec.rb

@@ -28,6 +28,11 @@ class AcceptanceParams < SimpleParams::Params
     param :age, type: :integer, validations: { inclusion: { in: 1..20 } }
   end
 
+  nested_array :cats, with_ids: true do
+    with_rails_helpers
+    param :name
+  end
+
   def name_has_letters
     if name.present? && !(name =~ /^[a-zA-Z]*$/)
       errors.add(:name, "must only contain letters")
@@ -111,6 +116,12 @@ describe SimpleParams::Params do
             name: "Spot",
             age: 8
           }
+        ],
+        cats: [
+          {
+            name: nil,
+            _destroy: false
+          }
         ]
       })
     end
@@ -204,7 +215,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, :phone, :dogs])
+      params.attributes.should eq([:reference, :name, :date_of_birth, :current_time, :age, :color, :sibling_names, :address, :phone, :dogs, :cats])
     end
 
     it "returns array of attribute symbols for nested class" do
@@ -320,12 +331,12 @@ describe SimpleParams::Params do
       end
     end
 
-    describe "#validate!", failing: true do
+    describe "#validate!" do
       let(:params) { AcceptanceParams.new }
 
       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\"]}, :dogs=>[{:name=>[\"can't be blank\"], :age=>[\"is not included in the list\", \"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\"]}], :cats=>[{:name=>[\"can't be blank\"]}]}"
         )
       end
     end
@@ -345,6 +356,11 @@ describe SimpleParams::Params do
             dogs: [
               name: "Spot",
               age: 6
+            ],
+            cats: [
+              "0" => {
+                name: "Fuzzball"
+              }
             ]
           }
         end
@@ -379,8 +395,15 @@ describe SimpleParams::Params do
               phone_number: "234"
             },
             dogs: [
-              name: "Spot",
-              age: 6
+              {
+                name: "Spot",
+                age: 6
+              }
+            ],
+            cats: [
+              "0" => {
+                name: "Fuzzball"
+              }
             ]
           }
         end
@@ -399,6 +422,51 @@ describe SimpleParams::Params do
           acceptance_params.should_not be_valid
         end
       end
+
+      context "with destroyed cat" 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
+              }
+            ],
+            cats: [
+              "0" => {
+                name: "Fuzzball"
+              },
+              "1" => {
+                name: "Fuzzball 2",
+                _destroy: "1"
+              }
+            ]
+          }
+        end
+
+        it "is valid after multiple times" do
+          acceptance_params = AcceptanceParams.new(params)
+          acceptance_params.valid?
+          acceptance_params.should be_valid
+          acceptance_params.should be_valid
+        end
+
+        it "only assigns 1 cat", failing: true do
+          acceptance_params = AcceptanceParams.new(params)
+          acceptance_params.cats.count.should eq(1)
+        end
+      end
     end
   end
 
@@ -447,6 +515,10 @@ describe SimpleParams::Params do
           param :name, String, desc: '', required: true
           param :age, Integer, desc: '', required: true
         end
+        param :cats, Array, desc:'', required: true do
+          param :name, String, desc:'', required: true
+          param :_destroy, Boolean, desc:'', required: false
+        end
       API_PIE_DOCS
 
       expect(documentation).to be_a String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel