pakada-dispatch 0.0.5 → 0.1.0

data/lib/pakada/dispatch.rb

@@ -7,38 +7,41 @@ require "pakada/dispatch/controller"
 require "pakada/dispatch/module"
 require "pakada/dispatch/version"
 
-class Pakada
-  class Dispatch
-    include Pakada::Module
-    
-    attr_reader :router
-    
-    def initialize
-      @router = Rack::Mount::RouteSet.new
-    end
-    
-    before :boot, :apply_dispatch_patches, :before => :all, do |ctx|
-      Pakada.modules.each_value do |m|
-        m.singleton_class.send :include, Pakada::Dispatch::Module
-      end
-    end
-    
-    before :boot, :load_controllers do |ctx|
-      Pakada.modules.each_value do |mod|
-        mod.load_controllers
-      end
-    end
-    
-    before :boot, :set_dispatch_app do |ctx|
-      Pakada.app = proc {|env| hookable :dispatch, env }
-    end
-    
-    after :boot, :freeze_router do |ctx|
-      router.rehash
-    end
-    
-    hookable :dispatch do |ctx|
-      ctx.result = router.call ctx.args
+class Pakada::Dispatch
+  include Pakada::Module
+  
+  attr_reader :router
+  
+  def initialize
+    @router = Rack::Mount::RouteSet.new
+  end
+  
+  def boot
+    apply_patches
+    load_module_controllers
+    set_app
+    freeze_router
+  end
+  
+  def apply_patches
+    Pakada.modules.each_value do |m|
+      m.singleton_class.send :include, Module
     end
   end
+  
+  def load_module_controllers
+    Pakada.modules.each_value {|m| m.load_controllers }
+  end
+  
+  def set_app
+    Pakada.app = proc {|env| request env }
+  end
+  
+  def freeze_router
+    router.rehash
+  end
+  
+  def request(env)
+    router.call env
+  end
 end

data/lib/pakada/dispatch/controller.rb

@@ -20,7 +20,7 @@ class Pakada
       def self.build(&block)
         Class.new do
           include Controller
-          instance_eval &block if block
+          class_eval &block if block
         end
       end
       

data/lib/pakada/dispatch/module.rb

@@ -11,7 +11,7 @@ class Pakada
           next unless file.match %r{.*/[a-z0-9_]+\.rb$}
           name = file.split("/").last.split(".").first
           @controllers[name.to_sym] = Controller.build do
-            instance_eval File.read(file), file, 1
+            class_eval File.read(file), file, 1
           end
         end if path
       end

data/lib/pakada/dispatch/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Dispatch
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

data/pakada-dispatch.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Routing And Action Controllers For Pakada}
   #s.description = %q{TODO: Write a gem description}
 
-  s.add_dependency "pakada"
+  s.add_dependency "pakada", "~> 0.2"
   s.add_dependency "rack-mount"
   s.add_dependency "yajl-ruby"
   

data/spec/dispatch_spec.rb

@@ -7,74 +7,72 @@ describe Pakada::Dispatch do
     subject.module_name.should == :dispatch
   end
   
-  describe ".initialize" do
+  describe "#initialize" do
     it "initializes the router" do
       subject.router.should respond_to :add_route
       subject.router.should respond_to :call
     end
   end
   
-  describe ".before(:boot, :apply_dispatch_patches)" do
-    before do
-      Pakada.load_modules
-      Pakada.load_hooking
+  describe "#boot" do
+    before :each do
+      [:apply_patches, :load_module_controllers].each {|m| subject.stub m }
     end
     
-    it "freedom-patches all loaded modules" do
-      Pakada.hooking.invoke :boot
-      Pakada.modules.each_value do |m|
-        modules = m.singleton_class.included_modules
-        modules.should include(Pakada::Dispatch::Module)
-      end
+    it "calls #apply_patches" do
+      subject.should_receive :apply_patches
+      subject.boot
     end
-  end
-  
-  describe ".before(:boot, :load_controllers)" do
-    before do
-      Pakada.load_modules
-      Pakada.load_hooking
+    
+    it "calls #load_module_controllers" do
+      subject.should_receive :load_module_controllers
+      subject.boot
     end
     
-    it "calls .load_controllers on each module" do
-      Pakada.modules.each_value do |mod|
-        mod.should_receive :load_controllers
-      end
-      Pakada.hooking.invoke :boot
+    it "calls #set_app" do
+      subject.should_receive :set_app
+      subject.boot
+    end
+    
+    it "calls #freeze_router" do
+      subject.should_receive :freeze_router
+      subject.boot
     end
   end
   
-  describe ".before(:boot, :set_dispatch_app)" do
-    it "overwrites Pakada.app with its own app" do
-      Pakada.load_modules
-      Pakada.load_hooking
-      Pakada.hooking.invoke :boot
+  describe "#apply_patches" do
+    it "patches Pakada::Module" do
+      Pakada.instance.stub(:modules).and_return :foo => stub("foo module")
       
-      req = {"key" => "value"}
-      resp = [200, {}, []]
-      Pakada.hooking.should_receive(:invoke).with(:dispatch, req) { resp }
-      Pakada.app.call(req).should == resp
+      subject.apply_patches
+      Pakada[:foo].should respond_to(:load_controllers)
     end
   end
   
-  describe ".before(:boot, :freeze_router)" do
-    it "freezes the router" do
-      Pakada.load_modules
-      Pakada.load_hooking
+  describe "#load_module_controllers" do
+    it "calls #load_controllers on each module" do
+      Pakada.instance.stub(:modules).and_return :foo => stub("foo module")
       
-      Pakada[:dispatch].router.should_receive :rehash
-      Pakada.hooking.invoke :boot
+      Pakada[:foo].should_receive :load_controllers
+      subject.load_module_controllers
     end
   end
   
-  describe ".hookable(:dispatch)" do
-    it "passes the request to the router" do
-      Pakada.load_modules
-      Pakada.load_hooking
+  describe "#set_app" do
+    it "makes Pakada.app.call forward to Dispatch.request" do
+      subject.set_app
       
-      req = {"key" => "value"}
-      resp = [200, {}, []]
-      Pakada[:dispatch].router.should_receive(:call).with(req) { resp }
-      Pakada.hooking.invoke(:dispatch, req).should == resp
+      req, resp = stub("request"), stub("response")
+      subject.should_receive(:request).with(req).and_return resp
+      
+      Pakada.app.call(req).should == resp
+    end
+  end
+  
+  describe "#freeze_router" do
+    it "freezes the router" do
+      subject.router.should_receive :rehash
+      subject.freeze_router
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: pakada-dispatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Lars Gierth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.2"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 530646867
+      hash: -856977645
       segments: 
       - 0
       version: "0"
@@ -118,14 +118,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 530646867
+      hash: -856977645
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Routing And Action Controllers For Pakada