pakada-dispatch 0.3.0 → 0.3.3

data/lib/pakada/dispatch/controller.rb

@@ -13,11 +13,11 @@ class Pakada
       def initialize(env, options = {})
         @request = Rack::Request.new(env)
         @response = options[:response] || Rack::Response.new
-        @options, @params = options, request.env["router.params"].dup
+        @options, @params = options, (request.env["router.params"] || {}).dup
       end
       
       def process(&block)
-        instance_eval &block
+        catch(:finish) { instance_eval &block }
         self
       end
       
@@ -26,6 +26,10 @@ class Pakada
       end
       
       def not_found
+        if Pakada[:render]
+          response.write "404 Not Found" if options[:render]
+          options[:render] = false
+        end
         response.status = 404
       end
       
@@ -35,6 +39,10 @@ class Pakada
       end
       
       def access_denied
+        if Pakada[:render]
+          response.write "403 Access Denied" if options[:render]
+          options[:render] = false
+        end
         response.status = 403
       end
       

data/lib/pakada/dispatch/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Dispatch
-    VERSION = "0.3.0"
+    VERSION = "0.3.3"
   end
 end

data/spec/controller_spec.rb

@@ -57,6 +57,12 @@ describe Pakada::Dispatch::Controller do
     it "returns the controller object" do
       ctrlr_obj.process(&block).should equal(ctrlr_obj)
     end
+    
+    it "catches :finish" do
+      proc {
+        ctrlr_obj.process { throw :finish }
+      }.should_not throw_symbol(:finish)
+    end
   end
   
   context "#not_found" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada-dispatch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000Z
+date: 2011-09-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakada
-  requirement: &78613870 !ruby/object:Gem::Requirement
+  requirement: &81086540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78613870
+  version_requirements: *81086540
 - !ruby/object:Gem::Dependency
   name: http_router
-  requirement: &78613560 !ruby/object:Gem::Requirement
+  requirement: &81086230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78613560
+  version_requirements: *81086230
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &78613140 !ruby/object:Gem::Requirement
+  requirement: &81085970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78613140
+  version_requirements: *81085970
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78612570 !ruby/object:Gem::Requirement
+  requirement: &81080830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78612570
+  version_requirements: *81080830
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &78612140 !ruby/object:Gem::Requirement
+  requirement: &81080460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78612140
+  version_requirements: *81080460
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &78587120 !ruby/object:Gem::Requirement
+  requirement: &81080100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78587120
+  version_requirements: *81080100
 - !ruby/object:Gem::Dependency
   name: pakada-render
-  requirement: &78586770 !ruby/object:Gem::Requirement
+  requirement: &81079600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78586770
+  version_requirements: *81079600
 description: 
 email:
 - lars.gierth@gmail.com