merb-core 1.1.0.rc1 → 1.1.0

data/lib/merb-core/bootloader.rb

@@ -372,15 +372,12 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   # :api: plugin
   def self.run
     set_encoding
-    # this is crucial: load init file with all the preferences
-    # then environment init file, then start enabling specific
-    # components, load dependencies and update logger.
+    load_dependencies
     unless Merb::disabled?(:initfile)
       load_initfile
       load_env_config
     end
     expand_ruby_path
-    load_dependencies
     update_logger
     nil
   end
@@ -1036,7 +1033,6 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         error_map = {}
 
         klasses.each do |klass|
-          klasses.delete(klass)
           begin
             load_file klass
           rescue NameError => ne
@@ -1044,6 +1040,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
             failed_classes.push(klass)
           end
         end
+        klasses.clear
 
         # Keep list of classes unique
         failed_classes.each { |k| klasses.push(k) unless klasses.include?(k) }
@@ -1317,6 +1314,8 @@ class Merb::BootLoader::RackUpApplication < Merb::BootLoader
       Merb::Config[:app] = eval("::Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, Merb::Config[:rackup])
     else
       Merb::Config[:app] = ::Rack::Builder.new {
+         use Rack::Head # handle head requests
+         use Merb::Rack::ContentLength # report content length
          if prefix = ::Merb::Config[:path_prefix]
            use Merb::Rack::PathPrefix, prefix
          end

data/lib/merb-core/config.rb

@@ -173,6 +173,9 @@ module Merb
           config[:bind_fail_fatal] = dev_mode
         end
         
+        # Set mutex to dispatcher
+        ::Merb::Dispatcher.use_mutex = config[:use_mutex]
+
         @configuration = config
       end
 

data/lib/merb-core/controller/mixins/conditional_get.rb

@@ -7,94 +7,109 @@
 # +request_fresh?+ that is used after setting of
 # last modification time or ETag:
 #
-# ==== Example
+# 
+# @example
+#   def show
+#     self.etag = Digest::SHA1.hexdigest(calculate_cache_key(params))
 #
-# def show
-#   self.etag = Digest::SHA1.hexdigest(calculate_cache_key(params))
-#
-#   if request_fresh?
-#     self.status = 304
-#     return ''
-#   else
-#     @product = Product.get(params[:id])
-#     display @product
+#     if request_fresh?
+#       self.status = 304
+#       return ''
+#     else
+#       @product = Product.get(params[:id])
+#       display @product
+#     end
 #   end
-# end
 module Merb::ConditionalGetMixin
 
-  # Sets ETag response header by calling
-  # #to_s on the argument.
+  # Sets ETag response header by calling #to_s on the argument
+  #
+  # @param tag [#to_s] value of ETag header
   #
-  # ==== Parameters
-  # tag<~to_s>::
-  #   value of ETag header enclosed in double quotes
-  #   as required by the RFC
+  # @return [String] value of ETag header enclosed in double quotes as required by the RFC
   #
-  # :api: public
+  # @api public
   def etag=(tag)
     headers[Merb::Const::ETAG] = %("#{tag}")
   end
 
-  # ==== Returns
-  # <String>::
-  #   Value of ETag response header or nil if it's not set.
+  # Value of the ETag header
+  #
+  # @return [String] Value of ETag response header if set.
+  # @return [nil] If ETag header not set.
   #
-  # :api: public
+  # @api public
   def etag
     headers[Merb::Const::ETAG]
   end
 
-  # ==== Returns
-  # <Boolean>::
-  # true if ETag response header equals If-None-Match request header,
-  # false otherwise
+  # Test to see if the request's Etag matches the one supplied locally
   #
-  # :api: public
+  # @return [true] if ETag response header equals If-None-Match request header
+  # @return [true] if it does not.
+  #
+  # @api public
   def etag_matches?(tag = self.etag)
     tag == self.request.if_none_match
   end
 
-  # Sets Last-Modified response header.
+  # Sets Last-Modified response header
+  #
+  # @param time [Time,DateTime] The last modified time of the resource
   #
-  # ==== Parameters
-  # tag<Time>::
-  # resource modification timestamp converted into format
-  # required by the RFC
+  # @return [String] The last modified time of the resource in the format required by the RFC
   #
-  # :api: public
+  # @api public
   def last_modified=(time)
     time = time.to_time if time.is_a?(DateTime)
     # time.utc.strftime("%a, %d %b %Y %X") if we could rely on locale being American
     headers[Merb::Const::LAST_MODIFIED] = time.httpdate
   end
 
-  # ==== Returns
-  # <String>::
-  #   Value of Last-Modified response header or nil if it's not set.
+  # Value of the Last-Modified header
+  #
+  # @return [Time] Value of Last-Modified response header if set.
+  # @return [nil] If Last-Modified not set.
   #
-  # :api: public
+  # @api public
   def last_modified
     last_mod = headers[Merb::Const::LAST_MODIFIED]
     Time.rfc2822(last_mod) if last_mod
   end
 
-  # ==== Returns
-  # <Boolean>::
-  # true if Last-Modified response header is < than
-  # If-Modified-Since request header value, false otherwise.
+  # Test to see if the request's If-Modified-Since is satisfied
   #
-  # :api: public
+  # @param time [Time] Time to test if the If-Modified-Since header against
+  #
+  # @return [true] Last-Modified response header is < than If-Modified-Since request header
+  # @return [false] otherwise
+  #
+  # @api public
   def not_modified?(time = self.last_modified)
-    request.if_modified_since && time && time <= request.if_modified_since
+    if !request.if_modified_since.nil? and !time.nil?
+      time <= request.if_modified_since
+    else
+      false
+    end
   end
 
-  # ==== Returns
-  # <Boolean>::
-  # true if either ETag matches or entity is not modified,
-  # so request is fresh; false otherwise
+  # Tests freshness of response using all supplied validators
+  #
+  # A response with no validators is always stale.
   #
-  # :api: public
+  # @return [true] ETag matches and entity is not modified
+  # @return [false] One or more validators failed, or none were supplied
+  #
+  # @api public
   def request_fresh?
-    etag_matches?(self.etag) || not_modified?(self.last_modified)
+    # make sure we have something to compare too.
+    return false unless last_modified or etag
+
+    fresh = true
+
+    # only check if we have set the right headers
+    fresh &&= etag_matches?(self.etag) if etag
+    fresh &&= not_modified?(self.last_modified) if last_modified
+    fresh
   end
 end

data/lib/merb-core/controller/mixins/controller.rb

@@ -124,6 +124,10 @@ module Merb
     #   Shorthand for common usage :message => {:error => "..."}
     # :success<String>::
     #   Shorthand for common usage :message => {:success => "..."}
+    # :status<String, Symbol>::
+    #   Status code to set for the response. Can be any valid redirect
+    #   status. Has precedence over the :permanent parameter, which is
+    #   retained for convenience.
     # 
     # ==== Returns
     # String:: Explanation of redirect.
@@ -141,7 +145,11 @@ module Merb
       opts = default_redirect_options.merge(opts)
 
       url = handle_redirect_messages(url,opts)
-      self.status = opts[:permanent] ? 301 : 302
+
+      _status   = opts[:status] if opts[:status]
+      _status ||= opts[:permanent] ? 301 : 302
+      self.status = _status
+
       Merb.logger.info("Redirecting to: #{url} (#{self.status})")
       headers['Location'] = url
       "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>"

data/lib/merb-core/controller/template.rb

@@ -187,6 +187,10 @@ module Merb::Template
   require 'erubis'
 
   class Erubis    
+    # Fixing bug in Erubis
+    # http://rubyforge.org/tracker/index.php?func=detail&aid=21825&group_id=1320&atid=5201
+    XmlHelper = ::Erubis::XmlHelper
+
     # ==== Parameters
     # io<#path>:: An IO containing the full path of the template.
     # name<String>:: The name of the method that will be created.

data/lib/merb-core/dispatch/dispatcher.rb

@@ -18,8 +18,6 @@ module Merb
         @@work_queue
       end  
       
-      Merb::Dispatcher.use_mutex = ::Merb::Config[:use_mutex]
-      
       # Dispatch the rack environment. ControllerExceptions are rescued here
       # and redispatched.
       #

data/lib/merb-core/dispatch/request_parsers.rb

@@ -127,12 +127,17 @@ module Merb
         else
           data = body
         end
+
         unless key_memo.include?(name) && name !~ /\[\]/ 
           paramhsh = normalize_params(paramhsh,name,data) 
         end
-        key_memo << name
+
+        # Prevent from double processing files but process other params
+        key_memo << name if filename && !filename.empty?
+
         break  if buf.empty? || content_length == -1
       }
+
       paramhsh
     end
 

data/lib/merb-core/dispatch/session/store_container.rb

@@ -6,6 +6,9 @@ module Merb
     # :api: private
     attr_accessor  :_fingerprint
     
+    # Determines how many times to try generating a unique session key before we give up
+    GENERATE_MAX_TRIES = 100
+
     # The class attribute :store holds a reference to an object that implements 
     # the following interface:
     #
@@ -54,7 +57,17 @@ module Merb
       # 
       # :api: private
       def generate
-        session = new(Merb::SessionMixin.rand_uuid)
+        
+        # make sure we generate a unique session uuid
+        sid = nil
+        GENERATE_MAX_TRIES.times do |i|
+          sid = Merb::SessionMixin.rand_uuid
+          data = store.retrieve_session(sid) rescue nil
+          break if data.nil?
+          raise "Unable to Generate Unique Session key" if i == (GENERATE_MAX_TRIES-1)
+        end
+        
+        session = new(sid)
         session.needs_new_cookie = true
         session
       end

data/lib/merb-core/rack/handler/mongrel.rb

@@ -83,16 +83,20 @@ module Merb
   
           begin
             response.status = status.to_i
+            response.send_status(body.respond_to?(:length) ? body.length : nil)
+
             headers.each { |k, vs|
               Array(vs).each { |v|
                 response.header[k] = v
               }
             }
+            response.send_header
             
             body.each { |part|
-              response.body << part
+              response.write(part)
+              response.socket.flush
             }
-            response.finished
+            response.done = true
           ensure
             body.close  if body.respond_to? :close
           end

data/lib/merb-core/test/helpers/multipart_request_helper.rb

@@ -1,6 +1,5 @@
 module Merb::Test::MultipartRequestHelper
   require 'rubygems'
-  gem "mime-types"
   require 'mime/types'
 
   class Param

data/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION    = '1.1.0.rc1'.freeze
+  VERSION    = '1.1.0'.freeze
 end

data/spec/public/controller/conditional_get_spec.rb

@@ -3,9 +3,9 @@ require File.join(File.dirname(__FILE__), "spec_helper")
 Controllers = Merb::Test::Fixtures::Controllers
 
 describe Merb::Controller, "#etag=" do
-  
+
   before do
-    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")    
+    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")
     Merb::Router.prepare do
       default_routes
     end
@@ -21,7 +21,7 @@ end
 
 describe Merb::Controller, "#last_modified=" do
   before do
-    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")    
+    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")
     Merb::Router.prepare do
       default_routes
     end
@@ -53,7 +53,7 @@ describe Merb::Controller, "#modified_since?" do
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
                               :sets_last_modified, {}, { Merb::Const::HTTP_IF_MODIFIED_SINCE => Time.at(7000).httpdate })
   end
-  
+
   it 'return true when response Last-Modified header value <= request If-Modified-Since header' do
     @controller.not_modified?(Time.at(5000)).should be(true)
     @controller.not_modified?(Time.at(6999)).should be(true)
@@ -67,35 +67,100 @@ end
 
 
 describe Merb::Controller, "#request_fresh?" do
+  it "returns false if no headers are supplied" do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :superfresh, {}, {})
+    @controller.request_fresh?.should be(false)
+  end
+
+  it "returns false if no validation information is supplied by the action and no headers are sent" do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_nothing, {}, {})
+    @controller.request_fresh?.should be(false)
+  end
+
+  it "returns false if no validation information is supplied by the action and an ETag header is sent" do
+    env = { Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_nothing, {}, env)
+    @controller.request_fresh?.should be(false)
+  end
+
+  it "returns false if no validation information is supplied by the action and an If-Modified-Since header is sent" do
+    env = { Merb::Const::HTTP_IF_MODIFIED_SINCE => Time.at(7000).httpdate }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_nothing, {}, env)
+    @controller.request_fresh?.should be(false)
+  end
+
+  it "returns false if no validation information is supplied by the action and both headers are sent" do
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_nothing, {}, env)
+
+    @controller.request_fresh?.should be(false)
+  end
+
+
   it 'return true when ETag matches' do
-    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(8000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
+    env = { Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
                               :sets_etag, {}, env)
 
     @controller.request_fresh?.should be(true)
   end
 
+  it 'return false when no If-None-Match is sent, but an ETag is set' do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_etag, {}, {})
+
+    @controller.request_fresh?.should be(false)
+  end
+
   it 'return true when entity is not modified since date given in request header' do
     env = { Merb::Const::HTTP_IF_MODIFIED_SINCE => Time.at(7000).httpdate }
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
                               :sets_last_modified, {}, env)
-    
+
     @controller.request_fresh?.should be(true)
   end
 
+  it 'return false when a Last-Modified is set, but no header is sent' do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :sets_last_modified, {}, {})
+
+    @controller.request_fresh?.should be(false)
+  end
+
   it 'return true when both etag and last modification date satisfy request freshness' do
-    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }    
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
                               :superfresh, {}, env)
-    
+
     @controller.request_fresh?.should be(true)
   end
 
+  it 'return false if etag satisfies but the last modification date does not satisfy request freshness' do
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(6999).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :superfresh, {}, env)
+
+    @controller.request_fresh?.should be(false)
+  end
+
+  it 'return false if etag does not satisfy but the last modification date does satisfy request freshness' do
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"wrong"' }
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
+                              :superfresh, {}, env)
+
+    @controller.request_fresh?.should be(false)
+  end
+
   it 'return false when neither etag nor last modification date satisfy request freshness' do
-    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }    
+    env = { 'HTTP_IF_MODIFIED_SINCE' => Time.at(7000).httpdate, Merb::Const::HTTP_IF_NONE_MATCH => '"39791e6fb09"' }
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::ConditionalGet,
                               :stale, {}, env)
-    
+
     @controller.request_fresh?.should be(false)
-  end  
+  end
 end

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

@@ -30,6 +30,10 @@ module Merb::Test::Fixtures
         
         "can has stale request"
       end
+
+      def sets_nothing
+        "can has nothing"
+      end
     end
   end
 end

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

@@ -21,6 +21,18 @@ module Merb::Test::Fixtures::Controllers
     end
   end
   
+  class PermanentAndStatusRedirect < Testing
+    def index
+      redirect("/", :permanent => true, :status => 302)
+    end
+  end
+
+  class WithStatusRedirect < Testing
+    def index
+      redirect("/", :status => 307)
+    end
+  end
+
   class RedirectWithMessage < Testing
     def index
       redirect("/", :message => { :notice => "what?" })
@@ -57,4 +69,4 @@ module Merb::Test::Fixtures::Controllers
       message[:notice]
     end
   end
-end
+end

data/spec/public/controller/redirect_spec.rb

@@ -19,6 +19,18 @@ describe Merb::Controller, " redirects" do
     @controller.headers["Location"].should == "/"
   end
 
+  it "recirect with :permanent and :stauts use :status" do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::PermanentAndStatusRedirect, :index)
+    @controller.status.should == 302
+    @controller.headers["Location"].should == "/"
+  end
+
+  it "redirect with status" do
+    @controller = dispatch_to(Merb::Test::Fixtures::Controllers::WithStatusRedirect, :index)
+    @controller.status.should == 307
+    @controller.headers["Location"].should == "/"
+  end
+
   it "redirects with messages" do
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::RedirectWithMessage, :index)
     @controller.status.should == 302

data/spec/public/core/config_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+
+describe Merb::Config do
+
+  it "should set Dispatcher.use_mutex to true by default" do
+    lambda {
+      startup_merb
+      Merb::Dispatcher.use_mutex.should be_true
+    }
+  end
+
+  it "should set Dispatcher.use_mutex to value in config" do
+    lambda {
+      startup_merb({:use_mutex => false})
+      Merb::Dispatcher.use_mutex.should be_false
+    }
+  end
+end

data/spec/public/request/multipart_spec.rb

@@ -1,13 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 startup_merb
 
+module Merb::MultipartRequestSpecHelper
+  def fake_file(read = nil, filename = 'sample.txt', path = 'sample.txt')
+    read ||= 'This is a text file with some small content in it.'
+    Struct.new(:read, :filename, :path).new(read, filename, path)
+  end
+end
+
 describe Merb::Request do
+  include Merb::MultipartRequestSpecHelper
+
   it "should handle file upload for multipart/form-data posts" do
-    file = Struct.new(:read, :filename, :path).
-      new("This is a text file with some small content in it.", "sample.txt", "sample.txt")
-    m = Merb::Test::MultipartRequestHelper::Post.new :file => file
+    file = fake_file
+    m = Merb::Test::MultipartRequestHelper::Post.new(:file => file)
     body, head = m.to_multipart
-    request = fake_request({:request_method => "POST", :content_type => head, :content_length => body.length}, :req => body)
+    request = fake_request({:request_method => "POST",
+                            :content_type => head,
+                            :content_length => body.length}, :req => body)
     request.params[:file].should_not be_nil
     request.params[:file][:tempfile].class.should == Tempfile
     request.params[:file][:content_type].should == 'text/plain'
@@ -15,23 +25,22 @@ describe Merb::Request do
   end
 
   it "should correctly format multipart posts which contain multiple parameters" do
-    file = Struct.new(:read, :filename, :path).
-      new("This is a text file with some small content in it.", "sample.txt", "sample.txt")
-    params = {:model => {:description1 => 'foo', :description2 => 'bar', :file => file}}
-
+    params = {:model => {:description1 => 'foo', :description2 => 'bar', :file => fake_file}}
     m = Merb::Test::MultipartRequestHelper::Post.new params
     body, head = m.to_multipart
     body.split('----------0xKhTmLbOuNdArY').size.should eql(5)
   end
 
   it "should correctly format multipart posts which contain an array as parameter" do
-    struct = Struct.new(:read, :filename, :path)
-    file = struct.new("This is a text file with some small content in it.", "sample.txt", "sample.txt")
-    file2 = struct.new("This is another text file", "sample2.txt", "sample2.txt")
-    params = {:model => {:description1 => 'foo', :description2 => 'bar', :child_attributes => [
-      { :file => file },
-      { :file => file2 }
-    ]}}
+    file = fake_file
+    file2 = fake_file("This is another text file", "sample2.txt", "sample2.txt")
+    params = {:model => {:description1 => 'foo',
+                         :description2 => 'bar',
+                         :child_attributes => [
+                           { :file => file },
+                           { :file => file2 }
+                         ]
+                        }}
 
     m = Merb::Test::MultipartRequestHelper::Post.new params
     body, head = m.to_multipart
@@ -42,8 +51,7 @@ describe Merb::Request do
   end
 
   it "should accept env['rack.input'] as IO object (instead of StringIO)" do
-    file = Struct.new(:read, :filename, :path).
-      new("This is a text file with some small content in it.", "sample.txt", "sample.txt")
+    file = fake_file
     m = Merb::Test::MultipartRequestHelper::Post.new :file => file
     body, head = m.to_multipart
     
@@ -66,5 +74,16 @@ describe Merb::Request do
       request = fake_request({:request_method => "GET", :content_type => 'multipart/form-data, boundary=----------0xKhTmLbOuNdArY', :content_length => 0}, :req => '')      
       running {request.params}.should_not raise_error        
   end
-  
+
+  it "should handle multiple occurences of one parameter" do
+    m = Merb::Test::MultipartRequestHelper::Post.new :file => fake_file
+    m.push_params({:checkbox => 0})
+    m.push_params({:checkbox => 1})
+    body, head = m.to_multipart
+    request = fake_request({:request_method => "POST",
+                            :content_type => head,
+                            :content_length => body.length}, :req => body)
+    request.params[:file].should_not be_nil
+    request.params[:checkbox].should eql '1'
+  end
 end

data/spec/public/session/memory_session_spec.rb

@@ -2,6 +2,36 @@ require File.join(File.dirname(__FILE__), "spec_helper")
 startup_merb(:session_store => "memory")
 require File.join(File.dirname(__FILE__), "controllers", "sessions")
 
+describe Merb::MemorySession, "container" do
+
+  it "should always generate unique session" do
+    # Fix session id generation
+    Merb::SessionMixin.stub!(:rand_uuid).and_return(1, 1, 2)
+
+    s1 = Merb::MemorySession.generate
+    s1.store.store_session(s1.session_id, {:foo => 'bar'})
+    s1.session_id.should eql 1
+
+    s2 = Merb::MemorySession.generate
+    s2.session_id.should eql 2
+    # Cleanup
+    s1.store.delete_session(1)
+    s2.store.delete_session(2)
+  end
+
+  it "should raise exception if unable to generate unique ID" do
+    # Fix session id generation
+    Merb::SessionMixin.stub!(:rand_uuid).and_return(1, 1)
+
+    s1 = Merb::MemorySession.generate
+    s1.store.store_session(s1.session_id, {:foo => 'bar'})
+
+    lambda { s2 = Merb::MemorySession.generate }.should raise_error
+
+    s1.store.delete_session(1)
+  end
+end
+
 describe Merb::MemorySession do
   
   before do 
@@ -23,4 +53,4 @@ describe Merb::MemorySession, "mixed into Merb::Controller" do
   
   it_should_behave_like "All session-stores mixed into Merb::Controller"
 
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 1
   - 0
-  - rc1
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 +00:00
+date: 2010-03-22 00:00:00 +00:00
 default_executable: merb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -388,6 +387,7 @@ files:
 - spec/public/controller/spec_helper.rb
 - spec/public/controller/streaming_spec.rb
 - spec/public/controller/url_spec.rb
+- spec/public/core/config_spec.rb
 - spec/public/core/merb_core_spec.rb
 - spec/public/core_ext/kernel_spec.rb
 - spec/public/core_ext/spec_helper.rb
@@ -2400,13 +2400,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: