merb-core 0.9.3 → 0.9.4

data/spec/public/router/nested_matches_spec.rb

@@ -0,0 +1,97 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe "A route derived from the blocks of #match" do
+
+  it "should inherit the :controller option." do
+    Merb::Router.prepare do |r|
+      r.match('/alpha', :controller=>'Alphas') do |alpha|
+        alpha.match('').to(:action=>'normal')
+      end
+    end
+    route_to('/alpha').should have_route(:controller=>'Alphas',:action=>'normal')
+  end
+
+  it "should inherit the :action option." do
+    Merb::Router.prepare do |r|
+      r.match('/alpha', :action=>'wierd') do |alpha|
+        alpha.match('').to(:controller=>'Alphas')
+      end
+    end
+    route_to('/alpha').should have_route(:controller=>'Alphas',:action=>'wierd')
+  end
+
+  it "should inherit the default :action of 'index'" do
+    Merb::Router.prepare do |r|
+      r.match('/alpha', :controller=>'Alphas') do |alpha|
+        alpha.match('').to({})
+      end
+    end
+    route_to('/alpha').should have_route(:controller=>'Alphas',:action=>'index')
+  end
+
+  it "should make use of the :params option" do
+    Merb::Router.prepare do |r|
+      r.match('/alpha', :controller=>'Alphas', :params =>{:key=>'value'}) do |alpha|
+        alpha.match('').to(:action=>'normal',:key2=>'value2')
+      end
+    end
+    route_to('/alpha').should have_route(:controller=>'Alphas',:key=>'value',:action=>'normal',:key2=>'value2')
+  end
+
+  it "should inherit the parameters through many levels" do
+    Merb::Router.prepare do |r|
+      r.match('/alpha', :controller=>'Alphas') do |alpha|
+        alpha.match('/beta', :action=>'normal') do |beta|
+          beta.match('/:id').to(:id=>':id')
+        end
+      end
+    end
+    route_to('/alpha/beta/gamma').should have_route(:controller=>'Alphas',:action=>'normal', :id=>'gamma')
+  end
+
+  it "allows wrapping of nested routes all having shared argument" do
+    Merb::Router.prepare do |r|
+      r.match('/:language') do |i18n|
+        i18n.match!('/:controller/:action')
+      end
+    end
+    route_to('/fr/hotels/search').should have_route(:controller => 'hotels', :action => "search", :language => "fr")
+  end
+
+  it "allows wrapping of nested routes all having shared argument" do
+    Merb::Router.prepare do |r|
+      r.match(/\/?(.*)?/).to(:language => "[1]") do |l|
+        l.match("/guides/:action/:id").to(:controller => "tour_guides")
+      end
+    end
+
+    route_to('/en/guides/search/london').should have_route(:controller => 'tour_guides', :action => "search", :language => "en", :id => "london")
+  end
+
+  it "allows wrapping of nested routes all having shared OPTIONAL argument" do
+    Merb::Router.prepare do |r|
+      r.match(/\/?(.*)?/).to(:language => "[1]") do |l|
+        l.match("/guides/:action/:id").to(:controller => "tour_guides")
+      end
+    end
+
+    route_to('/guides/search/london').should have_route(:controller => 'tour_guides', :action => "search", :id => "london")
+  end
+
+  it "allows wrapping of nested routes all having shared argument with PREDEFINED VALUES" do
+    Merb::Router.prepare do |r|
+      r.match(/\/?(en|es|fr|be|nl)?/).to(:language => "[1]") do |l|
+        l.match("/guides/:action/:id").to(:controller => "tour_guides")
+      end
+    end
+
+    route_to('/nl/guides/search/denboss').should have_route(:controller => 'tour_guides', :action => "search", :id => "denboss", :language => "nl")
+    route_to('/es/guides/search/barcelona').should have_route(:controller => 'tour_guides', :action => "search", :id => "barcelona", :language => "es")
+    route_to('/fr/guides/search/lille').should have_route(:controller => 'tour_guides', :action => "search", :id => "lille", :language => "fr")
+    route_to('/en/guides/search/london').should have_route(:controller => 'tour_guides', :action => "search", :id => "london", :language => "en")
+    route_to('/be/guides/search/brussels').should have_route(:controller => 'tour_guides', :action => "search", :id => "brussels", :language => "be")
+
+    route_to('/guides/search/brussels').should have_route(:controller => 'tour_guides', :action => "search", :id => "brussels")
+    route_to('/se/guides/search/stokholm').should have_route(:controller => 'tour_guides', :action => "search", :id => "stokholm", :language => nil)
+  end
+end

data/spec/public/router/resource_spec.rb

@@ -31,15 +31,7 @@ describe "resources routes" do
     route_to('/foo/edit', :method => :get).should have_route(:controller => 'foo', :action => 'edit', :id => nil)
   end
   
-  it "should match a get to /foo;edit to the blogposts controller and edit action" do
-    route_to('/foo;edit', :method => :get).should have_route(:controller => 'foo', :action => 'edit', :id => nil)
-  end
-  
   it "should match a get to /foo/delete to the blogposts controller and delete action" do
     route_to('/foo/delete', :method => :get).should have_route(:controller => 'foo', :action => 'delete', :id => nil)
   end
-  
-  it "should match a get to /foo;delete to the blogposts controller and delete action" do
-    route_to('/foo;delete', :method => :get).should have_route(:controller => 'foo', :action => 'delete', :id => nil)
-  end
-end
+end

data/spec/public/router/resources_spec.rb

@@ -35,22 +35,12 @@ describe "resources routes" do
     route_to('/blogposts/1/edit', :method => :get).should have_route(:controller => 'blogposts', :action => 'edit', :id => "1")
   end
   
-  it "should match a get to /blogposts/1;edit to the blogposts controller and the edit action with id 1" do
-    route_to('/blogposts/1;edit', :method => :get).should have_route(:controller => 'blogposts', :action => 'edit', :id => "1")
-  end
-  
   it "should not match a put to /blogposts/1/edit" do
     # not sure which of these is the best way to specify what I mean - so they're both in...
     route_to('/blogposts/1/edit', :method => :put).should have_nil_route
     route_to('/blogposts/1/edit', :method => :put).should_not have_route(:controller => 'blogposts', :action => 'edit', :id => "1")
   end
   
-  it "should not match a put to /blogposts/1;edit" do
-    # not sure which of these is the best way to specify what I mean - so they're both in...
-    route_to('/blogposts/1;edit', :method => :put).should have_nil_route
-    route_to('/blogposts/1;edit', :method => :put).should_not have_route(:controller => 'blogposts', :action => 'edit', :id => "1")
-  end
-  
   it "should match a get to /blogposts/1/delete to the blogposts controller and the delete action with id 1" do
     route_to('/blogposts/1/delete', :method => :get).should have_route(:controller => 'blogposts', :action => 'delete', :id => "1")
   end
@@ -79,10 +69,6 @@ describe "resources routes with named keys" do
  it "should match a get to /emails/bidule/merbivore_com/edit to the  emails controller and the destroy action with username => 'bidule', domain => 'merbivore_com'" do
    route_to('/emails/bidule/merbivore_com/edit', :method => :get).should have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
  end
- 
- it "should match a get to /emails/bidule/merbivore_com;edit to the  emails controller and the destroy action with username => 'bidule', domain => 'merbivore_com'" do
-   route_to('/emails/bidule/merbivore_com;edit', :method => :get).should have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
- end
 
  it "should not match a put to /emails/bidule/merbivore_com/edit" do
    # not sure which of these is the best way to specify what I mean - so they're both in...
@@ -90,12 +76,6 @@ describe "resources routes with named keys" do
    route_to('/emails/bidule/merbivore_com/edit', :method => :put).should_not have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
  end
  
- it "should not match a put to /emails/bidule/merbivore_com;edit" do
-   # not sure which of these is the best way to specify what I mean - so they're both in...
-   route_to('/emails/bidule/merbivore_com;edit', :method => :put).should have_nil_route
-   route_to('/emails/bidule/merbivore_com;edit', :method => :put).should_not have_route(:controller => 'emails', :action => 'edit', :username => "bidule", :domain => "merbivore_com")
- end
- 
  it "should match a get to /emails/bidule/merbivore_com/delete to the emails controller and the delete action with username => 'bidule', domain => 'merbivore_com'" do
    route_to('/emails/bidule/merbivore_com/delete', :method => :get).should have_route(:controller => 'emails', :action => 'delete', :username => "bidule", :domain => "merbivore_com")
  end

data/spec/public/router/spec_helper.rb

@@ -1,36 +1,54 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 require 'ostruct'
+
+require 'rack/mock'
+require 'stringio'
+Merb.start :environment => 'test',
+           :merb_root => File.dirname(__FILE__) / 'fixture'
+
+
 class SimpleRequest < OpenStruct
-  
+
   def method
     @table[:method]
   end
-  
+
   def params
     @table
   end
 end
 
 def prepare_route(from, to)
-  Merb::Router.prepare {|r| r.match(from).to(to)}  
+  Merb::Router.prepare {|r| r.match(from).to(to)}
 end
 
 def route_to(path, args = {}, protocol = "http://")
   Merb::Router.match(SimpleRequest.new({:protocol => protocol, :path => path}.merge(args)))[1]
 end
 
+def match_for(path, args = {}, protocol = "http://")
+  Merb::Router.match(SimpleRequest.new({:protocol => protocol, :path => path}.merge(args)))
+end
+
+def matched_route_for(*args)
+  # get route index
+  idx = match_for(*args)[0]
+
+  Merb::Router.routes[idx]
+end
+
 def generate(*args)
   Merb::Router.generate *args
 end
 
 module Merb
-  
+
   module Test
-    
+
     module RspecMatchers
 
       class HaveRoute
-        
+
         def self.build(expected)
           this = new
           this.instance_variable_set("@expected", expected)
@@ -62,11 +80,11 @@ module Merb
       def have_route(expected)
         HaveRoute.build(expected)
       end
-      
+
       def have_nil_route
         have_route({})
       end
-  
+
     end
   end
-end
+end

data/spec/public/router/special_spec.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
 describe "Regex-based routes" do
-  
+
   it "should process a simple regex" do
-    prepare_route(%r[^/foos?/(bar|baz)/:id], :controller => "foo", :action => "[1]", :id => ":id")      
+    prepare_route(%r[^/foos?/(bar|baz)/:id], :controller => "foo", :action => "[1]", :id => ":id")
     route_to("/foo/bar/baz").should have_route(:controller => "foo", :action => "bar", :id => "baz")
     route_to("/foos/baz/bam").should have_route(:controller => "foo", :action => "baz", :id => "bam")
   end
@@ -11,7 +11,7 @@ describe "Regex-based routes" do
   it "should support inbound user agents" do
     Merb::Router.prepare do |r|
       r.match(%r[^/foo/(.+)], :user_agent => /(MSIE|Gecko)/).
-        to(:controller => "foo", :title => "[1]", :action => "show", :agent => ":user_agent[1]")    
+        to(:controller => "foo", :title => "[1]", :action => "show", :agent => ":user_agent[1]")
     end
     route_to("/foo/bar", :user_agent => /MSIE/).should have_route(
       :controller => "foo", :action => "show", :title => "bar", :agent => "MSIE"
@@ -21,7 +21,7 @@ describe "Regex-based routes" do
 end
 
 describe "Routes that are restricted based on incoming params" do
-  
+
   it "should allow you to restrict routes to POST requests" do
     Merb::Router.prepare do |r|
       r.match("/:controller/create/:id", :method => :post).
@@ -30,12 +30,12 @@ describe "Routes that are restricted based on incoming params" do
     route_to("/foo/create/12", :method => "post").should have_route(
       :controller => "foo", :action => "create", :id => "12"
     )
-    
+
     route_to("/foo/create/12", :method => "get").should_not have_route(
       :controller => "foo", :action => "create", :id => "12"
     )
   end
-  
+
   it "should allow you to restrict routes based on protocol" do
     Merb::Router.prepare do |r|
       r.match(:protocol => "http://").to(:controller => "foo", :action => "bar")
@@ -44,5 +44,18 @@ describe "Routes that are restricted based on incoming params" do
     route_to("/foo/bar").should have_route(:controller => "foo", :action => "bar")
     route_to("/boo/hoo", :protocol => "https://").should have_route(:controller => "boo", :action => "hoo")
   end
-  
-end
+
+  it "does not require explicit specifying of params" do
+    Merb::Router.prepare do |r|
+      r.match!("/fb/:callback_path/:controller/:action")
+    end
+
+    route_to("/fb/callybacky/products/search").should have_route(
+      :controller => "products", :action => "search", :callback_path => "callybacky"
+    )
+    route_to("/fb/ping/products/search").should have_route(
+      :controller => "products", :action => "search", :callback_path => "ping"
+    )
+  end
+
+end

data/spec/public/template/template_spec.rb

@@ -23,11 +23,11 @@ module Merb::Test::Fixtures
   
   class MyTemplateEngine
     
-    def self.compile_template(path, name, mod)
-      text = File.read(path)
+    def self.compile_template(io, name, mod)
+      text = io.read
       table = { "\r"=>"\\r", "\n"=>"\\n", "\t"=>"\\t", '"'=>'\\"', "\\"=>"\\\\" }      
       text = (text.split("\n").map {|x| '"' + (x.gsub(/[\r\n\t"\\]/) { |m| table[m] }) + '"'}).join(" +\n")
-      mod.class_eval <<-EOS, path
+      mod.class_eval <<-EOS, File.expand_path(io.path)
         def #{name}
           #{text}
         end
@@ -52,12 +52,13 @@ describe Merb::Template do
   it "should accept template-type registrations via #register_extensions" do
     Merb::Template.register_extensions(Merb::Test::Fixtures::MyTemplateEngine, %w[myt])
     Merb::Template.engine_for("foo.myt").should == Merb::Test::Fixtures::MyTemplateEngine
+    Merb::Template.template_extensions.should include("myt")
   end
   
   # @semipublic
   
   def rendering_template(template_path)
-    Merb::Template.inline_template(template_path, Merb::Test::Fixtures::MyHelpers)
+    Merb::Template.inline_template(File.open(template_path), Merb::Test::Fixtures::MyHelpers)
     Merb::Test::Fixtures::Environment.new.
       send(Merb::Template.template_name(template_path))  
   end
@@ -73,6 +74,17 @@ describe Merb::Template do
     rendering_template(template_path).should == "Hello world!"
   end
   
+  it "should compile and inline templates that comes through via VirtualFile" do
+    Merb::Template.inline_template(VirtualFile.new("Hello", 
+      File.dirname(__FILE__) / "templates" / "template.html.erb"), 
+      Merb::Test::Fixtures::MyHelpers)
+      
+    res = Merb::Test::Fixtures::Environment.new.
+      send(Merb::Template.template_name(File.dirname(__FILE__) / "templates" / "template.html.erb"))
+      
+    res.should == "Hello"
+  end
+  
   it "should know how to correctly report errors" do
     template_path = File.dirname(__FILE__) / "templates" / "error.html.erb"
     running { render_template(template_path) }.should raise_error(NameError, /`foo'/)
@@ -85,7 +97,7 @@ describe Merb::Template do
   
   it "should find the full template name for a path via #template_for" do
     template_path = File.dirname(__FILE__) / "templates" / "template.html.erb"
-    name = Merb::Template.inline_template(template_path, Merb::Test::Fixtures::MyHelpers)
+    name = Merb::Template.inline_template(File.open(template_path), Merb::Test::Fixtures::MyHelpers)
     Merb::Test::Fixtures::Environment.new.should respond_to(name)
   end
   

data/spec/public/test/controller_matchers_spec.rb

@@ -7,6 +7,10 @@ class TestController < Merb::Controller
   def redirect_action; redirect(@redirect_to || "/"); end
   def success_action; end
   def missing_action; render("i can has errorz", :status => 404); end
+
+  def redirect_with_message_action
+    redirect(@redirect_to, :message => "okey dookey")
+  end
 end
 
 describe Merb::Test::Rspec::ControllerMatchers do
@@ -42,6 +46,12 @@ describe Merb::Test::Rspec::ControllerMatchers do
     it "should work with the result of a get helper call" do
       get("/redirect"){|controller| controller.redirect_to = "http://example.com/" }.should redirect_to("http://example.com/")
     end
+
+    it 'takes :message option' do
+      dispatch_to(TestController, :redirect_with_message_action) { |controller|
+        controller.redirect_to = "http://example.com/"
+      }.should redirect_to("http://example.com/", :message => "okey dookey")
+    end
   end
   
   describe "#respond_successfully" do

data/spec/public/test/request_helper_spec.rb

@@ -26,10 +26,31 @@ describe Merb::Test::RequestHelper do
       controller.params[:name].should == "Fred"
     end
 
+    it "should dispatch to the given controller and action with the query string merged into the params" do
+      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show)
+      controller = dispatch_to(@controller_klass, :show, {:name => "Fred"}, {'QUERY_STRING' => "last_name=Jones&age=42"} )
+      
+      controller.params[:name].should == "Fred"
+      controller.params[:last_name].should == "Jones"
+      controller.params[:age].should == "42"   
+    end
+
     it "should not hit the router to match its route" do
       Merb::Router.should_not_receive(:match)
       dispatch_to(@controller_klass, :index)
     end
+    
+    it "merges :controller into params" do
+      controller = dispatch_to(@controller_klass, :show, :name => "Fred")
+      
+      controller.params[:controller].should == @controller_klass.name.to_const_path
+    end
+    
+    it "merges :action into params" do
+      controller = dispatch_to(@controller_klass, :show, :name => "Fred")
+      
+      controller.params[:action].should == "show"
+    end
   end
   
   describe "#dispatch_with_basic_authentication_to" do
@@ -85,6 +106,14 @@ describe Merb::Test::RequestHelper do
       controller = get("/spec_helper_controller", :name => "Harry")
       controller.params[:name].should == "Harry"    
     end
+    
+    it "should perform the index action and have params available from the query string" do
+      Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
+      controller = get("/spec_helper_controller?last_name=Oswald&age=25", :name => "Harry")
+      controller.params[:name].should == "Harry"
+      controller.params[:last_name].should == "Oswald"
+      controller.params[:age].should == "25"
+    end
 
     it "should evaluate in the context of the controller in the block" do
       get("/spec_helper_controller") do |controller|

data/spec/public/test/route_helper_spec.rb

@@ -28,6 +28,23 @@ describe Merb::Test::RouteHelper do
     it "should work with a parameters hash" do
       url(:with_id, :id => 123).should == "/123"
     end
+    
+    it "should turn extra hash items into query params" do
+      generated_url = url(:getter, :id => 123, :color => 'red', :size => 'large')
+      lambda {
+        generated_url.match(/\bid=123\b/) &&
+        generated_url.match(/\bsize=large\b/) &&
+        generated_url.match(/\bcolor=red\b/)
+      }.call.should_not be_nil
+    end
+    
+    it "should remove items with nil values from query params" do
+      url(:getter, :color => nil, :size => 'large').should == "/?size=large"
+    end
+    
+    it "should remove items with nil values from query params when named route isn't specified" do
+      url(:controller => 'cont', :action => 'act', :color => nil, :size => 'large').should == "/cont/act?size=large"
+    end
   end
   
   describe "#request_to" do
@@ -51,4 +68,4 @@ describe Merb::Test::RouteHelper do
       request_to("/123")[:id].should == "123"
     end
   end
-end
+end