pakada 0.3.1 → 0.3.2

data/Gemfile

@@ -1,9 +1,12 @@
-source "http://rubygems.org"
+source :rubygems
 
 gemspec
 
 gem "awesome_print"
 gem "rake"
 
+gem "thin"
+gem "shotgun"
+
 gem "fakefs", :git => "https://github.com/lgierth/fakefs",
               :branch => "fix_infinite_loop"

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/module.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 class Pakada
   module Module
     @descendants = []
@@ -23,6 +25,8 @@ class Pakada
           # use Kernel.caller instead of self.caller so Mocha doesn't explode...
           file = Kernel.caller[0].split(":")[0]
           klass.instance_variable_set :@path, detect_path(file)
+        else
+          klass.instance_variable_set :@path, Pathname.new(klass.path)
         end
         
         unless klass.dependencies
@@ -42,8 +46,10 @@ class Pakada
       end
       
       def detect_path(file)
+        file = String(file)
         filepath = nil
         filepath = file if file =~ /^\// && File.exists?(file)
+        
         $LOAD_PATH.each do |dir|
           x = File.join dir, file
           if File.exists? x
@@ -56,7 +62,8 @@ class Pakada
         segments = File.dirname(filepath).split("/").reverse
         pos = segments.find_index("lib") || -1
         
-        segments[(pos + 1)..-1].reverse.join "/"
+        path = segments[(pos + 1)..-1].reverse.join("/")
+        Pathname.new File.expand_path(path)
       end
     end
     

data/lib/pakada/version.rb

@@ -1,3 +1,3 @@
 class Pakada
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/pakada.rb

@@ -40,14 +40,18 @@ class Pakada
   def self.boot
     instance(:default) {|ins| ins.urls = ["/"] } if instances.empty?
     
-    @urlmap = Rack::URLMap.new instances.values.inject({}) {|map, ins|
-      ins.urls.each {|url|
-        map[url] = proc {|env|
-          instance(ins.name) { ins.call env }
+    if instances.keys.length > 1
+      @urlmap = Rack::URLMap.new instances.values.inject({}) {|map, ins|
+        ins.urls.each {|url|
+          map[url] = proc {|env|
+            instance(ins.name) { ins.call env }
+          }
         }
+        map
       }
-      map
-    }
+    else
+      @urlmap = instances.values[0]
+    end
     
     instances.values.each {|ins|
       instance(ins.name) { ins.boot }

data/spec/module_spec.rb

@@ -24,14 +24,14 @@ describe Pakada::Module do
     it "loops through the load path to find a matching path" do
       m = Pakada::Module
       
-      path = "/my/path"
-      FileUtils.mkdir_p path + "/lib"
-      FileUtils.touch path + "/lib/some_module.rb"
-      $LOAD_PATH << path + "/lib"
+      path = Pathname.new("/my/path")
+      FileUtils.mkdir_p path.join("lib")
+      FileUtils.touch path.join("lib/some_module.rb")
+      $LOAD_PATH << path.join("lib")
       
       m.detect_path("some_module.rb").should == path
-      m.detect_path(path + "/lib/some_module.rb").should == path
-      $LOAD_PATH.delete path + "/lib"
+      m.detect_path(path.join("lib/some_module.rb")).should == path
+      $LOAD_PATH.delete path.join("lib")
       
       m.detect_path("config.ru").should be_nil
     end
@@ -86,23 +86,19 @@ describe Pakada::Module do
     end
     
     it "tries to determine the module's path" do
-      path = "/my/path"
-      file = path + "/lib/some_module.rb"
+      path = Pathname.new("/my/path")
+      file = path.join("lib/some_module.rb")
       
-      Kernel.should_receive(:mock_caller).once { [file + ":1: in `something'"] }
-      Kernel.instance_eval do
-        alias orig_caller caller
-        alias caller mock_caller
-      end
+      Kernel.should_receive(:caller).once {
+        [file.to_s + ":1: in `something'"]
+      }
       
-      Pakada::Module.should_receive(:detect_path).with(file).once { path }
+      Pakada::Module.should_receive(:detect_path).with(file.to_s).once { path }
       klass = Class.new do
         @pakada_name = :some_module
         include Pakada::Module
       end
       klass.path.should == path
-      
-      Kernel.instance_eval { alias caller orig_caller }
     end
     
     it "respects an already set path" do
@@ -112,7 +108,7 @@ describe Pakada::Module do
         @path = "/my/path"
         include Pakada::Module
       end
-      klass.path.should == "/my/path"
+      klass.path.should == Pathname.new("/my/path")
     end
     
     it "adds the module to the list of descendants" do
@@ -159,7 +155,7 @@ describe "SomeModule" do
   
   describe ".path" do
     it "contains the module's base path" do
-      @klass.path.should == "/opt/pakada"
+      @klass.path.should == Pathname.new("/opt/pakada")
     end
     
     it "is read-only" do

data/spec/pakada_spec.rb

@@ -98,6 +98,12 @@ describe Pakada do
       Pakada.boot
     end
     
+    it "doesn't create a URLMap if there's only one instance" do
+      Pakada.instances.delete :bar
+      Rack::URLMap.should_not_receive :new
+      Pakada.boot
+    end
+    
     it "calls #boot on each instance" do
       foo.should_receive :boot
       bar.should_receive :boot
@@ -108,15 +114,10 @@ describe Pakada do
     
     it "creates a default instance if there are no others" do
       Pakada.instances.clear
-      
-      Rack::URLMap.should_receive(:new) {|map|
-        default.should_receive(:call) {
-          Pakada.instance.should == default
-        }
-        map["/"].call({})
-      }
-      
       Pakada.boot
+      
+      Pakada.instances[:default].should equal(default)
+      default.urls.should == ["/"]
     end
   end
   
@@ -127,6 +128,9 @@ describe Pakada do
     
     before do
       Rack::URLMap.stub :new => urlmap
+      
+      Pakada.instance(:foo) {}
+      Pakada.instance(:bar) {}
       Pakada.boot
     end
     

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require "bundler"
-Bundler.setup :default, :development
-
 require "pakada"
 
 require "fakefs/safe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-11 00:00:00.000000000Z
+date: 2011-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &68362700 !ruby/object:Gem::Requirement
+  requirement: &70444740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68362700
+  version_requirements: *70444740
 - !ruby/object:Gem::Dependency
   name: hooked
-  requirement: &68362330 !ruby/object:Gem::Requirement
+  requirement: &70444530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68362330
+  version_requirements: *70444530
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &68362010 !ruby/object:Gem::Requirement
+  requirement: &70444320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68362010
+  version_requirements: *70444320
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &68361690 !ruby/object:Gem::Requirement
+  requirement: &70444110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68361690
+  version_requirements: *70444110
 - !ruby/object:Gem::Dependency
   name: fakefs-require
-  requirement: &68361290 !ruby/object:Gem::Requirement
+  requirement: &70443900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68361290
+  version_requirements: *70443900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &68361000 !ruby/object:Gem::Requirement
+  requirement: &70443690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68361000
+  version_requirements: *70443690
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &68360670 !ruby/object:Gem::Requirement
+  requirement: &70504120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68360670
+  version_requirements: *70504120
 description: 
 email:
 - lars.gierth@gmail.com