merb-core 0.9.2 → 0.9.3

data/spec/public/test/view_helper_spec.rb

@@ -54,7 +54,7 @@ describe Merb::Test::ViewHelper do
   it "should raise an error if the ouput is not specified and cannot be found" do
     @output, @response_output, @controller = nil
     
-    lambda { tag("div") }.should raise_error("The response output was not in it's usual places, please provide the output")
+    lambda { tag("div") }.should raise_error("The response output was not in its usual places, please provide the output")
   end
   
   it "should use @output if no output parameter is supplied" do

data/spec/public/test/view_matchers_spec.rb

@@ -1,106 +1,182 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "merb-core/test"
 
 Merb.start :environment => 'test', :log_level => :fatal
 
-module Merb::Test::Rspec::ViewMatchers
-  describe HasTag do
-    describe "#matches?" do
-      before(:each) do
-        @document = stub(:document)
-        Hpricot.should_receive(:parse).and_return @document
-      end
+describe Merb::Test::Rspec::ViewMatchers do
+  include Merb::Test::ViewHelper
+  
+  before(:each) do
+    @body = <<-EOF
+    <div id='main'>
+      <div class='inner'>hello, world!</div>
+    </div>
+    EOF
+  end
+  
+  describe "#match_tag" do
+    it "should work with a HasContent matcher in the block" do
+      @body.should have_tag(:div) {|d| d.should_not contain("merb")}
+    end
+    
+    it "should work with a 'with_tag' chain" do
+      @body.should have_tag(:div, :id => :main).with_tag(:div, :class => 'inner')
+    end
+    
+    it "should work with a block before a with_tag" do
+      @body.should have_tag(:div, :id => :main) {|d| d.should_not contain("merb")}.with_tag(:div, :class => 'inner')
+    end
+  end
+
+  module Merb::Test::Rspec::ViewMatchers
+  
+    describe HasTag do
+      describe "#matches?" do
+        before(:each) do
+          @document = stub(:document)
+          Hpricot.should_receive(:parse).and_return @document
+        end
       
-      it "should should pass all found elements to the block" do
-        @block_called = false
+        it "should should pass all found elements to the block" do
+          @block_called = false
         
-        @document.should_receive(:search).and_return [""]
-        HasTag.new("tag").matches?("") {|e| @block_called = true}
+          @document.should_receive(:search).and_return [""]
+          HasTag.new("tag").matches?("") {|e| @block_called = true}
         
-        @block_called.should be_true
-      end
-      
-      it "should not fail if the result if the block raises an error" do
-        @document.should_receive(:search).and_return [""]
-        HasTag.new("tag").matches?("") {|e| true.should be_false }
-      end
+          @block_called.should be_true
+        end
       
-      it "should not treat ExpectationNotMetError raised in the block as false" do
-        @document.should_receive(:search).and_return [1, 2, 3]
-        HasTag.new("tag").matches?("") {|e| e.should == 4 }.should be_false
+        it "should not intercept any errors raised in the block" do
+          @document.should_receive(:search).and_return [""]
+          lambda {
+            HasTag.new("tag").matches?("") {|e| true.should be_false }
+          }.should raise_error(Spec::Expectations::ExpectationNotMetError)
+        end
       end
-    end
     
-    describe "#with_tag" do
-      it "should set @inner_tag" do
-        outer = HasTag.new("outer")
-        inner = outer.with_tag("inner")
+      describe "#with_tag" do
+        it "should set @inner_tag" do
+          outer = HasTag.new("outer")
+          inner = outer.with_tag("inner")
         
-        outer.selector.should include(inner.selector)
+          outer.selector.should include(inner.selector)
+        end
       end
-    end
     
-    describe "#selector" do
-      it "should always start with \/\/" do
-        HasTag.new("tag").selector.should =~ /^\/\//
-      end
+      describe "#selector" do
+        it "should always start with \/\/" do
+          HasTag.new("tag").selector.should =~ /^\/\//
+        end
       
-      it "should use @tag for the element" do
-        HasTag.new("tag").selector.should include("tag")
-      end
+        it "should use @tag for the element" do
+          HasTag.new("tag").selector.should include("tag")
+        end
       
-      it "should use dot notation for the class" do
-        HasTag.new("tag", :class => "class").selector.should include("tag.class")
-      end
+        it "should use dot notation for the class" do
+          HasTag.new("tag", :class => "class").selector.should include("tag.class")
+        end
       
-      it "should use pound(#) notation for the id" do
-        HasTag.new("tag", :id => "id").selector.should include("tag#id")
-      end
+        it "should use pound(#) notation for the id" do
+          HasTag.new("tag", :id => "id").selector.should include("tag#id")
+        end
       
-      it "should include any custom attributes" do
-        HasTag.new("tag", :random => :attribute).selector.should include("[@random=\"attribute\"]")
-      end
+        it "should include any custom attributes" do
+          HasTag.new("tag", :random => :attribute).selector.should include("[@random=\"attribute\"]")
+        end
       
-      it "should not include the class as a custom attribute" do
-        HasTag.new("tag", :class => :my_class, :rand => :attr).selector.should_not include("[@class=\"my_class\"]")
-      end
+        it "should not include the class as a custom attribute" do
+          HasTag.new("tag", :class => :my_class, :rand => :attr).selector.should_not include("[@class=\"my_class\"]")
+        end
       
-      it "should not include the id as a custom attribute" do
-        HasTag.new("tag", :id => :my_id, :rand => :attr).selector.should_not include("[@id=\"my_id\"]")
+        it "should not include the id as a custom attribute" do
+          HasTag.new("tag", :id => :my_id, :rand => :attr).selector.should_not include("[@id=\"my_id\"]")
+        end
       end
-    end
     
-    describe "#failure_message" do
-      it "should include the tag name" do
-        HasTag.new("anytag").failure_message.should include("<anytag")
-      end
+      describe "#failure_message" do
+        it "should include the tag name" do
+          HasTag.new("anytag").failure_message.should include("<anytag")
+        end
       
-      it "should include the tag's id" do
-        HasTag.new("div", :id => :spacer).failure_message.should include("<div id=\"spacer\"")
-      end
+        it "should include the tag's id" do
+          HasTag.new("div", :id => :spacer).failure_message.should include("<div id=\"spacer\"")
+        end
       
-      it "should include the tag's class" do
-        HasTag.new("div", :class => :header).failure_message.should include("<div class=\"header\"")
+        it "should include the tag's class" do
+          HasTag.new("div", :class => :header).failure_message.should include("<div class=\"header\"")
+        end
+      
+        it "should include the tag's custom attributes" do
+          HasTag.new("h1", :attr => :val, :foo => :bar).failure_message.should include("attr=\"val\"")
+          HasTag.new("h1", :attr => :val, :foo => :bar).failure_message.should include("foo=\"bar\"")
+        end
       end
+    
+      describe "id, class, and attributes for error messages" do
+        it "should start with a space for a class, id, or custom attribute" do
+          HasTag.new("tag", :id => "identifier").id_for_error.should =~ /^ /
+          HasTag.new("tag", :class => "classifier").class_for_error.should =~ /^ /
+          HasTag.new("tag", :rand => "attr").attributes_for_error.should =~ /^ /
+        end
       
-      it "should include the tag's custom attributes" do
-        HasTag.new("h1", :attr => :val, :foo => :bar).failure_message.should include("attr=\"val\"")
-        HasTag.new("h1", :attr => :val, :foo => :bar).failure_message.should include("foo=\"bar\"")
+        it "should have 'class=\"classifier\"' in class_for_error" do
+          HasTag.new("tag", :class => "classifier").class_for_error.should include("class=\"classifier\"")
+        end
+      
+        it "should have 'id=\"identifier\" in id_for_error" do
+          HasTag.new("tag", :id => "identifier").id_for_error.should include("id=\"identifier\"")
+        end
       end
     end
     
-    describe "id, class, and attributes for error messages" do
-      it "should start with a space for a class, id, or custom attribute" do
-        HasTag.new("tag", :id => "identifier").id_for_error.should =~ /^ /
-        HasTag.new("tag", :class => "classifier").class_for_error.should =~ /^ /
-        HasTag.new("tag", :rand => "attr").attributes_for_error.should =~ /^ /
+    describe HasContent do
+      before(:each) do
+        @element = stub(:element)
+        @element.stub!(:inner_content).and_return <<-EOF
+          <div id='main'>
+            <div class='inner'>hello, world!</div>
+          </div>
+        EOF
+        
+        @element.stub!(:contains?)
+        @element.stub!(:matches?)
       end
       
-      it "should have 'class=\"classifier\"' in class_for_error" do
-        HasTag.new("tag", :class => "classifier").class_for_error.should include("class=\"classifier\"")
+      describe "#matches?" do
+        it "should call element#contains? when the argument is a string" do
+          @element.should_receive(:contains?)
+          
+          HasContent.new("hello, world!").matches?(@element)
+        end
+        
+        it "should call element#matches? when the argument is a regular expression" do
+          @element.should_receive(:matches?)
+          
+          HasContent.new(/hello, world/).matches?(@element)
+        end
       end
-      
-      it "should have 'id=\"identifier\" in id_for_error" do
-        HasTag.new("tag", :id => "identifier").id_for_error.should include("id=\"identifier\"")
+    
+      describe "#failure_message" do
+        it "should include the content string" do
+          hc = HasContent.new("hello, world!")
+          hc.matches?(@element)
+          
+          hc.failure_message.should include("\"hello, world!\"")
+        end
+        
+        it "should include the content regular expresson" do
+          hc = HasContent.new(/hello,\sworld!/)
+          hc.matches?(@element)
+          
+          hc.failure_message.should include("/hello,\\sworld!/")
+        end
+        
+        it "should include the element's inner content" do
+          hc = HasContent.new(/hello,\sworld!/)
+          hc.matches?(@element)
+          
+          hc.failure_message.should include(@element.inner_content)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,12 +102,15 @@ files:
 - spec/private/config/environment_spec.rb
 - spec/private/config/spec_helper.rb
 - spec/private/core_ext
+- spec/private/core_ext/class_spec.rb
 - spec/private/core_ext/hash_spec.rb
 - spec/private/core_ext/kernel_spec.rb
 - spec/private/core_ext/object_spec.rb
 - spec/private/core_ext/set_spec.rb
 - spec/private/core_ext/string_spec.rb
+- spec/private/core_ext/time_spec.rb
 - spec/private/dispatch
+- spec/private/dispatch/bootloader_spec.rb
 - spec/private/dispatch/cookies_spec.rb
 - spec/private/dispatch/dispatch_spec.rb
 - spec/private/dispatch/fixture
@@ -129,6 +132,7 @@ files:
 - spec/private/dispatch/fixture/app/views/layout
 - spec/private/dispatch/fixture/app/views/layout/application.html.erb
 - spec/private/dispatch/fixture/config
+- spec/private/dispatch/fixture/config/black_hole.rb
 - spec/private/dispatch/fixture/config/environments
 - spec/private/dispatch/fixture/config/environments/development.rb
 - spec/private/dispatch/fixture/config/environments/production.rb
@@ -267,8 +271,10 @@ files:
 - spec/public/boot_loader/boot_loader_spec.rb
 - spec/public/boot_loader/spec_helper.rb
 - spec/public/controller
+- spec/public/controller/authentication_spec.rb
 - spec/public/controller/base_spec.rb
 - spec/public/controller/controllers
+- spec/public/controller/controllers/authentication.rb
 - spec/public/controller/controllers/base.rb
 - spec/public/controller/controllers/display.rb
 - spec/public/controller/controllers/responder.rb
@@ -276,6 +282,7 @@ files:
 - spec/public/controller/controllers/views
 - spec/public/controller/controllers/views/layout
 - spec/public/controller/controllers/views/layout/custom.html.erb
+- spec/public/controller/controllers/views/layout/custom_arg.html.erb
 - spec/public/controller/controllers/views/merb
 - spec/public/controller/controllers/views/merb/test
 - spec/public/controller/controllers/views/merb/test/fixtures
@@ -285,6 +292,8 @@ files:
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb
+- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument
+- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout
@@ -301,6 +310,8 @@ files:
 - spec/public/controller/responder_spec.rb
 - spec/public/controller/spec_helper.rb
 - spec/public/controller/url_spec.rb
+- spec/public/core
+- spec/public/core/merb_core_spec.rb
 - spec/public/DEFINITIONS
 - spec/public/directory_structure
 - spec/public/directory_structure/directory
@@ -362,6 +373,12 @@ files:
 - spec/public/test/controllers/controller_assertion_mock.rb
 - spec/public/test/controllers/dispatch_controller.rb
 - spec/public/test/controllers/spec_helper_controller.rb
+- spec/public/test/example_groups
+- spec/public/test/example_groups/views
+- spec/public/test/example_groups/views/test
+- spec/public/test/helpers
+- spec/public/test/helpers/controllers
+- spec/public/test/matchers
 - spec/public/test/multipart_request_helper_spec.rb
 - spec/public/test/multipart_upload_text_file.txt
 - spec/public/test/request_helper_spec.rb
@@ -381,6 +398,7 @@ files:
 - lib/merb-core/controller/merb_controller.rb
 - lib/merb-core/controller/mime.rb
 - lib/merb-core/controller/mixins
+- lib/merb-core/controller/mixins/authentication.rb
 - lib/merb-core/controller/mixins/controller.rb
 - lib/merb-core/controller/mixins/render.rb
 - lib/merb-core/controller/mixins/responder.rb
@@ -395,6 +413,7 @@ files:
 - lib/merb-core/core_ext/rubygems.rb
 - lib/merb-core/core_ext/set.rb
 - lib/merb-core/core_ext/string.rb
+- lib/merb-core/core_ext/time.rb
 - lib/merb-core/core_ext.rb
 - lib/merb-core/dispatch
 - lib/merb-core/dispatch/cookies.rb
@@ -432,6 +451,7 @@ files:
 - lib/merb-core/rack.rb
 - lib/merb-core/server.rb
 - lib/merb-core/test
+- lib/merb-core/test/example_groups
 - lib/merb-core/test/helpers
 - lib/merb-core/test/helpers/controller_helper.rb
 - lib/merb-core/test/helpers/multipart_request_helper.rb
@@ -459,7 +479,7 @@ files:
 - lib/merb-core/version.rb
 - lib/merb-core.rb
 has_rdoc: true
-homepage: http://merb.devjavu.com
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []