merb-core 0.9.3 → 0.9.4

data/spec/public/test/route_matchers_spec.rb

@@ -4,7 +4,7 @@ Merb.start :environment => 'test', :log_level => :fatal
 
 class TestController < Merb::Controller
   def get(id = nil); end
-  def post; end
+  def post(version = nil); end
 end
 
 class IDish
@@ -21,6 +21,7 @@ describe Merb::Test::Rspec::RouteMatchers do
 
   before(:each) do
     Merb::Router.prepare do |r|
+      r.match(%r"/v(\d+\.\d+)", :method => :post).to(:controller => "test_controller", :action => "post", :version => "[1]")
       r.match("/", :method => :get).to(:controller => "test_controller", :action => "get").name(:getter)
       r.match("/", :method => :post).to(:controller => "test_controller", :action => "post")
       r.match("/:id").to(:controller => "test_controller", :action => "get").name(:with_id)
@@ -35,8 +36,18 @@ describe Merb::Test::Rspec::RouteMatchers do
 
     it "should work with the url helper and ParamMatcher" do
       idish = IDish.new(rand(1000).to_s)
+      
       request_to(url(:with_id, idish)).should route_to(TestController, :get).with(idish)
     end
+
+    it "should work with a negative ParamMatcher" do
+      request_to(url(:with_id, :id => 100)).should_not route_to(TestController, :get).with(:id => 1)
+    end
+
+    it "should work with a route containing a regexp" do
+      request_to("/v1.2", :post).should route_to(TestController, :post).with(:version => "1.2")
+      request_to("/v1.0", :post).should_not route_to(TestController, :post).with(:version => "3.14")
+    end
   end
 
   module Merb::Test::Rspec::RouteMatchers
@@ -92,6 +103,22 @@ describe Merb::Test::Rspec::RouteMatchers do
           matcher.matches?(:controller => "target_controller", :action => "target_action")
           matcher.failure_message.should include("TargetController#target_action")
         end
+
+        it "should include the expected parameters" do
+          expected_parameters = {:id => '123', :page => '2'}
+          matcher = RouteToMatcher.new(TestController, :any_action)
+          matcher.with(expected_parameters)
+          matcher.matches?(:controller => "target_controller", :action => "target_action")
+          matcher.failure_message.should include(expected_parameters.inspect)
+        end
+
+        it "should include the actual paramters" do
+          expected_parameters, actual_parameters = {:id => '123', :page => '2'}, {:id => '2', :page => '321'}
+          matcher = RouteToMatcher.new(TestController, :any_action)
+          matcher.with(expected_parameters)
+          matcher.matches?(actual_parameters.merge(:controller => "test_controller", :action => "any_action"))
+          matcher.failure_message.should include(actual_parameters.inspect)
+        end
       end
 
       describe "#negative_failure_message" do

data/spec/public/test/view_matchers_spec.rb

@@ -132,7 +132,7 @@ describe Merb::Test::Rspec::ViewMatchers do
     describe HasContent do
       before(:each) do
         @element = stub(:element)
-        @element.stub!(:inner_content).and_return <<-EOF
+        @element.stub!(:inner_text).and_return <<-EOF
           <div id='main'>
             <div class='inner'>hello, world!</div>
           </div>
@@ -175,9 +175,9 @@ describe Merb::Test::Rspec::ViewMatchers do
           hc = HasContent.new(/hello,\sworld!/)
           hc.matches?(@element)
           
-          hc.failure_message.should include(@element.inner_content)
+          hc.failure_message.should include(@element.inner_text)
         end
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,11 +3,15 @@ require "rubygems"
 require "spec"
 require File.join(File.dirname(__FILE__), "..", "lib", "merb-core")
 
+default_options = {:environment => 'test', :adapter => 'runner'}
+options = default_options.merge($START_OPTIONS || {})
+Merb.start options
+
 # -- Global custom matchers --
 
 # A better +be_kind_of+ with more informative error messages.
 #
-# The default +be_kind_of+ just says 
+# The default +be_kind_of+ just says
 #
 #   "expected to return true but got false"
 #
@@ -16,13 +20,35 @@ require File.join(File.dirname(__FILE__), "..", "lib", "merb-core")
 #   "expected File but got Tempfile"
 
 module Merb
-  
   module Test
-    
     module RspecMatchers
+      class IncludeLog
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(target)
+          target.log.rewind
+          @text = target.log.read
+          @text =~ (String === @expected ? /#{@expected}/ : @expected)
+        end
+        
+        def failure_message
+          "expected to find `#{@expected}' in the log but got:\n" <<
+          @text.map {|s| "  #{s}" }.join
+        end
+        
+        def negative_failure_message
+          "exected not to find `#{@expected}' in the log but got:\n" <<
+          @text.map {|s| "  #{s}" }.join
+        end
+        
+        def description
+          "include #{@text} in the log"
+        end
+      end
       
       class BeKindOf
-
         def initialize(expected) # + args
           @expected = expected
         end
@@ -43,29 +69,47 @@ module Merb
         def description
           "be_kind_of #{@target}"
         end
-
       end
 
       def be_kind_of(expected) # + args
         BeKindOf.new(expected)
       end
+      
+      def include_log(expected)
+        IncludeLog.new(expected)
+      end
     end
 
     module Helper
-      
       def running(&blk) blk; end
-      
+
       def executing(&blk) blk; end
-      
+
       def doing(&blk) blk; end
-      
-      def calling(&blk) blk; end      
+
+      def calling(&blk) blk; end
     end
   end
 end
 
+
 Spec::Runner.configure do |config|
   config.include Merb::Test::Helper
   config.include Merb::Test::RspecMatchers
-  config.include Merb::Test::RequestHelper  
-end
+  config.include Merb::Test::RequestHelper
+
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+
+  alias silence capture
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,20 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: extlib
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: erubis
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -31,7 +33,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,7 +43,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json_pure
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -49,7 +53,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -58,7 +63,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -68,6 +74,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -92,6 +99,9 @@ files:
 - TODO
 - docs/bootloading.dox
 - docs/documentation_standards
+- docs/merb-core-call-stack-diagram.mmap
+- docs/merb-core-call-stack-diagram.pdf
+- docs/merb-core-call-stack-diagram.png
 - docs/new_render_api
 - bin/merb
 - bin/merb-specs
@@ -102,17 +112,10 @@ 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
 - spec/private/dispatch/fixture/app
 - spec/private/dispatch/fixture/app/controllers
@@ -141,11 +144,7 @@ files:
 - spec/private/dispatch/fixture/config/rack.rb
 - spec/private/dispatch/fixture/config/router.rb
 - spec/private/dispatch/fixture/log
-- spec/private/dispatch/fixture/log/development.log
-- spec/private/dispatch/fixture/log/merb.4000.pid
 - spec/private/dispatch/fixture/log/merb_test.log
-- spec/private/dispatch/fixture/log/production.log
-- spec/private/dispatch/fixture/merb.4000.pid
 - spec/private/dispatch/fixture/public
 - spec/private/dispatch/fixture/public/images
 - spec/private/dispatch/fixture/public/images/merb.jpg
@@ -153,11 +152,21 @@ files:
 - spec/private/dispatch/fixture/public/stylesheets
 - spec/private/dispatch/fixture/public/stylesheets/master.css
 - 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/rack
-- spec/private/rack/application_spec.rb
+- spec/private/router
+- spec/private/router/behavior_spec.rb
+- spec/private/router/fixture
+- spec/private/router/fixture/log
+- spec/private/router/fixture/log/merb_test.log
+- spec/private/router/route_spec.rb
+- spec/private/router/router_spec.rb
+- spec/private/vendor
+- spec/private/vendor/facets
+- spec/private/vendor/facets/plural_spec.rb
+- spec/private/vendor/facets/singular_spec.rb
 - spec/public
 - spec/public/abstract_controller
 - spec/public/abstract_controller/controllers
@@ -186,6 +195,7 @@ files:
 - spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb
 - spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited
 - spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb
+- spec/public/abstract_controller/controllers/cousins.rb
 - spec/public/abstract_controller/controllers/display.rb
 - spec/public/abstract_controller/controllers/filters.rb
 - spec/public/abstract_controller/controllers/helpers.rb
@@ -195,6 +205,10 @@ files:
 - spec/public/abstract_controller/controllers/views/helpers
 - spec/public/abstract_controller/controllers/views/helpers/capture
 - spec/public/abstract_controller/controllers/views/helpers/capture/index.erb
+- spec/public/abstract_controller/controllers/views/helpers/capture_eq
+- spec/public/abstract_controller/controllers/views/helpers/capture_eq/index.erb
+- spec/public/abstract_controller/controllers/views/helpers/capture_with_args
+- spec/public/abstract_controller/controllers/views/helpers/capture_with_args/index.erb
 - spec/public/abstract_controller/controllers/views/helpers/concat
 - spec/public/abstract_controller/controllers/views/helpers/concat/index.erb
 - spec/public/abstract_controller/controllers/views/layout
@@ -217,6 +231,8 @@ files:
 - spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots
 - spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb
 - spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb
+- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents
+- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb
 - spec/public/abstract_controller/controllers/views/partial
 - spec/public/abstract_controller/controllers/views/partial/another_directory
 - spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb
@@ -240,12 +256,18 @@ files:
 - spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as
 - spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb
 - spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb
+- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter
+- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/_collection.erb
+- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/index.erb
 - spec/public/abstract_controller/controllers/views/partial/partial_with_locals
 - spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb
 - spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb
 - spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals
 - spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb
 - spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb
+- spec/public/abstract_controller/controllers/views/partial/with_absolute_partial
+- spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb
+- spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb
 - spec/public/abstract_controller/controllers/views/partial/with_as_partial
 - spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb
 - spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb
@@ -273,25 +295,35 @@ files:
 - spec/public/controller
 - spec/public/controller/authentication_spec.rb
 - spec/public/controller/base_spec.rb
+- spec/public/controller/config
+- spec/public/controller/config/init.rb
 - spec/public/controller/controllers
 - spec/public/controller/controllers/authentication.rb
 - spec/public/controller/controllers/base.rb
+- spec/public/controller/controllers/cookies.rb
+- spec/public/controller/controllers/dispatcher.rb
 - spec/public/controller/controllers/display.rb
+- spec/public/controller/controllers/redirect.rb
 - spec/public/controller/controllers/responder.rb
 - spec/public/controller/controllers/url.rb
 - 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/layout/custom_arg.json.erb
 - spec/public/controller/controllers/views/merb
 - spec/public/controller/controllers/views/merb/test
 - spec/public/controller/controllers/views/merb/test/fixtures
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers
+- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides
+- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.html.erb
+- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.xml.erb
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb
 - 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/no_layout.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
@@ -304,14 +336,20 @@ files:
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb
 - spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb
+- spec/public/controller/cookies_spec.rb
+- spec/public/controller/dispatcher_spec.rb
 - spec/public/controller/display_spec.rb
-- spec/public/controller/log
-- spec/public/controller/log/merb.4000.pid
+- spec/public/controller/redirect_spec.rb
 - 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/core_ext
+- spec/public/core_ext/fixtures
+- spec/public/core_ext/fixtures/core_ext_dependency.rb
+- spec/public/core_ext/kernel_spec.rb
+- spec/public/core_ext/spec_helper.rb
 - spec/public/DEFINITIONS
 - spec/public/directory_structure
 - spec/public/directory_structure/directory
@@ -328,9 +366,7 @@ files:
 - spec/public/directory_structure/directory/config
 - spec/public/directory_structure/directory/config/router.rb
 - spec/public/directory_structure/directory/log
-- spec/public/directory_structure/directory/log/merb.4000.pid
 - spec/public/directory_structure/directory/log/merb_test.log
-- spec/public/directory_structure/directory/merb.4000.pid
 - spec/public/directory_structure/directory_spec.rb
 - spec/public/logger
 - spec/public/logger/logger_spec.rb
@@ -344,9 +380,7 @@ files:
 - spec/public/reloading/directory/config
 - spec/public/reloading/directory/config/init.rb
 - spec/public/reloading/directory/log
-- spec/public/reloading/directory/log/merb.4000.pid
 - spec/public/reloading/directory/log/merb_test.log
-- spec/public/reloading/directory/merb.4000.pid
 - spec/public/reloading/reload_spec.rb
 - spec/public/request
 - spec/public/request/multipart_spec.rb
@@ -354,7 +388,12 @@ files:
 - spec/public/router
 - spec/public/router/default_spec.rb
 - spec/public/router/deferred_spec.rb
+- spec/public/router/fixation_spec.rb
+- spec/public/router/fixture
+- spec/public/router/fixture/log
+- spec/public/router/fixture/log/merb_test.log
 - spec/public/router/namespace_spec.rb
+- spec/public/router/nested_matches_spec.rb
 - spec/public/router/nested_resources_spec.rb
 - spec/public/router/resource_spec.rb
 - spec/public/router/resources_spec.rb
@@ -373,12 +412,6 @@ 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
@@ -404,21 +437,17 @@ files:
 - lib/merb-core/controller/mixins/responder.rb
 - lib/merb-core/controller/template.rb
 - lib/merb-core/core_ext
-- lib/merb-core/core_ext/class.rb
-- lib/merb-core/core_ext/hash.rb
 - lib/merb-core/core_ext/kernel.rb
-- lib/merb-core/core_ext/mash.rb
-- lib/merb-core/core_ext/object.rb
-- lib/merb-core/core_ext/object_space.rb
-- 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
+- lib/merb-core/dispatch/default_exception
+- lib/merb-core/dispatch/default_exception/default_exception.rb
+- lib/merb-core/dispatch/default_exception/views
+- lib/merb-core/dispatch/default_exception/views/_css.html.erb
+- lib/merb-core/dispatch/default_exception/views/_javascript.html.erb
+- lib/merb-core/dispatch/default_exception/views/index.html.erb
 - lib/merb-core/dispatch/dispatcher.rb
-- lib/merb-core/dispatch/exceptions.html.erb
 - lib/merb-core/dispatch/request.rb
 - lib/merb-core/dispatch/router
 - lib/merb-core/dispatch/router/behavior.rb
@@ -430,6 +459,7 @@ files:
 - lib/merb-core/dispatch/session/memcached.rb
 - lib/merb-core/dispatch/session/memory.rb
 - lib/merb-core/dispatch/session.rb
+- lib/merb-core/dispatch/worker.rb
 - lib/merb-core/gem_ext
 - lib/merb-core/gem_ext/erubis.rb
 - lib/merb-core/logger.rb
@@ -442,16 +472,27 @@ files:
 - lib/merb-core/rack/adapter/irb.rb
 - lib/merb-core/rack/adapter/mongrel.rb
 - lib/merb-core/rack/adapter/runner.rb
+- lib/merb-core/rack/adapter/swiftiplied_mongrel.rb
 - lib/merb-core/rack/adapter/thin.rb
+- lib/merb-core/rack/adapter/thin_turbo.rb
 - lib/merb-core/rack/adapter/webrick.rb
 - lib/merb-core/rack/adapter.rb
 - lib/merb-core/rack/application.rb
 - lib/merb-core/rack/handler
 - lib/merb-core/rack/handler/mongrel.rb
+- lib/merb-core/rack/middleware
+- 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.rb
 - lib/merb-core/rack.rb
 - lib/merb-core/server.rb
+- lib/merb-core/tasks
+- lib/merb-core/tasks/audit.rake
+- lib/merb-core/tasks/merb.rb
+- lib/merb-core/tasks/merb_rake_helper.rb
+- lib/merb-core/tasks/stats.rake
 - 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
@@ -470,6 +511,7 @@ files:
 - lib/merb-core/test/test_ext
 - lib/merb-core/test/test_ext/hpricot.rb
 - lib/merb-core/test/test_ext/object.rb
+- lib/merb-core/test/test_ext/string.rb
 - lib/merb-core/test.rb
 - lib/merb-core/vendor
 - lib/merb-core/vendor/facets
@@ -489,7 +531,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.4
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -500,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - install the json gem to get faster json parsing
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb. Pocket rocket web framework.