weak_parameters 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c85836d4a9c0cc561b4f3843fc393d0a48d4ccf
-  data.tar.gz: d69dafbf77051a318e6bbac744436c9899050150
+  metadata.gz: 574d6b069ecee483c92abe98a1f0aeefc6c77ce1
+  data.tar.gz: 3f69d7e525b372617d94ab264dcaaa69602943df
 SHA512:
-  metadata.gz: 14c03ed3af01ed9297b76ab93db448b72a8ffa53c1dcbc8ff6a8967641b30d9c8bd33882bc6e74cd350c9bc4f194cf87f6b1a26830a34352d8af379d9026a1b1
-  data.tar.gz: 02f0e3e72b22e16075066a11a04a5f128e17108407dc748bbb3acc4b3c64ad4bb5377da4094955aeea5edbec3feeb1654e73d10674d64f812edef76707e54186
+  metadata.gz: cc55b3b93a4fd17d76fe10d17c011158c69439aa2d7f79c512588d7439122542014bb7372096e583e8f1db739ff566ef95c476757e4c8398d332c829798ff376
+  data.tar.gz: f1577e70e84ffdbe6bd96dd03cf85cae30f733736da65628d2e2f387ea96a73c8a9ed7484f0b4e1ea77829c92b6b1a41b3248b108d5015898483d2c7cae63bef

data/README.md

@@ -11,8 +11,8 @@ gem "weak_parameters"
 # WeakParameters provides `validates` class method to define validations.
 class RecipesController < ApplicationController
   validates :create do
-    string :name, required: true
-    integer :type
+    string :name, required: true, except: ["charlie", "dave"]
+    integer :type, only: "1".."3"
   end
 
   def create

data/lib/weak_parameters/base_validator.rb

@@ -9,7 +9,7 @@ module WeakParameters
     end
 
     def validate
-      raise_error if required? && nil? || exist? && invalid_type?
+      raise_error unless valid?
     end
 
     def required?
@@ -22,6 +22,19 @@ module WeakParameters
 
     private
 
+    def valid?
+      case
+      when required? && nil?
+        false
+      when exist? && invalid_type?
+        false
+      when exist? && exceptional?
+        false
+      else
+        true
+      end
+    end
+
     def nil?
       value.nil?
     end
@@ -30,6 +43,17 @@ module WeakParameters
       !nil?
     end
 
+    def exceptional?
+      case
+      when options[:only].try(:exclude?, value)
+        true
+      when options[:except].try(:include?, value)
+        true
+      else
+        false
+      end
+    end
+
     def value
       params[key]
     end

data/lib/weak_parameters/version.rb

@@ -1,3 +1,3 @@
 module WeakParameters
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

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

@@ -1,7 +1,7 @@
 class RecipesController < ApplicationController
   validates :create do
-    string :name, required: true
-    integer :type
+    string :name, required: true, except: %w[invalid wrong]
+    integer :type, only: "1".."3"
     boolean :flag
     hash :config
     array :tags

data/spec/requests/recipes_spec.rb

@@ -78,6 +78,28 @@ describe "Recipes" do
       end
     end
 
+    context "with invalid param to :only condition" do
+      before do
+        params[:type] = 0
+      end
+
+      it "returns 400" do
+        post "/recipes", params
+        response.status.should == 400
+      end
+    end
+
+    context "with invalid param to :except condition" do
+      before do
+        params[:name] = "invalid"
+      end
+
+      it "returns 400" do
+        post "/recipes", params
+        response.status.should == 400
+      end
+    end
+
     context "with valid condition", :autodoc do
       it "creates a new recipe" do
         post "/recipes", params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weak_parameters
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails