dzl 1.0.0.rc6 → 1.0.0.rc7

data/config.ru

@@ -15,10 +15,10 @@ end
 #   run Dzl::Examples::Trey
 # end
 
-# require 'dzl/examples/fun_with_params'
-# map '/' do
-#   run Dzl::Examples::FunWithParams
-# end
+require 'dzl/examples/fun_with_params'
+map '/' do
+  run Dzl::Examples::FunWithParams
+end
 
 # require 'dzl/examples/fun_with_requests'
 # map '/' do
@@ -45,10 +45,10 @@ end
 #   run Dzl::Examples::FunWithScopes
 # end
 
-require 'dzl/examples/fun_with_hashes'
-map '/' do
-  run Dzl::Examples::FunWithHashes
-end
+# require 'dzl/examples/fun_with_hashes'
+# map '/' do
+#   run Dzl::Examples::FunWithHashes
+# end
 
 # require 'dzl/examples/fun_with_pblocks'
 # map '/' do

data/lib/dzl/dsl_subjects/parameter_block.rb

@@ -57,18 +57,20 @@ class Dzl::DSLSubjects::ParameterBlock < Dzl::DSLSubject
       end
     end
 
-    if !errors.empty?
-      Dzl::ValueOrError.new(e: errors)
-    elsif @opts[:protection]
+    if @opts[:protection]
       protection_errors = @opts[:protection].collect do |protection|
         protection.allow?(parandidates, request)
       end.select { |result| result.error? }
 
-      if protection_errors.empty?
+      if protection_errors.empty? && errors.empty?
         Dzl::ValueOrError.new(v: parandidates)
+      elsif !protection_errors.empty?
+        protection_errors.first
       else
-        protection_errors[0]
+        Dzl::ValueOrError.new(e: errors)
       end
+    elsif !errors.empty?
+      Dzl::ValueOrError.new(e: errors)
     else
       Dzl::ValueOrError.new(v: parandidates)
     end

data/lib/dzl/examples/fun_with_params.rb

@@ -36,6 +36,18 @@ class Dzl::Examples::FunWithParams < Dzl::Examples::Base
     end
   end
 
+  post '/body' do
+    required :foo, :bar
+  end
+
+  post '/other_protected', :get do
+    required :foo
+
+    protect do
+      http_basic username: 'no', password: 'way'
+    end
+  end
+
   endpoint '/arithmetic' do
     optional :int do
       type Fixnum

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.rc6"
+  VERSION = "1.0.0.rc7"
 end

data/spec/fun_with_params_spec.rb

@@ -126,6 +126,14 @@ describe Dzl::Examples::FunWithParams do
       get '/protected' do |response|
         response.status.should == 401
       end
+
+      post '/other_protected', foo: 'present' do |response|
+        response.status.should == 401
+      end
+
+      get '/other_protected' do |response|
+        response.status.should == 401
+      end
     end
 
     it 'should present the http basic challenge with invalid credentials' do
@@ -140,6 +148,27 @@ describe Dzl::Examples::FunWithParams do
       get '/protected' do |response|
         response.status.should == 200
       end
+
+      post '/other_protected', foo: 'present' do |response|
+        response.status.should == 200
+      end
+    end
+
+    it 'should 404 with valid auth and bad params' do
+      authorize('no', 'way')
+      post '/other_protected' do |response|
+        response.status.should == 404
+      end
+
+      get '/other_protected' do |response|
+        response.status.should == 404
+      end
+    end
+
+    it 'should 401 with invalid auth' do
+      get '/other_protected' do |response|
+        response.status.should == 401
+      end
     end
   end
 
@@ -237,5 +266,13 @@ describe Dzl::Examples::FunWithParams do
         }
       end
     end
+
+    describe '/body' do
+      specify 'works' do
+        post('/body', foo: 'hello', bar: 'world') do |response|
+          response.status.should == 200
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc6
+  version: 1.0.0.rc7
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70264021734620 !ruby/object:Gem::Requirement
+  requirement: &70287627293400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264021734620
+  version_requirements: *70287627293400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70264021734100 !ruby/object:Gem::Requirement
+  requirement: &70287627291640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70264021734100
+  version_requirements: *70287627291640
 description: Small, fast racktivesupport web framework with handy DSL and explicit
   parameter validation.
 email: