sinatra-param 0.0.1 → 0.0.2

data/Gemfile.lock

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

data/README.md

@@ -1,5 +1,5 @@
 # sinatra-param
-_Parameter Validation and Typecasting for Sinatra_
+_Parameter Contracts for Sinatra_
 
 REST conventions takes the guesswork out of designing and consuming web APIs. `GET` / `POST` / `PATCH` / `DELETE` resource endpoints and you get what you'd expect.
 
@@ -36,12 +36,12 @@ end
 
 By declaring parameter types, incoming parameters will automatically be transformed into an object of that type. For instance, if a param is `Boolean`, values of `'1'`, `'true'`, `'t'`, `'yes'`, and `'y'` will be automatically transformed into `true`.
 
-- String
-- Integer
-- Float
-- Boolean _("1/0", "true/false", "t/f", "yes/no", "y/n")_
-- Array _("1,2,3,4,5")_
-- Hash _(key1:value1,key2:value2)_
+- `String`
+- `Integer`
+- `Float`
+- `Boolean` _("1/0", "true/false", "t/f", "yes/no", "y/n")_
+- `Array` _("1,2,3,4,5")_
+- `Hash` _(key1:value1,key2:value2)_
 
 ### Validations
 
@@ -65,6 +65,8 @@ Use the `transform` option to take even more of the business logic of parameter
 
 - Another pain point is the awkward way parameters are passed as JSON in HTTP bodies. I'd love to see an elegant, unobtrusive way to do this automatically.
 
+- Support for Rails-style Arrays (`'key[]=value1&key[]=value2'`) and Hashes (`'key[a]=value1&key[b]=value2`). /via [@manton](https://twitter.com/#!/manton)
+
 - Testing. This will happen soon. 
 
 ## Contact

data/lib/sinatra/param.rb

@@ -1,8 +1,10 @@
 require 'sinatra/base'
+require 'time'
+require 'date'
 
 module Sinatra
   module Param
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
 
     class InvalidParameterError < StandardError; end
 
@@ -13,7 +15,7 @@ module Sinatra
         validate!(params[name], options)
       rescue
         error = "Invalid parameter, #{name}"
-        if content_type.match(mime_type(:json))
+        if content_type && content_type.match(mime_type(:json))
           error = {message: error}.to_json
         end
 
@@ -23,48 +25,51 @@ module Sinatra
 
     private
 
-      def coerce(param, type, options = {})
-        return nil if param.nil?
-        return Integer(param) if type == Integer
-        return Float(param) if type == Float
-        return String(param) if type == String
-        return Array(param.split(options[:delimiter] || ",")) if type == Array
-        return Hash[param.split(options[:delimiter] || ",").map{|c| c.split(options[:separator] || ":")}] if type == Hash
-        return ((/(false|f|no|n|0)$/i === param) ? false : (/(true|t|yes|y|1)$/i === param) ? true : nil) if type == Boolean
-        return nil
-      end
+    def coerce(param, type, options = {})
+      return nil if param.nil?
+      return Integer(param) if type == Integer
+      return Float(param) if type == Float
+      return String(param) if type == String
+      return Time.parse(param) if type == Time
+      return Date.parse(param) if type == Date
+      return DateTime.parse(param) if type == DateTime
+      return Array(param.split(options[:delimiter] || ",")) if type == Array
+      return Hash[param.split(options[:delimiter] || ",").map{|c| c.split(options[:separator] || ":")}] if type == Hash
+      return ((/(false|f|no|n|0)$/i === param) ? false : (/(true|t|yes|y|1)$/i === param) ? true : nil) if type == TrueClass || type == FalseClass || type == :boolean
+      return nil
+    end
 
-      def validate!(param, options)
-        options.each do |key, value|
-          case key
-            when :required
-              raise InvalidParameterError if value && param.nil?
-            when :blank
-              raise InvalidParameterError if !value && case param
-                  when String
-                    !(/\S/ === param)
-                  when Array, Hash
-                    param.empty?
-                  else
-                    param.nil?
+    def validate!(param, options)
+      options.each do |key, value|
+        case key
+          when :required
+            raise InvalidParameterError if value && param.nil?
+          when :blank
+            raise InvalidParameterError if !value && case param
+                when String
+                  !(/\S/ === param)
+                when Array, Hash
+                  param.empty?
+                else
+                  param.nil?
+              end
+          when :is
+            raise InvalidParameterError unless value === param
+          when :in, :within, :range
+            raise InvalidParameterError unless param.nil? || case value
+                when Range
+                  value.include?(param)
+                else
+                  Array(value).include?(param)
                 end
-            when :is
-              raise InvalidParameterError unless value === param
-            when :in, :within, :range
-              raise InvalidParameterError unless case value
-                  when Range
-                    value.include?(param)
-                  else
-                    Array(value).include?(param)
-                  end
-            when :min
-              raise InvalidParameterError unless value <= param
-            when :max
-              raise InvalidParameterError unless value >= param
-          end
+          when :min
+            raise InvalidParameterError unless param.nil? || value <= param
+          when :max
+            raise InvalidParameterError unless param.nil? || value >= param
         end
       end
     end
+  end
 
   helpers Param
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000Z
+date: 2012-06-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70189725114120 !ruby/object:Gem::Requirement
+  requirement: &70267098070800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70189725114120
+  version_requirements: *70267098070800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70189725113620 !ruby/object:Gem::Requirement
+  requirement: &70267098069940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70189725113620
+  version_requirements: *70267098069940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70189725113160 !ruby/object:Gem::Requirement
+  requirement: &70267098067980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70189725113160
+  version_requirements: *70267098067980
 description: Parameter Contracts for Sinatra
 email: m@mattt.me
 executables: []
@@ -61,6 +61,7 @@ files:
 - ./LICENSE
 - ./Rakefile
 - ./README.md
+- ./sinatra-param-0.0.1.gem
 - ./sinatra-param.gemspec
 homepage: http://github.com/mattt/sinatra-param
 licenses: []
@@ -76,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4481802987950945093
+      hash: 567877916880817740
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4481802987950945093
+      hash: 567877916880817740
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15