weak_parameters 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efcb865d817a6867afa772ec6f3dfe729edd1376
-  data.tar.gz: 4e7b85548130ba79ea37ac9e01128a146a4a575a
+  metadata.gz: 26e7c722507f3503ec86ccf9125412e4ffa92d80
+  data.tar.gz: 2d12877fdf00a549ef15a33c3586d14b88dcc71e
 SHA512:
-  metadata.gz: c67f0ed28ba05e9c3b0bbb95f1470647c984cb7382371aaf9d759fb393a600c46b1997043e258f68c76cffb91a4472a55aa33a765fbbe011893e3a36bd30c999
-  data.tar.gz: 049f8b27c064d73b8bd07914393f1dba7ea73eec7e5d4541ab09630d9064e9b7b14f9abdf16c2f7fc5d1f515c589c2cbd3927df7340659336f8044ac9b0c42d2
+  metadata.gz: 618f2b0a8f715c18636238b4e279a0cef462098313a2b5fac7fda66aa6c54df3d292a67b75c4c76e8f98af7bb10cf105f14204cc02791f3f3af1c18e0063617e
+  data.tar.gz: 551e7ebf28056014418d229c41a9ac10b285fe8e30bc356a08b9f1b2a42f7336539f0672f3b440d2d08f09cd70796bd650162317cc2b8eb6abc7761bb0a93a86

data/lib/weak_parameters/base_validator.rb

@@ -1,16 +1,16 @@
 module WeakParameters
   class BaseValidator
-    attr_reader :params, :key, :options, :block
+    attr_reader :controller, :key, :options, :block
 
-    def initialize(params, key, options = {}, &block)
-      @params = params
+    def initialize(controller, key, options = {}, &block)
+      @controller = controller
       @key = key
       @options = options
       @block = block
     end
 
     def validate
-      raise_error unless valid?
+      handle_failure unless valid?
     end
 
     def required?
@@ -57,10 +57,22 @@ module WeakParameters
       end
     end
 
+    def params
+      controller.params
+    end
+
     def value
       params[key]
     end
 
+    def handle_failure
+      if has_handler?
+        controller.send(options[:handler])
+      else
+        raise_error
+      end
+    end
+
     def raise_error
       raise WeakParameters::ValidationError, error_message
     end
@@ -76,5 +88,9 @@ module WeakParameters
     def invalid_type?
       !valid_type?
     end
+
+    def has_handler?
+      !!options[:handler]
+    end
   end
 end

data/lib/weak_parameters/controller.rb

@@ -2,7 +2,7 @@ module WeakParameters
   module Controller
     def validates(action_name, &block)
       before_filter only: action_name do
-        validator = WeakParameters::Validator.new(params, &block)
+        validator = WeakParameters::Validator.new(self, &block)
         WeakParameters.stats[params[:controller]][params[:action]] = validator
         WeakParameters.stats[params[:controller]][params[:action]].validate
       end

data/lib/weak_parameters/validator.rb

@@ -1,9 +1,9 @@
 module WeakParameters
   class Validator
-    attr_reader :block, :params
+    attr_reader :block, :controller
 
-    def initialize(params, &block)
-      @params = params
+    def initialize(controller, &block)
+      @controller = controller
       instance_eval(&block)
     end
 
@@ -18,31 +18,31 @@ module WeakParameters
     private
 
     def any(key, options = {}, &block)
-      validators << WeakParameters::AnyValidator.new(params, key, options, &block)
+      validators << WeakParameters::AnyValidator.new(controller, key, options, &block)
     end
 
     def string(key, options = {}, &block)
-      validators << WeakParameters::StringValidator.new(params, key, options, &block)
+      validators << WeakParameters::StringValidator.new(controller, key, options, &block)
     end
 
     def integer(key, options = {}, &block)
-      validators << WeakParameters::IntegerValidator.new(params, key, options, &block)
+      validators << WeakParameters::IntegerValidator.new(controller, key, options, &block)
     end
 
     def boolean(key, options = {}, &block)
-      validators << WeakParameters::BooleanValidator.new(params, key, options, &block)
+      validators << WeakParameters::BooleanValidator.new(controller, key, options, &block)
     end
 
     def hash(key, options = {}, &block)
-      validators << WeakParameters::HashValidator.new(params, key, options, &block)
+      validators << WeakParameters::HashValidator.new(controller, key, options, &block)
     end
 
     def array(key, options = {}, &block)
-      validators << WeakParameters::ArrayValidator.new(params, key, options, &block)
+      validators << WeakParameters::ArrayValidator.new(controller, key, options, &block)
     end
 
-    def float(key, options = {})
-      validators << WeakParameters::FloatValidator.new(params, key, options, &block)
+    def float(key, options = {}, &block)
+      validators << WeakParameters::FloatValidator.new(controller, key, options, &block)
     end
   end
 end

data/lib/weak_parameters/version.rb

@@ -1,3 +1,3 @@
 module WeakParameters
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

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

@@ -8,6 +8,7 @@ class RecipesController < ApplicationController
     hash :config
     array :tags
     float :rate
+    integer :custom, only: 0..1, handler: :render_error
     string :zip_code do |value|
       value =~ /\A\d{3}-\d{4}\z/
     end
@@ -16,4 +17,10 @@ class RecipesController < ApplicationController
   def create
     head 201
   end
+
+  private
+
+  def render_error
+    head 403
+  end
 end

data/spec/requests/recipes_spec.rb

@@ -11,6 +11,7 @@ describe "Recipes" do
       config: {},
       tags: [],
       zip_code: "123-4567",
+      custom: 0,
     }
   end
 
@@ -116,5 +117,15 @@ describe "Recipes" do
     context "with valid condition", :autodoc do
       include_examples "201"
     end
+
+    context "with custom handler option" do
+      before do
+        params[:custom] = "invalid"
+      end
+      it "delegates to specified method" do
+        post "/recipes", params
+        response.status.should == 403
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weak_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,3 +191,4 @@ test_files:
 - spec/dummy/script/rails
 - spec/requests/recipes_spec.rb
 - spec/spec_helper.rb
+has_rdoc: