sinatra-api 1.1.5 → 1.1.7

data/lib/sinatra/api/parameter_validator.rb

@@ -37,7 +37,8 @@ module Sinatra::API
         value = hash[key]
         typename = definition[:type]
         validator = definition[:validator]
-        validator ||= self.validators[typename]
+        validator = validators[validator] if validator.is_a?(Symbol)
+        validator ||= validators[typename]
         definition[:coerce] = true unless definition.has_key?(:coerce)
 
         if validator
@@ -51,7 +52,7 @@ module Sinatra::API
             rc = validator.validate(value, definition)
           # ?
           else
-            raise 'Invalid ParameterValidator, must respond to #call or #validate'
+            raise "Invalid ParameterValidator #{validator.class}, must respond to #call or #validate"
           end
 
           if rc.is_a?(String)

data/lib/sinatra/api/parameters.rb

@@ -178,7 +178,7 @@ module Sinatra::API
         raise ArgumentError, 'API Argument type must be either :required or :optional'
       end
 
-      if !h.has_key?(name)
+      if !h || !h.has_key?(name)
         if type == :required
           halt 400, "Missing required parameter :#{name}"
         end

data/lib/sinatra/api/version.rb

@@ -21,6 +21,6 @@
 
 module Sinatra
   module API
-    VERSION = "1.1.5"
+    VERSION = "1.1.7"
   end
 end

data/spec/integration/parameter_validators_spec.rb

@@ -1,3 +1,37 @@
 describe Sinatra::API::ParameterValidator do
   include_examples 'integration specs'
+
+  context 'defining parameters' do
+    it 'should define a required parameter using hash style' do
+      app.post '/' do
+        api_required!({
+          id: :integer
+        })
+        api_params.to_json
+      end
+
+      rc = api_call post '/', { id: "15" }.to_json
+      rc.should succeed(200)
+      rc.body[:id].should == 15
+    end
+
+    it 'should work with nested-hashes' do
+      pending 'nested parameter groups'
+
+      app.post '/' do
+        api_required!({
+          project: {
+            id: :integer
+          }
+        })
+        api_params.to_json
+      end
+
+      rc = api_call post '/', { project: { id: "15" } }.to_json
+      rc.should succeed(200)
+      puts rc.body.inspect
+      rc.body[:project][:id].should == 15
+    end
+
+  end
 end

data/spec/integration/parameters_spec.rb

@@ -15,6 +15,44 @@ describe Sinatra::API::Parameters do
         last_response.body.should match(/Missing required parameter :id/)
       end
 
+      it 'should define a required group parameter' do
+        pending 'nested parameter groups'
+
+        app.post '/' do
+          api_required!({
+            id: nil,
+            project: {
+              name: nil
+            }
+          })
+
+          api_params.to_json
+        end
+
+        rc = api_call post '/', { id: 123, project: { name: 'adooga' } }.to_json
+        rc.should succeed
+        rc.body.should == {
+          id: 123,
+          project: {
+            name: 'adooga'
+          }
+        }.with_indifferent_access
+      end
+
+      it 'should reject when missing a required group parameter' do
+        app.post '/' do
+          api_required!({
+            id: nil,
+            project: {
+              name: nil
+            }
+          })
+        end
+
+        rc = api_call post '/', { id: 123 }.to_json
+        rc.should fail(400, 'missing name')
+      end
+
       it 'should define required parameters using list style' do
         app.post '/' do
           api_required!([ :id, :name ])
@@ -141,4 +179,15 @@ describe Sinatra::API::Parameters do
     }.to_json
   end
 
+  it 'should conflict with route parameters' do
+    app.post '/chickens/:chicken_id' do
+      api_parameter! :chicken_id, type: :string
+      api_params.to_json
+    end
+
+    rc = api_call post '/chickens/12', { chicken_id: 'keeek' }.to_json
+    rc.should succeed(200)
+    rc.body[:chicken_id].should == '12'
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-api
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json