rack-spec 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eaf27c620c698b3f0d4648fa5e243a391aafe03
-  data.tar.gz: e34cca3032930bbe5912ff95ff9c526a2a30ea1e
+  metadata.gz: fa1f5b2caa1ab2a81b5a1d16ab2c2c42061ca322
+  data.tar.gz: 593e35231041acbdb78ede30ef3b6d05a84e31d3
 SHA512:
-  metadata.gz: 06b6732cf5f1d56cbdf792db56540407ad8139d3431fac24472cb693238004f74ef5ed71bc82e33563619b160ee5087f358ffd081db4c4d6b1ba9df5da5162d1
-  data.tar.gz: 09893425824f9924f3fa23aa60821e9a8cf86b7ff2774dd0fbd1b0104f7f00a9aec07048173280dba0202443042a3a1c45465905335d6b20e198712a511056b2
+  metadata.gz: 58f77db673d54bbe9c01a31094cfaebdceaee8bc0c25720d5f0029576f3f8548f9dcc7ad7f7b5850be6a226914c7b73d142b9771cd2837a6d3c2e7c2c2bccd32
+  data.tar.gz: 5fcc86a1e6aad44874f912987dca182a5784d93589691a90b407a34ab78f07c322879d8c1012ed5ca14d2a4b89838cf453b0c699fa6c7e6829d999f13a1fb19a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.0.3
+* Add a new constraint: required
+* More DRY way for validator definition
+
 ## v0.0.2
 * Change key name: queryParameters -> parameters
 * Add a new constraint: only

data/lib/rack/spec.rb

@@ -4,6 +4,8 @@ require "rack/spec/spec"
 require "rack/spec/validation"
 require "rack/spec/validation_error"
 require "rack/spec/validators/base"
+require "rack/spec/validators/null_validator"
+require "rack/spec/validator_factory"
 require "rack/spec/validators/maximum_length_validator"
 require "rack/spec/validators/maximum_validator"
 require "rack/spec/validators/minimum_length_validator"
@@ -11,8 +13,8 @@ require "rack/spec/validators/minimum_validator"
 require "rack/spec/validators/null_validator"
 require "rack/spec/validators/only_validator"
 require "rack/spec/validators/parameters_validator"
+require "rack/spec/validators/required_validator"
 require "rack/spec/validators/type_validator"
-require "rack/spec/validator_factory"
 require "rack/spec/version"
 
 module Rack

data/lib/rack/spec/validation_error.rb

@@ -3,12 +3,12 @@ require "json"
 module Rack
   class Spec
     class ValidationError < StandardError
-      def initialize(message)
-        @message = message
+      def initialize(validator)
+        @validator = validator
       end
 
       def message
-        @message
+        "Invalid #{key} on `#{constraint_name}` constraint"
       end
 
       def to_rack_response
@@ -17,6 +17,14 @@ module Rack
 
       private
 
+      def constraint_name
+        @validator.class.registered_name
+      end
+
+      def key
+        @validator.key
+      end
+
       def status
         400
       end
@@ -26,7 +34,7 @@ module Rack
       end
 
       def body
-        { message: @message }.to_json
+        { message: message }.to_json
       end
     end
   end

data/lib/rack/spec/validator_factory.rb

@@ -14,13 +14,6 @@ module Rack
           validator_classes[type].new(key, constraint, env)
         end
       end
-
-      register "maximum", Validators::MaximumValidator
-      register "maximumLength", Validators::MaximumLengthValidator
-      register "minimum", Validators::MinimumValidator
-      register "minimumLength", Validators::MinimumLengthValidator
-      register "only", Validators::OnlyValidator
-      register "type", Validators::TypeValidator
     end
   end
 end

data/lib/rack/spec/validators/base.rb

@@ -2,6 +2,15 @@ module Rack
   class Spec
     module Validators
       class Base
+        class << self
+          attr_accessor :registered_name
+
+          def register_as(name)
+            self.registered_name = name
+            ValidatorFactory.register(name, self)
+          end
+        end
+
         attr_reader :constraint, :key, :env
 
         def initialize(key, constraint, env)
@@ -12,7 +21,7 @@ module Rack
 
         def validate!
           unless valid?
-            raise ValidationError, error_message
+            raise ValidationError, self
           end
         end
 

data/lib/rack/spec/validators/maximum_length_validator.rb

@@ -2,15 +2,13 @@ module Rack
   class Spec
     module Validators
       class MaximumLengthValidator < Base
+        register_as "maximumLength"
+
         private
 
         def valid?
           value.nil? || value.length <= constraint
         end
-
-        def error_message
-          "Expected #{key} to be equal or shorter than #{constraint}, but in fact #{value.inspect}"
-        end
       end
     end
   end

