dzl 1.0.1 → 1.0.2

data/lib/dzl/dsl_proxies/parameter_block.rb

@@ -61,10 +61,14 @@ class Dzl::DSLProxies::ParameterBlock < Dzl::DSLProxy
   def import_pblock(*pblocks)
     pblocks.each do |pblock|
       next unless @subject.router.pblocks.has_key?(pblock)
-      @subject.router.pblocks[pblock].params.each do |name, param|
+      pb = @subject.router.pblocks[pblock]
+      pb.params.each do |name, param|
         @subject.params[name] = param.clone
       end
+      pb.opts.each do |name, opt|
+        @subject.opts[name] = opt.clone
+      end
     end
   end
   alias_method :import_parameters, :import_pblock
-end
+end

data/lib/dzl/dsl_subjects/router.rb

@@ -88,7 +88,11 @@ class Dzl::DSLSubjects::Router < Dzl::DSLSubject
           )
           true
         else
-          errors[endpoint.route] = validation.error
+          if validation.error == :request_method_not_supported
+            errors[endpoint.route] ||= :request_method_not_supported
+          else
+            errors[endpoint.route] = validation.error
+          end
           false
         end
       end

data/lib/dzl/examples/fun_with_global_params.rb

@@ -0,0 +1,16 @@
+require 'dzl/examples/base'
+
+class Dzl::Examples::FunWithGlobalParams < Dzl::Examples::Base
+  defaults do
+    content_type 'application/json'
+  end
+
+  global_pblock do 
+    protect do
+      api_key header: 'x_api_key', valid_keys: ['valid-key']
+    end                        
+    required(:number) {type Fixnum}
+  end
+
+  post '/globally_protected'
+end

data/lib/dzl/examples/fun_with_params.rb

@@ -54,6 +54,19 @@ class Dzl::Examples::FunWithParams < Dzl::Examples::Base
     end
   end
 
+  get '/multi_endpoint_route' do
+    protect do
+      api_key header: 'x_api_key', valid_keys: ['valid-key']
+    end
+    handle{'OK'}
+  end
+
+  post '/multi_endpoint_route' do
+    required(:number) { type Fixnum }
+  end
+
+  put '/multi_endpoint_route'
+
   endpoint '/api_proc' do
     protect do
       api_key header: 'x_api_key', validate_with: lambda {|key| key.match(/valid/)}

data/lib/dzl/request.rb

@@ -68,7 +68,7 @@ class Dzl::Request < Rack::Request
   protected
   def preformatted_params
     @preformatted_params ||= begin
-      if content_type == "application/json"
+      if content_type == "application/json" && !body.blank?
         JSON.parse(body).recursively_symbolize_keys!
       else
         {}

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/fun_with_global_params_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'rack/test'
+require 'dzl/examples/fun_with_global_params'
+
+describe Dzl::Examples::FunWithGlobalParams do
+  include Rack::Test::Methods
+
+  def app; Dzl::Examples::FunWithGlobalParams; end
+
+  describe '/globally_protected' do
+    before(:each) {header 'Content-Type', 'application/json'}
+    let(:post_body) {{'number' => 23}.to_json}
+    let(:valid_key) {{'HTTP_X_API_KEY' => 'valid-key'}}
+
+    it 'should 401 if no api key provided' do
+      post '/globally_protected'
+      last_response.status.should == 401
+    end
+
+    it 'should 401 if invalid api key provided' do
+      post '/globally_protected', {}, {"HTTP_X_API_KEY" => 'invalid-key'}
+      last_response.status.should == 401
+    end
+
+    it 'should accept valid api key' do
+      post '/globally_protected', post_body, valid_key
+      last_response.status.should == 200
+    end
+
+    it 'should reject invalid required parameter' do
+      invalid_body = {'number' => 'string'}.to_json
+      post('/globally_protected', invalid_body, valid_key) do |response|
+        response.status.should == 404
+        JSON.parse(response.body)['errors']['/globally_protected'].should == {
+          'number' => 'type_conversion_error'
+        }
+      end
+    end
+  end
+end

data/spec/fun_with_handlers_spec.rb

@@ -29,6 +29,13 @@ describe 'handlers' do
     end
   end
 
+  it "should handle empty body for content-type application/json" do 
+    get '/say_bar?baz=no&bam=nope&bar=Hello%2C%20world', '', {"CONTENT_TYPE" => "application/json"} do |response|
+      response.status.should == 200
+      response.body.should == 'Hello, world'
+    end    
+  end
+
   it 'calls error hooks on errors' do
     Object.should_receive(:first_error_hook)
     Object.should_receive(:second_error_hook)

data/spec/fun_with_params_spec.rb

@@ -110,7 +110,7 @@ describe Dzl::Examples::FunWithParams do
     it 'converts :bar to time' do
       get '/foo/2012-01-01' do |response|
         response.status.should == 200
-        JSON.parse(response.body)['params']['bar'].should == '2012-01-01T00:00:00-05:00'
+        Time.parse(JSON.parse(response.body)['params']['bar']).should == Time.parse('2012-01-01T00:00:00')
       end
     end
   end
@@ -189,6 +189,52 @@ describe Dzl::Examples::FunWithParams do
     end
   end
 
+  describe 'get /multi_endpoint_route' do
+    it 'should 401 if no api key provided' do
+      get '/multi_endpoint_route'
+      last_response.status.should == 401
+    end
+
+    it 'should 401 if invalid api key provided' do
+      get '/multi_endpoint_route', {}, {"HTTP_X_API_KEY" => 'invalid-key'}
+      last_response.status.should == 401
+    end
+
+    it 'should accept valid api key' do
+      get '/multi_endpoint_route', {}, {"HTTP_X_API_KEY" => 'valid-key'}
+      last_response.status.should == 200
+    end
+  end
+
+  describe 'post /multi_endpoint_route' do
+    it 'should not allow a request with no parameters in the body' do
+      header 'Content-Type', 'application/json'
+      post('/multi_endpoint_route', {}.to_json) do |response|
+        response.status.should == 404
+        JSON.parse(response.body)['errors']['/multi_endpoint_route'].should == {
+          'number' => 'missing_required_param'
+        }
+      end
+    end
+
+    it 'should not allow string instead of number' do
+      header 'Content-Type', 'application/json'
+      post('/multi_endpoint_route', {'number' => 'string'}.to_json) do |response|
+        response.status.should == 404
+        JSON.parse(response.body)['errors']['/multi_endpoint_route'].should == {
+          'number' => 'type_conversion_error'
+        }
+      end
+    end
+  end
+
+  describe 'put /multi_endpoint_route' do
+    it 'should return a valid response' do
+      put '/multi_endpoint_route', {}
+      last_response.status.should == 200
+    end
+  end
+
   describe '/api_proc' do
     it 'should 401 if no api key provided' do
       get '/api_proc'

data/spec/trey_spec.rb

@@ -85,11 +85,11 @@ describe 'trey support' do
 
     it "understands time parameters" do
       get('/page_insights', req_params.merge({
-          since:"#{req_params[:since]}T00:00:00-05:00",
-          until:"#{req_params[:until]}T00:00:00-05:00",
+          since: Time.parse(req_params[:since]),
+          until: Time.parse(req_params[:until]),
         })) do |response|
         response.status.should == 200
-        JSON.parse(response.body)['params']['since'].should == '2012-01-01'
+        Time.parse(JSON.parse(response.body)['params']['since']).should == Time.parse('2012-01-01')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70301799221440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70301799221440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70301799219580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +38,12 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70301799219580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email:
@@ -78,6 +88,7 @@ files:
 - lib/dzl/dsl_subjects/scope.rb
 - lib/dzl/errors.rb
 - lib/dzl/examples/base.rb
+- lib/dzl/examples/fun_with_global_params.rb
 - lib/dzl/examples/fun_with_handlers.rb
 - lib/dzl/examples/fun_with_hashes.rb
 - lib/dzl/examples/fun_with_hooks.rb
@@ -105,6 +116,7 @@ files:
 - lib/hash_validator/hash_validator.rb
 - spec/dsl_subject_spec.rb
 - spec/endpoint_doc_spec.rb
+- spec/fun_with_global_params_spec.rb
 - spec/fun_with_handlers_spec.rb
 - spec/fun_with_hashes_spec.rb
 - spec/fun_with_hooks_spec.rb
@@ -133,21 +145,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -426579451222087061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -426579451222087061
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Parameter validation and request routing DSL & web framework
 test_files:
 - spec/dsl_subject_spec.rb
 - spec/endpoint_doc_spec.rb
+- spec/fun_with_global_params_spec.rb
 - spec/fun_with_handlers_spec.rb
 - spec/fun_with_hashes_spec.rb
 - spec/fun_with_hooks_spec.rb