simple_params 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDJjYTQ5MTFmNzEyZmRlYjViMjQyZDY5YzlmNDQ2ZmJiYzU4ZjQyNg==
+    MDJmOTE0MzM0NTQzZmNiMTkzMjFiNjc3ZTdlNzc3MjhkNWViODQ1Ng==
   data.tar.gz: !binary |-
-    MjYwZTM3OWE3ZjczODI3NzM5YzhhODFiYzU3ZDA5NTRjYTdkZWU4Mg==
+    OGExMjA2YTNlMDhkYzM3MjE5YjQ1OWJmNWU5NGZkYzE5ZWUyY2E1OA==
 SHA512:
   metadata.gz: !binary |-
-    ZjVlNjMxNDlkZTkwOTdiYTllZTg4MGRmYTZhYTE1OWIzN2Y5NjMzNmE0NzUy
-    YzQ2YjM4NGM2ZDc2OTAxNjc2NmU3MjA5YTQzMGI5ZWUyYzU4MDQ0NDhiMDcw
-    MmI2Mjg0ZWI3ZDEzOTY1ZGJmMWQyYzI3ZTA1OWJmYzc1Mzk1N2Q=
+    YjgxYzY5N2YyYjZmMjdmOWJhN2Q5OTNjNDY0YzBmM2VhZWNlNjc1ZGY0NzRk
+    ODE5OTJhMTQ1ZmI2MTRiZWI3YjBmODZlMGVhYWVhODM5NGYzY2M4MWY1ODBm
+    NmMxODBhYWQ3M2RiMzQzMzViYWFjZmUxOGQ4NmIwN2Q5Nzk0NDc=
   data.tar.gz: !binary |-
-    NWQxMzE3ZjRlNDM3MmQ0NzU3MmY5NzRjN2Y4Zjk4YzYzZTQxNTc0MWM2ZDgx
-    NTliYjIyYTkxMDY4MzE2MGVkZTdmYThmMmQwYmEwMTUwMjIyYThkMzdlZGU4
-    ZWZiMzBmYjQyOGRhYWNhNTIwYzAwMjM0NzQ3MzhhY2Y5NmZmMTI=
+    NWE4MDdjNTg0ODgyYzAwMmM5MTcxMTFiMDY3ZTAyNjMxNmFlZTJiM2Y0YjRh
+    NTM1MWU2YTQ0ZWM0NTYzNmY3NjAxNmQ3ZjBmODliY2M2NmVlMmViMDJmZTFj
+    MzFhY2UwY2Y0ODIyNDI2YWMwMWI0YzdkMzI2NWY3ZWQxMjg3M2E=

data/Gemfile.lock

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

data/lib/simple_params/params.rb

@@ -92,6 +92,11 @@ module SimpleParams
           attribute.send("value")
         end
 
+        define_method("raw_#{name}") do
+          attribute = send("#{name}_attribute")
+          attribute.send("raw_value")
+        end
+
         define_method("#{name}=") do |val|
           attribute = send("#{name}_attribute")
           attribute.send("value=", val)

data/lib/simple_params/validation_matchers/coercion_matcher.rb

@@ -24,41 +24,41 @@ module SimpleParams
         when :integer
           @subject.send("#{@attribute}=", "100.02")
           (@subject.send(attribute) == 100) &&
-          (@subject.send(attribute).is_a?(TYPE_MAPPINGS[:integer]))
+          @subject.send("raw_#{attribute}").is_a?(TYPE_MAPPINGS[:integer])
         when :string
           @subject.send("#{@attribute}=", 200)
           (@subject.send(attribute) == "200") &&
-          (@subject.send(attribute).is_a?(TYPE_MAPPINGS[:string]))
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:string])
         when :decimal
           @subject.send("#{@attribute}=", "100")
           (@subject.send(attribute) == 100.0) &&
-          (@subject.send(attribute).is_a?(TYPE_MAPPINGS[:decimal]))
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:decimal])
         when :datetime 
           @subject.send("#{@attribute}=", DateTime.new(2014,2,3))
