merb-core 0.9.7 → 0.9.8

data/spec/private/dispatch/fixture/public/merb.fcgi

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-argv = ARGV + %w[-a fcgi]
-Merb.start(argv)

data/spec/private/dispatch/fixture/public/stylesheets/master.css

@@ -1,119 +0,0 @@
-body {
-  font-family: Arial, Verdana, sans-serif;
-  font-size: 12px;
-  background-color: #fff;
-}
-* {
-  margin: 0px;
-  padding: 0px;
-  text-decoration: none;
-}
-html {
-  height: 100%;
-  margin-bottom: 1px;
-}
-#container {
-  width: 80%;
-  text-align: left;
-  background-color: #fff;
-  margin-right: auto;
-  margin-left: auto;
-}
-#header-container {
-  width: 100%;
-  padding-top: 15px;
-}
-#header-container h1, #header-container h2 {
-  margin-left: 6px;
-  margin-bottom: 6px;
-}
-.spacer {
-  width: 100%;
-  height: 15px;
-}
-hr {
-  border: 0px;
-  color: #ccc;
-  background-color: #cdcdcd;
-  height: 1px;
-  width: 100%;
-  text-align: left;
-}
-h1 {
-  font-size: 28px;
-  color: #c55;
-  background-color: #fff;
-  font-family: Arial, Verdana, sans-serif;
-  font-weight: 300;
-}
-h2 {
-  font-size: 15px;
-  color: #999;
-  font-family: Arial, Verdana, sans-serif;
-  font-weight: 300;
-  background-color: #fff;
-}
-h3 {
-  color: #4d9b12;
-  font-size: 15px;
-  text-align: left;
-  font-weight: 300;
-  padding: 5px;
-  margin-top: 5px;
-}
-
-#left-container {
-  float: left;
-  width: 250px;
-  background-color: #FFFFFF;
-  color: black;
-}
-
-#left-container h3 {
-  color: #c55;
-}
-
-#main-container {
-  margin: 5px 5px 5px 260px;
-  padding: 15px;
-  border-left: 1px solid silver;
-  min-height: 400px;
-}
-p {
-  color: #000;
-  background-color: #fff;
-  line-height: 20px;
-  padding: 5px;
-}
-a {
-  color: #4d9b12;
-  background-color: #fff;
-  text-decoration: none;
-}
-a:hover {
-  color: #4d9b12;
-  background-color: #fff;
-  text-decoration: underline;
-}
-#footer-container {
-  clear: both;
-  font-size: 12px;
-  font-family: Verdana, Arial, sans-serif;
-}
-.right {
-  float: right;
-  font-size: 100%;
-  margin-top: 5px;
-  color: #999;
-  background-color: #fff;
-}
-.left {
-  float: left;
-  font-size: 100%;
-  margin-top: 5px;
-  color: #999;
-  background-color: #fff;
-}
-#main-container ul {
-  margin-left: 3.0em;
-}

data/spec/private/dispatch/route_params_spec.rb

@@ -1,23 +0,0 @@
-$START_OPTIONS = {:merb_root => File.join(File.dirname(__FILE__), "fixture")}
-require File.join(File.dirname(__FILE__), "spec_helper")
-require 'rack/mock'
-require 'stringio'
-
-describe Merb::Dispatcher, "route params" do
-  before(:each) do
-    env = Rack::MockRequest.env_for("/foo/bar/54")
-    env['REQUEST_URI'] = "/foo/bar/54"  # MockRequest doesn't set this
-    @controller = Merb::Dispatcher.handle(Merb::Request.new(env))
-  end
-
-  it "should properly set the route params" do
-    @controller.request.route_params[:id].should == '54'
-  end
-
-  it "should properly add route_params to params" do
-    @controller.request.route_params.each { |k,v|
-      @controller.request.params[k].should == v
-    }
-  end
-
-end

data/spec/private/dispatch/spec_helper.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")

data/spec/private/router/behavior_spec.rb

@@ -1,60 +0,0 @@
-require 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 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
-
-describe Merb::Router::Behavior, "#redirect" do
-  predicate_matchers[:redirect] = :redirects?
-
-  before :each do
-    Merb::Router.prepare do |r|
-      r.match('/old/location').redirect("/new/location", true)
-    end
-  end
-
-  it "makes route redirecting" do
-    @behavior = matched_route_for("/old/location").behavior
-    @behavior.should redirect
-  end
-end
-
-
-
-describe Merb::Router::Behavior, "#defer_to" do
-  before :each do
-    Merb::Router.prepare do |r|      
-      r.match("/deferred/:zoo").defer_to do |request, params|
-        params.merge(:controller => "w00t") if params[:zoo]
-      end
-      r.default_routes
-    end    
-  end
-
-  it "registers route properly so it has index" do
-    matched_route_for("/deferred/abc").index.should_not be(nil)
-  end
-end

data/spec/private/router/fixture/log/merb_test.log

@@ -1,35 +0,0 @@
-Fri, 05 Sep 2008 23:42:49 GMT  ~  info  ~  Logfile created
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Not Using Sessions
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000
- ~ Starting Merb server listening at 0.0.0.0:4000

data/spec/private/router/route_spec.rb

@@ -1,418 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Merb::Router::Route, "initially" do
-  predicate_matchers[:allow_fixation] = :allow_fixation?
-
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :continents do |c|
-        c.resources :countries
-      end
-    end
-
-    @r1 = Merb::Router.routes.first
-    @r5 = Merb::Router.routes[4]
-  end
-
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "has reader for conditions" do
-    @r1.conditions
-  end
-
-  it "has reader for params" do
-    @r1.params
-  end
-
-  it "has reader for behavior" do
-    @r5.behavior
-  end
-
-  it "has reader for conditional block" do
-    @r5.conditional_block
-  end
-
-  it "has reader for segments" do
-    @r5.segments
-  end
-
-  it "has reader for index" do
-    @r1.index.should == 0
-  end
-
-  it "has reader for symbol" do
-    @r1.symbol
-  end
-
-  it "does not allow fixation" do
-    @r1.should_not allow_fixation
-  end
-end
-
-describe Merb::Router::Route, "#fixatable" do
-  predicate_matchers[:allow_fixation] = :allow_fixation?
-
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :continents do |c|
-        c.resources :countries
-      end
-    end
-
-    @route = Merb::Router.routes[4]
-  end
-  
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "allows fixation when called with true" do
-    @route.fixatable(true)
-
-    @route.should allow_fixation
-  end
-
-  it "allows fixation when called with true" do
-    @route.fixatable(true)
-    @route.should allow_fixation
-
-    @route.fixatable(false)
-    @route.should_not allow_fixation
-  end
-
-  it "allows fixation when called with default argument" do
-    @route.fixatable
-
-    @route.should allow_fixation
-  end
-end
-
-
-
-describe Merb::Router::Route, "#to_s" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :continents do |c|
-        c.resources :countries
-      end
-    end
-
-    @route = Merb::Router.routes[4]
-  end
-  
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "concatenates route segments" do
-    @route.stub!(:segments).and_return(["continents/", "new"])
-    @route.to_s.should == "continents/new"
-  end
-
-  it "prefixes symbol segments with colon" do
-    @route.stub!(:segments).and_return(["continents/", :id])
-    @route.to_s.should == "continents/:id"
-  end
-end
-
-
-
-describe Merb::Router::Route, "#register" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :continents do |c|
-        c.resources :countries
-      end
-    end
-
-    @route = Merb::Router.routes[4]
-  end
-  
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "adds route to Merb routes set" do
-    Merb::Router.routes = []
-    @route.register
-
-    Merb::Router.routes.should include(@route)
-  end
-
-  it "sets index on route" do
-    Merb::Router.routes = []
-    @route.register
-
-    @route.index.should == 0
-  end
-
-  it "returns route itself" do
-    Merb::Router.routes = []
-    @route.register.should == @route
-  end
-end
-
-
-
-describe Merb::Router::Route, "#symbol_segments" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :continents do |c|
-        c.resources :countries
-      end
-    end
-
-    @route = Merb::Router.routes[4]
-  end
-
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "cherrypicks segments that are Symbols" do
-    @route.stub!(:segments).and_return(["prefix/", :controller, "ping"])
-    @route.symbol_segments.should == [:controller]
-  end
-end
-
-
-
-describe Merb::Router::Route, "#segments_from_path" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.resources :continents do |c|
-        c.resources :countries
-      end
-    end
-
-    @route = Merb::Router.routes[4]
-  end
-
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "turns path into string and symbol segments" do
-    @route.segments_from_path("prefix/:controller/:action/:id").should == ["prefix/", :controller, "/", :action, "/", :id]
-  end
-
-  it "handles slash edge case just fine" do
-    @route.segments_from_path("/").should == ["/"]
-  end
-end
-
-
-
-describe Merb::Router::Route, "#name" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.match("/").to(:controller => "home")
-    end
-
-    @route = Merb::Router.routes.first
-  end
-
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "places the route into named routes collection" do
-    @route.name(:home)
-
-    Merb::Router.named_routes[:home].should == @route
-  end
-
-  it "only accepts Symbols" do
-    lambda { @route.name("home") }.should raise_error(ArgumentError)
-  end
-  
-end
-
-
-describe Merb::Router::Route, "#regexp?" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.match(/api\/(.*)/).to(:controller => "api", :token => "[1]").name(:regexpy)
-
-      r.match("/what-is-regexps-dude").to(:controller => "plain_strings").name(:non_regexpy)
-    end
-
-    @regexp_route   = Merb::Router.named_routes[:regexpy]
-    @non_regexp_route = Merb::Router.named_routes[:non_regexpy]
-  end
-
-  it "is true for routes that use regular expressions" do
-    @regexp_route.should be_regexp
-  end
-
-  it "is false for routes that do not explicitly use regular expressions" do
-    @non_regexp_route.should_not be_regexp
-  end
-
-  it "is true if behavior returns true when sent regexp?" do
-    @non_regexp_route.stub!(:behavior).and_return(stub("regexp_behavior", :regexp? => true))
-    @non_regexp_route.should be_regexp
-  end
-
-  it "is true if any of behavior's anscestors return true when sent regexp?" do
-    @regexp_ancestor = stub("regexp_ancestor", :regexp? => true)
-    @not_regexp_ancestor = stub("not_regexp_ancestor", :regexp? => false)
-    @behavior_with_ancestors = stub("regexp_behavior", :regexp? => false, :ancestors => [@regexp_ancestor, @not_regexp_ancestor])
-
-    @non_regexp_route.stub!(:behavior).and_return(@behavior_with_ancestors)
-    @non_regexp_route.should be_regexp
-  end
-
-  after :each do
-    Merb::Router.reset!
-  end
-end
-
-
-
-describe Merb::Router::Route, "#generate" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.match(/api\/(.*)/).to(:controller => "api", :token => "[1]").name(:regexpy)
-      r.match("/world/countries/:name").to(:controller => "countries").name(:non_regexpy)
-    end
-
-    @regexp_route   = Merb::Router.named_routes[:regexpy]
-    @non_regexp_route = Merb::Router.named_routes[:non_regexpy]
-  end
-  
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "does not work for regexp routes" do
-    lambda { @regexp_route.generate({ :token => "apitoken" }) }.should raise_error(RuntimeError, /regexp/)
-  end
-
-  it "replaces symbol segments in the URL with values from given Hash parameters" do
-     @non_regexp_route.generate({ :name => "Italy" }).should == "/world/countries/Italy"
-    @non_regexp_route.generate({ :name => "Brazil" }).should == "/world/countries/Brazil"
-  end
-
-  it "replaces symbol segments with Fixnum  values just fine" do
-    @non_regexp_route.generate({ :name => 101 }).should == "/world/countries/101"
-  end
-
-  it "appends unknown symbol segments after ?" do
-    @non_regexp_route.generate({ :name => 101, :area => 10101 }).should == "/world/countries/101?area=10101"
-  end
-
-  it "calls #to_param on segments that respond to it" do
-    @non_regexp_route.generate({ :name => stub('US', :to_param => 'USA') }).should == "/world/countries/USA"
-  end
-  
-  it "adds fragment after ?" do
-    @non_regexp_route.generate({:name => 101, :area => 10101, :fragment => :a_fragment}).should == "/world/countries/101?area=10101#a_fragment"
-  end
-end
-
-
-
-describe Merb::Router::Route, "#if_conditions" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.match(/api\/(.*)/).to(:controller => "api", :token => "[1]").name(:regexpy)
-      r.match("/world/countries/:name").to(:controller => "countries").name(:non_regexpy)
-      r.match("/world/continents/:continent/countries/:country").to(:controller => "world_map").name(:two_symbol_segments)
-    end
-
-    @regexp_route   = Merb::Router.named_routes[:regexpy]
-    @non_regexp_route = Merb::Router.named_routes[:non_regexpy]
-    @two_symbol_route = Merb::Router.named_routes[:two_symbol_segments]
-  end
-  
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "returns array with =~ statements" do
-    # just to show you what it looks like
-    @non_regexp_route.if_conditions({}).should == [" (/^\\/world\\/countries\\/([^\\/.,;?]+)$/ =~ cached_path)  && (path1 = $1)"]
-  end
-
-  it "returns array of syntactically valid Ruby code statements that can be evaluated" do
-    cached_path = "/world/countries/Italy"
-    eval(@non_regexp_route.if_conditions({}).first)
-    # raises nothing and passes
-  end
-
-  it "works with regexp routes" do
-    cached_path = "/api/signin"
-    eval(@regexp_route.if_conditions({}).first)
-    # raises nothing and passes
-  end
-
-  it "adds conditions and match group for each symbol segment of route" do
-    # again, just to show you what it looks like
-    @two_symbol_route.if_conditions({}).should == [" (/^\\/world\\/continents\\/([^\\/.,;?]+)\\/countries\\/([^\\/.,;?]+)$/ =~ cached_path)  && (path1, path2 = $1, $2)"]
-  end
-end
-
-describe Merb::Router::Route, "#if_conditions" do
-  before :each do
-    Merb::Router.prepare do |r|
-      r.match(/api\/(.*)/).to(:controller => "api", :token => "[1]").name(:regexpy)
-      r.match("/world/countries/:name").to(:controller => "countries").name(:non_regexpy)
-      r.match("/world/continents/:continent/countries/:country").to(:controller => "world_map").name(:two_symbol_segments)
-    end
-
-    @regexp_route   = Merb::Router.named_routes[:regexpy]
-    @non_regexp_route = Merb::Router.named_routes[:non_regexpy]
-    @two_symbol_route = Merb::Router.named_routes[:two_symbol_segments]
-  end
-  
-  after :each do
-    Merb::Router.reset!
-  end
-
-  it "uses if in compiled statement when argument is false" do
-    @regexp_route.compile(false).should =~ /\s*elsif/
-  end
-
-  it "uses elsif in compiled statement when argument is true" do
-    @non_regexp_route.compile(true).should =~ /^if/
-  end
-
-  it "uses if in compiled statement by default" do
-    @regexp_route.compile.should =~ /\s*elsif/
-  end
-end
-
-describe "Merb::Router::Route.capture" do
-  
-  after :each do
-    Merb::Router.reset!
-  end  
-  
-  it "should capture routes that have been added in the block context" do
-    routes, named, route = [], {}, nil
-    Merb::Router.prepare do |r|
-      routes, named = Merb::Router.capture do
-        route = r.match("/overview").to(:controller => "home", :action => 'overview')
-      end
-      r.match("/").to(:controller => "home").name(:home)
-    end
-    routes.should include(route)
-    named.should_not include(route)
-  end
-  
-  it "should capture named routes that have been added in the block context" do
-    routes, named, route = [], {}, nil
-    Merb::Router.prepare do |r|
-      r.match("/overview").to(:controller => "home", :action => 'overview')
-      routes, named = Merb::Router.capture do
-        route = r.match("/").to(:controller => "home").name(:home)
-      end
-    end
-    routes.should include(route)
-    named[:home].should == route
-  end
-  
-end