rory 0.3.4 → 0.3.5

data/lib/rory/dispatcher.rb

@@ -17,7 +17,8 @@ module Rory
     def get_route
       match = nil
       route = route_map.detect do |route_hash|
-        match = route_hash[:regex].match(@request.path_info[1..-1])
+        path_name = @request.path_info[1..-1] || ''
+        match = route_hash[:regex].match(path_name)
         methods = route_hash[:methods] || []
         match && (methods.empty? || methods.include?(method.to_sym))
       end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/application_spec.rb

@@ -40,7 +40,7 @@ describe Rory::Application do
 
   describe ".call" do
     it "forwards arg to new dispatcher, and calls dispatch" do
-      dispatcher = stub(:dispatch => :expected)
+      dispatcher = double(:dispatch => :expected)
       rack_request = double
       Rack::Request.stub(:new).with(:env).and_return(rack_request)
       Rory::Dispatcher.should_receive(:new).with(rack_request, Fixture::Application.instance).and_return(dispatcher)
@@ -51,7 +51,7 @@ describe Rory::Application do
   describe ".load_config_data" do
     it "returns parsed yaml file with given name from directory at config_path" do
       Fixture::Application.any_instance.stub(:config_path).and_return('Africa the Great')
-      YAML.stub!(:load_file).with(
+      YAML.stub(:load_file).with(
         File.expand_path(File.join('Africa the Great', 'foo_type.yml'))).
         and_return(:oscar_the_grouch_takes_a_nap)
       Fixture::Application.load_config_data(:foo_type).should == :oscar_the_grouch_takes_a_nap
@@ -62,7 +62,7 @@ describe Rory::Application do
     it "sets up sequel connection to DB from YAML file" do
       config = { 'development' => :expected }
       Fixture::Application.any_instance.stub(:load_config_data).with(:database).and_return(config)
-      Sequel.should_receive(:connect).with(:expected).and_return(stub(:loggers => []))
+      Sequel.should_receive(:connect).with(:expected).and_return(double(:loggers => []))
       Fixture::Application.connect_db('development')
     end
   end

data/spec/controller_spec.rb

@@ -51,7 +51,7 @@ describe Rory::Controller do
 
   describe "#redirect" do
     it "delegates to dispatcher from request" do
-      @request[:dispatcher] = dispatcher = stub
+      @request[:dispatcher] = dispatcher = double
       dispatcher.should_receive(:redirect).with(:whatever)
       controller = Rory::Controller.new(@request)
       controller.redirect(:whatever)
@@ -60,7 +60,7 @@ describe Rory::Controller do
 
   describe "#render_not_found" do
     it "delegates to dispatcher from request" do
-      @request[:dispatcher] = dispatcher = stub
+      @request[:dispatcher] = dispatcher = double
       dispatcher.should_receive(:render_not_found)
       controller = Rory::Controller.new(@request)
       controller.render_not_found

data/spec/dispatcher_spec.rb

@@ -75,6 +75,16 @@ describe Rory::Dispatcher do
       }
     end
 
+    it "works with empty path" do
+      @request.stub(:path_info => '', :request_method => 'GET')
+      @dispatcher.get_route.should == {
+        :controller => 'root',
+        :action => 'vegetable',
+        :regex => /^$/,
+        :methods => [:get]
+      }
+    end
+
     it "works with root url represented by slash" do
       @request.stub(:path_info => '/', :request_method => 'GET')
       @dispatcher.get_route.should == {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack