weak_parameters 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ff95fe3c0c70019f9928aec5497ade558f8931
-  data.tar.gz: c89f0b1d89a105a945be5da03610b89ee6b6742b
+  metadata.gz: 7e14888d6ca91c30183114b9da6414fd06813b14
+  data.tar.gz: ddf56dcd3f9802d6fc82bbc4a0b26d3efb537a39
 SHA512:
-  metadata.gz: 104f5d6733c9ada50db9c805329471d6042fd33004e2000a86e703b9f9ee6e8122a649633b5aeafed55eac18fcd3d7157b9a1e63c430143d169cf0d038603d03
-  data.tar.gz: 07f767852ee08f96bcbbdf709b7d3438b8df3fbc7d1956535ca75e42e9bd538eff2cc7f2b0821576268458898fbb7758d2e036aa35a14254badb7a474cfcb0f2
+  metadata.gz: 2c4e91827ef9bc297a92475c07539dd46f7cf6bc8f3e47006fa090c04f877fca8563b1654640e117ea2ebb67a2775f379f80a92c8531e81c578e92492e5cc9c8
+  data.tar.gz: adb68ddf8264e3a4020eef3bac59673d5f79b1c7215ff73ab638e0223b032d96e6a78dff97b55a1ac3f2bdf5c64fbd9a74795e714a522b87dc9948dffc2d7a44

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.6
+* Support nested parameters (Thx @mzp)
+
 ## 0.1.5
 * Support `file` validator (#6)
 

data/README.md

@@ -55,6 +55,7 @@ irb(main):005:0> app.post "/recipes", name: "alice", type: "bob"
 * integer
 * string
 * boolean (= 0, 1, false, true)
+* file
 
 ### Avilable options
 * required

data/lib/weak_parameters/base_validator.rb

@@ -1,6 +1,6 @@
 module WeakParameters
   class BaseValidator
-    attr_reader :controller, :key, :options, :block
+    attr_reader :controller, :options, :block
 
     def initialize(controller, key, options = {}, &block)
       @controller = controller
@@ -9,7 +9,8 @@ module WeakParameters
       @block = block
     end
 
-    def validate
+    def validate(*path)
+      @path = path
       handle_failure unless valid?
     end
 
@@ -21,6 +22,10 @@ module WeakParameters
       self.class.name.split("::").last.sub(/Validator$/, "").underscore.to_sym
     end
 
+    def key
+      path[-1]
+    end
+
     private
 
     def valid?
@@ -57,8 +62,16 @@ module WeakParameters
       end
     end
 
+    # key array to validation target
+    def path
+      # Because @key becomes nil at ListValidator, I remove it from path.
+      (@path + [ @key ]).compact
+    end
+
     def params
-      controller.params
+      path[0...-1].inject(controller.params) { |params, key|
+        params[key]
+      }
     end
 
     def value

data/lib/weak_parameters/list_validator.rb

@@ -0,0 +1,23 @@
+module WeakParameters
+  class ListValidator < WeakParameters::ArrayValidator
+    attr_reader :validator
+    def initialize(controller, key, validator)
+      super controller, key, {}
+      @validator = validator
+    end
+
+    def validate(*args)
+      super
+
+      if valid? && exist?
+        value.each.with_index do |_, i|
+          validator.validate(*path, i)
+        end
+      end
+    end
+
+    def validators
+      [ validator ]
+    end
+  end
+end

data/lib/weak_parameters/object_validator.rb

@@ -0,0 +1,39 @@
+module WeakParameters
+  class ObjectValidator < WeakParameters::HashValidator
+    attr_reader :validators
+    def initialize(controller, key, validators, options = {})
+      super controller, key, options
+      @validators = validators
+    end
+
+    def validate(*args)
+      super
+
+      if valid? && exist?
+        validators.each do |validator|
+          validator.validate(*path)
+        end
+      end
+    end
+
+    private
+
+    def valid?
+      case
+      when required? && nil?
+        false
+      when exist? && invalid_type?
+        false
+      when exist? && exceptional?
+        false
+      else
+        true
+      end
+    end
+
+    def error_message
+      keys = path.map { |k| "[#{k.inspect}]" }.join ''
+      "params#{keys} must be a valid Hash"
+    end
+  end
+end

data/lib/weak_parameters/string_validator.rb

@@ -3,5 +3,9 @@ module WeakParameters
     def valid_type?
       value.is_a?(String)
     end
+
+    def error_message
+      "params[#{key.inspect}] must be a valid String"
+    end
   end
 end

data/lib/weak_parameters/validator.rb

@@ -17,6 +17,18 @@ module WeakParameters
 
     private
 
+    def with_validators(&block)
+      old_validators = @validators
+
+      begin
+        @validators = []
+        block.call
+        @validators
+      ensure
+        @validators = old_validators
+      end
+    end
+
     def params
       controller.params
     end
@@ -52,5 +64,15 @@ module WeakParameters
     def file(key, options = {}, &block)
       validators << WeakParameters::FileValidator.new(controller, key, options, &block)
     end
+
+    def object(key, options = {}, &block)
+      children = with_validators { instance_eval(&block) }
+      validators << WeakParameters::ObjectValidator.new(controller, key, children, options)
+    end
+
+    def list(key, type, options = {}, &block)
+      children = with_validators { send type, nil, options, &block }
+      validators << WeakParameters::ListValidator.new(controller, key, children.first)
+    end
   end
 end

data/lib/weak_parameters/version.rb

@@ -1,3 +1,3 @@
 module WeakParameters
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/weak_parameters.rb

@@ -10,6 +10,8 @@ require "weak_parameters/float_validator"
 require "weak_parameters/hash_validator"
 require "weak_parameters/integer_validator"
 require "weak_parameters/string_validator"
+require "weak_parameters/object_validator"
+require "weak_parameters/list_validator"
 require "weak_parameters/controller"
 require "weak_parameters/validation_error"
 require "weak_parameters/validator"

data/spec/dummy/app/controllers/recipes_controller.rb

@@ -13,6 +13,18 @@ class RecipesController < ApplicationController
     string :zip_code do |value|
       value =~ /\A\d{3}-\d{4}\z/
     end
+    object :nested, required: true do
+      integer :number, only: [0, 1]
+    end
+
+    list :numbers, :integer, description: 'some numbers'
+
+    object :body do
+      list :items, :object, description: 'some items' do
+        string :name
+        integer :price
+      end
+    end
   end
 
   def create

data/spec/requests/recipes_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "Recipes" do
+describe "Recipes", type: :request do
   let(:params) do
     {
       object: [],
@@ -13,6 +13,16 @@ describe "Recipes" do
       attachment: Rack::Test::UploadedFile.new(__FILE__),
       zip_code: "123-4567",
       custom: 0,
+      nested: {
+        number: 0
+      },
+      numbers: [1, 2, 3],
+      body: {
+        items: [
+          { name: "foo", price: 100 },
+          { name: "bar", price: 100 }
+        ]
+      }
     }
   end
 
@@ -135,5 +145,35 @@ describe "Recipes" do
         response.status.should == 403
       end
     end
+
+    context "with wrong nested params" do
+      before do
+        params[:nested][:number] = true
+      end
+      include_examples "400"
+    end
+
+    context "with wrong repeated params" do
+      describe 'scalar' do
+        before do
+          params[:numbers] = 1
+        end
+        include_examples "400"
+      end
+
+      describe 'wrong type' do
+        before do
+          params[:numbers] = ["foo"]
+        end
+        include_examples "400"
+      end
+    end
+
+    context "with complex params" do
+      before do
+        params[:body][:items] << { price: "xxx" }
+      end
+      include_examples "400"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weak_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,6 +89,8 @@ files:
 - lib/weak_parameters/float_validator.rb
 - lib/weak_parameters/hash_validator.rb
 - lib/weak_parameters/integer_validator.rb
+- lib/weak_parameters/list_validator.rb
+- lib/weak_parameters/object_validator.rb
 - lib/weak_parameters/string_validator.rb
 - lib/weak_parameters/validation_error.rb
 - lib/weak_parameters/validator.rb