merb-core 0.9.3 → 0.9.4

data/spec/public/abstract_controller/controllers/cousins.rb

@@ -0,0 +1,41 @@
+module Merb::Test::Fixtures
+  
+  module Abstract
+    
+    class Testing < Merb::AbstractController
+      self._template_root = File.dirname(__FILE__) / "views"
+    end
+    
+    class FilterParent < Testing
+      before :print_before_filter
+      
+      def print_before_filter
+        @before_string = "Before"
+      end
+    end
+    
+    class FilterChild1 < FilterParent
+      before :print_before_filter, :only => :limited
+      
+      def index
+        @before_string.to_s + " Index"
+      end
+      
+      def limited
+        @before_string.to_s + " Limited"
+      end
+    end
+
+    class FilterChild2 < FilterParent
+      
+      def index
+        @before_string.to_s + " Index"
+      end
+      
+      def limited
+        @before_string.to_s + " Limited"
+      end
+    end
+    
+  end
+end

data/spec/public/abstract_controller/controllers/helpers.rb

@@ -7,11 +7,21 @@ module Merb::Test::Fixtures
       def _template_location(context, type = nil, controller = controller_name)
         "helpers/#{File.basename(controller)}/#{context}"
       end
+      
+      def index
+        render
+      end
     end
     
     class Capture < HelperTesting
-      def index
-        render
+    end
+    
+    class CaptureWithArgs < HelperTesting
+    end
+    
+    class CaptureEq < HelperTesting
+      def helper_using_capture(&blk)
+        "Beginning... #{capture(&blk)}... Done"
       end
     end
 

data/spec/public/abstract_controller/controllers/partial.rb

@@ -11,7 +11,7 @@ module Merb::Test::Fixtures
         "partial/#{File.basename(controller)}/#{context}"
       end
     end
-
+    
     class BasicPartial < RenderIt
 
       def index
@@ -19,6 +19,14 @@ module Merb::Test::Fixtures
       end
     end
 
+    class WithAbsolutePartial < RenderIt
+      
+      def index
+        @absolute_partial_path = File.expand_path(File.dirname(__FILE__)) / 'views' / 'partial' / 'with_absolute_partial' / 'partial'
+        render 
+      end
+    end
+
     class WithPartial < RenderIt
 
       def index
@@ -57,6 +65,13 @@ module Merb::Test::Fixtures
         render
       end
     end
+    
+   class PartialWithCollectionsAndCounter < RenderIt
+      def index
+        @foo = %w(1 2 3 4 5)
+        render
+      end
+    end
 
     class PartialWithLocals < RenderIt
 
@@ -103,4 +118,4 @@ module Merb::Test::Fixtures
       end
     end
   end
-end
+end

data/spec/public/abstract_controller/controllers/render.rb

@@ -8,6 +8,13 @@ module Merb::Test::Fixtures
       self._template_root = File.dirname(__FILE__) / "views"
     end
 
+		class RenderTwoThrowContents < Testing
+			
+			def index
+				render
+			end
+		end
+
     class RenderString < Testing
       
       def index
@@ -76,11 +83,19 @@ module Merb::Test::Fixtures
       end
     end
     
+    class RenderTemplateAbsolutePath < RenderTemplate
+      
+      def index
+        render :template => File.expand_path(self._template_root) / 'wonderful' / 'index'
+      end
+      
+    end
+    
     class RenderTemplateMultipleRoots < RenderTemplate
       self._template_roots << [File.dirname(__FILE__) / "alt_views", :_template_location]
       
       def show
-        render :layout=>false
+        render :layout => false
       end
     end
 

data/spec/public/abstract_controller/controllers/views/helpers/capture_eq/index.erb

@@ -0,0 +1 @@
+Pre. <%= helper_using_capture do %>Capturing<% end =%>. Post.

data/spec/public/abstract_controller/controllers/views/helpers/capture_with_args/index.erb

@@ -0,0 +1 @@
+<% x = capture('one', 'two') do |one, two| -%>Capture: <%= one %>, <%= two %><% end -%><%= x %>

data/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb

@@ -0,0 +1 @@
+<% throw_content(:foo, "Foo") %><% throw_content(:foo, "Bar") %><%= catch_content(:foo) %>

data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/_collection.erb

@@ -0,0 +1 @@
+<%= collection_index %>/<%= collection_size %> 

data/spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/index.erb

@@ -0,0 +1 @@
+Partial counting: <%= partial :collection, :with => @foo %>

data/spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb

@@ -0,0 +1 @@
+Absolute Partial

data/spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb

@@ -0,0 +1 @@
+Index <%= partial @absolute_partial_path %>

data/spec/public/abstract_controller/filter_spec.rb

@@ -78,6 +78,15 @@ describe Merb::AbstractController, " should support before and after filters" do
     running { dispatch_should_make_body("TestConditionalFilterWithNoProcOrSymbol", "") }.should raise_error(ArgumentError, /a Symbol or a Proc/)
   end
   
+  it "should throw an error if an unknown option is passed to a filter" do
+    running { Merb::Test::Fixtures::Abstract.class_eval do
+        
+      class TestErrorFilter < Merb::Test::Fixtures::Abstract::Testing
+        before :foo, :except => :index
+      end 
+    end }.should raise_error(ArgumentError, /known filter options/)
+  end
+  
   it "should support passing an argument to a before filter method" do
     dispatch_should_make_body("TestBeforeFilterWithArgument", "index action")
   end
@@ -85,4 +94,14 @@ describe Merb::AbstractController, " should support before and after filters" do
   it "should support passing arguments to a before filter method" do
     dispatch_should_make_body("TestBeforeFilterWithArguments", "index action")
   end
-end
+  
+  it "should inherit before filters" do
+    dispatch_should_make_body("FilterChild2", "Before Limited", :limited)
+  end
+  
+  it "should not get contaminated by cousins" do
+    dispatch_should_make_body("FilterChild2", "Before Index")
+    dispatch_should_make_body("FilterChild1", "Before Limited", :limited)
+    dispatch_should_make_body("FilterChild1", " Index")
+  end
+end

data/spec/public/abstract_controller/helper_spec.rb

@@ -3,11 +3,19 @@ require File.join(File.dirname(__FILE__), "spec_helper")
 describe Merb::AbstractController, " with capture and concat" do
   
   it "should support capture" do
-    dispatch_should_make_body("Capture", "Capture")    
+    dispatch_should_make_body("Capture", "Capture")
+  end
+  
+  it "should support capture with arguments" do
+    dispatch_should_make_body("CaptureWithArgs", "Capture: one, two")
+  end
+
+  it "should support basic helpers that use capture with <%=" do
+    dispatch_should_make_body("CaptureEq", "Pre. Beginning... Capturing... Done. Post.")
   end
   
   it "should support concat" do
     dispatch_should_make_body("Concat", "Concat")
   end
-  
+    
 end

data/spec/public/abstract_controller/partial_spec.rb

@@ -50,4 +50,12 @@ describe Merb::AbstractController, " Partials" do
     dispatch_should_make_body("BasicPartialWithMultipleRoots", "Base Index: Alt Partial")
   end
   
+  it "should be able to count collections" do
+    dispatch_should_make_body("PartialWithCollectionsAndCounter", "Partial counting: 0/5 1/5 2/5 3/5 4/5 ")
+  end
+  
+  it "should render a partial using an absolute path" do
+    dispatch_should_make_body("WithAbsolutePartial", "Index Absolute Partial")
+  end
+  
 end

data/spec/public/abstract_controller/render_spec.rb

@@ -6,6 +6,10 @@ describe Merb::AbstractController, " rendering plain strings" do
     Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")
   end
 
+	it "should render two thrown_contents into same object" do
+    dispatch_should_make_body("RenderTwoThrowContents", "FooBar")		
+	end
+
   it "should support rendering plain strings with no layout" do
     dispatch_should_make_body("RenderString", "the index")
   end
@@ -63,6 +67,10 @@ describe Merb::AbstractController, " rendering templates" do
     dispatch_should_make_body("RenderTemplateCustomLocation", "Wonderful")
   end
   
+  it "should support rendering templates from an absolute path location" do
+    dispatch_should_make_body("RenderTemplateAbsolutePath", "Wonderful")
+  end
+
   it "should support rendering templates with multiple roots" do
     dispatch_should_make_body("RenderTemplateMultipleRoots", "App: Multiple")
   end

data/spec/public/abstract_controller/spec_helper.rb

@@ -2,6 +2,7 @@ __DIR__ = File.dirname(__FILE__)
 require File.join(__DIR__, "..", "..", "spec_helper")
 
 require File.join(__DIR__, "controllers", "filters")
+require File.join(__DIR__, "controllers", "cousins")
 require File.join(__DIR__, "controllers", "render")
 require File.join(__DIR__, "controllers", "partial")
 require File.join(__DIR__, "controllers", "display")
@@ -12,12 +13,15 @@ Merb.start :environment => 'test'
 module Merb::Test::Behaviors
   include Merb::Test::RequestHelper
   
-  def dispatch_should_make_body(klass, body, action = :index, opts = {})
-    controller = Merb::Test::Fixtures::Abstract.const_get(klass).new
+  def dispatch_should_make_body(klass, body, action = :index, opts = {}, env = {}, &blk)
+    klass = Merb::Test::Fixtures::Abstract.const_get(klass)
     if opts.key?(:presets)
+      controller = klass.new
       opts[:presets].each { |attr, value| controller.send(attr, value)}
+      controller._dispatch(action.to_s)
+    else
+      controller = dispatch_to(klass, action, opts, env, &blk)
     end
-    controller._dispatch(action.to_s)
     controller.body.should == body
   end
 end

data/spec/public/boot_loader/boot_loader_spec.rb

@@ -5,7 +5,7 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
 class Merb::BootLoader::AfterTest < Merb::BootLoader
-  after Merb::BootLoader::BeforeAppRuns
+  after Merb::BootLoader::BeforeAppLoads
   
   def self.run
   end
@@ -21,7 +21,7 @@ end
 describe "The BootLoader" do
   
   it "should support adding a BootLoader after another" do
-    idx = Merb::BootLoader.subclasses.index("Merb::BootLoader::BeforeAppRuns")
+    idx = Merb::BootLoader.subclasses.index("Merb::BootLoader::BeforeAppLoads")
     Merb::BootLoader.subclasses.index("Merb::BootLoader::AfterTest").should == idx + 1
   end
 

data/spec/public/controller/base_spec.rb

@@ -9,9 +9,17 @@ describe Merb::Controller, " callable actions" do
     end
   end
   
-  it "should dispatch to callable actions" do
+  it "has no any callable actions by default" do
+    Merb::Controller.callable_actions.should be_empty
+  end
+  
+  it "sets body on dispatch to callable action" do
     controller = dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index)
     controller.body.should == "index"
+  end
+
+  it "sets status on dispatch to callable action" do
+    controller = dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index)
     controller.status.should == 200
   end
 
@@ -29,4 +37,4 @@ describe Merb::Controller, " callable actions" do
       should raise_error(Merb::ControllerExceptions::ActionNotFound)
   end
  
-end
+end

data/spec/public/controller/config/init.rb

@@ -0,0 +1,6 @@
+Merb::Config.use do |c|
+  c[:session_cookie_domain] = "specs.merbivore.com"
+  c[:session_id_key]        = "some_meaningless_id_key"
+  c[:session_secret_key]    = "some_super_hyper_secret_key"
+  c[:session_expiry]        = Merb::Const::WEEK * 4
+end

data/spec/public/controller/controllers/authentication.rb

@@ -1,47 +1,45 @@
 module Merb::Test::Fixtures::Controllers
-  
+
   class Testing < Merb::Controller
     self._template_root = File.dirname(__FILE__) / "views"
   end
 
   class BasicAuthentication < Testing
-
     before :authenticate, :only => :index
 
     def index
       "authenticated"
     end
-    
+
     protected
-  
+
     def authenticate
       basic_authentication { |u, p| u == "Fred" && p == "secret" }
     end
-    
   end
-  
+
   class BasicAuthenticationWithRealm < BasicAuthentication
     def authenticate
       basic_authentication("My Super App") { |u, p| u == "Fred" && p == "secret" }
     end
   end
-  
+
   class AuthenticateBasicAuthentication < Testing
     def index
       basic_authentication.authenticate { |u, p| "Fred:secret" }
     end
   end
-  
+
   class RequestBasicAuthentication < BasicAuthentication
     def authenticate
       basic_authentication.request
     end
   end
-  
+
   class RequestBasicAuthenticationWithRealm < BasicAuthentication
     def authenticate
       basic_authentication("My SuperApp").request
     end
   end
-  
-end
+
+end

data/spec/public/controller/controllers/base.rb

@@ -1,15 +1,10 @@
-
-
 module Merb::Test::Fixtures
-
   module Controllers
-    
     class Testing < Merb::Controller
       self._template_root = File.dirname(__FILE__) / "views"
     end
 
     module Inclusion
-
       def self.included(base)
         base.show_action(:baz)
       end
@@ -21,12 +16,11 @@ module Merb::Test::Fixtures
       def bat
         "bat"
       end
-      
     end
 
     class Base < Testing
       include Inclusion
-      
+
       def index
         self.status = :ok
         "index"
@@ -39,4 +33,4 @@ module Merb::Test::Fixtures
     end
 
   end
-end
+end

data/spec/public/controller/controllers/cookies.rb

@@ -0,0 +1,16 @@
+module Merb::Test::Fixtures::Controllers
+
+  class Testing < Merb::Controller
+    self._template_root = File.dirname(__FILE__) / "views"
+  end
+
+  class CookiesController < Testing
+  end
+  
+  class OverridingSessionCookieDomain < CookiesController
+    self._session_cookie_domain = "overridden.merbivore.com"
+  end
+
+  class NotOverridingSessionCookieDomain < CookiesController
+  end
+end

data/spec/public/controller/controllers/dispatcher.rb

@@ -0,0 +1,35 @@
+class Application < Merb::Controller
+end
+
+module Merb::Test::Fixtures
+  module Controllers
+    class Testing < Merb::Controller
+      self._template_root = File.dirname(__FILE__) / "views"
+    end
+
+    class DispatchTo < Testing
+      def index
+        "Dispatched"
+      end
+    end
+    
+    class NotAController
+      def index
+        "Dispatched"
+      end
+    end
+    
+    class RaiseGone < Testing
+      def index
+        raise Gone
+      end
+    end
+
+    class RaiseLoadError < Merb::Controller
+      def index
+        raise LoadError, "In the controller"
+      end
+    end
+
+  end
+end