joshbuddy-usher 0.4.6 → 0.4.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 6
-:major: 0
 :minor: 4
+:patch: 7
+:major: 0

data/lib/usher/node.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
-require '/Users/josh/Development/fuzzy_hash/lib/fuzzy_hash'
+require 'fuzzy_hash'
 
 class Usher
 

data/spec/private/recognize_spec.rb

@@ -19,13 +19,13 @@ describe "Usher route recognition" do
   it "should recognize a specific domain name" do
     target_route = route_set.add_route('/sample', :controller => 'sample', :action => 'action', :conditions => {:protocol => 'http'})
     route_set.add_route('/sample', :controller => 'sample', :action => 'action2', :conditions => {:protocol => 'https'})
-    target_route.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http'})).first).should == true
+    route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http'})).path.route.should == target_route
   end
   
   it "should recognize a regex domain name" do
     target_route = route_set.add_route('/sample', :controller => 'sample', :action => 'action', :conditions => {:domain => /^admin.*$/})
     route_set.add_route('/sample', :controller => 'sample', :action => 'action2', :conditions => {:domain => 'www.host.com'})
-    target_route.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/sample', :domain => 'admin.host.com'})).first).should == true
+    route_set.recognize(build_request({:method => 'get', :path => '/sample', :domain => 'admin.host.com'})).path.route.should == target_route
   end
   
   it "should recognize a format-style variable" do
@@ -122,17 +122,17 @@ describe "Usher route recognition" do
     target_route_http_www = route_set.add_route('/sample', :controller => 'sample', :action => 'action', :conditions => {:protocol => 'http', :domain => 'www.spec.com'})
     target_route_https_msie = route_set.add_route('/sample', :controller => 'sample', :action => 'action2', :conditions => {:protocol => 'https', :user_agent => 'MSIE 6.0'})
     target_route_https_admin = route_set.add_route('/sample', :controller => 'sample', :action => 'action2', :conditions => {:protocol => 'https', :domain => 'admin.spec.com'})
-    target_route_http_admin.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http', :domain => 'admin.spec.com', :user_agent => nil})).first).should == true
-    target_route_http_www.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http', :domain => 'www.spec.com', :user_agent => nil})).first).should == true
-    target_route_https_msie.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'https', :domain => 'admin.spec.com', :user_agent => 'MSIE 6.0'})).first).should == true
-    target_route_https_admin.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'https', :domain => 'admin.spec.com', :user_agent => nil})).first).should == true
+    route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http', :domain => 'admin.spec.com', :user_agent => nil})).path.route.should == target_route_http_admin
+    route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http', :domain => 'www.spec.com', :user_agent => nil})).path.route.should == target_route_http_www
+    route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'https', :domain => 'admin.spec.com', :user_agent => 'MSIE 6.0'})).path.route.should == target_route_https_msie
+    route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'https', :domain => 'admin.spec.com', :user_agent => nil})).path.route.should == target_route_https_admin
   end
   
   it "should correctly fix that tree if conditionals are used later" do
     noop_route = route_set.add_route('/noop', :controller => 'products', :action => 'noop')
     product_show_route = route_set.add_route('/products/show/:id', :id => /\d+/, :conditions => {:method => 'get'})
-    noop_route.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/noop', :domain => 'admin.host.com'})).first).should == true
-    product_show_route.paths.include?(route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :domain => 'admin.host.com'})).first).should == true
+    route_set.recognize(build_request({:method => 'get', :path => '/noop', :domain => 'admin.host.com'})).path.route.should == noop_route
+    route_set.recognize(build_request({:method => 'get', :path => '/products/show/123', :domain => 'admin.host.com'})).path.route.should == product_show_route
   end
   
   it "should use conditionals that are boolean" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,47 +33,38 @@ extra_rdoc_files:
 files: 
 - History.txt
 - Manifest.txt
-- Rakefile
 - README.rdoc
+- Rakefile
 - VERSION.yml
-- lib/usher
+- lib/usher.rb
 - lib/usher/exceptions.rb
 - lib/usher/generate.rb
 - lib/usher/grapher.rb
-- lib/usher/interface
+- lib/usher/interface.rb
 - lib/usher/interface/email_interface.rb
 - lib/usher/interface/merb_interface.rb
-- lib/usher/interface/rack_interface
+- lib/usher/interface/rack_interface.rb
 - lib/usher/interface/rack_interface/mapper.rb
 - lib/usher/interface/rack_interface/route.rb
-- lib/usher/interface/rack_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_2_interface/mapper.rb
 - lib/usher/interface/rails2_3_interface.rb
-- lib/usher/interface.rb
 - lib/usher/node.rb
-- lib/usher/route
+- lib/usher/route.rb
 - lib/usher/route/path.rb
 - lib/usher/route/request_method.rb
 - lib/usher/route/variable.rb
-- lib/usher/route.rb
 - lib/usher/splitter.rb
-- lib/usher.rb
-- spec/private
-- spec/private/email
+- rails/init.rb
 - spec/private/email/recognize_spec.rb
 - spec/private/generate_spec.rb
 - spec/private/grapher_spec.rb
 - spec/private/path_spec.rb
-- spec/private/rack
 - spec/private/rack/dispatch_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
@@ -82,12 +73,10 @@ files:
 - spec/private/request_method_spec.rb
 - spec/private/split_spec.rb
 - spec/spec.opts
-- rails/init.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/usher
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -110,5 +99,20 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A general purpose routing library
-test_files: []
-
+test_files: 
+- spec/private/email/recognize_spec.rb
+- spec/private/generate_spec.rb
+- spec/private/grapher_spec.rb
+- spec/private/path_spec.rb
+- spec/private/rack/dispatch_spec.rb
+- 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/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