pakada 0.3.4 → 0.3.5

data/lib/pakada.rb

@@ -118,38 +118,23 @@ class Pakada
     
     @safety = {}
     
-    modules, resolved = Array(config[:modules]).dup, false
-    until resolved
-      j ||= modules.size
-      i, j = j, 0
-      
-      modules.reverse[0...i].map {|mod|
-        mod.dependencies
-      }.flatten.each {|dep|
-        unless modules.include? dep
-          modules << dep
-          j += 1
-        end
-      }
-      
-      resolved = true if j == 0
-    end
+    path = File.expand_path(config[:path])
+    @urls, @path = Array(config[:urls]), Pathname.new(path)
+    
+    modules = resolve_modules(Array(config[:modules]))
     Pakada.instance(self) {
-      @modules = modules.inject({}) {|hash, mod|
-        hash[mod.pakada_name] = safety(mod).new; hash
+      @modules = modules.inject({}) {|a, e|
+        a[e.pakada_name] = safety(e).allocate; a
       }
+      @modules.each_value {|m| m.send :initialize }
     }
     
-    path = File.expand_path(config[:path])
-    @urls, @path = Array(config[:urls]), Pathname.new(path)
     @middleware = []
   end
   
   def boot
     Pakada.instance(self) {
-      [:hooks, :boot].each {|m|
-        modules.each_value {|mod| mod.send m }
-      }
+      [:hooks, :boot].each {|m| modules.each_value &m }
     } unless Pakada.testing?
   end
   
@@ -158,7 +143,11 @@ class Pakada
   end
   
   def call(req_env)
-    Pakada.instance(self) { to_app.call req_env }
+    Pakada.instance(self) {
+      to_app.call(req_env).tap {|res|
+        res[1].delete_if {|k, v| k =~ /^X-Pakada/ }
+      }
+    }
   end
   
   def to_app
@@ -171,4 +160,25 @@ class Pakada
   def request(req_env)
     Rack::Response.new("Hi, I'm Pakada #{VERSION}").finish
   end
+  
+  private
+  
+  def resolve_modules(modules)
+    modules, resolved = modules.dup, false
+    until resolved
+      j ||= modules.size
+      i, j = j, 0
+      
+      modules.reverse[0...i].map(&:dependencies).flatten.each {|dep|
+        unless modules.include? dep
+          modules << dep
+          j += 1
+        end
+      }
+      
+      resolved = true if j == 0
+    end
+    
+    modules
+  end
 end

data/lib/pakada/version.rb

@@ -1,3 +1,3 @@
 class Pakada
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/pakada_spec.rb

@@ -195,13 +195,19 @@ describe Pakada do
   
   context "#initialize(name, config)" do
     let(:module1) do
-      stub :new => stub, :pakada_name => :module1, :dependencies => [module2]
+      stub :allocate => stub("module1", :send => nil),
+           :pakada_name => :module1,
+           :dependencies => [module2]
     end
     let(:module2) do
-      stub :new => stub, :pakada_name => :module2, :dependencies => [module3]
+      stub :allocate => stub("module2", :send => nil),
+           :pakada_name => :module2,
+           :dependencies => [module3]
     end
     let(:module3) do
-      stub :new => stub, :pakada_name => :module3, :dependencies => []
+      stub :allocate => stub("module3", :send => nil),
+           :pakada_name => :module3,
+           :dependencies => []
     end
     let(:instance) { Pakada.new :foo, :modules => [module1] }
     
@@ -214,14 +220,18 @@ describe Pakada do
     end
     
     it "resolves and initializes the modules" do
-      instance.modules[:module1].should equal(module1.new)
-      instance.modules[:module2].should equal(module2.new)
-      instance.modules[:module3].should equal(module3.new)
+      module1.allocate.should_receive(:send).with :initialize
+      module2.allocate.should_receive(:send).with :initialize
+      module3.allocate.should_receive(:send).with :initialize
+      
+      instance.modules[:module1].should equal(module1.allocate)
+      instance.modules[:module2].should equal(module2.allocate)
+      instance.modules[:module3].should equal(module3.allocate)
     end
     
     it "initializes modules in the context of this instance" do
-      context = nil
-      module1.should_receive(:new) {
+      context = 123
+      module1.allocate.should_receive(:send) {
         context = Pakada.instance
       }
       
@@ -246,7 +256,7 @@ describe Pakada do
     before do
       1.upto(5) {|i|
         Pakada::Module.descendants << stub({
-          :new => stub("module#{i}"),
+          :allocate => stub("module#{i}", :send => nil),
           :pakada_name => :"module#{i}",
           :dependencies => []
         })
@@ -322,7 +332,7 @@ describe Pakada do
   context "#call(env)" do
     let(:instance) { Pakada.new :foo }
     let(:env) { stub "env" }
-    let(:response) { stub "response" }
+    let(:response) { [200, {"X-Pakada-Foo" => "bar"}, []] }
     
     it "forwards to #to_app.call" do
       instance.stub :to_app => stub("#to_app")
@@ -337,11 +347,19 @@ describe Pakada do
     it "forwards in the context of this instance" do
       instance.should_receive(:to_app) {
         Pakada.instance.should equal(instance)
-        proc {}
+        proc {|env| response }
       }
       
       instance.call(env)
     end
+    
+    it "drops response headers that start with X-Pakada" do
+      instance.stub :to_app => stub("#to_app")
+      instance.to_app.stub :call => response
+      instance.call(env).tap {|res|
+        res[1].key?("X-Pakada-Foo").should equal(false)
+      }
+    end
   end
   
   context "#to_app" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-27 00:00:00.000000000Z
+date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &72594210 !ruby/object:Gem::Requirement
+  requirement: &71392370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72594210
+  version_requirements: *71392370
 - !ruby/object:Gem::Dependency
   name: hooked
-  requirement: &72593940 !ruby/object:Gem::Requirement
+  requirement: &71392070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72593940
+  version_requirements: *71392070
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72593660 !ruby/object:Gem::Requirement
+  requirement: &71391770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72593660
+  version_requirements: *71391770
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &72593300 !ruby/object:Gem::Requirement
+  requirement: &71391490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72593300
+  version_requirements: *71391490
 - !ruby/object:Gem::Dependency
   name: fakefs-require
-  requirement: &72592820 !ruby/object:Gem::Requirement
+  requirement: &71391200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72592820
+  version_requirements: *71391200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &72592580 !ruby/object:Gem::Requirement
+  requirement: &71390780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72592580
+  version_requirements: *71390780
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &72592310 !ruby/object:Gem::Requirement
+  requirement: &71390320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72592310
+  version_requirements: *71390320
 description: 
 email:
 - lars.gierth@gmail.com