pakada-dispatch 0.2.0 → 0.2.1

data/.travis.yml

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

data/Gemfile

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

data/Rakefile

@@ -1,9 +1,4 @@
-require "bundler"
-Bundler.setup :development
+task :default => :spec
 
 require "rspec/core/rake_task"
-
-task :default => :spec
 RSpec::Core::RakeTask.new :spec
-
-Bundler::GemHelper.install_tasks

data/lib/pakada/dispatch/controller.rb

@@ -17,17 +17,30 @@ class Pakada
       
       attr_reader :options, :params, :request, :response
       
-      def initialize(env, options = {})
+      def initialize(env, options = {}, &block)
         @request = Rack::Request.new(env)
         @response = options[:response] || Rack::Response.new
         
-        @options, @params = options, env["router.params"]
+        @options, @params = options, request.env["router.params"]
+        (request.env["pakada.controllers"] ||= []) << self
+        
+        catch(:finish) { instance_eval &block }
       end
       
       def finish!
         throw :finish
       end
       
+      def actions
+        self.class.actions
+      end
+      
+      def action(name, options = {})
+        aecktschn = self.class.action(name)
+        options[:response] ||= response
+        proc { aecktschn.call request.env, options }
+      end
+      
       module ClassMethods
         def actions
           @actions ||= {}
@@ -35,10 +48,10 @@ class Pakada
         
         def action(name, options = {}, &block)
           if block
-            actions[name] = proc {|env, opts = {}|
-              c = self.new(env, options.merge(opts))
-              catch(:finish) { c.instance_eval &block }
-              c.response.finish
+            actions[name] = proc {|env, *args|
+              opts = args[0] || {}
+              action = self.new(env, options.merge(opts), &block)
+              action.response.finish unless opts[:response]
             }
           end
           actions[name]
@@ -48,11 +61,11 @@ class Pakada
           method(:call).to_proc
         end
         
-        def call(env)
+        def call(env, options = {})
           env["router.params"] ||= {}
           name = env["router.params"][:action] ||
                  env["REQUEST_METHOD"].downcase
-          action(name.to_sym).call env
+          action(name.to_sym).call env, options
         end
       end
     end

data/lib/pakada/dispatch/module.rb

@@ -4,9 +4,7 @@ class Pakada
   class Dispatch
     module Module
       def controller_path
-        # TODO change this when Pakada uses Pathname for module paths
-        #@controller_path ||= path.join("controllers")
-        @controller_path ||= Pathname.new(path).join("controllers")
+        @controller_path ||= path.join("controllers")
       end
       
       def controllers

data/lib/pakada/dispatch/version.rb

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

data/pakada-dispatch.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "pakada"
   s.add_dependency "http_router"
+  s.add_dependency "rack"
   
   s.add_development_dependency "rspec"
   s.add_development_dependency "yard"

data/spec/controller_spec.rb

@@ -4,11 +4,14 @@ describe Pakada::Dispatch::Controller do
   let(:block) { proc {} }
   let(:ctrlr_mod) { Pakada.safety Pakada::Dispatch::Controller }
   let(:ctrlr) { ctrlr_mod.create &block }
+  let(:ctrlr_obj) { ctrlr.new env, options, &block }
+  let(:env) { {"router.params" => stub("router params")} }
+  let(:options) { {:response => stub("response")} }
   
   context ".included hook" do
     it "extends the includer class with ClassMethods" do
       mod = Pakada.safety(Pakada::Dispatch::Controller::ClassMethods)
-      ctrlr.singleton_class.included_modules.should include(mod)
+      (class << ctrlr; self; end).included_modules.should include(mod)
     end
   end
   
@@ -25,19 +28,16 @@ describe Pakada::Dispatch::Controller do
     end
   end
   
-  context "#initialize(env, options)" do
-    let(:env) { {"router.params" => stub("router params")} }
-    let(:options) { {:response => stub("response")} }
-    let(:ctrlr_obj) { ctrlr.new env, options }
-    
+  context "#initialize(env, options) { ... }" do
     it "sets the options and routing params objects" do
       ctrlr_obj.options.should equal(options)
       ctrlr_obj.params.should equal(env["router.params"])
     end
     
     it "sets the request and response objects" do
+      response = options[:response]
       ctrlr_obj.request.env.should equal(env)
-      ctrlr_obj.response.should equal(options[:response])
+      ctrlr_obj.response.should equal(response)
     end
     
     it "defaults to an empty response object" do
@@ -45,23 +45,77 @@ describe Pakada::Dispatch::Controller do
       ctrlr_obj.response.status.should equal(200)
       ctrlr_obj.response.should_not equal(old_response)
     end
+    
+    it "adds itself to env[pakada.controllers]" do
+      ctrlr_obj
+      env["pakada.controllers"].should == [ctrlr_obj]
+    end
+    
+    let(:ctrlr_alloc) { ctrlr.allocate }
+    
+    it "instance_evals the passed block, catching :finish" do
+      ctrlr_alloc.should_receive(:instance_eval) {|&blk|
+        blk.should equal(block)
+        throw :catch
+      }
+      proc {
+        ctrlr_alloc.send :initialize, env, &block
+      }.should throw_symbol(:catch)
+    end
   end
   
   context "#finish!" do
     it "throws :finish" do
-      proc { ctrlr.new({}).finish! }.should throw_symbol(:finish)
+      proc { ctrlr_obj.finish! }.should throw_symbol(:finish)
+    end
+  end
+  
+  context "#actions" do
+    let(:actions) { stub "action" }
+    
+    it "forwards to .actions" do
+      ctrlr.should_receive(:actions) { actions }
+      ctrlr_obj.actions.should equal(actions)
+    end
+  end
+  
+  context "#action(name, options = {})" do
+    before {
+      ctrlr_obj.actions[:foo] = stub("action")
+    }
+    
+    it "forwards to .action" do
+      ctrlr.action(:foo).should_receive(:call) {|env, opts|
+        env.should equal(ctrlr_obj.request.env)
+      }
+      ctrlr_obj.action(:foo).call
+    end
+    
+    it "passes the response in options" do
+      ctrlr.action(:foo).should_receive(:call) {|env, opts|
+        opts.should == options
+      }
+      ctrlr_obj.action(:foo).call
     end
   end
   
   context ".actions" do
     it "is an empty Hash" do
-      ctrlr.actions.should be_an(Hash)
+      ctrlr.actions.should be_a(Hash)
       ctrlr.actions.should be_empty
     end
   end
   
-  context ".action(name, options) { ... }" do
-    let(:block) { proc {} }
+  context ".action(name)" do
+    let(:action) { stub "action" }
+    before { ctrlr.actions[:foo] = action }
+    
+    it "returns the specified action" do
+      ctrlr.action(:foo).should equal(action)
+    end
+  end
+  
+  context ".action(name, options = {}) { ... }" do
     let(:options) { {:foo => stub("foo option")} }
     let(:override_options) { {:bar => stub("bar option")} }
     let(:merged_options) { options.merge override_options }
@@ -78,27 +132,21 @@ describe Pakada::Dispatch::Controller do
       ctrlr.action(:foo).should respond_to(:call)
     end
     
-    it "'s proc creates a controller object passing env and options" do
-      ctrlr.should_receive(:new).with(env, merged_options) { ctrlr_obj }
+    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
+        blk.should equal(block)
+      }
       ctrlr.action(:foo).call env, override_options
     end
     
-    it "'s proc instance_evals the action proc catching :finish" do
-      ctrlr_obj.should_receive(:instance_eval) {|&blk| block.should equal(blk) }
-      ctrlr.action(:foo).call env
-    end
-    
     it "'s proc returns the finished response" do
       ctrlr.action(:foo).call(env).should equal(response.finish)
     end
-  end
-  
-  context ".action(name)" do
-    let(:action) { stub "action" }
-    before { ctrlr.actions[:foo] = action }
     
-    it "returns the specified action" do
-      ctrlr.action(:foo).should equal(action)
+    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
   end
   
@@ -128,7 +176,7 @@ describe Pakada::Dispatch::Controller do
     }
     
     it "sets default routing params" do
-      ctrlr.action(:bar).should_receive(:call) {|e|
+      ctrlr.action(:bar).should_receive(:call) {|e, opts|
         e["router.params"].should == {}
       }
       

data/spec/dispatch_spec.rb

@@ -44,8 +44,8 @@ describe Pakada::Dispatch do
       mod = Pakada.safety(Pakada::Dispatch::Module)
       
       dispatch.boot
-      module1.singleton_class.included_modules.should include(mod)
-      module2.singleton_class.included_modules.should include(mod)
+      (class << module1; self; end).included_modules.should include(mod)
+      (class << module2; self; end).included_modules.should include(mod)
     end
     
     it "loads each module's controllers" do

data/spec/module_spec.rb

@@ -40,7 +40,7 @@ describe Pakada::Dispatch::Module do
     }
     
     it "creates a controller class from the given block" do
-      Pakada.safety(Pakada::Dispatch::Controller)
+      Pakada.safety(Pakada::Dispatch::Controller) \
         .should_receive(:create) {|&blk|
           blk.should equal(block)
           controller

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada-dispatch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-12 00:00:00.000000000Z
+date: 2011-08-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakada
-  requirement: &79590830 !ruby/object:Gem::Requirement
+  requirement: &75057660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79590830
+  version_requirements: *75057660
 - !ruby/object:Gem::Dependency
   name: http_router
-  requirement: &79590540 !ruby/object:Gem::Requirement
+  requirement: &75057450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79590540
+  version_requirements: *75057450
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &75057240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *75057240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79590290 !ruby/object:Gem::Requirement
+  requirement: &75057010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79590290
+  version_requirements: *75057010
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &79589990 !ruby/object:Gem::Requirement
+  requirement: &75056780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79589990
+  version_requirements: *75056780
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &79589700 !ruby/object:Gem::Requirement
+  requirement: &75056570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79589700
+  version_requirements: *75056570
 description: 
 email:
 - lars.gierth@gmail.com
@@ -74,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .rspec
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE