weak_parameters 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1eda85eff3c4bef895416ca359efa1dd90db8f7
-  data.tar.gz: 8ef1d0d971591b665066b042a32b88c530353ade
+  metadata.gz: f112bfd3d9b173060049795b5fc59f3453edc245
+  data.tar.gz: 3fd97028246f58ab071b810b5e239fba042d8074
 SHA512:
-  metadata.gz: 8c15d0bcf364fb6dc89be768bd71bb9e6d3c96be1b2cd24b7d32f04749ef774b74741a6d6b606ee525734cf759768ac7882a0588be5b9b965ea1aeb7991b65fb
-  data.tar.gz: d505f087124d6e89059dd9941e1a438e4d58527bda9d86e2b7ee6b158cbd81a9c9caae42b4f43c3f6c8bbb190e19324c147670bc58adacb604e1d9dec3bae5d4
+  metadata.gz: 534fce296c74c8af8e006cb63f953d6c2e594939054d63aa24ad0791402dcec12c56880e81d4f7732f40a13cd8bcdc1521ec0d08a1de52dbb21ba7de84d31d3a
+  data.tar.gz: 314aba9cb4a7561c2253c8d10c536a9e3e951e23bbb9673a90a3aef2ff7317922a035e7126ede67eb2f13fb6c09a541b929c21929dd7880f057e35806118610c

data/README.md

@@ -13,6 +13,9 @@ class RecipesController < ApplicationController
   validates :create do
     string :name, required: true, except: ["charlie", "dave"]
     integer :type, only: 1..3
+    string :quantity do |value|
+      value =~ /\A\d+(?:\.\d+)g\z/
+    end
   end
 
   def create
@@ -36,6 +39,7 @@ irb(main):005:0> app.post "/recipes", name: "alice", type: "bob"
 
 ### Available validators
 * array
+* float
 * hash
 * integer
 * string

data/lib/weak_parameters.rb

@@ -4,6 +4,7 @@ require "active_support/hash_with_indifferent_access"
 require "weak_parameters/base_validator"
 require "weak_parameters/array_validator"
 require "weak_parameters/boolean_validator"
+require "weak_parameters/float_validator"
 require "weak_parameters/hash_validator"
 require "weak_parameters/integer_validator"
 require "weak_parameters/string_validator"

data/lib/weak_parameters/base_validator.rb

@@ -1,11 +1,12 @@
 module WeakParameters
   class BaseValidator
-    attr_reader :params, :key, :options
+    attr_reader :params, :key, :options, :block
 
-    def initialize(params, key, options = {})
+    def initialize(params, key, options = {}, &block)
       @params = params
       @key = key
       @options = options
+      @block = block
     end
 
     def validate
@@ -30,6 +31,8 @@ module WeakParameters
         false
       when exist? && exceptional?
         false
+      when exist? && block && !block.call(value)
+        false
       else
         true
       end

data/lib/weak_parameters/float_validator.rb

@@ -0,0 +1,17 @@
+module WeakParameters
+  class FloatValidator < WeakParameters::BaseValidator
+    def valid_type?
+      /\A-?\d+(?:\.\d+)?\z/ === params[key].to_s
+    end
+
+    def error_message
+      "params[#{key.inspect}] must be a Float"
+    end
+
+    private
+
+    def value
+      super.presence.try(:to_f)
+    end
+  end
+end

data/lib/weak_parameters/validator.rb

@@ -17,24 +17,28 @@ module WeakParameters
 
     private
 
-    def string(key, options = {})
-      validators << WeakParameters::StringValidator.new(params, key, options)
+    def string(key, options = {}, &block)
+      validators << WeakParameters::StringValidator.new(params, key, options, &block)
     end
 
-    def integer(key, options = {})
-      validators << WeakParameters::IntegerValidator.new(params, key, options)
+    def integer(key, options = {}, &block)
+      validators << WeakParameters::IntegerValidator.new(params, key, options, &block)
     end
 
-    def boolean(key, options = {})
-      validators << WeakParameters::BooleanValidator.new(params, key, options)
+    def boolean(key, options = {}, &block)
+      validators << WeakParameters::BooleanValidator.new(params, key, options, &block)
     end
 
-    def hash(key, options = {})
-      validators << WeakParameters::HashValidator.new(params, key, options)
+    def hash(key, options = {}, &block)
+      validators << WeakParameters::HashValidator.new(params, key, options, &block)
     end
 
-    def array(key, options = {})
-      validators << WeakParameters::ArrayValidator.new(params, key, options)
+    def array(key, options = {}, &block)
+      validators << WeakParameters::ArrayValidator.new(params, key, options, &block)
+    end
+
+    def float(key, options = {})
+      validators << WeakParameters::FloatValidator.new(params, key, options, &block)
     end
   end
 end

data/lib/weak_parameters/version.rb

@@ -1,3 +1,3 @@
 module WeakParameters
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

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

@@ -6,6 +6,10 @@ class RecipesController < ApplicationController
     boolean :flag
     hash :config
     array :tags
+    float :rate
+    string :zip_code do |value|
+      value =~ /\A\d{3}-\d{4}\z/
+    end
   end
 
   def create

data/spec/requests/recipes_spec.rb

@@ -9,6 +9,7 @@ describe "Recipes" do
       flag: true,
       config: {},
       tags: [],
+      zip_code: "123-4567",
     }
   end
 
@@ -79,6 +80,28 @@ describe "Recipes" do
       end
     end
 
+    context "with wrong float param" do
+      before do
+        params[:rate] = "-x"
+      end
+
+      it "returns 400" do
+        post "/recipes", params
+        response.status.should == 400
+      end
+    end
+
+    context "with block failure" do
+      before do
+        params[:zip_code] = "123-456"
+      end
+
+      it "returns 400" do
+        post "/recipes", params
+        response.status.should == 400
+      end
+    end
+
     context "without non-required param" do
       before do
         params.delete(:type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weak_parameters
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,6 +83,7 @@ files:
 - lib/weak_parameters/base_validator.rb
 - lib/weak_parameters/boolean_validator.rb
 - lib/weak_parameters/controller.rb
+- lib/weak_parameters/float_validator.rb
 - lib/weak_parameters/hash_validator.rb
 - lib/weak_parameters/integer_validator.rb
 - lib/weak_parameters/string_validator.rb