Changeset 1104

Timestamp:

12/14/07 00:20:25 (1 year ago)

Author:

e.@brainspl.at

Message:

add :namespace option to routes. closes #341 [mail@paulbarry.com]

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/lib/merb/request.rb (modified) (1 diff)
• trunk/lib/merb/router.rb (modified) (3 diffs)
• trunk/spec/merb/request_spec.rb (modified) (1 diff)
• trunk/spec/merb/router_spec.rb (modified) (3 diffs)

trunk/CHANGELOG

@@ -6 +6 @@
-* Fixed merb.show_routes within merb -i
-* Fixed image_tag, css_include_tag, and js_include_tag to work with path_prefix
+* Adds spec helper methods with_route and dispatch_to
+* fix rakefile cfor cygwin
+* add count with collection to partial()
+* Form control mixin is deprecated Use merb_helpers plugin.
+* add redirect matcher to rspec test helpers
+* allow r.resource(:foo, :myparam => 42) resource routes pass on params to underlying match() call
+* spit out error and help message if you call merb with no args
+* get rid of dependency on mongrel for escape and unescape
+* make sure not to use write_nonblock when logging to STDOUT
+* Fixed image_tag, css_include_tag, and js_include_tag to work with path_prefix
+* fix set_status to actually work, add docs,
+* config/merb.yml is now correctly loaded from Rake and test environment - using Merb::Server.load_config
+* added config option to disable loading of the JSON gem - still enabled by default 
+* don't raise if names local on a partial is nil
+* Use svn export instead of checkout upon merb:freeze_from_svn
+* Extracted url and other general methods out of ControllerMixin into GeneralControllerMixin
+* fix caching of @_buffer in render, form_for
+* Seperates spec helpers into the Merb::Test namespace to prevent spec methods leaking into specs
+* Changes the spec url helper method to the same used in the controller
+* Made Request#parse_multipart return an empty hash instead of nil if the request is not multipart
+* Changes throw_content so that it can be called without a block
+* 
+
-
-== 0.4.1 "Faster Partials or Partially Faster?" 2007-11-12

trunk/lib/merb/request.rb

@@ -143 +143 @@
-    
-    def controller_name
-
+
+
+
+
+
-    end
-    

trunk/lib/merb/router.rb

@@ -43 +43 @@
-      def generate(name, params = {}, fallback = {})
-        raise "Named route not found: #{name}" unless @@named_routes.has_key? name
-
+.sub(/\/$/, '').squeeze("/")
-      end
-    end # self
@@ -305 +305 @@
-
-        singular = name.to_s.singularize
+        
+        namespace = options[:namespace] || merged_params[:namespace]
+        
+        if options[:name_prefix].nil? && namespace != nil
+          options[:name_prefix] = "#{namespace}_"
+        end
+        
-        name_prefix = options.delete(:name_prefix)
-
@@ -355 +362 @@
-        routes = next_level.to_resource(options)
-
+        namespace = options[:namespace] || merged_params[:namespace] 
+        
+        if options[:name_prefix].nil? && namespace != nil
+          options[:name_prefix] = "#{namespace}_"
+        end
+        
-        route_name = "#{name_prefix}#{name}"
-

trunk/spec/merb/request_spec.rb

@@ -278 +278 @@
-    request.send(:multipart_params).should == {}
-  end
+  
+  it "should add namespace to controller name" do
+    request = Merb::Request.new(@in)
+    request.stubs(:route_params).returns({:controller => 'bar', :namespace => 'foo'})
+    request.controller_name.should == "foo/bar"
+  end
-end

trunk/spec/merb/router_spec.rb

@@ -187 +187 @@
-        to(:controller => "users", :action => "[2]", :id => "[1]")
-      
+      # Namespace can be used to specify the module
+      r.match('/bar').to(:controller => 'bar', :namespace => 'foo')
+      
+      # Namespace can be used to provide path prefix
+      r.match('/admin').to(:namespace => 'admin') do |foo|
+        foo.match('/foo').to(:controller => 'foo')
+      end
+      r.match('/foo').to(:controller => 'foo')
+        
-      # Putting it all together, and adding the requirement that we use an "admin" prefix on the
-domain
-domain => /^admin\b/
+host
+host => /^admin\b/).to(:namespace => 'admin'
-        admin.match(%r[/([A-Z]\w+)\+([A-Z]\w+)/::]).
-admin/
+
-            :first_name => ":path[1]", :last_name => ":path[2]")
-admin/
+
-      # Note that the last line above sends all traffic in the "admin" subdomain to the
-      # Admin::Users#default action if no other route is matched.
@@ -323 +332 @@
-  end
-  
+  it "should use namespace" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/bar', :method => :get), {})
+    route[:namespace].should == 'foo'
+    route[:controller].should == 'bar'
+    route[:action].should == 'index' 
+    should_only_have_keys(route, :namespace, :controller, :action)   
+  end
+  
+  it "should have namespace 'admin' if path is '/admin/foo'" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/admin/foo', :method => :get), {})
+    route[:namespace].should == 'admin'
+    route[:controller].should == 'foo'
+    route[:action].should == 'index' 
+    should_only_have_keys(route, :namespace, :controller, :action)   
+  end
+  
+  it "should not have namespace if path is just '/foo'" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/foo', :method => :get), {})
+    route[:controller].should == 'foo'
+    route[:action].should == 'index' 
+    should_only_have_keys(route, :controller, :action)   
+  end
+  
-  it "should send all admin.* domains to the 'admin/users' controller, and 'default' action" do
-
-
+
+
+
-    route[:action].should == "default"
-
+namespace, :
-    
-
-
+
+
+
-    route[:action].should == "default"
-
+namespace, :
-  end
-  
-  it "should decipher the first-name / last-name pairs on an admin.* domain" do
-
-
+
+
+
-    route[:action].should == "edit"
-    route[:first_name].should == "Duane"
-    route[:last_name].should == "Johnson"
-
+namespace, :
-  end
-  
@@ -747 +782 @@
-  end
-end
+
+describe Merb::Router, "with resources using namespace 'admin'" do
+  before(:each) do
+    Merb::Router.prepare do |r|
+      #Declare one in the nested style
+      r.match(:host => /^.*$/).to(:namespace => 'admin') do |admin|
+        admin.resources :oranges
+      end
+      #Declare one in the non-nested style
+      r.resources :ape, :namespace => 'admin'
+      #Declare resources without a namespace to make sure it's not overridden
+      r.resources :oranges
+      r.resource :ape
+    end
+  end
+  
+  it "should generate admin_oranges path" do
+    Merb::Router.generate(:admin_oranges).should == '/oranges'
+  end
+
+  it "should generate admin_orange path" do
+    Merb::Router.generate(:admin_orange, {:id => 1}).should == '/oranges/1'
+    b = Blogposts.new
+    Merb::Router.generate(:admin_orange, b).should == '/oranges/42'
+    Merb::Router.generate(:admin_orange, :id => b).should == '/oranges/42'
+  end
+  
+  it "should generate new_admin_orange path" do
+    Merb::Router.generate(:new_admin_orange).should == '/oranges/new'
+  end
+  
+  it "should generate edit_admin_orange path" do
+    Merb::Router.generate(:edit_admin_orange, {:id => 1}).should == '/oranges/1/edit'
+  end  
+  
+  it "should generate admin_ape path" do
+    Merb::Router.generate(:admin_ape).should == '/ape'
+  end
+
+  it "should generate new_admin_ape path" do
+    Merb::Router.generate(:new_admin_ape).should == '/ape/new'
+  end
+  
+  it "should generate edit_admin_ape path" do
+    Merb::Router.generate(:edit_admin_ape).should == '/ape/edit'
+  end  
+
+end