simple_params 1.6.5 → 1.6.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWNlZDM0YjZkNWQxNjhhOGRjZDJjMWJiMzBiMTU1NGQ3ZjljNTZmMQ==
+    ZTgwM2FiZTg2YTJlYjdhY2VlM2UwZjk1YzMwOWIyODE1NTEzNzQ2Yg==
   data.tar.gz: !binary |-
-    MTExMDdjMmE1MWJkOWEzNWJkOWEyOTg5MThmMWQ5ZTNhNjRiY2U5YQ==
+    NDE5Y2Y2YTIxODA5ODAyNmZlNjY2ZmFiODcxMDZhM2E4ODM5ODY1NQ==
 SHA512:
   metadata.gz: !binary |-
-    YmY4ZDg1NjFjNDYxNTBjZGRhNDhkMTBjNGI3Y2RmOTEyZWExYWVjZmQ0OWQz
-    YTBiNzBhMjY4N2NlYzgyNmQwNTg0MjQxZGNkMmU5ZDNkOWI5MDhiY2VhZTg3
-    ZmE5MTYxMThjNWU1OTBiZTk2MGVkNTJiZjBlNzNiYWIyM2YxN2Y=
+    NmYwNjU4YmNlZWI0NjMzNjQ3YWY2OWI1MDE1Zjg1ZjU4ZjFjMGFjNWM1OTQ3
+    ZjljZjgyNDEwMGE4MzQ1NmUxYzU1NGJlYjc0NTRhY2ViZjQ5YTc4ODVjMWYw
+    MThkZmQ3ZTk2ZDEzZjViYWU4OGMxNjhkZjk4ODJkMGU5M2E1ZTA=
   data.tar.gz: !binary |-
-    ZjVkZTVmNWRlZWJmNzVhOWI3ZWE5NDllMDg2NGZlZWQzYWJlMmFiZTlkOTc1
-    NWJhZTdjNGE2MTQ4NDk5YjdhZTFiYjlhOTc4OWYyZTg2Y2EzNjg2Y2U5ZDFm
-    ZDJiZmFkNGVlZmU3OGU4MzU0NTczYjZmNjg0NjU5YTEwYTA1OWQ=
+    NDkzZWZmN2Y2MTYzNWM0ZWJmMWZiNTdjN2E0NjI3MTdlOGI2ZDI1ODgzM2Yz
+    NGNkNTkyYWY0ZDdkMWZlYTBhOTYxOThkMGQ1ZTQwMzExNzcxNGNlZDUyY2E0
+    ZmQ4YmQzNTRlZTEwMmNiZGMxZjA2ZWEzODMyNDgyOTMyNDcyZmI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_params (1.6.4)
+    simple_params (1.6.7)
       activemodel (>= 3.0, < 5.0)
       shoulda-matchers (~> 2.8)
       virtus (>= 1.0.0)
@@ -9,10 +9,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activesupport (4.2.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -31,10 +31,10 @@ GEM
     diff-lcs (1.2.5)
     equalizer (0.0.11)
     i18n (0.7.0)
-    ice_nine (0.11.1)
-    json (1.8.2)
+    ice_nine (0.11.2)
+    json (1.8.3)
     method_source (0.8.2)
-    minitest (5.6.0)
+    minitest (5.9.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -69,3 +69,6 @@ DEPENDENCIES
   rake (~> 10.1)
   rspec (~> 2.6)
   simple_params!
+
+BUNDLED WITH
+   1.12.5

data/lib/simple_params/params.rb

@@ -30,6 +30,14 @@ module SimpleParams
       end
 
       def add_validations(name, opts = {})
+
+        conditional_validation = opts.fetch(:validations, {}).fetch(:if, nil)
+
+        if conditional_validation
+          opts[:optional] = false
+          opts[:validations].delete(:if)
+        end
+
         validations = ValidationBuilder.new(opts).build
         validates name, validations unless validations.empty?
       end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.6.5"
+  VERSION = "1.6.8"
 end

data/spec/fixtures/dummy_params.rb

@@ -9,7 +9,7 @@ class DummyParams < SimpleParams::Params
   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 } }
+    string_param :zip_code, optional: true, validations: { length: { in: 5..9 }, if: true }
     param :state, default: "North Carolina", formatter: :transform_state_code
 
     def transform_state_code(val)

data/spec/params_spec.rb

@@ -443,7 +443,7 @@ describe SimpleParams::Params do
                   param :address, Hash, desc: '', required: true do
                     param :street, String, desc: '', required: true
                     param :city, String, desc: '', required: true
-                    param :zip_code, String, desc: '', required: false
+                    param :zip_code, String, desc: '', required: true
                     param :state, String, desc: '', required: false
                   end
                   param :phone, Hash, desc: '', required: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.8
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A DSL for specifying params, including type coercion and validation