merb-core 0.9.4 → 0.9.5

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ module Merb
         def matches?(target)
           target.log.rewind
           @text = target.log.read
-          @text =~ (String === @expected ? /#{@expected}/ : @expected)
+          @text =~ (String === @expected ? /#{Regexp.escape @expected}/ : @expected)
         end
         
         def failure_message
@@ -98,6 +98,12 @@ Spec::Runner.configure do |config|
   config.include Merb::Test::RspecMatchers
   config.include Merb::Test::RequestHelper
 
+  def with_level(level)
+    Merb.logger = Merb::Logger.new(StringIO.new, level)
+    yield
+    Merb.logger
+  end
+
   def capture(stream)
     begin
       stream = stream.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 +03:00
+date: 2008-08-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -82,6 +82,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Merb. Pocket rocket web framework.
 email: ez@engineyard.com
 executables: 
@@ -110,6 +140,7 @@ files:
 - spec/private/config/adapter_spec.rb
 - spec/private/config/config_spec.rb
 - spec/private/config/environment_spec.rb
+- spec/private/config/merb_spec.rb
 - spec/private/config/spec_helper.rb
 - spec/private/core_ext
 - spec/private/core_ext/kernel_spec.rb
@@ -154,8 +185,6 @@ files:
 - spec/private/dispatch/route_params_spec.rb
 - spec/private/dispatch/session_mixin_spec.rb
 - spec/private/dispatch/spec_helper.rb
-- spec/private/plugins
-- spec/private/plugins/plugin_spec.rb
 - spec/private/router
 - spec/private/router/behavior_spec.rb
 - spec/private/router/fixture
@@ -371,6 +400,10 @@ files:
 - spec/public/logger
 - spec/public/logger/logger_spec.rb
 - spec/public/logger/spec_helper.rb
+- spec/public/rack
+- spec/public/rack/conditinal_get_middleware_spec.rb
+- spec/public/rack/rack_middleware_spec.rb
+- spec/public/rack/shared_example_groups.rb
 - spec/public/reloading
 - spec/public/reloading/directory
 - spec/public/reloading/directory/app
@@ -437,6 +470,7 @@ files:
 - lib/merb-core/controller/mixins/responder.rb
 - lib/merb-core/controller/template.rb
 - lib/merb-core/core_ext
+- lib/merb-core/core_ext/hash.rb
 - lib/merb-core/core_ext/kernel.rb
 - lib/merb-core/core_ext.rb
 - lib/merb-core/dispatch
@@ -481,9 +515,12 @@ files:
 - lib/merb-core/rack/handler
 - lib/merb-core/rack/handler/mongrel.rb
 - lib/merb-core/rack/middleware
+- lib/merb-core/rack/middleware/conditional_get.rb
+- lib/merb-core/rack/middleware/content_length.rb
 - lib/merb-core/rack/middleware/path_prefix.rb
 - lib/merb-core/rack/middleware/profiler.rb
 - lib/merb-core/rack/middleware/static.rb
+- lib/merb-core/rack/middleware/tracer.rb
 - lib/merb-core/rack/middleware.rb
 - lib/merb-core/rack.rb
 - lib/merb-core/server.rb

data/spec/private/plugins/plugin_spec.rb

@@ -1,166 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
-
-Merb.environment = 'test'
-
-def reset_merb_generator_scope
-  Merb.orm_generator_scope = :merb_default
-  Merb.test_framework_generator_scope = :rspec
-  Kernel.stub!(:dependency)
-end
-
-describe "Plugins", "default generator scope" do
-  it "has :merb_default" do
-    Merb.generator_scope.should include(:merb_default)
-  end
-
-  it "MUST include :merb" do
-    Merb.generator_scope.should include(:merb)
-  end
-
-  it "has :rspec" do
-    Merb.generator_scope.should include(:rspec)
-  end
-end
-
-
-
-describe "Plugins", "ORM generator scope" do
-  before :each do
-    reset_merb_generator_scope
-  end
-
-  it "has merb_default stub by default" do
-    Merb.orm_generator_scope.should == :merb_default
-  end
-end
-
-
-
-describe "Plugins","use_orm" do
-  before(:each) do
-    reset_merb_generator_scope
-  end
-
-  it "removes defaults from generator scope" do
-    use_orm(:datamapper)
-    Merb.generator_scope.should_not include(:merb_default)
-  end
-
-  it "adds orm symbol to generator scope" do
-    use_orm(:activerecord)
-    Merb.generator_scope.should include(:activerecord)
-  end
-
-  it "replaces previously used if use_orm is called more than once" do
-    use_orm(:sequel)
-    use_orm(:activerecord)
-    use_orm(:datamapper)
-
-    Merb.generator_scope.should_not include(:sequel)
-    Merb.generator_scope.should_not include(:activerecord)
-    Merb.generator_scope.should include(:datamapper)
-  end
-
-  it "calls dependency :merb_<orm>" do
-    Kernel.should_receive(:dependency).with("merb_activerecord").once.
-      and_return(true)
-    use_orm(:activerecord)
-  end
-
-  it "does not affect presence of :merb in generator scope" do
-    use_orm(:datamapper)
-    Merb.generator_scope.should include(:merb)
-  end
-end
-
-
-
-describe "Plugins", "test framework generator scope" do
-  before :each do
-    reset_merb_generator_scope
-  end
-
-  it "has rspec by default" do
-    Merb.test_framework_generator_scope.should == :rspec
-  end
-end
-
-
-
-describe "Plugins","use_test" do
-  before(:each) do
-    reset_merb_generator_scope
-  end
-
-  it "removes defaults" do
-    use_test(:test_unit)
-    Merb.generator_scope.should_not include(:rspec)
-  end
-
-  it "adds used test framework to generator scope" do
-    use_test(:test_unit)
-    Merb.generator_scope.should include(:test_unit)
-  end
-
-  it "raises an error when unsupported test framework is used" do
-    lambda { use_test(:fiddlefaddle) }.should raise_error
-  end
-
-  it "does not affect presence of :merb in generator scope" do
-    use_test(:test_unit)
-    Merb.generator_scope.should include(:merb)
-  end
-end
-
-
-
-describe "Plugins", "register_orm" do
-  before(:each) do
-    reset_merb_generator_scope
-  end
-
-  it "registers ORM plugin at orm generator scope" do
-    register_orm(:sequel)
-
-    Merb.orm_generator_scope.should == :sequel
-  end
-end
-
-
-
-describe "Plugins", "register_test_framework" do
-  before(:each) do
-    reset_merb_generator_scope
-  end
-
-  it "registers test framework at generator scope" do
-    register_test_framework(:test_unit)
-
-    Merb.generator_scope.should include(:test_unit)
-  end
-end
-
-
-
-describe "Plugins", "supported_test_framework?" do
-  before(:each) do
-    Merb.generator_scope.replace [:merb_default, :merb, :rspec]
-    Kernel.stub!(:dependency)
-  end
-
-  it "supports RSpec" do
-    supported_test_framework?(:rspec).should be(true)
-  end
-
-  it "supports Test::Unit" do
-    supported_test_framework?(:rspec).should be(true)
-  end
-
-  it "does not (no yet) support MSpec" do
-    supported_test_framework?(:mspec).should be(false)
-  end
-
-  it "does not (no yet) support Bacon" do
-    supported_test_framework?(:bacon).should be(false)
-  end
-end