tred-fancyroutes 0.9.2 → 0.9.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "fancyroutes"
-GEM_VERSION = "0.9.1"
+GEM_VERSION = "0.9.3"
 AUTHOR = "The TRED Team"
 EMAIL = "tred3000@gmail.com"
 HOMEPAGE = "http://tred.github.com/fancyroutes"
@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.summary = SUMMARY
-  
+
   s.require_path = 'lib'
   s.autorequire = GEM
   s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{lib,spec}/**/*")

data/lib/fancyroutes.rb

@@ -1,91 +1,91 @@
 module FancyRoutes
 
   class Route
-    
+
     def initialize
       @segments = []
     end
-    
+
     def request_method(method)
       @request_method = method.to_sym
       self
     end
-    
+
     %w(get put post delete).each do |meth|
       define_method(meth) { request_method(meth) }
     end
-    
+
     attr_writer :name
-    
+
     def segment(segment)
       segment = case segment
-        when Symbol 
+        when Symbol
           ":#{segment}"
         when Hash
           self.send(segment.values.first, segment.keys.first)
           segment.keys.first.to_s
-        else 
-          segment.to_s 
+        else
+          segment.to_s
         end
       @segments << segment
       self
     end
     alias_method :/, :segment
-    
+
     def controller(controller)
       @controller = controller.to_s
       self
     end
     alias_method :>>, :controller
-    
+
     def action(action)
       @action = action.to_s
       self
     end
     alias_method :>, :action
-    
+
     def apply(rails_map)
       rails_map.send( (@name ? @name : :connect),
         @segments.join("/"), {
-          :controller => @controller.underscore,
-          :action => @action.underscore,
+          :controller => @controller.try(:underscore),
+          :action => @action.try(:underscore),
           :conditions => { :method => @request_method }
         }
       )
     end
-    
+
     # hacky deep clone
     def copy
-      Marshal::load(Marshal.dump(self))  
+      Marshal::load(Marshal.dump(self))
     end
 
   end
-  
+
   class RootRoute < Route
-    
+
     def apply(rails_map)
       rails_map.root :controller => @controller,
                      :action => @action,
                      :conditions => { :method => @request_method }
     end
-    
+
   end
 
   # may be clearer to use 3 classes here: RouteSet, MasterSet & NestedSet
-  
+
   class RouteSet
-  
+
     attr_reader :routes
-    
+
     def initialize(template_route = nil)
       @template_route = template_route
       @routes = []
     end
-    
+
     def apply(rails_route_map)
       @routes.each { |route| route.apply(rails_route_map) }
     end
-    
+
     # builds a new route
     def route(meth = nil, name = nil)
       route = @template_route ? @template_route.copy : (name == :root ? RootRoute.new : Route.new)
@@ -94,30 +94,30 @@ module FancyRoutes
       @routes << route
       route
     end
-    
+
     %w(get put post delete).each do |meth|
       define_method(meth) { route(meth) }
     end
-    
+
     def root
       route(:get, :root)
     end
-    
+
     def method_missing(meth,*args)
       route(nil,meth)
     end
-    
+
     def with(route, &blk)
       # this route is used as a template, not as an actual route so we remove
       # it from the routes collection
-      @routes.pop 
+      @routes.pop
       nested_set = self.class.new(route)
       nested_set.instance_eval(&blk)
       @routes += nested_set.routes
     end
-    
+
   end
-  
+
 end
 
 def FancyRoutes(m, &blk)

data/spec/fancyroutes_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "FancyRoutes" do
-  
+
   before(:each) do
     @map = Object.new
   end
@@ -14,14 +14,14 @@ describe "FancyRoutes" do
       :action => 'my_action',
       :conditions => { :method => :get },
     })
-    
-    FancyRoutes(@map) do 
+
+    FancyRoutes(@map) do
       route(:get).segment('').controller(:my_controller).action(:my_action)
     end
   end
-  
+
   # an now lets dry up the mocking and route building
-  
+
   def fancyroutes(&blk)
     FancyRoutes(@map,&blk)
   end
@@ -36,44 +36,52 @@ describe "FancyRoutes" do
 
   example "short form route on root" do
     expect :get, '', 'my_controller', 'my_action'
-    
+
     fancyroutes do
       get / '' >> :my_controller > :my_action
     end
   end
-  
+
   example "short form route on order" do
     expect :get, ':slug/order', 'my_controller', 'my_action'
-    
-    fancyroutes do 
+
+    fancyroutes do
       get / :slug / 'order' >> :my_controller > :my_action
     end
   end
-  
+
   example "short form route on order as put" do
     expect :put, ':slug/order', 'my_controller', 'my_action'
-    
+
     fancyroutes do
       put / :slug / 'order' >> :my_controller > :my_action
     end
   end
-  
+
+  example "default Rails route" do
+    expect :get, ':controller/:action', nil, nil
+
+    fancyroutes do
+      get / :controller / :action
+    end
+  end
+
   example "short form route nested route" do
     expect :get,  ':slug/order', 'my_controller', 'get_action'
     expect :post, ':slug/order', 'my_controller', 'post_action'
-    
-    fancyroutes do 
+
+    fancyroutes do
       with route / :slug >> :my_controller do
         get / 'order' > :get_action
         post / 'order' > :post_action
       end
     end
   end
-  
+
   example "short form route nested route on method only" do
     expect :get,  ':slug/order', 'my_controller', 'get_action'
     expect :post, ':slug/order', 'my_controller', 'post_action'
-    
+
     fancyroutes do
       with route / :slug / 'order' >> :my_controller do
         get > :get_action
@@ -81,11 +89,11 @@ describe "FancyRoutes" do
       end
     end
   end
-  
+
   example "nested in nested routes" do
     expect :get,  ':slug/order', 'my_controller', 'get_action'
     expect :post, ':slug/order', 'my_controller', 'post_action'
-    
+
     fancyroutes do
       with route / :slug do
         with route >> :my_controller do
@@ -95,45 +103,45 @@ describe "FancyRoutes" do
       end
     end
   end
-  
+
   example "with named segments" do
     expect :get, 'my_controller/my_action', 'my_controller', 'my_action'
-    
-    fancyroutes do 
+
+    fancyroutes do
       get / {'my_controller' => :controller} / {'my_action' => :action}
     end
   end
-  
+
   example "with named segments using dashes" do
     expect :get, 'my-controller/my-action', 'my_controller', 'my_action'
-    
-    fancyroutes do 
+
+    fancyroutes do
       get / {'my-controller' => :controller} / {'my-action' => :action}
     end
   end
-  
+
   example "a named route" do
     mock(@map).my_name('my_controller/:image', {
       :controller => 'my_controller',
       :action => 'my_action',
       :conditions => { :method => :get }
     })
-    
-    fancyroutes do 
+
+    fancyroutes do
       my_name.get / {'my_controller' => :controller} / :image > :my_action
     end
   end
-  
+
   example "root route" do
     mock(@map).root(
       :controller => 'my_controller',
       :action => 'my_action',
       :conditions => { :method => :get }
     )
-    
+
     fancyroutes do
       root >> :my_controller > :my_action
     end
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tred-fancyroutes
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - The TRED Team
@@ -9,11 +9,11 @@ autorequire: fancyroutes
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -07:00
+date: 2009-08-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: 
+description: ""
 email: tred3000@gmail.com
 executables: []
 
@@ -29,8 +29,9 @@ files:
 - lib/fancyroutes.rb
 - spec/fancyroutes_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://tred.github.com/fancyroutes
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -51,9 +52,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Removing the cruft, bringing the HTTP method to the forefront and sporting a neat DRYing block syntax--FancyRoutes is a layer on top of the Rails routing system which provides an elegant API for mapping requests to your application's controllers and actions.
 test_files: []