pakada-dispatch 0.2.1 → 0.2.3

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - ruby-1.8.7
-  - ruby-1.9.2
-  - ruby-head
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
   - jruby
   - rbx-2.0
   - ree

data/Gemfile

@@ -7,5 +7,3 @@ gem "awesome_print"
 
 gem "thin"
 gem "shotgun"
-
-gem "hatetepe", :path => "../hatetepe"

data/lib/pakada/dispatch.rb

@@ -1,3 +1,4 @@
+require "hooked"
 require "http_router"
 require "pakada"
 
@@ -12,10 +13,16 @@ class Pakada::Dispatch
   
   def initialize
     @router = HttpRouter.new
+    Pakada.safety(Controller).extend Hooked
+    Pakada.safety(Controller).around(:included) {|inner, klass|
+      klass.send :include, Hooked
+      klass.extend Hooked
+      inner.call klass
+    }
   end
   
   def hooks
-    Pakada.instance.instead_of :request, @router.method(:call)
+    Pakada.instance.instead_of(:request) {|env| request env }
   end
   
   def boot
@@ -25,4 +32,8 @@ class Pakada::Dispatch
       mod.routes if mod.respond_to? :routes
     }
   end
+  
+  def request(env)
+    router.call env
+  end
 end

data/lib/pakada/dispatch/controller.rb

@@ -49,7 +49,7 @@ class Pakada
         def action(name, options = {}, &block)
           if block
             actions[name] = proc {|env, *args|
-              opts = args[0] || {}
+              opts = (args[0] || {}).merge(:action => name)
               action = self.new(env, options.merge(opts), &block)
               action.response.finish unless opts[:response]
             }

data/lib/pakada/dispatch/module.rb

@@ -13,7 +13,12 @@ class Pakada
       
       def controller(name, &block)
         if block
-          controllers[name] = Pakada.safety(Controller).create(&block)
+          controllers[name] = Pakada.safety(Controller).create(&block).tap {|c|
+            c.before(:new) {|env, *args|
+              options = args[0] || {}
+              options.merge! :module => pakada_name, :controller => name
+            }
+          }
         else
           controllers[name]
         end

data/lib/pakada/dispatch/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Dispatch
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

data/spec/controller_spec.rb

@@ -135,7 +135,7 @@ describe Pakada::Dispatch::Controller do
     it "'s proc creates a controller object passing env, options and block" do
       ctrlr.should_receive(:new) {|e, opts, &blk|
         e.should equal(env)
-        opts.should == merged_options
+        opts.values_at(*merged_options.keys).should == merged_options.values
         blk.should equal(block)
       }
       ctrlr.action(:foo).call env, override_options
@@ -145,6 +145,13 @@ describe Pakada::Dispatch::Controller do
       ctrlr.action(:foo).call(env).should equal(response.finish)
     end
     
+    it "'s proc adds the action's name to the options hash" do
+      ctrlr.should_receive(:new) {|e, opts|
+        opts[:action].should equal(:foo)
+      }
+      ctrlr.action(:foo).call env
+    end
+    
     it "'s proc returns nothing if a response gets passed in via options" do
       ctrlr.action(:foo).call(env, :response => response).should be_nil
     end

data/spec/dispatch_spec.rb

@@ -13,12 +13,34 @@ describe Pakada::Dispatch do
     it "sets the router" do
       dispatch.router.should equal(router)
     end
+    
+    let(:controller) { Pakada.safety(Pakada::Dispatch::Controller) }
+    let(:klass) { stub "controller klass" }
+    let(:inner) { stub "proc", :call => nil }
+    
+    it "makes Controller and controllers hookable" do
+      controller.should_receive(:around) {|method, &block|
+        method.should equal(:included)
+        
+        klass.should_receive(:extend).with Hooked
+        klass.should_receive(:include).with Hooked
+        block.call inner, klass
+      }
+      dispatch
+      controller.method :hooked
+    end
   end
   
   context "#hooks" do
+    let(:env) { stub "env" }
+    let(:response) { stub "response" }
+    
     it "replaces Pakada#request with router#call" do
-      Pakada.instance.should_receive(:instead_of).with(
-        :request, dispatch.router.method(:call))
+      Pakada.instance.should_receive(:instead_of) {|name, &block|
+        name.should == :request
+        dispatch.should_receive(:request).with(env) { response }
+        block.call(env).should equal(response)
+      }
       dispatch.hooks
     end
   end

data/spec/module_spec.rb

@@ -32,7 +32,7 @@ describe Pakada::Dispatch::Module do
   
   context "#controller(name) { ... }" do
     let(:block) { proc {} }
-    let(:controller) { stub "controller" }
+    let(:controller) { stub "controller", :before => nil }
     let(:dispatch) { Pakada::Dispatch.new }
     
     before {
@@ -49,6 +49,20 @@ describe Pakada::Dispatch::Module do
       mod.controller :bar, &block
       mod.controllers[:bar].should equal(controller)
     end
+    
+    let(:options) { {} }
+    
+    it "hooks the controller class' .new method to add module and controller name to options" do
+      Pakada.safety(Pakada::Dispatch::Controller) \
+        .should_receive(:create) { controller }
+      controller.should_receive(:before) {|method, &blk|
+        method.should equal(:new)
+        blk.call nil, options
+        options[:module].should equal(:foo)
+        options[:controller].should equal(:bar)
+      }
+      mod.controller(:bar) {}
+    end
   end
   
   context "#load_controllers" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada-dispatch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-09-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakada
-  requirement: &75057660 !ruby/object:Gem::Requirement
+  requirement: &85649150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75057660
+  version_requirements: *85649150
 - !ruby/object:Gem::Dependency
   name: http_router
-  requirement: &75057450 !ruby/object:Gem::Requirement
+  requirement: &85648750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75057450
+  version_requirements: *85648750
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &75057240 !ruby/object:Gem::Requirement
+  requirement: &85648260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75057240
+  version_requirements: *85648260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75057010 !ruby/object:Gem::Requirement
+  requirement: &85647280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75057010
+  version_requirements: *85647280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &75056780 !ruby/object:Gem::Requirement
+  requirement: &85646720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75056780
+  version_requirements: *85646720
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &75056570 !ruby/object:Gem::Requirement
+  requirement: &85646210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75056570
+  version_requirements: *85646210
 description: 
 email:
 - lars.gierth@gmail.com
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Routing And Action Controllers For Pakada