simple_params 1.5.2 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE2OTkyZTFiMjYzYTQ1NmVlNzI4OWUyNzM3MGMyZjEyNzRjOGUyNg==
+    NjA4YzU5ZjQ2NTRjMmYwNmViZWQ3N2ZhZTM3ZTE2Y2Q4ZGQyMWViNA==
   data.tar.gz: !binary |-
-    NTMxMGU3ZWE5NTY4ZmI2OGMyZDk0ZjZiOTIxNGJmMmI0NjgxNjRhMw==
+    M2FkYjI0NzcxZjgzODA0Y2JhZDcyODM4MzZkYzM1YWUyNjM4MjI5ZA==
 SHA512:
   metadata.gz: !binary |-
-    OTJmMzRhNTFlOWI0YjAwZjU1N2E1NDhjYTkzZWJjZTczMWMxODQyOWRkNmYw
-    NjRhZjU2OTNlNDI4MzAwZGM0ZTJiMTNhMWEyMDEzODE0MzBkZWMxZmE0YTA0
-    ZjI0MmJhNGY1MWZkZGE2NTQwMDZkMWZkNGQyNGE1NzE3YTdhZTY=
+    YmM2MmNiMDg5YmY5YzUxNGIwMjU1MzU4NGIyMDdjZjkxZjE0MDgxOTFmYzM1
+    YWM4NWE0MzkzNmFhOTFmNDk4ZDlkNjJlOTYwZTEwMmNjOGFiYjFjOThlZjY0
+    YjYzNGEyYTdhNzIyNmEwMzY0YmUyYWVhMzhlNjRhZmQ5ZmE1ZmQ=
   data.tar.gz: !binary |-
-    ZGZkZmI0NmI4NzY3MWJhYWQwNjRiZDk1NDBkOWNjNDk2ODc3OTFmYzQwYzIz
-    N2JmNDk5MTZkYzZiNDE5MjI2ZDJhYTc5ZTFlODk3MmJjMjllZTA5NzBmNDYy
-    NzY2NTJhNWMzZTc5N2FlMzRiM2YxMWRlNjUwZjkxM2U0OTJjOTk=
+    OTdlMjA1ZmM1MjliODZkYzEyYTdhNzYyNjdkZWRjMWZjZTY1NjVhYjllYTM2
+    NmQyMDI4ZjEwY2I0MWMxMThjNmJjMjUwYzQ2NzhiZjRjYjQxODdiMzMwMmRm
+    YzgzNDZjMTY5YWUyMmZmYjVhNWM4MWM1OGQ5ZTM3ZTY4ZmQzNGE=

data/Gemfile.lock

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

data/lib/simple_params/concerns/has_attributes.rb

@@ -1,6 +1,7 @@
 module SimpleParams
   module HasAttributes
     extend ActiveSupport::Concern
+
     included do
       def attributes
         (defined_attributes.keys + nested_classes.keys).flatten

data/lib/simple_params/params.rb

@@ -30,8 +30,8 @@ module SimpleParams
       end
 
       def add_validations(name, opts = {})
-        validation_string = ValidationBuilder.new(name, opts).validation_string
-        eval(validation_string)
+        validations = ValidationBuilder.new(opts).build
+        validates name, validations unless validations.empty?
       end
 
       def nested_classes

data/lib/simple_params/validation_builder.rb

@@ -1,31 +1,33 @@
 module SimpleParams
   class ValidationBuilder
-    def initialize(name, opts={})
-      @name = name
+    def initialize(opts={})
       @opts = opts
+      @validations = opts[:validations] || {}
     end
 
-    def validation_string
-      validations = @opts[:validations] || {}
-      has_default = @opts.has_key?(:default) # checking has_key? because :default may be nil
-      optional = @opts[:optional]
-      if !validations.empty?
-        if optional || has_default
-          validations.merge!(allow_nil: true)
-        else
-          validations.merge!(presence: true)
+    def build
+      if allow_nil?
+        unless @validations.empty?
+          @validations.merge!(allow_nil: true)
         end
       else
-        if !optional && !has_default
-          validations.merge!(presence: true)
-        end
+        @validations.merge!(presence: true)
       end
 
-      if validations.empty?
-        return  ''
-      else
-        return "validates :#{@name.to_sym}, #{validations}"
-      end
+      @validations
+    end
+
+    private
+    def has_default?
+      @opts.has_key?(:default)
+    end
+
+    def optional?
+      !!@opts[:optional]
+    end
+
+    def allow_nil?
+      optional? || has_default?
     end
   end
 end

data/lib/simple_params/version.rb

@@ -1,3 +1,3 @@
 module SimpleParams
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 end

data/spec/acceptance_spec.rb

