padrino-routing 0.2.9 → 0.4.5

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.4.5

data/lib/padrino-routing.rb

@@ -1,8 +1,8 @@
-# require 'padrino-core/support_lite'
 Dir[File.dirname(__FILE__) + '/padrino-routing/**/*.rb'].each {|file| require file }
 
 module Padrino
-  class RouteNotFound < RuntimeError; end
+  class RouteNotFound < RuntimeError;    end
+  class InvalidNameSpace < RuntimeError; end
 
   module Routing
     def self.registered(app)
@@ -26,10 +26,14 @@ module Padrino
       # Used to define namespaced route configurations in order to group similar routes
       # Class evals the routes but with the namespace assigned which will append to each route
       # namespace(:admin) { get(:show) { "..." } }
-      def namespace(name, &block)
-        original, @_namespace = @_namespace, name
-        self.class_eval(&block)
-        @_namespace = original
+      def namespace(*args, &block)
+        if namespace = args.find { |ns| !ns.kind_of?(Symbol) }
+          raise InvalidNameSpace, "The name space #{namespace.inspect} must be a symbol"
+        else
+          original, @_namespaces = @_namespaces, args
+          self.class_eval(&block)
+          @_namespaces = original
+        end
       end
 
       # Hijacking route method in Sinatra to replace a route alias (i.e :account) with the full url string mapping
@@ -37,16 +41,20 @@ module Padrino
       # If the path is not a symbol, nothing is changed and the original route method is invoked
       def route(verb, path, options={}, &block)
         if path.kind_of?(Symbol)
-          route_name = [@_namespace, path].flatten.compact
+          route_name = [@_namespaces, path].flatten.compact
           if mapped_url = options.delete(:map) # constructing named route
             map(*route_name).to(mapped_url)
             path = mapped_url
           else # referencing prior named route
-            route_name.unshift(self.app_name.to_sym)
-            path = named_paths[route_name]
+            path = named_paths[route_name.dup.unshift(self.app_name.to_sym)]
+          end
+          # If here we don't have a path we autobuild them
+          unless path
+            mapped_url = "/" + route_name.join("/")
+            map(*route_name).to(mapped_url)
+            path = mapped_url
           end
         end
-        raise RouteNotFound.new("Route alias #{route_name.inspect} is not mapped to a url") unless path
         super verb, path, options, &block
       end
     end

data/lib/padrino-routing/controller_ext.rb

@@ -3,10 +3,9 @@ if defined?(Padrino::Application) # Extends padrino application if being used
     module ControllerNamespacing
       # Makes the routes defined in the block and in the Modules given
       # in `extensions` available to the application
-      def controllers_with_namespaces(*namespace, &block)
-        must_use_namespaces = namespace.size == 1 && namespace.first.is_a?(Symbol)
-        return controllers_without_namespaces(*namespace, &block) unless must_use_namespaces
-        namespace(namespace.first) { instance_eval(&block) } if block_given?
+      def controllers_with_namespaces(*args, &block)
+        return controllers_without_namespaces(*args, &block) unless args.all? { |a| a.kind_of?(Symbol) }
+        namespace(*args) { instance_eval(&block) } if block_given?
       end
 
       # Makes the routing urls defined in this block and in the Modules given

data/padrino-routing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-routing}
-  s.version = "0.2.9"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2009-12-22}
+  s.date = %q{2010-01-06}
   s.description = %q{Enhances padrino with a named route mapping system allowing for advanced routes}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [

data/test/fixtures/routing_app/app.rb

@@ -1,7 +1,3 @@
-require 'sinatra/base'
-require 'haml'
-require 'padrino-routing'
-
 class RoutingDemo < Sinatra::Base
   register Padrino::Routing
 
@@ -31,6 +27,18 @@ class RoutingDemo < Sinatra::Base
     end
   end
 
+  namespace :autogenerated, :accounts do
+    get :index do
+      url_for(:autogenerated, :accounts, :index)
+    end
+  end
+
+  namespace :autogenerated, :accounts do
+    get :with_mapping, :map => "/autogenerated/accounts/with/mapping" do
+      url_for(:autogenerated, :accounts, :with_mapping)
+    end
+  end
+
   get :account do
     "<h1>the account url for #{params[:name]} and id #{params[:id]}</h1>"
   end

data/test/helper.rb

@@ -4,10 +4,13 @@ require 'shoulda'
 require 'mocha'
 require 'rack/test'
 require 'webrat'
+require 'padrino-core'
+require 'padrino-helpers'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'padrino-helpers'
+
+require 'padrino-routing'
 
 class Test::Unit::TestCase
   include Rack::Test::Methods

data/test/test_padrino_routing.rb

@@ -12,32 +12,38 @@ class TestPadrinoRouting < Test::Unit::TestCase
       demo.class.map(:admin, :demo).to('/admin/demo/:name')
       assert_equal '/admin/demo/john', demo.url_for(:admin, :demo, :name => 'john')
     end
+
     should "support finding known urls ignoring blank extra param" do
       demo = app.new
       demo.class.map(:admin, :demo).to('/admin/demo')
       assert_equal '/admin/demo', demo.url_for(:admin, :demo, :foo => '')
     end
+
     should "support calling to_param on an object which supports the call" do
       obj = stub(:to_param => '25', :to_s => "<Fake>")
       demo = app.new
       demo.class.map(:admin, :demo).to('/admin/demo/:foo')
       assert_equal '/admin/demo/25', demo.url_for(:admin, :demo, :foo => obj)
     end
+
     should "support finding known urls with named param ignoring blank extra param" do
       demo = app.new
       demo.class.map(:admin, :demo).to('/admin/demo/:name')
       assert_equal '/admin/demo/john', demo.url_for(:admin, :demo, :name => 'john', :foo => ' ')
     end
+
     should "support finding known urls with one extra param" do
       demo = app.new
       demo.class.map(:admin, :demo).to('/admin/demo/:name')
       assert_equal '/admin/demo/john?foo=bar', demo.url_for(:admin, :demo, :name => 'john', :foo => 'bar')
     end
+
     should "support finding known urls with extra params" do
       demo = app.new
       demo.class.map(:demo).to('/demo/:name')
       assert_equal '/demo/john?bar=foo&foo=bar', demo.url_for(:demo, :name => 'john', :foo => 'bar', :bar => 'foo')
     end
+
     should "support finding known urls with multiple named params with extra params" do
       demo = app.new
       demo.class.map(:demo).to('/demo/:name/id/:id')
@@ -52,11 +58,13 @@ class TestPadrinoRouting < Test::Unit::TestCase
       assert_have_selector :p, :class => 'account_url', :content => '/the/accounts/foobar/path/10/end'
       assert_have_selector :p, :class => 'accounts_index', :content => '/the/accounts/index'
     end
+
     should "display admin route links" do
       assert_have_selector :p, :class => 'admin_url', :content => '/admin/25/show'
       assert_have_selector :p, :class => 'admin_url2', :content => '/admin/10/update/test'
       assert_have_selector :p, :class => 'admin_url3', :content => '/admin/12/destroy'
     end
+
     should "support app namespaces" do
       assert_have_selector :p, :class => 'app_accounts_index', :content => '/the/accounts/index'
       assert_have_selector :p, :class => 'app_admin_url', :content => '/admin/25/show'
@@ -71,6 +79,7 @@ class TestPadrinoRouting < Test::Unit::TestCase
       assert_equal "/demo", demo.class.named_paths[[:routing_demo, :demo]]
       assert_equal "/demo", demo.url_for(:demo)
     end
+
     should "support changing uri root with mount" do
       demo = app.new
       demo.class.stubs(:uri_root).returns("/blog")
@@ -85,27 +94,44 @@ class TestPadrinoRouting < Test::Unit::TestCase
       assert_nothing_raised { app.new.url_for(:accounts) }
       assert_nothing_raised { app.new.url_for(:routing_demo, :admin, :show, :id => 5) }
     end
+
     should "properly raise not found exception" do
       assert_raises(Padrino::RouteNotFound) { visit '/failed_route' }
       assert_raises(Padrino::RouteNotFound) { app.new.url_for(:admin, :fake) }
     end
-    should "properly raise about an invalid alias for route definition" do
-      assert_raises(Padrino::RouteNotFound) { app.get(:fake) }
+
+    should "properly autogenerate routes" do
+      assert_nothing_raised { app.get(:fake) do; end }
     end
+
     should "properly work when alias is used in proper route definition" do
       assert_nothing_raised { app.get(:accounts) do; end }
     end
   end
 
+  context 'for autogenerated routed' do
+    setup { visit '/autogenerated/accounts/index' }
+    should "return proper content" do
+      assert_equal '/autogenerated/accounts/index', response_body
+    end
+  end
+
+  context 'for autogenerated routed with mapping' do
+    setup { visit '/autogenerated/accounts/with/mapping' }
+    should "return proper content" do
+      assert_equal '/autogenerated/accounts/with/mapping', response_body
+    end
+  end
+
   context 'for no namespaced account route' do
-    setup { visit '/the/accounts/demo/path/5/end'}
+    setup { visit '/the/accounts/demo/path/5/end' }
     should "return proper account text" do
       assert_have_selector :h1, :content => "the account url for demo and id 5"
     end
   end
 
   context 'for no namespaced accounts index route' do
-    setup { visit '/the/accounts/index/'}
+    setup { visit '/the/accounts/index/' }
     should "return proper account text" do
       assert_have_selector :h1, :content => "the accounts index"
     end
@@ -131,4 +157,4 @@ class TestPadrinoRouting < Test::Unit::TestCase
       assert_have_selector :p, :content => "destroy admin with id 60"
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-routing
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.4.5
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2010-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency