merb-core 0.9.7 → 0.9.8

data/spec/public/router/namespace_spec.rb

@@ -1,113 +0,0 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-describe "namespaced resource(s) routes" do
-
-  after :each do
-    Merb::Router.named_routes = {}
-    Merb::Router.routes = []
-  end
-
-  it "should match a get to /admin/blogposts without setting namespace" do
-    Merb::Router.prepare do |r|
-      r.match('/admin') do |admin|
-        admin.resources :blogposts
-      end
-    end
-    route_to('/admin/blogposts', :method => :get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace=>nil)
-  end
-
-  it "should match a get to /admin/blogposts setting namespace manually" do
-    Merb::Router.prepare do |r|
-      r.match('/admin').to(:namespace => "my_admin") do |admin|
-        admin.resources :blogposts
-      end
-    end
-    route_to('/admin/blogposts', :method => :get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace=>"my_admin")
-  end
-
-  it "should match a get to /admin/blogposts to the blogposts controller and index action" do
-    Merb::Router.prepare do |r|
-      r.namespace :admin do |admin|
-        admin.resources :blogposts
-      end
-    end
-    route_to('/admin/blogposts', :method => :get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace => 'admin')
-  end
-  
-  it "should match a get to /admin/foo to the foo controller and show action" do
-    Merb::Router.prepare do |r|
-      r.namespace :admin do |admin|
-        admin.resource :foo
-      end
-    end
-    route_to('/admin/foo', :method => :get).should have_route(:controller => 'foo', :action => 'show', :id => nil)
-  end
-
-  it "should match a get to /admin/foo/blogposts to the blogposts controller and index action" do
-    Merb::Router.prepare do |r|
-      r.namespace :admin do |admin|
-        admin.resource :foo do |foo|
-          foo.resources :blogposts
-        end
-      end
-    end
-    route_to('/admin/foo/blogposts', :method => :get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace => 'admin')
-  end
-
-  it "should match a get to /admin/blogposts/1/foo to the foo controller and the show action" do
-    Merb::Router.prepare do |r|
-      r.namespace :admin do |admin|
-        admin.resources :blogposts do |blogposts|
-          blogposts.resource :foo
-        end
-      end
-    end
-    route_to('/admin/blogposts/1/foo', :method => :get).should have_route(:controller => 'foo', :action => 'show', :blogpost_id => '1', :id => nil, :namespace => "admin")
-  end
-
-  it "should match a get to /blogposts to the blogposts controller when namespace is passed in to resources" do
-    Merb::Router.prepare do |r|
-      r.resources :blogposts, :namespace => "admin"
-    end
-    route_to("/blogposts", :method =>:get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace => "admin")
-  end
-
-  it "should match a get to /blogposts/1/foo to the foo controller when namespace is passed in to resources as an option" do
-    Merb::Router.prepare do |r|
-      r.resources :blogposts, :namespace => "admin" do |blogposts|
-        blogposts.resource :foo, :namespace => "admin"
-      end
-    end
-    route_to("/blogposts", :method =>:get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace => "admin")
-    route_to("/blogposts/1/foo", :method =>:get).should have_route(:controller => 'foo', :action => 'show', :blogpost_id => '1', :namespace => "admin")
-  end
-  
-  it "should match a get to /blogposts/1/foo to the foo controller without a namespace" do
-    Merb::Router.prepare do |r|
-      r.resources :blogposts, :namespace => "admin" do |blogposts|
-        blogposts.resource :foo
-      end
-    end
-    route_to("/blogposts/1/foo", :method =>:get).should have_route(:controller => 'foo', :action => 'show', :blogpost_id => '1', :namespace => nil)
-  end
-  
-  it "should match a get to /my_admin/blogposts to the blogposts controller with a custom patch setting" do
-    Merb::Router.prepare do |r|
-      r.namespace(:admin, :path=>"my_admin") do |admin|
-        admin.resources :blogposts
-      end
-    end
-    route_to('/my_admin/blogposts', :method => :get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil, :namespace => 'admin')
-  end
-
-  it "should match a get to /admin/blogposts/1/foo to the foo controller and the show action with namespace admin" do
-    Merb::Router.prepare do |r|
-      r.namespace(:admin, :path=>"") do |admin|
-        admin.resources :blogposts do |blogposts|
-          blogposts.resource :foo
-        end
-      end
-    end
-    route_to('/blogposts/1/foo', :method => :get).should have_route(:controller => 'foo', :action => 'show', :blogpost_id => '1', :id => nil, :namespace => "admin")
-  end
-
-end

data/spec/public/router/nested_matches_spec.rb

@@ -1,97 +0,0 @@
-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/nested_resources_spec.rb

@@ -1,41 +0,0 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-
-Merb::Router.prepare do |r|
-  r.resources :blogposts do |b|
-    b.resources :comments do |c|
-      c.resources :versions
-    end
-  end
-  r.resources :users do |u|
-    u.resources :comments
-  end
-  r.resource :foo do |f|
-    f.resources :comments
-  end
-  r.resources :domains, :keys => [:domain] do |d|
-    d.resources :emails, :keys => [:username]
-  end
-end
-
-describe "nested resources routes" do
-  
-  it "should match a get to /blogposts/1/comments to the comments controller and index action with blogpost_id" do
-    route_to('/blogposts/1/comments', :method => :get).should have_route(:controller => 'comments', :action => 'index', :id => nil, :blogpost_id => '1')
-  end
-  
-  it "should match a get to /blogposts/1/comments/2/versions to the versions controller and index action with blogpost_id and comment_id" do
-    route_to('/blogposts/1/comments/2/versions', :method => :get).should have_route(:controller => 'versions', :action => 'index', :id => nil, :blogpost_id => '1', :comment_id => '2')
-  end
-  
-  it "should match a get to /users/1/comments to the comments controller and index action with user_id" do
-    route_to('/users/1/comments', :method => :get).should have_route(:controller => 'comments', :action => 'index', :id => nil, :user_id => '1')
-  end
-
-  it "should match a get to /foo/comments to the comments controller and index action" do
-    route_to('/foo/comments', :method => :get).should have_route(:controller => 'comments', :action => 'index', :id => nil)
-  end
-  
-  it "should match a get to /domains/merbivore_com/emails to the emails controller and index action with domain => 'merbivore_com" do
-     route_to('/domains/merbivore_com/emails', :method => :get).should have_route(:controller => 'emails', :action => 'index', :username => nil, :domain => 'merbivore_com')
-  end
-end

data/spec/public/router/resource_spec.rb

@@ -1,37 +0,0 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-
-describe "resources routes" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resource :foo
-    end
-  end
-  
-  it "should match a get to /foo to the blogposts controller and show action" do
-    route_to('/foo', :method => :get).should have_route(:controller => 'foo', :action => 'show', :id => nil)
-  end
-  
-  it "should match a post to /foo to the blogposts controller and create action" do
-    route_to('/foo', :method => :post).should have_route(:controller => 'foo', :action => 'create', :id => nil)
-  end
-  
-  it "should match a put to /foo to the blogposts controller and update action" do
-    route_to('/foo', :method => :put).should have_route(:controller => 'foo', :action => 'update', :id => nil)
-  end
-  
-  it "should match a delete to /foo to the blogposts controller and show action" do
-    route_to('/foo', :method => :delete).should have_route(:controller => 'foo', :action => 'destroy', :id => nil)
-  end
-  
-  it "should match a get to /foo/new to the blogposts controller and new action" do
-    route_to('/foo/new', :method => :get).should have_route(:controller => 'foo', :action => 'new', :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
-end

data/spec/public/router/resources_spec.rb

@@ -1,82 +0,0 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-
-describe "resources routes" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :blogposts
-    end
-  end
-  
-  it "should match a get to /blogposts to the blogposts controller and index action" do
-    route_to('/blogposts', :method => :get).should have_route(:controller => 'blogposts', :action => 'index', :id => nil)
-  end
-  
-  it "should match a post to /blogposts to the blogposts controller and create action" do
-    route_to('/blogposts', :method => :post).should have_route(:controller => 'blogposts', :action => 'create', :id => nil)
-  end
-  
-  it "should match a get to /blogposts/new to the blogposts controller and the new action" do
-    route_to('/blogposts/new', :method => :get).should have_route(:controller => 'blogposts', :action => 'new', :id => nil)
-  end
-  
-  it "should match a get to /blogposts/1 ot the  blogposts controller and the show action with id 1" do
-    route_to('/blogposts/1', :method => :get).should have_route(:controller => 'blogposts', :action => 'show', :id => "1")
-  end
-  
-  it "should match a put to /blogposts/1 ot the  blogposts controller and the update action with id 1" do
-    route_to('/blogposts/1', :method => :put).should have_route(:controller => 'blogposts', :action => 'update', :id => "1")
-  end
-  
-  it "should match a delete to /blogposts/1 ot the  blogposts controller and the destroy action with id 1" do
-    route_to('/blogposts/1', :method => :delete).should have_route(:controller => 'blogposts', :action => 'destroy', :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 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
-end
-
-
-describe "resources routes with named keys" do
- before :each do
-   Merb::Router.prepare do |r|
-     r.resources :emails, :keys => ["username", "domain"]
-   end 
- end
- 
- it "should match a get to /emails/bidule/merbivore_com to the  emails controller and the show action with username => 'bidule', domain => 'merbivore_com'" do
-   route_to('/emails/bidule/merbivore_com', :method => :get).should have_route(:controller => 'emails', :action => 'show', :username => "bidule", :domain => "merbivore_com")
- end
- 
- it "should match a put to /emails/bidule/merbivore_com to the  emails controller and the update action with username => 'bidule', domain => 'merbivore_com'" do
-   route_to('/emails/bidule/merbivore_com', :method => :put).should have_route(:controller => 'emails', :action => 'update', :username => "bidule", :domain => "merbivore_com")
- end
- 
- it "should match a delete to /emails/bidule/merbivore_com to the  emails controller and the destroy action with username => 'bidule', domain => 'merbivore_com'" do
-   route_to('/emails/bidule/merbivore_com', :method => :delete).should have_route(:controller => 'emails', :action => 'destroy', :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...
-   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
-end

data/spec/public/router/spec_helper.rb

@@ -1,90 +0,0 @@
-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)}
-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)
-          this
-        end
-
-        def matches?(target)
-          @target = target
-          @errors = []
-          @expected.all? { |param, value| @target[param] == value }
-        end
-
-        def failure_message
-          @target.each do |param, value|
-            @errors << "Expected :#{param} to be #{@expected[param].inspect}, but was #{value.inspect}" unless
-              @expected[param] == value
-          end
-          @errors << "Got #{@target.inspect}"
-          @errors.join("\n")
-        end
-
-        def negative_failure_message
-          "Expected #{@expected.inspect} not to be #{@target.inspect}, but it was."
-        end
-
-        def description() "have_route #{@target.inspect}" end
-      end
-
-      def have_route(expected)
-        HaveRoute.build(expected)
-      end
-
-      def have_nil_route
-        have_route({})
-      end
-
-    end
-  end
-end