@@ -6,6 +6,13 @@ class AcceptanceParams < SimpleParams::Params
   param :reference, type: :object, optional: true
   param :name
   param :date_of_birth, type: :date, optional: true
+  param :content, optional: true, validations: { length: {
+    minimum: 20,
+    maximum: 40,
+    tokenizer: lambda { |str| str.split(/\s+/) },
+    too_short: "must have at least %{count} words",
+    too_long: "must have at most %{count} words"
+  } }
   param :current_time, type: :datetime, optional: true
   param :age, type: :integer, optional: true, validations: { inclusion: { in: 18..100 } }
   param :color, default: "red", validations: { inclusion: { in: ["red", "green"] }}
@@ -116,6 +123,7 @@ describe SimpleParams::Params do
         reference: nil,
         name: "Tom", 
         date_of_birth: nil,
+        content: nil,
         current_time: nil,
         age: nil,
         color: "red",
@@ -179,6 +187,10 @@ describe SimpleParams::Params do
             "0" => { name: "Paws" },
             "1" => { name: "Turbo", _destroy: "1" },
             "2" => { name: "Felix" }
+          },
+          birds: {
+            "0" => { name: "Birdy" },
+            "1" => { name: "Tweety", _destroy: "1" }
           }
         }
       end
@@ -192,6 +204,10 @@ describe SimpleParams::Params do
       it "builds correct number of cats" do
         subject.cats.count.should eq(2)
       end
+
+      it "builds correct number of birds" do
+        subject.birds.count.should eq(1)
+      end
     end
   end
 
@@ -263,7 +279,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, :cats, :birds])
+      params.attributes.should eq([:reference, :name, :date_of_birth, :content, :current_time, :age, :color, :sibling_names, :address, :phone, :dogs, :cats, :birds])
     end
 
     it "returns array of attribute symbols for nested class" do
@@ -626,6 +642,7 @@ describe SimpleParams::Params do
         param:reference, Object, desc:'', required: false
         param :name, String, desc: '', required: true
         param :date_of_birth, Date, desc: '', required: false
+        param:content,String,desc:'',required:false
         param :current_time, desc: '', required: false
         param :age, Integer, desc: '', required: false
         param :color, String, desc: '', required: false

data/spec/validation_builder_spec.rb

@@ -1,29 +1,28 @@
 require 'spec_helper'
 
 describe SimpleParams::ValidationBuilder do
-  let(:name) { "my_attribute" }
-
   context "with blank opts" do
-    let(:builder) { described_class.new(name) }
+    let(:builder) { described_class.new }
 
-    it "has correct validation string" do
-      builder.validation_string.should eq(
-        'validates :my_attribute, {:presence=>true}'
+    it "has correct validations" do
+      builder.build.should eq(
+        { presence: true }
       )
     end
   end
 
-  context "with optional" do
+  context "with only optional" do
     let(:opts) do
       {
-        optional: true
+        optional: true,
+        validations: nil
       }
     end
 
-    let(:builder) { described_class.new(name, opts) }
+    let(:builder) { described_class.new(opts) }
 
-    it "has correct validation string" do
-      builder.validation_string.should eq('')
+    it "has correct validations" do
+      builder.build.should eq({})
     end
   end
 
@@ -34,25 +33,48 @@ describe SimpleParams::ValidationBuilder do
       }
     end
 
-    let(:builder) { described_class.new(name, opts) }
+    let(:builder) { described_class.new(opts) }
 
-    it "has correct validation string" do
-      builder.validation_string.should eq('')
+    it "has correct validations" do
+      builder.build.should eq( {})
     end
   end
 
-  context "with other validations" do
+  context "with other validations (simple)" do
     let(:opts) do
       {
         validations: { presence: true, length: { in: [0..20]} }
       }
     end
 
-    let(:builder) { described_class.new(name, opts) }
+    let(:builder) { described_class.new(opts) }
+
+    it "has correct validations" do
+      builder.build.should eq(
+        { presence: true, length: { in: [0..20] } }
+      )
+    end
+  end
+
+  context "with other validations (complex)" do
+    let(:stored_proc) do
+      lambda { |str| str.split(/\s+/) }
+    end
+
+    let(:opts) do
+      {
+        validations: { presence: true, length: { 
+            minimum: 2, tokenizer: stored_proc
+          } 
+        }
+      }
+    end
+
+    let(:builder) { described_class.new(opts) }
 
-    it "has correct validation string" do
-      builder.validation_string.should eq(
-        'validates :my_attribute, {:presence=>true, :length=>{:in=>[0..20]}}'
+    it "has correct validations" do
+      builder.build.should eq(
+        { presence: true, length: { minimum: 2, tokenizer: stored_proc } }
       )
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_params
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - brycesenz