data/lib/rack/spec/validators/maximum_validator.rb

@@ -2,15 +2,13 @@ module Rack
   class Spec
     module Validators
       class MaximumValidator < Base
+        register_as "maximum"
+
         private
 
         def valid?
           value.nil? || value.to_f <= constraint
         end
-
-        def error_message
-          "Expected #{key} to be equal or higher than #{constraint}, but in fact #{value.inspect}"
-        end
       end
     end
   end

data/lib/rack/spec/validators/minimum_length_validator.rb

@@ -2,15 +2,13 @@ module Rack
   class Spec
     module Validators
       class MinimumLengthValidator < Base
+        register_as "minimumLength"
+
         private
 
         def valid?
           value.nil? || value.length >= constraint
         end
-
-        def error_message
-          "Expected #{key} to be equal or longer than #{constraint}, but in fact #{value.inspect}"
-        end
       end
     end
   end

data/lib/rack/spec/validators/minimum_validator.rb

@@ -2,15 +2,13 @@ module Rack
   class Spec
     module Validators
       class MinimumValidator < Base
+        register_as "minimum"
+
         private
 
         def valid?
           value.nil? || value.to_f >= constraint
         end
-
-        def error_message
-          "Expected #{key} to be equal or higher than #{constraint}, but in fact #{value.inspect}"
-        end
       end
     end
   end

data/lib/rack/spec/validators/null_validator.rb

@@ -2,7 +2,7 @@ module Rack
   class Spec
     module Validators
       class NullValidator < Base
-        def validate!(env)
+        def validate!
         end
       end
     end

data/lib/rack/spec/validators/only_validator.rb

@@ -2,15 +2,13 @@ module Rack
   class Spec
     module Validators
       class OnlyValidator < Base
+        register_as "only"
+
         private
 
         def valid?
           value.nil? || constraint.include?(value)
         end
-
-        def error_message
-          "Expected #{key} to be included in #{constraint}, but in fact #{value.inspect}"
-        end
       end
     end
   end

data/lib/rack/spec/validators/required_validator.rb

@@ -0,0 +1,15 @@
+module Rack
+  class Spec
+    module Validators
+      class RequiredValidator < Base
+        register_as "required"
+
+        private
+
+        def valid?
+          value.nil? == !constraint
+        end
+      end
+    end
+  end
+end

data/lib/rack/spec/validators/type_validator.rb

@@ -9,15 +9,17 @@ module Rack
             @patterns ||= Hash.new(//)
           end
 
-          def register(name, pattern)
+          def pattern(name, pattern)
             patterns[name] = pattern
           end
         end
 
-        register "boolean", /\A(?:true|false)\z/
-        register "float", /\A-?\d+(?:\.\d+)*\z/
-        register "integer", /\A-?\d+\z/
-        register "iso8601", ->(value) { Time.iso8601(value) rescue false }
+        register_as "type"
+
+        pattern "boolean", /\A(?:true|false)\z/
+        pattern "float", /\A-?\d+(?:\.\d+)*\z/
+        pattern "integer", /\A-?\d+\z/
+        pattern "iso8601", ->(value) { Time.iso8601(value) rescue false }
 
         private
 
@@ -25,10 +27,6 @@ module Rack
           value.nil? || pattern === value
         end
 
-        def error_message
-          "Expected #{key} to be #{constraint}, but in fact #{value.inspect}"
-        end
-
         def pattern
           self.class.patterns[constraint]
         end

data/lib/rack/spec/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Spec
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/rack/spec_spec.rb

@@ -37,6 +37,7 @@ describe Rack::Spec do
                   type: string
                   minimumLength: 3
                   maximumLength: 10
+                  required: true
       EOS
       run ->(env) do
         [200, {}, ["OK"]]
@@ -128,15 +129,15 @@ describe Rack::Spec do
   end
 
   describe "POST" do
+    before do
+      params[:title] = "test"
+    end
+
     let(:verb) do
       :post
     end
 
     context "with valid request" do
-      before do
-        params[:title] = "test"
-      end
-
       it { should == 200 }
     end
 
@@ -153,5 +154,12 @@ describe Rack::Spec do
       end
       it { should == 400 }
     end
+
+    context "with request body parameter invalid on required" do
+      before do
+        params.delete(:title)
+      end
+      it { should == 400 }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-spec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -150,6 +150,7 @@ files:
 - lib/rack/spec/validators/null_validator.rb
 - lib/rack/spec/validators/only_validator.rb
 - lib/rack/spec/validators/parameters_validator.rb
+- lib/rack/spec/validators/required_validator.rb
 - lib/rack/spec/validators/type_validator.rb
 - lib/rack/spec/version.rb
 - rack-spec.gemspec