joshbuddy-usher 0.4.3 → 0.4.5

data/spec/private/grapher_spec.rb

@@ -1,39 +1,41 @@
 require 'lib/usher'
 
-route_set = Usher.new
 
 describe "Usher grapher" do
 
   before(:each) do
-    route_set.reset!
+    @route_set = Usher.new
+    @route_set.reset!
+    @url_generator = Usher::Generators::URL.new(@route_set)
   end
 
   it "should find a simple path" do
-    route_set.add_route('/:a/:b/:c')
-    route_set.generate_url(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
+    @route_set.add_route('/:a/:b/:c')
+    @url_generator.generate(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
   end
 
   it "should pick a more specific route" do
-    route_set.add_route('/:a/:b')
-    route_set.add_route('/:a/:b/:c')
-    route_set.generate_url(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
+    @route_set.add_route('/:a/:b')
+    @route_set.add_route('/:a/:b/:c')
+    @url_generator.generate(nil, {:a => 'A', :b => 'B', :c => 'C'}).should == '/A/B/C'
   end
 
   it "should fail to generate a route when none matches" do
-    route_set.add_route('/:a/:b')
-    proc {route_set.generate_url(nil, {:c => 'C', :d => 'D'}) }.should raise_error Usher::UnrecognizedException
+    @route_set.add_route('/:a/:b')
+    proc {@url_generator.generate(nil, {:c => 'C', :d => 'D'}) }.should raise_error Usher::UnrecognizedException
   end
 
   it "should find the most specific route and append extra parts on as a query string" do
-    route_set.add_route('/:a/:b/:c')
-    route_set.add_route('/:a/:b')
-    route_set.generate_url(nil, {:a => 'A', :b => 'B', :d => 'C'}).should == '/A/B?d=C'
+    @route_set.add_route('/:a/:b/:c')
+    @route_set.add_route('/:a/:b')
+    @url_generator.generate(nil, {:a => 'A', :b => 'B', :d => 'C'}).should == '/A/B?d=C'
   end
   
-  it "should do a validity check against the incoming variables when asked to" do
-    route_set.add_route('/:a/:b', :b => /\d+/)
-    route_set.generate_url(nil, {:a => 'A', :b => 'B'}).should == '/A/B'
-    proc{ route_set.generate_url(nil, {:a => 'A', :b => 'B'}, :check_variables => true).should == '/A/B?d=C'}.should raise_error Usher::ValidationException
-  end
+  # FIXME
+  #it "should do a validity check against the incoming variables when asked to" do
+  #  route_set.add_route('/:a/:b', :b => /\d+/)
+  #  route_set.generate_url(nil, {:a => 'A', :b => 'B'}).should == '/A/B'
+  #  proc{ route_set.generate_url(nil, {:a => 'A', :b => 'B'})}.should raise_error Usher::ValidationException
+  #end
 
 end

data/spec/private/path_spec.rb

@@ -22,12 +22,12 @@ describe "Usher route adding" do
   it "should add every kind of optional route possible" do
     route_set.add_route('/a/b(/c)(/d(/e))')
     route_set.routes.first.paths.collect{|a| a.parts }.should == [
-      [:/, "a", :/, "b"],
-      [:/, "a", :/, "b", :/, "c", :/, "d"], 
-      [:/, "a", :/, "b", :/, "d", :/, "e"], 
-      [:/, "a", :/, "b", :/, "c"],
-      [:/, "a", :/, "b", :/, "d"],
-      [:/, "a", :/, "b", :/, "c", :/, "d", :/, "e"]
+      ['/', "a", '/', "b"],
+      ['/', "a", '/', "b", '/', "c", '/', "d"], 
+      ['/', "a", '/', "b", '/', "d", '/', "e"], 
+      ['/', "a", '/', "b", '/', "c"],
+      ['/', "a", '/', "b", '/', "d"],
+      ['/', "a", '/', "b", '/', "c", '/', "d", '/', "e"]
     ]
     
   end
@@ -39,7 +39,7 @@ describe "Usher route adding" do
   it "should calculate depths for nodes" do
     route_set.add_named_route(:route, '/bad/route/three/four')
     route_set.tree.depth.should == 0
-    route_set.tree.lookup[:/].depth.should == 1
+    route_set.tree.lookup['/'].depth.should == 1
   end
 
   it "should pp for nodes" do
@@ -47,19 +47,19 @@ describe "Usher route adding" do
     route_set.tree.depth.should == 0
     old_out = $stdout
     $stdout = (output = StringIO.new)
-    route_set.tree.lookup[:/].lookup['bad'].lookup[:/].pp
+    route_set.tree.lookup['/'].lookup['bad'].lookup['/'].pp
     $stdout = old_out
     output.rewind
     output.read.should == <<-HEREDOC
-   3: :/ false
+   3: "/" false
     route ==> 
     4: "route" false
      / ==> 
-     5: :/ false
+     5: "/" false
       three ==> 
       6: "three" false
        / ==> 
-       7: :/ false
+       7: "/" false
         four ==> 
         8: "four" true
     HEREDOC

data/spec/private/{rails → rails2_2}/generate_spec.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), 'compat')
 require 'lib/usher'
 
-route_set = Usher::Interface.for(:rails2)
+route_set = Usher::Interface.for(:rails2_2)
 
-describe "Usher (for rails) URL generation" do
+describe "Usher (for rails 2.2) URL generation" do
   
   before(:each) do
     route_set.reset!

data/spec/private/{rails → rails2_2}/path_spec.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), 'compat')
 require 'lib/usher'
 
-route_set = Usher::Interface.for(:rails2)
+route_set = Usher::Interface.for(:rails2_2)
 
-describe "Usher (for rails) route adding" do
+describe "Usher (for rails 2.2) route adding" do
 
   before(:each) do
     route_set.reset!

data/spec/private/{rails → rails2_2}/recognize_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'compat')
 require 'lib/usher'
 require 'action_controller'
 
-route_set = Usher::Interface.for(:rails2)
+route_set = Usher::Interface.for(:rails2_2)
 
 def build_request_mock(path, method, params)
   request = mock "Request"
@@ -16,7 +16,7 @@ end
 
 SampleController = Object.new
 
-describe "Usher (for rails) route recognition" do
+describe "Usher (for rails 2.2) route recognition" do
 
   before(:each) do
     route_set.reset!

data/spec/private/rails2_3/compat.rb

@@ -0,0 +1 @@
+require 'activesupport'

data/spec/private/rails2_3/generate_spec.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), 'compat')
+require 'lib/usher'
+
+route_set = Usher::Interface.for(:rails2_3)
+
+describe "Usher (for rails 2.3) URL generation" do
+  
+  before(:each) do
+    route_set.reset!
+  end
+
+  it "should fill in the controller from recall" do
+    route_set.add_route('/:controller/:action/:id')
+    route_set.generate({:action => 'thingy'}, {:controller => 'sample', :action => 'index', :id => 123}, :generate).should == '/sample/thingy'
+  end
+
+  it "should skip the action if not provided" do
+    route_set.add_route('/:controller/:action/:id')
+    route_set.generate({:controller => 'thingy'}, {:controller => 'sample', :action => 'index', :id => 123}, :generate).should == '/thingy'
+  end
+
+  it "should pick the correct param from optional parts" do
+    route_set.add_route('/:controller/:action(.:format)')
+    route_set.generate({:action => 'thingy', :format => 'html'}, {:controller => 'sample', :action => 'index', :id => 123}, :generate).should == '/sample/thingy.html'
+    route_set.generate({:action => 'thingy'}, {:controller => 'sample', :action => 'index', :id => 123}, :generate).should == '/sample/thingy'
+  end
+
+end

data/spec/private/rails2_3/path_spec.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), 'compat')
+require 'lib/usher'
+
+route_set = Usher::Interface.for(:rails2_3)
+
+describe "Usher (for rails 2.3) route adding" do
+
+  before(:each) do
+    route_set.reset!
+  end
+
+  it "shouldn't allow routes without a controller to be added" do
+    proc { route_set.add_route('/bad/route') }.should raise_error
+  end
+
+end

data/spec/private/rails2_3/recognize_spec.rb

@@ -0,0 +1,79 @@
+require File.join(File.dirname(__FILE__), 'compat')
+require 'lib/usher'
+require 'action_controller'
+
+route_set = Usher::Interface.for(:rails2_3)
+
+def build_request_mock(path, method, params)
+  request = mock "Request"
+  request.should_receive(:path).any_number_of_times.and_return(path)
+  request.should_receive(:method).any_number_of_times.and_return(method)
+  params = params.with_indifferent_access
+  request.should_receive(:path_parameters=).any_number_of_times.with(params)
+  request.should_receive(:path_parameters).any_number_of_times.and_return(params)
+  request
+end
+
+SampleController = Object.new
+
+describe "Usher (for rails 2.3) route recognition" do
+
+  before(:each) do
+    route_set.reset!
+  end
+
+  it "should recognize a simple request" do
+    route_set.add_route('/sample', :controller => 'sample', :action => 'action')
+    route_set.recognize(build_request_mock('/sample', 'get', {:controller => 'sample', :action => 'action'})).should == SampleController
+  end
+
+  it "should interpolate action :index" do
+    route_set.add_route('/sample', :controller => 'sample')
+    route_set.recognize(build_request_mock('/sample', 'get', {:controller => 'sample', :action => 'index'})).should == SampleController
+  end
+
+  it "should correctly distinguish between multiple request methods" do
+    route_set.add_route('/sample', :controller => 'not_sample', :conditions => {:method => :get})
+    correct_route = route_set.add_route('/sample', :controller => 'sample', :conditions => {:method => :post})
+    route_set.add_route('/sample', :controller => 'not_sample', :conditions => {:method => :put})
+    route_set.recognize(build_request_mock('/sample', :post, {:controller => 'sample', :action => 'index'})).should == SampleController
+  end
+
+  it "should prefer the static route to the dynamic route" do
+    route_set.add_route('/sample/:action', :controller => 'not_sample')
+    route_set.add_route('/sample/test', :controller => 'sample', :action => 'action')
+    route_set.recognize(build_request_mock('/sample/test', 'get', {:controller => 'sample', :action => 'action'})).should == SampleController
+  end
+  
+  it "should raise based upon an invalid param" do
+    route_set.add_named_route(:sample, '/sample/:action', :controller => 'sample', :requirements => {:action => /\d+/})
+    proc { route_set.recognize(build_request_mock('/sample/asdqwe', :post, {})) }.should raise_error
+  end
+  
+  it "should raise based upon an invalid route" do
+    route_set.add_named_route(:sample, '/sample', :controller => 'sample', :action => 'test')
+    proc { route_set.recognize(build_request_mock('/test/asdqwe', :post, {})) }.should raise_error
+  end
+  
+  it "should add /:controller and /:controller/:action if /:controller/:action/:id is added" do
+    route_set.add_route('/:controller/:action/:id')
+    route_set.route_count.should == 3
+  end
+  
+  it "should correctly recognize a format (dynamic path path with . delimiter)" do
+    route_set.add_route('/:controller/:action/:id.:format')
+    route_set.recognize(build_request_mock('/sample/test/123.html', 'get', {:controller => 'sample', :action => 'test', :id => '123', :format => 'html'})).should == SampleController
+  end
+  
+  it "should support root nodes" do
+    route_set.add_route('/', :controller => 'sample')
+    route_set.recognize(build_request_mock('/', :get, {:controller => 'sample', :action => 'index'})).should == SampleController
+  end
+  
+  it "should default action to 'index' when controller (and not index) is specified" do
+    route_set.add_route('/:controller/:action')
+    route_set.recognize(build_request_mock('/sample', :get, {:controller => 'sample', :action => 'index'})).should == SampleController
+  end
+  
+  
+end

data/spec/private/split_spec.rb

@@ -4,62 +4,62 @@ describe "Usher route tokenizing" do
   
   
   it "should split / delimited routes" do
-    Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this/split').should == [[:/, 'test', :/,'this', :/, 'split']]
+    Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this/split').should == [['/', 'test', '/','this', '/', 'split']]
   end
 
   it "should split / delimited routes with a regex in it" do
     Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').
-      split('/test/{this}/split').should == [[:/, 'test', :/, /this/, :/, 'split']]
+      split('/test/{this}/split').should == [['/', 'test', '/', /this/, '/', 'split']]
   end
   
   it "should split on ' ' delimited routes as well" do
-    Usher::Splitter.for_delimiters([' '], '[0-9A-Za-z\$\-_\+!\*\',]+').split('test this split').should == [['test', :' ', 'this', :' ', 'split']]
+    Usher::Splitter.for_delimiters([' '], '[0-9A-Za-z\$\-_\+!\*\',]+').split('test this split').should == [['test', ' ', 'this', ' ', 'split']]
   end
   
   it "should split on email delimiters as well" do
-    Usher::Splitter.for_delimiters(['@', '+', '-', '.'], '[a-zA-Z0-9]+').split('one+more.12345-09876-alphanum3ric5@domain.com').should == [["one", :+, "more", :".", "12345", :-, "09876", :-, "alphanum3ric5", :"@", "domain", :".", "com"]]
+    Usher::Splitter.for_delimiters(['@', '+', '-', '.'], '[a-zA-Z0-9]+').split('one+more.12345-09876-alphanum3ric5@domain.com').should == [["one", '+', "more", ".", "12345", '-', "09876", '-', "alphanum3ric5", "@", "domain", ".", "com"]]
   end
   
   it "should split on ' ' delimited routes for more complex routes as well" do
-    Usher::Splitter.for_delimiters([' '], '[0-9A-Za-z\$\-_\+!\*\',]+').split('(test|this) split').should == [['test', :' ', 'split'], ['this', :' ', 'split']]
+    Usher::Splitter.for_delimiters([' '], '[0-9A-Za-z\$\-_\+!\*\',]+').split('(test|this) split').should == [['test', ' ', 'split'], ['this', ' ', 'split']]
   end
   
   it "should group optional parts with brackets" do
     Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this(/split)').should == [
-      [:/, 'test', :/, 'this'],
-      [:/, 'test', :/, 'this', :/, 'split']
+      ['/', 'test', '/', 'this'],
+      ['/', 'test', '/', 'this', '/', 'split']
     ]
   end
 
   it "should group exclusive optional parts with brackets and pipes" do
     Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this(/split|/split2)').should == [
-      [:/, 'test', :/, 'this',:/, 'split'],
-      [:/, 'test', :/, 'this',:/, 'split2']
+      ['/', 'test', '/', 'this','/', 'split'],
+      ['/', 'test', '/', 'this','/', 'split2']
     ]
   end
 
   it "should group exclusive optional-optional parts with brackets and pipes" do
     Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this((/split|/split2))').should == [
-      [:/, 'test',:/, 'this'],
-      [:/, 'test',:/, 'this', :/, 'split'],
-      [:/, 'test',:/, 'this', :/, 'split2']
+      ['/', 'test','/', 'this'],
+      ['/', 'test','/', 'this', '/', 'split'],
+      ['/', 'test','/', 'this', '/', 'split2']
     ]
   end
 
   it "should group optional parts with brackets (for non overlapping groups)" do
     Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this(/split)(/split2)') == [
-      [:/, "test", :/, "this"],
-      [:/, "test", :/, "this", :/, "split"],
-      [:/, "test", :/, "this", :/, "split2"],
-      [:/, "test", :/, "this", :/, "split", :/, "split2"]
+      ['/', "test", '/', "this"],
+      ['/', "test", '/', "this", '/', "split"],
+      ['/', "test", '/', "this", '/', "split2"],
+      ['/', "test", '/', "this", '/', "split", '/', "split2"]
     ]
   end
 
   it "should group nested-optional parts with brackets" do
     Usher::Splitter.for_delimiters(['/', '.'], '[0-9A-Za-z\$\-_\+!\*\',]+').split('/test/this(/split(.:format))') == [
-      [:/, "test", :/, "this"],
-      [:/, "test", :/, "this", :/, "split"],
-      [:/, "test", :/, "this", :/, "split", :'.', Usher::Route::Variable.new(:':', :format)]
+      ['/', "test", '/', "this"],
+      ['/', "test", '/', "this", '/', "split"],
+      ['/', "test", '/', "this", '/', "split", '.', Usher::Route::Variable.new(:':', :format)]
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ files:
 - VERSION.yml
 - lib/usher
 - lib/usher/exceptions.rb
+- lib/usher/generate.rb
 - lib/usher/grapher.rb
 - lib/usher/interface
 - lib/usher/interface/email_interface.rb
@@ -46,9 +47,10 @@ files:
 - lib/usher/interface/rack_interface/mapper.rb
 - lib/usher/interface/rack_interface/route.rb
 - lib/usher/interface/rack_interface.rb
-- lib/usher/interface/rails2_interface
-- lib/usher/interface/rails2_interface/mapper.rb
-- lib/usher/interface/rails2_interface.rb
+- lib/usher/interface/rails2_2_interface
+- lib/usher/interface/rails2_2_interface/mapper.rb
+- lib/usher/interface/rails2_2_interface.rb
+- lib/usher/interface/rails2_3_interface.rb
 - lib/usher/interface.rb
 - lib/usher/node.rb
 - lib/usher/route
@@ -66,11 +68,16 @@ files:
 - spec/private/path_spec.rb
 - spec/private/rack
 - spec/private/rack/dispatch_spec.rb
-- spec/private/rails
-- spec/private/rails/compat.rb
-- spec/private/rails/generate_spec.rb
-- spec/private/rails/path_spec.rb
-- spec/private/rails/recognize_spec.rb
+- spec/private/rails2_2
+- spec/private/rails2_2/compat.rb
+- spec/private/rails2_2/generate_spec.rb
+- spec/private/rails2_2/path_spec.rb
+- spec/private/rails2_2/recognize_spec.rb
+- spec/private/rails2_3
+- spec/private/rails2_3/compat.rb
+- spec/private/rails2_3/generate_spec.rb
+- spec/private/rails2_3/path_spec.rb
+- spec/private/rails2_3/recognize_spec.rb
 - spec/private/recognize_spec.rb
 - spec/private/request_method_spec.rb
 - spec/private/split_spec.rb