weak_parameters 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52940d7977000d245a95b87b5f22af91aa4b5c3
-  data.tar.gz: 33eced881c79f06410b1a1d62f2afcafc00a003d
+  metadata.gz: '09e8c53c2c8454671bcdc7b74e641d830a4198bc'
+  data.tar.gz: a70b4dc7bbdbea50696e8eda91a0101c230b9b49
 SHA512:
-  metadata.gz: 66a4a668aad0a88ccfa96cb8a3ed6fa6dfaab0c5fbcf6a3b449d0ad1581385a7621e5e8f76639bfd29a6ae652308b175d4bf9321fd42915862e416a9ba9bd92d
-  data.tar.gz: 998d553643a47651bac8df5a7fb0ca69e6c18e5ffc4aad8cdc5c17f62b0861565eb1b2f1b8f634ce003da1a1562e6deb637b1625b83c3493cbf7f142fe716aff
+  metadata.gz: 89b575f9765feb386807dd60ffdcdaa34d8741a09ab5bb1137f3ccbe20358456dad70f2a7eb2178e64966a05cd7eee4cb453701a01af82c2a1f4dec2428e0de7
+  data.tar.gz: 6f3bdc9e43d62048c604155551187e9547531d9e4a5c9529db29993b24085611be8185735fbaaed5adf95a20c318aa6408be68ee88cdfbd415d333ab0712efc7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.3
+
+- Support date and time validator (Thx @shimomuh)
+
 ## 0.4.2
 
 - Fix options on list validator (Thx @laboone)

data/README.md

@@ -26,6 +26,8 @@ class RecipesController < ApplicationController
     string :quantity do |value|
       value =~ /\A\d+(?:\.\d+)g\z/
     end
+    date :date, only: ["%Y/%m/%d", "%Y.%m.%d"]
+    time :time, only: "%Y/%m/%d %H:%M:%S"
   end
 
   def create
@@ -59,6 +61,8 @@ irb(main):005:0> app.post "/recipes", name: "alice", type: "bob"
 * file
 * object
 * list
+* date (= default %Y-%m-%d)
+* time (= default %Y-%m-%d %H:%M:%S)
 
 ### Available options
 * required

data/lib/weak_parameters/date_validator.rb

@@ -0,0 +1,40 @@
+module WeakParameters
+  class DateValidator < WeakParameters::BaseValidator
+    private
+
+    def parser_class
+      ::Date
+    end
+
+    def valid_type?
+      if options[:only]
+        Array(options[:only]).any? do |format|
+          begin
+            parser_class.strptime(value, format)
+            return false unless strictly?(format)
+            true
+          rescue ::ArgumentError
+            false
+          end
+        end
+      else
+        begin
+          parser_class.parse(value)
+          return false unless strictly?
+          true
+        rescue ::ArgumentError
+          false
+        end
+      end
+    end
+
+    def strictly?(format = nil)
+      result = format ? ::Date._strptime(value, format) : ::Date._strptime(value)
+      result && !result.key?(:leftover)
+    end
+
+    def error_message
+      "params[#{key.inspect}] must be a valid Date"
+    end
+  end
+end

data/lib/weak_parameters/time_validator.rb

@@ -0,0 +1,18 @@
+module WeakParameters
+  class TimeValidator < WeakParameters::DateValidator
+    private
+
+    def parser_class
+      ::Time
+    end
+
+    # Time is always true! (no custom validation)
+    def strictly?(format = nil)
+      true
+    end
+
+    def error_message
+      "params[#{key.inspect}] must be a valid Time"
+    end
+  end
+end

data/lib/weak_parameters/validator.rb

@@ -65,6 +65,14 @@ module WeakParameters
       validators << WeakParameters::FloatValidator.new(controller, key, options, &block)
     end
 
+    def date(key, options = {}, &block)
+      validators << WeakParameters::DateValidator.new(controller, key, options, &block)
+    end
+
+    def time(key, options = {}, &block)
+      validators << WeakParameters::TimeValidator.new(controller, key, options, &block)
+    end
+
     def file(key, options = {}, &block)
       validators << WeakParameters::FileValidator.new(controller, key, options, &block)
     end

data/lib/weak_parameters/version.rb

@@ -1,3 +1,3 @@
 module WeakParameters
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/weak_parameters.rb

@@ -6,6 +6,8 @@ require "weak_parameters/any_validator"
 require "weak_parameters/array_validator"
 require "weak_parameters/boolean_validator"
 require "weak_parameters/file_validator"
+require "weak_parameters/date_validator"
+require "weak_parameters/time_validator"
 require "weak_parameters/float_validator"
 require "weak_parameters/hash_validator"
 require "weak_parameters/integer_validator"

data/spec/dummy/app/controllers/concerns/with_recipe.rb

@@ -11,6 +11,10 @@ module WithRecipe
       hash :config
       array :tags
       float :rate
+      date :date
+      date :custom_date, only: %w[%Y/%m/%d %Y.%m.%d]
+      time :time
+      time :custom_time, only: '%Y/%m/%d %H:%M:%S'
       file :attachment
       integer :custom, only: 0..1, handler: :render_error
       string :zip_code do |value|

data/spec/dummy/app/controllers/concerns/with_strong.rb

@@ -19,6 +19,10 @@ module WithStrong
       array :strong_tags, strong: true
       float :rate
       float :strong_rate, strong: true
+      date :date
+      date :strong_date, strong: true
+      time :time
+      time :strong_time, strong: true
       file :attachment
       file :strong_attachment, strong: true
       integer :custom, only: 0..1, handler: :render_error

data/spec/requests/api/recipes_spec.rb

@@ -106,6 +106,34 @@ describe "Recipes with rails-api", type: :request do
       include_examples "400"
     end
 
+    context "with wrong date param" do
+      before do
+        params[:date] = '2017-01-32'
+      end
+      include_examples "400"
+    end
+
+    context "with wrong custom_date param" do
+      before do
+        params[:custom_date] = Date.current.strftime('%Y-%m-%d')
+      end
+      include_examples "400"
+    end
+
+    context "with wrong time param" do
+      before do
+        params[:time] = '2017-01-31 24:00:01'
+      end
+      include_examples "400"
+    end
+
+    context "with wrong custom_time param" do
+      before do
+        params[:custom_time] = Time.current.strftime('%Y-%m-%d %H:%M:%S')
+      end
+      include_examples "400"
+    end
+
     context "with wrong file param" do
       before do
         params[:attachment] = "x"

data/spec/requests/api/strong_spec.rb

@@ -17,6 +17,10 @@ describe "Strong with rails-api", type: :request do
       strong_config: { a: 1, b: { c: 2 } },
       tags: [1],
       strong_tags: [1],
+      date: Date.current.strftime('%Y-%m-%d'),
+      strong_date: Date.current.strftime('%Y-%m-%d'),
+      time: Time.current.strftime('%Y-%m-%d %H:%M:%S'),
+      strong_time: Time.current.strftime('%Y-%m-%d %H:%M:%S'),
       attachment: Rack::Test::UploadedFile.new(__FILE__),
       strong_attachment: Rack::Test::UploadedFile.new(__FILE__),
       zip_code: "123-4567",
@@ -73,6 +77,12 @@ describe "Strong with rails-api", type: :request do
       expect(controller.permitted_params).not_to have_key "strong_rate"
       expect(controller.permitted_params).not_to have_key "rate"
 
+      expect(controller.permitted_params).to have_key "strong_date"
+      expect(controller.permitted_params).not_to have_key "date"
+
+      expect(controller.permitted_params).to have_key "strong_time"
+      expect(controller.permitted_params).not_to have_key "time"
+
       expect(controller.permitted_params).to have_key "strong_attachment"
       expect(controller.permitted_params).not_to have_key "attachment"
 

data/spec/requests/recipes_spec.rb

@@ -106,6 +106,34 @@ describe "Recipes", type: :request do
       include_examples "400"
     end
 
+    context "with wrong date param" do
+      before do
+        params[:date] = '2017-01-32'
+      end
+      include_examples "400"
+    end
+
+    context "with wrong custom_date param" do
+      before do
+        params[:custom_date] = Date.current.strftime('%Y-%m-%d')
+      end
+      include_examples "400"
+    end
+
+    context "with wrong time param" do
+      before do
+        params[:time] = '2017-01-31 24:00:01'
+      end
+      include_examples "400"
+    end
+
+    context "with wrong custom_time param" do
+      before do
+        params[:custom_time] = Time.current.strftime('%Y-%m-%d %H:%M:%S')
+      end
+      include_examples "400"
+    end
+
     context "with wrong file param" do
       before do
         params[:attachment] = "x"

data/spec/requests/strong_spec.rb

@@ -17,6 +17,10 @@ describe "Strong", type: :request do
       strong_config: { a: 1, b: { c: 2 } },
       tags: [1],
       strong_tags: [1],
+      date: Date.current.strftime('%Y-%m-%d'),
+      strong_date: Date.current.strftime('%Y-%m-%d'),
+      time: Time.current.strftime('%Y-%m-%d %H:%M:%S'),
+      strong_time: Time.current.strftime('%Y-%m-%d %H:%M:%S'),
       attachment: Rack::Test::UploadedFile.new(__FILE__),
       strong_attachment: Rack::Test::UploadedFile.new(__FILE__),
       zip_code: "123-4567",
@@ -73,6 +77,12 @@ describe "Strong", type: :request do
       expect(controller.permitted_params).not_to have_key "strong_rate"
       expect(controller.permitted_params).not_to have_key "rate"
 
+      expect(controller.permitted_params).to have_key "strong_date"
+      expect(controller.permitted_params).not_to have_key "date"
+
+      expect(controller.permitted_params).to have_key "strong_time"
+      expect(controller.permitted_params).not_to have_key "time"
+
       expect(controller.permitted_params).to have_key "strong_attachment"
       expect(controller.permitted_params).not_to have_key "attachment"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weak_parameters
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,7 @@ files:
 - lib/weak_parameters/base_validator.rb
 - lib/weak_parameters/boolean_validator.rb
 - lib/weak_parameters/controller.rb
+- lib/weak_parameters/date_validator.rb
 - lib/weak_parameters/file_validator.rb
 - lib/weak_parameters/float_validator.rb
 - lib/weak_parameters/hash_validator.rb
@@ -149,6 +150,7 @@ files:
 - lib/weak_parameters/list_validator.rb
 - lib/weak_parameters/object_validator.rb
 - lib/weak_parameters/string_validator.rb
+- lib/weak_parameters/time_validator.rb
 - lib/weak_parameters/validation_error.rb
 - lib/weak_parameters/validator.rb
 - lib/weak_parameters/version.rb
@@ -219,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Add a validation filter to your controller.