pakada 0.3.3 → 0.3.4

data/.yardopts

@@ -1 +1 @@
-- LICENSE ROADMAP.md
+- LICENSE 

data/lib/pakada/version.rb

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

data/lib/pakada.rb

@@ -15,50 +15,48 @@ class Pakada
     attr_reader :instances, :stack
   end
   
-  def self.instance(name = nil, &block)
-    return @stack.last unless name
-    return instances[name] unless block
+  def self.instance(name_or_ins = nil)
+    return stack.last unless name_or_ins
     
-    unless instances[name]
+    if self === name_or_ins
+      ins = name_or_ins
+    else
+      ins, name = instances[name_or_ins], name_or_ins
+    end
+    return ins unless block_given?
+    
+    unless ins
       dsl = Struct.new(:urls, :modules, :path).new
-      ret = block.call(dsl)
+      ret = yield(dsl)
       
-      config = Hash[*dsl.members.map {|m| m.to_sym }.zip(dsl.values).flatten(1)]
+      config = Hash[*dsl.members.map(&:to_sym).zip(dsl.values).flatten(1)]
       instances[name] = new(name, config)
     else
-      @stack << instances[name]
+      stack << ins
       begin
-        ret = block.call(instances[name])
+        ret = yield(ins)
       ensure
-        @stack.pop
+        stack.pop
       end
     end
-    
     ret
   end
   
   def self.boot
     instance(:default) {|ins| ins.urls = ["/"] } if instances.empty?
     
-    if instances.keys.length > 1
-      @urlmap = Rack::URLMap.new instances.values.inject({}) {|map, ins|
+    @urlmap = if instances.keys.length > 1
+      Rack::URLMap.new instances.values.inject({}) {|map, ins|
         ins.urls.each {|url|
-          map[url] = proc {|env|
-            instance(ins.name) { ins.call env }
-          }
+          map[url] = proc {|env| ins.call env }
         }
         map
       }
     else
-      ins = instances.values[0]
-      @urlmap = proc {|env|
-        instance(ins.name) { ins.call env }
-      }
+      instances.values[0]
     end
     
-    instances.values.each {|ins|
-      instance(ins.name) { ins.boot }
-    }
+    instances.values.each &:boot
   end
   
   def self.call(env)
@@ -136,8 +134,10 @@ class Pakada
       
       resolved = true if j == 0
     end
-    @modules = modules.inject({}) {|hash, mod|
-      hash[mod.pakada_name] = safety(mod).new; hash
+    Pakada.instance(self) {
+      @modules = modules.inject({}) {|hash, mod|
+        hash[mod.pakada_name] = safety(mod).new; hash
+      }
     }
     
     path = File.expand_path(config[:path])
@@ -146,8 +146,10 @@ class Pakada
   end
   
   def boot
-    [:hooks, :boot].each {|m|
-      modules.each_value {|mod| mod.send m }
+    Pakada.instance(self) {
+      [:hooks, :boot].each {|m|
+        modules.each_value {|mod| mod.send m }
+      }
     } unless Pakada.testing?
   end
   
@@ -156,7 +158,7 @@ class Pakada
   end
   
   def call(req_env)
-    to_app.call req_env
+    Pakada.instance(self) { to_app.call req_env }
   end
   
   def to_app

data/spec/pakada_spec.rb

@@ -25,7 +25,7 @@ describe Pakada do
     end
   end
   
-  context ".instance(name, &block)" do
+  context ".instance(name) {|ins_or_dsl| ... }" do
     before do
       Pakada.stub :instances => {
         :foo => stub("instance: foo"),
@@ -66,6 +66,16 @@ describe Pakada do
       
       Pakada.instances[:create_me].should equal(create)
     end
+    
+    let(:baz) { Pakada.allocate }
+    
+    it "accepts arbitrary instance objects" do
+      Pakada.instance(baz) {|ins|
+        ins.should equal(baz)
+        Pakada.instance.should equal(baz)
+        Pakada.instances.should_not include(ins)
+      }
+    end
   end
   
   context ".boot" do
@@ -83,7 +93,6 @@ describe Pakada do
     
     it "creates a Rack::URLMap with end-points for each instance" do
       foo.should_receive(:call).twice {|e|
-        Pakada.instance.should equal(foo)
         env.should equal(e)
         response
       }
@@ -210,6 +219,15 @@ describe Pakada do
       instance.modules[:module3].should equal(module3.new)
     end
     
+    it "initializes modules in the context of this instance" do
+      context = nil
+      module1.should_receive(:new) {
+        context = Pakada.instance
+      }
+      
+      instance.should equal(context)
+    end
+    
     it "sets the URL list" do
       ins = Pakada.new(:foo, :urls => "http://example.org")
       ins.urls.should == ["http://example.org"]
@@ -266,7 +284,7 @@ describe Pakada do
       Pakada.instance(:instance) {}
       instance.stub :modules => {
         :foo => stub("foo module"),
-        :bar => stub("bar module")
+        :bar => stub("bar module", :hooks => nil, :boot => nil)
       }
     end
     
@@ -288,6 +306,17 @@ describe Pakada do
       
       instance.boot
     end
+    
+    it "calls #hooks and #boot in the context of this instance" do
+      foo.should_receive(:hooks) {
+        Pakada.instance.should equal(instance)
+      }
+      foo.should_receive(:boot) {
+        Pakada.instance.should equal(instance)
+      }
+      
+      instance.boot
+    end
   end
   
   context "#call(env)" do
@@ -295,9 +324,8 @@ describe Pakada do
     let(:env) { stub "env" }
     let(:response) { stub "response" }
     
-    before { instance.stub :to_app => stub("#to_app") }
-    
     it "forwards to #to_app.call" do
+      instance.stub :to_app => stub("#to_app")
       instance.to_app.should_receive(:call) {|e|
         e.should equal(env)
         response
@@ -305,6 +333,15 @@ describe Pakada do
       
       instance.call(env).should equal(response)
     end
+    
+    it "forwards in the context of this instance" do
+      instance.should_receive(:to_app) {
+        Pakada.instance.should equal(instance)
+        proc {}
+      }
+      
+      instance.call(env)
+    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.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-08-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &85331310 !ruby/object:Gem::Requirement
+  requirement: &72594210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85331310
+  version_requirements: *72594210
 - !ruby/object:Gem::Dependency
   name: hooked
-  requirement: &85330850 !ruby/object:Gem::Requirement
+  requirement: &72593940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85330850
+  version_requirements: *72593940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85214840 !ruby/object:Gem::Requirement
+  requirement: &72593660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85214840
+  version_requirements: *72593660
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &85214630 !ruby/object:Gem::Requirement
+  requirement: &72593300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85214630
+  version_requirements: *72593300
 - !ruby/object:Gem::Dependency
   name: fakefs-require
-  requirement: &85214350 !ruby/object:Gem::Requirement
+  requirement: &72592820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85214350
+  version_requirements: *72592820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &85214080 !ruby/object:Gem::Requirement
+  requirement: &72592580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85214080
+  version_requirements: *72592580
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &85213810 !ruby/object:Gem::Requirement
+  requirement: &72592310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85213810
+  version_requirements: *72592310
 description: 
 email:
 - lars.gierth@gmail.com
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Modularization contract for web applications