sinatra-param 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6bc853522acf081f09e12f5c27bdaba38100c9
-  data.tar.gz: 319a7c7ef04009d6f709a9faf9209623d831f93f
+  metadata.gz: 51bb4d9b8f81421a0d793c498715a28f329f2b03
+  data.tar.gz: dcf4efc7ef4741d3911f9d257b5b93290c76c298
 SHA512:
-  metadata.gz: 13ba305e660dec0f8173b474a1ae79e19d570fe977594d91878dacdccb003a636d39abe641aa4911c860fad866908af5cada37bad9da0ce8083dbd8ad858ab88
-  data.tar.gz: 6dc4d1d351e0261bacd12d2dc5873b82b04f105d3c2e25a64d280c6fb932da41c131bb9ccece3c0cd218caddaa4a1329051c292d7d3bbf2b9ae8c9dbcd93d1e9
+  metadata.gz: 99308c05d8a95b98e2a6e7d8b535ef9a8f190075e805e0eb9784e6cfd430a5467c68f26185e6f0a08ed15d8ea36f93095a220311655627a6b7c22b8208d3178e
+  data.tar.gz: d94dd2f94a98df3c8645f580dce22a3985555465dc06b57427f5be6cc2c2eace4737cae39fe41136b394cee3139b664ab0e2a8985f1ad74ae69b65fee67aef93

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-param (1.1.2)
+    sinatra-param (1.2.0)
       sinatra (~> 1.3)
 
 GEM

data/README.md

@@ -33,6 +33,7 @@ class App < Sinatra::Base
     param :categories,  Array
     param :sort,        String, default: "title"
     param :order,       String, in: ["ASC", "DESC"], transform: :upcase, default: "ASC"
+    param :price,       String, format: "[<\=>]\s*\$\d+"
 
     {...}.to_json
   end
@@ -59,6 +60,7 @@ Encapsulate business logic in a consistent way with validations. If a parameter
 - `is`
 - `in`, `within`, `range`
 - `min` / `max`
+- `format`
 
 ### Defaults and Transformations
 

data/lib/sinatra/param.rb

@@ -88,8 +88,11 @@ module Sinatra
               else
                 param.nil?
             end
+        when :format
+          raise InvalidParameterError, "Parameter must be a string if using the format validation" unless param.kind_of?(String)
+          raise InvalidParameterError, "Parameter must match format #{value}" unless param =~ value
         when :is
-          raise InvalidParameterError, "Parameter must be #{value}" unless value === param
+          raise InvalidParameterError, "Parameter must be #{value}" unless param === value
         when :in, :within, :range
           raise InvalidParameterError, "Parameter must be within #{value}" unless param.nil? || case value
               when Range

data/lib/sinatra/param/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Param
-    VERSION = '1.1.2'
+    VERSION = '1.2.0'
   end
 end

data/spec/dummy/app.rb

@@ -121,6 +121,16 @@ class App < Sinatra::Base
     param :arg, String, blank: true
   end
 
+  get '/validation/format/9000' do
+    param :arg, Integer, format: /9000/
+    params.to_json
+  end
+
+  get '/validation/format/hello' do
+    param :arg, String, format: /hello/
+    params.to_json
+  end
+
   get '/validation/is' do
     param :arg, String, is: 'foo'
     params.to_json

data/spec/parameter_validations_spec.rb

@@ -52,6 +52,26 @@ describe 'Parameter Validations' do
     end
   end
 
+  describe 'format' do
+    it 'returns 200 on requests when value matches the param regex' do
+      get('/validation/format/hello', arg: 'hello world') do |response|
+        response.status.should eq(200)
+      end
+    end
+
+    it 'returns 400 on requests when value does not match the param regex' do
+      get('/validation/format/hello', arg: 'world') do |response|
+        response.status.should eq(400)
+      end
+    end
+
+    it 'returns 400 on requests when value is not a string' do
+      get('/validation/format/9000', arg: 9000) do |response|
+        response.status.should eq(400)
+      end
+    end
+  end
+
   describe 'is' do
     it 'returns 400 on requests when value is other than defined' do
       get('/validation/is', arg: 'bar') do |response|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -142,6 +142,7 @@ files:
 - ./README.md
 - ./sinatra-param-1.1.0.gem
 - ./sinatra-param-1.1.1.gem
+- ./sinatra-param-1.1.2.gem
 - ./sinatra-param.gemspec
 - spec/dummy/app.rb
 - spec/parameter_sets_spec.rb