merb-core 0.9.7 → 0.9.8

data/spec/public/directory_structure/directory_spec.rb

@@ -1,43 +0,0 @@
-$START_OPTIONS = {:merb_root => File.join(File.dirname(__FILE__), "directory")}
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-
-describe "The default Merb directory structure" do
-
-  it "should load in controllers" do
-    calling { Base }.should_not raise_error
-  end
-
-  it "should be able to complete the dispatch cycle" do
-    controller = dispatch_to(Base, :string)
-    controller.body.should == "String"
-  end
-
-  it "should be able to complete the dispatch cycle with templates" do
-    controller = dispatch_to(Base, :template)
-    controller.body.should == "Template ERB"
-  end
-
-end
-
-describe "Modifying the _template_path" do
-
-  it "should move the templates to a new location" do
-    controller = dispatch_to(Custom, :template)
-    controller.body.should == "Wonderful Template"
-  end
-
-end
-
-describe "Merb.root_path" do
-
-  it "should return a path relative to Merb.root" do
-    path = Merb.root_path('/app/controllers/base.rb')
-    path.to_s.should == File.join(Merb.root, '/app/controllers/base.rb')
-  end
-
-  it "should accept multiple arguments like File.join" do
-    path = Merb.root_path('app', 'controllers', 'base.rb')
-    path.to_s.should == File.join(Merb.root, 'app', 'controllers', 'base.rb')
-  end
-
-end

data/spec/public/logger/logger_spec.rb

@@ -1,181 +0,0 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-
-describe Merb do
-
-  describe "Command Line Options" do
-    
-    it "should allow -l / --log_level to set the log_level" do
-      pending("How do we spec these?")
-    end
-    
-    it "should allow -L / --log_file  to set the log_file" do
-      pending("How do we spec these?")
-      # Run an instance of merb from the command line 
-      # using system and test if the file was created?
-    end
-    
-  end
-
-end
-
-describe Merb::Logger do
-
-  describe "#new" do
-    it "should call set_log with the arguments it was passed." do
-      logger = Merb::Logger.allocate # create an object sans initialization
-      logger.should_receive(:set_log).with('a partridge', 'a pear tree', 'a time bomb').and_return(true)
-      logger.send(:initialize, 'a partridge', 'a pear tree', 'a time bomb')
-    end
-  end
-  
-  describe "#set_log" do
-
-    before(:each) do
-      @logger = Merb::Logger.new(Merb.log_file)
-    end
-
-    it "should set the log level to :warn (4) when second parameter is :warn" do
-      Merb::Logger.new(Merb.log_file, :warn).level.should eql(4)
-    end
-
-    it "should set the log level to :debug (0) when Merb.environment is development" do
-      Merb.should_receive(:environment).and_return("development")
-      @logger.set_log(Merb.log_path / "development.log")
-      @logger.level.should eql(0)
-    end
-    
-    it "should set the log level to :error (6) when Merb.environment is production" do
-      Merb.should_receive(:environment).and_return("production")
-      @logger.set_log(Merb.log_path / "production.log")
-      @logger.level.should eql(4)
-    end
-    
-    it "should initialize the buffer to an empty array" do
-      @logger.buffer.should eql([])
-    end
-
-    it "should default the delimiter to ' ~ '" do
-      @logger.delimiter.should eql(" ~ ")
-    end
-    
-    it "should assign the newly created object to Merb.logger" do
-      @logger = Merb::Logger.new(Merb.log_file)
-      Merb.logger.should eql(@logger)
-    end
-    
-  end
-  
-  describe "#flush" do
-
-    before(:each) do
-      @logger = Merb::Logger.new(Merb.log_file)
-    end
-    
-    it "should immediately return if the buffer is empty" do
-      @logger.should_not_receive(:write)
-      @logger.flush
-    end
-
-    it "should call the write_method with the stringified contents of the buffer if the buffer is non-empty" do
-      @logger.send(:<<, "a message")
-      @logger.send(:<<, "another message")
-      @logger.log.should_receive(:write).with(" ~ a message\n ~ another message\n")
-      @logger.flush
-    end
-
-  end
-  
-  describe "#close" do
-    before(:each) do
-      @logger = Merb::Logger.new(Merb.log_file)
-    end
-
-    it "should flush the buffer before closing" do
-      # TODO: how to specify order? eg. flush then close
-      @logger.should_receive(:flush)
-      @logger.log.should_receive(:close)
-      @logger.close
-    end
-
-    it "should call the close method if the log responds to close" do
-      @logger.log.should_receive(:close)
-      @logger.close
-    end
-
-    it "shouldn't call the close method if the log is a terminal" do
-      @logger.log.should_receive(:tty?).and_return(true)
-      @logger.log.should_not_receive(:close)
-      @logger.close
-    end
-
-    it "should set the stored log attribute to nil" do
-      @logger.close
-      @logger.log.should eql(nil)
-    end
-
-  end
-
-  describe "<<" do
-    
-  end
-
-  describe "level methods" do
-
-    before(:all) do
-      @logger = Merb::Logger.new(Merb.log_file)
-    end
-
-    it "should provide a #debug method which can be used to log" do
-      @logger.should respond_to(:debug)
-      @logger.should_receive(:<<).with("message").and_return(true)
-      @logger.debug("message")
-    end
-
-    it "should provide a #info method which can be used to log" do
-      @logger.should respond_to(:info)
-      @logger.should_receive(:<<).with("message").and_return(true)
-      @logger.info("message")
-    end
-
-    it "should provide a #warn method which can be used to log" do
-      @logger.should respond_to(:warn)
-      @logger.should_receive(:<<).with("message").and_return(true)
-      @logger.warn("message")
-    end
-
-    it "should provide a #error method which can be used to log" do
-      @logger.should respond_to(:error)
-      @logger.should_receive(:<<).with("message").and_return(true)
-      @logger.error("message")
-    end
-
-    it "should provide a #fatal method which can be used to log" do
-      @logger.should respond_to(:fatal)
-      @logger.should_receive(:<<).with("message").and_return(true)
-      @logger.fatal("message")
-    end
-    
-    # TODO: add positive and negative tests for each of the methods below:
-    it "should provide a #debug? method" do
-      @logger.should respond_to(:debug?)
-    end
-
-    it "should provide a #info? method" do
-      @logger.should respond_to(:info?)
-    end
-
-    it "should provide a #warn? method" do
-      @logger.should respond_to(:warn?)
-    end
-
-    it "should provide a #error? method" do
-      @logger.should respond_to(:error?)
-    end
-
-    it "should provide a #fatal? method" do
-      @logger.should respond_to(:fatal?)
-    end
-
-  end
-
-end

data/spec/public/logger/spec_helper.rb

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

data/spec/public/rack/conditinal_get_middleware_spec.rb

@@ -1,127 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-
-require "sha1"
-
-class ConditionalGetTestController < Merb::Controller
-  def with_etag
-    response = "original message-body"
-    headers['ETag'] = Digest::SHA1.hexdigest(response)
-
-    response
-  end
-
-  def with_last_modified
-    headers[Merb::Const::LAST_MODIFIED] = :documents_last_modified_time
-    "original message-body"
-  end
-
-  def without
-    # sanity check
-    headers.delete('ETag')
-    headers.delete(Merb::Const::LAST_MODIFIED)
-    
-    "original message-body"
-  end
-end
-
-
-Merb::Router.prepare do |r|
-  r.match("/with_etag").to(
-    :controller => "conditional_get_test_controller", :action => "with_etag"
-  )
-  r.match("/with_last_modified").to(
-    :controller => "conditional_get_test_controller", :action => "with_last_modified"
-  )
-  r.match("/without").to(
-    :controller => "conditional_get_test_controller", :action => "without"
-  )
-end
-
-describe Merb::Rack::ConditionalGet do
-
-  describe(
-    "when the client already has an up-to-date document", 
-    :shared => true
-  ) do
-    it 'sets status to "304"' do
-      @status.should == 304
-    end
-
-    it 'returns no message-body' do
-      @body.should == ""
-    end
-  end
-
-  describe(
-    "when the client does NOT have an up-to-date document",
-    :shared => true
-  ) do
-    it 'does not modify status' do
-      @status.should == 200
-    end
-
-    it 'does not modify message-body' do
-      @body.should == "original message-body"
-    end
-  end
-  
-  before(:each) do
-    @app        = Merb::Rack::Application.new
-    @middleware = Merb::Rack::ConditionalGet.new(@app)
-  end
-  
-  describe "when response has no ETag header and no Last-Modified header" do
-    before(:each) do
-      env = Rack::MockRequest.env_for('/without')
-      @status, @headers, @body = @middleware.call(env)        
-    end
-    
-    it_should_behave_like "when the client does NOT have an up-to-date document"
-  end
-
-  describe "when response has ETag header" do
-    describe "and it == to HTTP_IF_NONE_MATCH of the request" do
-      before(:each) do
-        env = Rack::MockRequest.env_for('/with_etag')
-        env['HTTP_IF_NONE_MATCH'] =
-          Digest::SHA1.hexdigest("original message-body")
-        @status, @headers, @body = @middleware.call(env)        
-      end
-
-      it_should_behave_like "when the client already has an up-to-date document"
-    end
-
-    describe "and it IS NOT == to HTTP_IF_NONE_MATCH of the request" do
-      before(:each) do
-        env = Rack::MockRequest.env_for('/with_etag')
-        env['HTTP_IF_NONE_MATCH'] =
-          Digest::SHA1.hexdigest("a different message-body")
-        @status, @headers, @body = @middleware.call(env)
-      end
-      
-      it_should_behave_like "when the client does NOT have an up-to-date document"
-    end
-  end
-
-  describe "when response has Last-Modified header" do
-    describe "and it == to HTTP_IF_NOT_MODIFIED_SINCE of the request" do
-      before(:each) do
-        env = Rack::MockRequest.env_for('/with_last_modified')
-        env[Merb::Const::HTTP_IF_MODIFIED_SINCE] = :documents_last_modified_time
-        @status, @headers, @body = @middleware.call(env)
-      end
-      
-      it_should_behave_like "when the client already has an up-to-date document"
-    end
-
-    describe "and it IS NOT == to HTTP_IF_NOT_MODIFIED_SINCE of the request" do
-      before(:each) do
-        env = Rack::MockRequest.env_for('/with_last_modified')
-        env[Merb::Const::HTTP_IF_MODIFIED_SINCE] = :some_other_time
-        @status, @headers, @body = @middleware.call(env)
-      end
-
-      it_should_behave_like "when the client does NOT have an up-to-date document"
-    end
-  end
-end

data/spec/public/rack/csrf_middleware_spec.rb

@@ -1,70 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-require File.join(File.dirname(__FILE__), "shared_example_groups")
-
-
-Merb::Router.prepare do |r|
-  r.resources :users
-end
-
-class Users < Merb::Controller
-  def new
-    body = "<div><form action='/users' method='POST'></form></div>"
-    body
-  end
-
-  def index
-    body = "<div>This is my index action</div>"
-    body
-  end
-
-  def edit
-    body = "<div><form action='/users' method='POST'></form><form action='/sessions' method='POST'></form></div>"
-  end
-
-  def create
-
-  end
-end
-
-
-describe Merb::Rack::Csrf do
-  before(:each) do
-    @app = Merb::Rack::Application.new
-    @middleware = Merb::Rack::Csrf.new(@app)
-    @env = Rack::MockRequest.env_for('/users/new')
-    
-    Merb::Config[:session_secret_key] = "ABC"
-  end
-
-  it "should be successful" do
-    env = Rack::MockRequest.env_for('/users', :method => 'POST', 'csrf_authentication_token' => "b072aa15485e028dc8973d48089efe0e")
-    status, header, body = @middleware.call(env)
-    status.should == 200
-  end
-
-  it "should return a Merb::ExceptionsController::Forbidden (403)" do
-    env = Rack::MockRequest.env_for('/users', :method => 'POST', 'csrf_authentication_token' => "INCORRECT_AUTH_TOKEN")
-    status, header, body = @middleware.call(env)
-    status.should == 403
-  end
-
-  it "should insert a hidden field in to any form with a POST method" do
-    env = Rack::MockRequest.env_for('/users/new')
-    status, header, body = @middleware.call(env)
-    body.should have_tag(:form, :action => '/users')
-      body.should have_tag(:input, :type => 'hidden', :id => 'csrf_authentication_token')
-  end
-
-  it "should not do anything if there is no form found in the response" do
-    env = Rack::MockRequest.env_for('/users')
-    status, header, body = @middleware.call(env)
-    body.should not_match_tag('form')
-  end
-
-  it "should insert hidden fields in to both forms" do
-    env = Rack::MockRequest.env_for('/users/1/edit')
-    status, header, body = @middleware.call(env)
-    body.should have_tag(:form, :action => '/users')
-    body.should have_tag(:form, :action => '/sessions')
-  end
-end

data/spec/public/rack/rack_middleware_spec.rb

@@ -1,99 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-require File.join(File.dirname(__FILE__), "shared_example_groups")
-
-class RackyController < Merb::Controller
-  def index
-    body = "Everyone loves Rack"
-    headers['Content-Length'] = body.size.to_s
-    
-    body
-  end
-end
-
-Merb::Router.prepare do |r|
-  r.match("/heavy/lifting").to(:controller => "racky_controller")
-end
-
-
-describe Merb::Rack::Application do
-  before(:each) do
-    @app = Merb::Rack::Application.new
-    @env = Rack::MockRequest.env_for('/heavy/lifting')
-    
-    @result = @app.call(@env)
-    @body   = "Everyone loves Rack"
-  end
-
-  it_should_behave_like "rack application"
-
-  it 'sets Date header' do
-    status, headers, body = @app.call(@env)
-
-    headers.should include(Merb::Const::DATE)
-  end
-  
-  describe "#deferred?" do
-    it "returns true when request path matches deferred actions regexp" do
-      Merb::Config[:deferred_actions] = ['/heavy/lifting']
-
-      @app.deferred?(@env).should be(true)
-    end
-
-    it "returns false when request path DOES NOT match deferred actions regexp" do
-      @app.deferred?(Rack::MockRequest.env_for('/not/deferred')).should be(false)
-    end
-  end
-end
-
-
-describe Merb::Rack::Middleware do
-  before(:each) do
-    @app = Merb::Rack::Application.new
-    @middleware = Merb::Rack::Middleware.new(@app)
-    @env        = Rack::MockRequest.env_for('/heavy/lifting')
-    
-    @result = @middleware.call(@env)
-    @body   = "Everyone loves Rack"
-  end
-
-  it_should_behave_like "rack application"
-
-  it_should_behave_like "transparent middleware"
-end
-
-
-
-describe Merb::Rack::Tracer do
-  before(:each) do
-    @app = Merb::Rack::Application.new
-    @middleware = Merb::Rack::Tracer.new(@app)
-    @env        = Rack::MockRequest.env_for('/heavy/lifting')
-    
-    @result = @middleware.call(@env)
-    @body   = "Everyone loves Rack"
-  end
-
-  it_should_behave_like "rack application"
-
-  it_should_behave_like "transparent middleware"  
-end
-
-
-describe Merb::Rack::ContentLength do
-  before(:each) do
-    @app = Merb::Rack::Application.new
-    @middleware = Merb::Rack::ContentLength.new(@app)
-    @env        = Rack::MockRequest.env_for('/heavy/lifting')
-    
-    @result = @middleware.call(@env)
-    @body   = "Everyone loves Rack"
-  end
-
-  it_should_behave_like "rack application"
-
-  it_should_behave_like "transparent middleware"
-
-  it 'sets Content-Length header to response body size' do
-    @result[1]['Content-Length'].should == @body.size.to_s
-  end
-end