padrino-routing 0.1.2 → 0.1.3

data/README.rdoc

@@ -26,7 +26,7 @@ Let's take a look at how to define named route mappings:
   require 'padrino-routing'
   
   class RoutingDemo < Sinatra::Application
-    register SinatraMore::RoutingPlugin  
+    register Padrino::Routing
     
     # Define the named route mappings
     map(:account).to("/the/accounts/:name/and/:id")
@@ -52,6 +52,22 @@ You can also refer to the url in views using <tt>url_for</tt>
 Simply invoking <tt>url_for(name, *parameters)</tt> will return the full mapped url for use in links or anywhere else
 that the url might be required.
 
+The routing plugin supports inline route definitions as well in which the url and the named alias
+are defined together within the controller:
+
+  # app/controllers/example.rb
+  SimpleApp.controllers do
+    get :index, :map => '/index' do
+      ...
+    end
+    
+    get :account, :map => '/the/accounts/:name/and/:id' do
+      # access params[:name] and params[:index]
+    end
+  end
+  
+Routes defined inline this way can be accessed and treated the same way as traditional named aliases.
+
 The routing system also supports url route configuration namespaces:
 
   # /app/routes/example.rb
@@ -83,9 +99,23 @@ You could also define the route aliases themselves using a namespace for conveni
 
 You can then reference the urls using the same <tt>url_for</tt> method:
 
-  <%= link_to 'admin page', url_for(:admin, :show, :id => 25) %>
-  <%= link_to 'admin page', url_for(:admin, :update, :id => 25) %>
-  <%= link_to 'admin page', url_for(:admin, :show, :id => 25) %>
+  <%= link_to 'admin show page', url_for(:admin, :show, :id => 25) %>
+  <%= link_to 'admin index page', url_for(:admin, :destroy, :id => 25) %>
+  
+In addition to regular namespacing, as a shortcut you can have a controller serve as a namespace as well:
+
+   # /app/routes/admin.rb
+  SimpleApp.controllers :admin do
+    get :index, :map => "/admin/:id/index" do
+      "admin destroy for #{params[:id]}"
+    end
+  end
+  
+This will put all named routes within this controller block into the 'admin' namespace and then can be referenced:
+
+  <%= link_to 'admin index page', url_for(:admin, :index, :id => 25) %>
+  
+Note that controller namespaces are simply a shortcut for standard namespaces and do not differ in any other way.
   
 You can freely use both named route aliases and traditional Sinatra routes in the same application without conflict.
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/padrino-routing.rb

@@ -36,10 +36,10 @@ module Padrino
       # Supports namespaces by accessing the instance variable and appending this to the route alias name
       # 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) 
+        if path.kind_of?(Symbol)
           route_name = [@_namespace, path].flatten.compact
           if mapped_url = options.delete(:map) # constructing named route
-            map(*route_name).to(mapped_url) 
+            map(*route_name).to(mapped_url)
             path = mapped_url
           else # referencing prior named route
             route_name.unshift(self.app_name)

data/lib/padrino-routing/controller_ext.rb

@@ -1,20 +1,28 @@
-# TODO add tests to make sure this works
+if defined?(Padrino::Application) # Extends padrino application if being used
+  module Padrino
+    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 and namespace.first.is_a?(Symbol)
+        return controllers_without_namespaces(*namespace, &block) unless must_use_namespaces
+        self.reset_routes! if reload?
+        namespace(namespace.first) { instance_eval(&block) } if block_given?
+      end
 
-module Padrino
-  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)
-      controllers_without_namespaces unless namespace.size == 1 && namespace.first.is_a?(Symbol)
-      @routes = Padrino::Application.dupe_routes if reload?
-      namespace(namespace.first) { instance_eval(&block) } if block_given?
+      # Makes the routing urls defined in this block and in the Modules given
+      # in `extensions` available to the application
+      def urls(*extensions, &block)
+        instance_eval(&block) if block_given?
+        include(*extensions)  if extensions.any?
+      end
     end
-  end
-  
-  class Application 
-    extend Padrino::ControllerNamespacing
-    class << self
-      alias_method_chain :controllers, :namespaces
+
+    class Application
+      extend Padrino::ControllerNamespacing
+      class << self
+        alias_method_chain :controllers, :namespaces
+      end
     end
-  end if defined?(Padrino::Application)
-end
+  end
+end

data/padrino-routing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-routing}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-11-18}
+  s.date = %q{2009-11-20}
   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 = [
@@ -36,8 +36,8 @@ Gem::Specification.new do |s|
      "test/fixtures/adv_routing_app/config/apps.rb",
      "test/fixtures/adv_routing_app/config/boot.rb",
      "test/fixtures/adv_routing_app/config/urls.rb",
+     "test/fixtures/adv_routing_app/controllers/autogenerated.rb",
      "test/fixtures/adv_routing_app/controllers/namespacing.rb",
-     "test/fixtures/adv_routing_app/controllers/url_autogeneration.rb",
      "test/fixtures/routing_app/app.rb",
      "test/fixtures/routing_app/views/index.haml",
      "test/helper.rb",

data/test/fixtures/adv_routing_app/config/urls.rb

@@ -1,4 +1,4 @@
-AdvRoutingDemo::urls do
+AdvRoutingDemo.urls do
   map(:test).to("/test/:id/action")
   map(:admin, :settings).to("/admin/settings/action")
   map :admin do |admin|

data/test/fixtures/adv_routing_app/controllers/{url_autogeneration.rb → autogenerated.rb}

@@ -1,8 +1,7 @@
-AdvRoutingDemo::controllers do
+AdvRoutingDemo.controllers do
   get :simple, :map => "/some/simple/action" do
     "<h1>simple action welcomes you</h1>"
   end
-  
   get :hello, :map => "/some/hello/action/:id/param" do
     "<h1>hello params id is #{params[:id]}</h1>"
   end

data/test/fixtures/adv_routing_app/controllers/namespacing.rb

@@ -1,4 +1,4 @@
-AdvRoutingDemo::controllers :admin do
+AdvRoutingDemo.controllers :admin do
   get :dashboard do
     "<h1>This is the admin dashboard, id: #{params[:id]}</h1>"
   end
@@ -17,7 +17,7 @@ AdvRoutingDemo::controllers :admin do
 end
 
 
-AdvRoutingDemo::controllers do
+AdvRoutingDemo.controllers do
   namespace :blog do
     get :index, :map => "/blog/index/action" do
       "<h1>Here is the blog</h1>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-routing
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2009-11-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,8 +112,8 @@ files:
 - test/fixtures/adv_routing_app/config/apps.rb
 - test/fixtures/adv_routing_app/config/boot.rb
 - test/fixtures/adv_routing_app/config/urls.rb
+- test/fixtures/adv_routing_app/controllers/autogenerated.rb
 - test/fixtures/adv_routing_app/controllers/namespacing.rb
-- test/fixtures/adv_routing_app/controllers/url_autogeneration.rb
 - test/fixtures/routing_app/app.rb
 - test/fixtures/routing_app/views/index.haml
 - test/helper.rb