usher 0.5.13 → 0.6.0

data/spec/private/generate_with_spec.rb

@@ -3,7 +3,7 @@ require "usher"
 
 describe Usher::Route::GenerateWith, "#empty?" do
   before :all do
-    GenerateWith = Usher::Route::GenerateWith
+    ::GenerateWith = Usher::Route::GenerateWith
   end
 
   describe "when all fields are nil" do
@@ -25,4 +25,4 @@ describe Usher::Route::GenerateWith, "#empty?" do
       @filled_generate_with.empty?.should be_false
     end
   end
-end
+end

data/spec/private/rack/dispatch_spec.rb

@@ -84,6 +84,12 @@ describe "Usher (for rack) route dispatching" do
       @usher2.add("/bad"  ).match_partially!.to(@bad_app)
       @usher2.add("/some(/:foo)").to(@app)
 
+      @usher3 = Usher::Interface.for(:rack)
+      @usher3.add("(/)", :default_values => {:optional_root => true} ).to(@app)
+
+      @usher2.add("/optional_mount").match_partially!.to(@usher3)
+
+      route_set.add("/baz", :default_values => {:baz => "baz"}).match_partially!.to(@usher3)
       route_set.add("/foo/:bar", :default_values => {:foo => "foo"}).match_partially!.to(@usher2)
       route_set.add("/foo", :default_values => {:controller => :foo}).to(@app)
     end
@@ -93,6 +99,37 @@ describe "Usher (for rack) route dispatching" do
       route_set.call(Rack::MockRequest.env_for("/foo"))
     end
 
+    it "should match the route where the last part is optional" do
+      @app.should_receive(:call).once.with do |e|
+        e['usher.params'].should == {
+          :optional_root  => true,
+          :baz            => 'baz'
+        }
+      end
+      route_set.call(Rack::MockRequest.env_for("/baz/"))
+    end
+
+    it "should match when a mounted apps root route is optional" do
+      @app.should_receive(:call).once.with do |e|
+        e['usher.params'].should == {
+          :optional_root => true,
+          :foo           => "foo",
+          :bar           => "bar"
+        }
+      end
+      route_set.call(Rack::MockRequest.env_for("/foo/bar/optional_mount"))
+    end
+
+    it "should match the route where the last part is empty" do
+      @app.should_receive(:call).once.with do |e|
+        e['usher.params'].should == {
+          :baz            => 'baz',
+          :optional_root  => true
+        }
+      end
+      route_set.call(Rack::MockRequest.env_for("/baz"))
+    end
+
     it "should route through the first route, and the second to the app" do
       @app.should_receive(:call).once.with{|e| e['usher.params'].should == {:bar => "bar", :foo => "foo"}}
       result = route_set.call(Rack::MockRequest.env_for("/foo/bar/good"))
@@ -195,7 +232,7 @@ describe "Usher (for rack) route dispatching" do
       end
     end
   end
-  
+
   describe "use as middlware" do
     it "should allow me to set a default application to use" do
       @app.should_receive(:call).with{|e| e['usher.params'].should == {:middle => :ware}}

data/spec/private/recognize_spec.rb

@@ -47,6 +47,23 @@ describe "Usher route recognition" do
       @route_set.recognize(build_request({:method => 'put', :path => '/sample', :protocol => 'wacky', :domain => 'admin.spec.com', :user_agent => nil})).path.route.should == target_route_http_admin_generic
 
     end
+    
+    it "should recognize an empty path" do
+      @route_set.add_route('').to(:test)
+      @route_set.recognize(build_request({:path => ''})).path.route.destination.should == :test
+    end
+    
+    it "should recognize an optionally empty path" do
+      @route_set.add_route('(/)').to(:test)
+      @route_set.recognize(build_request({:path => ''})).path.route.destination.should == :test
+      @route_set.recognize(build_request({:path => '/'})).path.route.destination.should == :test
+    end
+    
+    it "should allow adding a pure regex" do
+      @route_set.add_route(/\/test\/(testing|gold)/).to(:test)
+      @route_set.recognize(build_request({:path => '/test/testing'})).path.route.destination.should == :test
+      @route_set.recognize(build_request({:path => '/test/gold'})).path.route.destination.should == :test
+    end
 
     it "should correctly fix that tree if conditionals are used later" do
       noop_route = @route_set.add_route('/noop', :controller => 'products', :action => 'noop')
@@ -73,6 +90,15 @@ describe "Usher route recognition" do
     end
   end
 
+  it "should recognize path with a trailing slash" do
+    @route_set = Usher.new(:request_methods => [:protocol, :domain, :port, :query_string, :remote_ip, :user_agent, :referer, :method, :subdomains], :ignore_trailing_delimiters => true)
+    
+    target_route = @route_set.add_route('/path', :controller => 'sample', :action => 'action')
+
+    response = @route_set.recognize(build_request({:method => 'get', :path => '/path/'}))
+    response.path.route.should == target_route
+  end
+
   it "should recognize a format-style variable" do
     target_route = @route_set.add_route('/sample.:format', :controller => 'sample', :action => 'action')
     @route_set.recognize(build_request({:method => 'get', :path => '/sample.html', :domain => 'admin.host.com'})).should == Usher::Node::Response.new(target_route.paths.first, [[:format , 'html']], nil, "/sample.html")
@@ -368,4 +394,5 @@ describe "Usher route recognition" do
     end
 
   end
+  
 end

data/spec/private/url_parts_spec.rb

@@ -28,11 +28,11 @@ describe Usher::Util::Generators::URL::UrlParts do
   include PathAndRequestHelper
 
   before :all do
-    UrlParts = Usher::Util::Generators::URL::UrlParts
+    ::UrlParts = Usher::Util::Generators::URL::UrlParts
   end
 
   describe "#url" do
-    describe "when generate_with is provided" do      
+    describe "when generate_with is provided" do
       before :each do
         @path = stub_path_with 'https', 'overridden', 9443
         @request = rack_request_for 'http://localhost'
@@ -105,7 +105,7 @@ describe Usher::Util::Generators::URL::UrlParts do
         @request = mock 'request'
       end
 
-      it "should just extract the url" do        
+      it "should just extract the url" do
         @request.should_receive(:url).and_return('http://localhost')
 
         url_parts = UrlParts.new(@path, @request)
@@ -113,4 +113,4 @@ describe Usher::Util::Generators::URL::UrlParts do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: usher
 version: !ruby/object:Gem::Version 
-  version: 0.5.13
+  version: 0.6.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2009-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.9
+        version: 0.0.11
     version: 
 description: A general purpose routing library
 email: joshbuddy@gmail.com
@@ -57,6 +57,7 @@ files:
 - lib/usher/interface/rails23.rb
 - lib/usher/interface/rails23/mapper.rb
 - lib/usher/interface/rails3.rb
+- lib/usher/interface/sinatra.rb
 - lib/usher/interface/text.rb
 - lib/usher/node.rb
 - lib/usher/route.rb
@@ -65,7 +66,6 @@ files:
 - lib/usher/route/static.rb
 - lib/usher/route/util.rb
 - lib/usher/route/variable.rb
-- lib/usher/spinoffs/strscan_additions.rb
 - lib/usher/splitter.rb
 - lib/usher/util.rb
 - lib/usher/util/generate.rb
@@ -74,6 +74,7 @@ files:
 - lib/usher/util/rack-mixins.rb
 - rails/init.rb
 - spec/private/delimiters_spec.rb
+- spec/private/destination_spec.rb
 - spec/private/email/recognize_spec.rb
 - spec/private/generate_spec.rb
 - spec/private/generate_with_spec.rb
@@ -94,7 +95,6 @@ files:
 - spec/private/recognize_spec.rb
 - spec/private/request_method_spec.rb
 - spec/private/splitter_spec.rb
-- spec/private/string_scanner_spec.rb
 - spec/private/url_parts_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -128,6 +128,7 @@ specification_version: 3
 summary: A general purpose routing library
 test_files: 
 - spec/private/delimiters_spec.rb
+- spec/private/destination_spec.rb
 - spec/private/email/recognize_spec.rb
 - spec/private/generate_spec.rb
 - spec/private/generate_with_spec.rb
@@ -148,6 +149,5 @@ test_files:
 - spec/private/recognize_spec.rb
 - spec/private/request_method_spec.rb
 - spec/private/splitter_spec.rb
-- spec/private/string_scanner_spec.rb
 - spec/private/url_parts_spec.rb
 - spec/spec_helper.rb

data/lib/usher/spinoffs/strscan_additions.rb

@@ -1,31 +0,0 @@
-require 'strscan'
-
-#TODO: rewrite this in C and commit this addition back to community
-class StringScanner
-  #      scan_before(pattern)
-  #
-  #
-  # Scans the string until the +pattern+ is matched. As opposed to #scan_until,
-  # it does not include a matching pattern into a returning value and sets
-  # pointer just _before_ the pattern position.
-  # If there is no match, +nil+ is returned.
-  #
-  #  s = StringScanner.new("Fri Dec 12 1975 14:39")
-  #  s.scan_until(/1/)        # -> "Fri Dec "
-  #  s.scan(/1/)              # -> "1"
-  #  s.scan_until(/1/)        # -> nil
-  #
-  def scan_before(pattern)
-    return nil unless self.exist?(pattern)
-
-    pattern_size = self.matched_size
-    result = self.scan_until(pattern)
-
-    self.pos = self.pos - pattern_size
-    (result.length == pattern_size) ?
-      (result = '') :
-      (result = result[0..(result.length - pattern_size - 1)])    
-
-    result
-  end
-end

data/spec/private/string_scanner_spec.rb

@@ -1,39 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
-require "usher"
-
-describe StringScanner do
-  describe "#scan_before" do
-    before :each do
-      @scanner = StringScanner.new("/one/two..three")
-    end
-
-    describe "when there is a match" do
-      it "should return subsequent string without matching pattern in the end" do
-        @scanner.scan_before(/\.\./).should == "/one/two"
-      end
-
-      it "should set pointer right before the matching pattern" do
-        @scanner.scan_before(/\.\./)
-        @scanner.scan(/\.\./).should == '..'
-      end
-
-      describe "when matching pattern is right at the position" do
-        it "should return empty string" do
-          @scanner.scan_before(/\//).should == ''
-        end
-      end
-    end
-
-    describe "when there is no match" do
-      it "should return nil" do
-        @scanner.scan_before(/bla-bla-bla/).should == nil
-      end
-
-      it "should not move the pointer" do
-        @scanner.scan_before(/bla-bla-bla/)
-        @scanner.pos.should == 0
-      end
-    end
-  end
-end
-