-          @subject.send(attribute).is_a?(TYPE_MAPPINGS[:datetime])
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:datetime])
         when :date
-          @subject.send("#{@attribute}=", Date.new(2014,2,3))
-          @subject.send(attribute).is_a?(TYPE_MAPPINGS[:date])
+          @subject.send("#{@attribute}=", DateTime.new(2014,2,3,12,0,0))
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:date])
         when :time
           @subject.send("#{@attribute}=", Time.new(2007,11,5,11,21,0, "-05:00"))
-          @subject.send(attribute).is_a?(TYPE_MAPPINGS[:time])
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:time])
         when :float
           @subject.send("#{@attribute}=", "20")
-          (@subject.send(attribute) == 20.0) &&
-          (@subject.send(attribute).is_a?(TYPE_MAPPINGS[:float]))
+          (@subject.send("raw_#{attribute}") == 20.0) &&
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:float])
         when :boolean
           @subject.send("#{@attribute}=", 0)
           (@subject.send(attribute) == false) &&
-          (@subject.send(attribute).is_a?(TrueClass) || @subject.send(attribute).is_a?(FalseClass))
+          (@subject.send("raw_#{attribute}").is_a?(TrueClass) || @subject.send("raw_#{attribute}").is_a?(FalseClass))
         when :array
           @subject.send("#{@attribute}=", ["red, green, blue"])
-          @subject.send(attribute).is_a?(TYPE_MAPPINGS[:array])
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:array])
         when :hash
           @subject.send("#{@attribute}=", { "dog"=>1, "cat"=>2, "fish"=>3 })
-          @subject.send(attribute).is_a?(TYPE_MAPPINGS[:hash])
+          class_matches(@subject.send("raw_#{attribute}"), TYPE_MAPPINGS[:hash])
         when :object
           @subject.send("#{@attribute}=", "programmer")
-          @subject.send(attribute).is_a?(TYPE_MAPPINGS[:object])
+          @subject.send("raw_#{attribute}").is_a?(TYPE_MAPPINGS[:object])
         else
           false
         end
@@ -79,6 +79,9 @@ module SimpleParams
       end
 
       private
+      def class_matches(target, comparison)
+        target.class.name.to_s == comparison.name.to_s
+      end
     end
   end
 end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/fixtures/dummy_params.rb

@@ -28,7 +28,7 @@ class DummyParams < SimpleParams::Params
   end
 
   nested_array :dogs do
-    param :name
+    param :name, formatter: lambda { |params, name| name.upcase }
     param :age, type: :integer, validations: { inclusion: { in: 1..20 } }
   end
 

data/spec/fixtures/validator_params.rb

@@ -0,0 +1,51 @@
+class ValidatorParams < SimpleParams::Params
+  string_param :name
+  integer_param :age, optional: true, default: 37
+  string_param :first_initial, default: lambda { |params, param| params.name[0] if params.name.present? }
+  decimal_param :amount, optional: true, default: 0.10, formatter: lambda { |params, param| param.round(2) }
+  param :color, default: "red", validations: { inclusion: { in: ["red", "green"] }}, formatter: :lower_case_colors
+  param :height, optional: true, validations: { inclusion: { in: ["tall","supertall"]} }
+  param :birth_date, type: :date
+  param :born_on, type: :datetime
+  param :bank_balance, type: :float, formatter: lambda { |params, amt| sprintf('$%.2f', amt) }
+  param :weight, type: :decimal
+  param :favorite_colors, type: :array
+  param :pets, type: :hash
+  param :car, type: :object
+  param :submitted_at, type: :time
+  param :has_cellphone, type: :boolean
+  param :title, optional: true, default: "programmer"
+  param :account_type, default: "checking", validations: { inclusion: { in: ["checking", "savings"] }}
+  param :account_status, default: "active", validations: { inclusion: { in: ["active", "inactive"] }}
+  param :username, type: :string, validations: { exclusion: { in: ['admin', 'demo'] } }
+
+  nested_hash :address do
+    string_param :street
+    string_param :city, validations: { length: { in: 4..40 } }
+    string_param :zip_code, optional: true, validations: { length: { in: 5..9 } }
+    param :state, default: "North Carolina", formatter: :transform_state_code
+
+    def transform_state_code(val)
+      val == "SC" ? "South Carolina" : val
+    end
+  end
+
+  nested_hash :phone do
+    boolean_param :cell_phone, default: true
+    string_param :phone_number, validations: { length: { in: 7..10 } }, formatter: lambda { |params, attribute| attribute.gsub(/\D/, "") }
+    string_param :area_code, default: lambda { |params, param|
+      if params.phone_number.present?
+        params.phone_number[0..2]
+      end
+    }
+  end
+
+  nested_array :dogs do
+    param :name
+    param :age, type: :integer, validations: { inclusion: { in: 1..20 } }
+  end
+
+  def lower_case_colors(val)
+    val.downcase
+  end
+end

data/spec/params_spec.rb

@@ -74,11 +74,43 @@ describe SimpleParams::Params do
         params.dogs.first.should be_nil
       end
 
-      it "can access nested arrays as arrays with data", failing: true do
+      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.first.name.should eq("SPOT")
+      end
+    end
+  end
+
+  describe "accessors", accessors: true do
+    let(:params) { DummyParams.new(dogs: [{}]) }
+
+    it "can access raw values for non-formatted param" do
+      params.name = "Tom"
+      params.name.should eq("Tom")
+      params.raw_name.should eq("Tom")
+    end
+
+    it "can access raw values for formatted param" do
+      params.amount = 1.095
+      params.amount.should eq(1.10)
+      params.raw_amount.should eq(1.095)
+    end
+
+    describe "nested params", nested: true do
+      it "can access raw values for formatted param" do
+        params.address.state = "SC"
+        params.address.state.should eq("South Carolina")
+        params.address.raw_state.should eq("SC")
+      end
+    end
+
+    describe "nested arrays", nested: true do
+      it "can access raw values for formatted param" do
+        params.dogs.first.name = "Fido"
+        params.dogs.first.name.should eq("FIDO")
+        params.dogs.first.raw_name.should eq("Fido")
       end
     end
   end

data/spec/validation_matchers/coercion_matcher_spec.rb

@@ -1,36 +1,24 @@
 require 'spec_helper'
+require 'fixtures/validator_params'
 
 describe SimpleParams::ValidationMatchers::CoercionMatcher do
-  class CoercionMatcherTestClass < SimpleParams::Params
-    param :name, type: :string
-    param :expiration_date, type: :date
-    param :amount, type: :integer
-    param :beginning_date, type: :datetime
-    param :cost, type: :float
-    param :weight, type: :decimal
-    param :colors, type: :array
-    param :animals, type: :hash
-    param :title, type: :object
-    param :office_hours, type: :time
-    param :cellphone, type: :boolean
-
-
-  end
-
-  subject { CoercionMatcherTestClass.new }
+  subject { ValidatorParams.new }
 
   it { should coerce_param(:name).into(:string) }
-  it { should coerce_param(:expiration_date).into(:date) }
-  it { should_not coerce_param(:expiration_date).into(:datetime) }
-  it { should coerce_param(:amount).into(:integer) }
-  it { should coerce_param(:beginning_date).into(:datetime) }
-  it { should coerce_param(:cost).into(:float) }
-  it { should_not coerce_param(:cost).into(:integer) }
+  it { should coerce_param(:birth_date).into(:date) }
+  it { should_not coerce_param(:birth_date).into(:datetime) }
+  it { should coerce_param(:age).into(:integer) }
+  it { should coerce_param(:born_on).into(:datetime) }
+  it { should_not coerce_param(:born_on).into(:date) }
+  it { should coerce_param(:bank_balance).into(:float) }
+  it { should_not coerce_param(:bank_balance).into(:integer) }
   it { should coerce_param(:weight).into(:decimal) }
   it { should_not coerce_param(:weight).into(:float) }
-  it { should coerce_param(:colors).into(:array) }
-  it { should coerce_param(:animals).into(:hash) }
-  it { should coerce_param(:title).into(:object) }
-  it { should coerce_param(:office_hours).into(:time) }
-  it { should coerce_param(:cellphone).into(:boolean) }
+  it { should coerce_param(:favorite_colors).into(:array) }
+  it { should coerce_param(:pets).into(:hash) }
+  it { should coerce_param(:car).into(:object) }
+  it { should coerce_param(:submitted_at).into(:time) }
+  it { should_not coerce_param(:submitted_at).into(:date) }
+  it { should_not coerce_param(:submitted_at).into(:datetime) }
+  it { should coerce_param(:has_cellphone).into(:boolean) }
 end

data/spec/validation_matchers/format_matcher_spec.rb

@@ -1,16 +1,11 @@
 require 'spec_helper'
+require 'fixtures/validator_params'
 
 describe SimpleParams::ValidationMatchers::FormatMatcher do
-  class FormatMatcher < SimpleParams::Params
-    param :amount, type: :float, formatter: lambda { |params, amt| sprintf('%.2f', amt) }
-    param :expiration_date, type: :date, formatter: lambda { |params, date| date.strftime("%Y-%m")}
-    param :cost, type: :float, formatter: lambda { |params, amt| sprintf('%.2f', amt) }
-  end
+  subject { ValidatorParams.new }
 
-  subject { FormatMatcher.new }
-
-  it { should format(:amount).with_value(10).into("10.00") }
-  it { should format(:expiration_date).with_value(Date.new(2014, 2, 4)).into("2014-02") }
-  it { should_not format(:cost).with_value(12).into("14.00") }
-  it { should_not format(:expiration_date).with_value(Date.new(2016, 2, 4)).into("2014-02") }
+  it { should format(:color).with_value("RED").into("red") }
+  it { should format(:amount).with_value(1.2345).into(1.23) }
+  it { should format(:bank_balance).with_value(1100.4).into("$1100.40") }
+  it { should_not format(:birth_date).with_value(Date.new(2014, 1, 1)).into("1/1/2014") }
 end

data/spec/validation_matchers/nested_array_matcher_spec.rb

@@ -1,17 +1,9 @@
 require 'spec_helper'
+require 'fixtures/validator_params'
 
 describe SimpleParams::ValidationMatchers::NestedArrayMatcher do
-  class NestedArrayMatcherTestClass < SimpleParams::Params
-    param :name
-    param :age, optional: true, default: 37
-    nested_array :dogs do
-      param :name
-      param :age, type: :integer
-    end
-  end
-
-  subject { NestedArrayMatcherTestClass.new }
+  subject { ValidatorParams.new }
 
   it { should have_nested_array(:dogs) }
-  it { should_not have_nested_array(:broken) } 
+  it { should_not have_nested_array(:address) } 
 end

data/spec/validation_matchers/nested_parameter_matcher_spec.rb

@@ -1,26 +1,10 @@
 require 'spec_helper'
+require 'fixtures/validator_params'
 
 describe SimpleParams::ValidationMatchers::NestedParameterMatcher do
-  class NestedParameterMatcherTestClass < SimpleParams::Params
-    param :name
-    param :age, optional: true, default: 37
-    param :title, optional: true, default: "programmer"
-    param :account_type, default: "checking", validations: { inclusion: { in: ["checking", "savings"] }}
-    param :account_status, optional: true, validations: { inclusion: { in: ["active", "inactive"] }}
-    nested_param :billing_address do
-      param :first_name
-      param :last_name
-      param :company, optional: true
-      param :street
-      param :city
-      param :state
-      param :zip_code
-      param :country
-    end
-  end
+  subject { ValidatorParams.new }
 
-  subject { NestedParameterMatcherTestClass.new }
-
-  it { should have_nested_parameter(:billing_address) }
-  it { should_not have_nested_parameter(:broken) } 
+  it { should have_nested_parameter(:address) }
+  it { should have_nested_parameter(:phone) }
+  it { should_not have_nested_parameter(:dogs) } 
 end

data/spec/validation_matchers/optional_parameter_matcher_spec.rb

@@ -1,16 +1,8 @@
 require 'spec_helper'
+require 'fixtures/validator_params'
 
 describe SimpleParams::ValidationMatchers::OptionalParameterMatcher do
-  class OptionalParameterMatcher < SimpleParams::Params
-    param :name
-    param :age, optional: true, default: 37
-    param :title, optional: true, default: "programmer"
-    param :account_type, default: "checking", validations: { inclusion: { in: ["checking", "savings"] }}
-    param :account_status, optional: true, validations: { inclusion: { in: ["active", "inactive"] }}
-    param :username, type: :string, default: "test", validations: { exclusion: { in: ['admin', 'demo'] } }
-  end
-
-  subject { OptionalParameterMatcher.new }
+  subject { ValidatorParams.new }
 
   it { should_not have_optional_parameter(:name) }
   it { should have_optional_parameter(:age).with_default(37) }
@@ -18,6 +10,5 @@ describe SimpleParams::ValidationMatchers::OptionalParameterMatcher do
   it { should have_optional_parameter(:account_status).with_allowed_values("active", "inactive") }
   it { should have_optional_parameter(:account_type).with_default("checking").with_allowed_values("checking", "savings") }
   it { should have_optional_parameter(:account_type).with_disallowed_values("admin", "demo") }
-  it { should have_optional_parameter(:username).with_default("test").with_allowed_values("myuser", "kitten") }
-  it { should have_optional_parameter(:username).with_disallowed_values("admin", "demo") }
+  it { should_not have_optional_parameter(:username) }
 end

data/spec/validation_matchers/required_parameter_matcher_spec.rb

@@ -1,22 +1,14 @@
 require 'spec_helper'
+require 'fixtures/validator_params'
 
 describe SimpleParams::ValidationMatchers::RequiredParameterMatcher do
-  class RequiredParameterMatcherTestClass < SimpleParams::Params
-    param :name
-    param :age, optional: true
-    param :title, default: "programmer"
-    param :account_type, validations: { inclusion: { in: ["checking", "savings"] }}
-    param :account_status, default: "active", validations: { inclusion: { in: ["active", "inactive"] }}
-    param :username, type: :string, validations: { exclusion: { in: ['admin', 'demo'] } }
-  end
+  subject { ValidatorParams.new }
 
-  subject { RequiredParameterMatcherTestClass.new }
-  
   it { should have_required_parameter(:name) }
   it { should_not have_required_parameter(:age) }
   it { should_not have_required_parameter(:name).with_default("Matthew") }
   it { should have_required_parameter(:title).with_default("programmer") }
-  it { should have_required_parameter(:account_type).with_allowed_values("checking", "savings") }
+  it { should have_required_parameter(:account_type).with_default("checking").with_allowed_values("checking", "savings") }
   it { should have_required_parameter(:account_status).with_default("active").with_allowed_values("active", "inactive") }
   it { should have_required_parameter(:account_status).with_disallowed_values("admin", "demo") }
   it { should have_required_parameter(:username).with_allowed_values("myuser", "kitten") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -157,6 +157,7 @@ files:
 - spec/attribute_spec.rb
 - spec/errors_spec.rb
 - spec/fixtures/dummy_params.rb
+- spec/fixtures/validator_params.rb
 - spec/formatter_spec.rb
 - spec/multiple_classes_spec.rb
 - spec/params_spec.rb
@@ -201,6 +202,7 @@ test_files:
 - spec/attribute_spec.rb
 - spec/errors_spec.rb
 - spec/fixtures/dummy_params.rb
+- spec/fixtures/validator_params.rb
 - spec/formatter_spec.rb
 - spec/multiple_classes_spec.rb
 - spec/params_spec.rb