merb-core 0.9.13 → 1.0

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

@@ -5,7 +5,9 @@ module Merb
     cattr_accessor :subclasses 
     self.subclasses = []
     
+    # :api: private
     attr_reader :session_id
+    # :api: private
     attr_accessor :needs_new_cookie
     
     class << self
@@ -21,7 +23,7 @@ module Merb
       # ==== Returns
       # SessionContainer:: The new session.
       # 
-      # @api private
+      # :api: private
       def generate
       end
       
@@ -34,7 +36,7 @@ module Merb
       # ==== Returns
       # SessionContainer:: a SessionContainer.
       # 
-      # @api private
+      # :api: private
       def setup(request)
       end
       
@@ -43,7 +45,7 @@ module Merb
     # ==== Parameters
     # session_id<String>:: A unique identifier for this session.
     # 
-    # @api private
+    # :api: private
     def initialize(session_id)
       @_destroy = false
       self.session_id = session_id
@@ -54,7 +56,7 @@ module Merb
     # Recreates the cookie with the default expiration time. Useful during log
     # in for pushing back the expiration date.
     # 
-    # @api private
+    # :api: private
     def session_id=(sid)
       self.needs_new_cookie = (@session_id && @session_id != sid)
       @session_id = sid
@@ -68,13 +70,13 @@ module Merb
     # ==== Parameters
     # request<Merb::Request>:: The Merb::Request that came in from Rack.
     # 
-    # @api private
+    # :api: private
     def finalize(request)
     end
     
     # Destroy the current session - clears data and removes session cookie.
     # 
-    # @api private
+    # :api: private
     def clear!
       @_destroy = true
       self.clear
@@ -82,9 +84,9 @@ module Merb
     
     # Regenerate the session_id.
     # 
-    # @api private
+    # :api: private
     def regenerate
     end
     
   end
-end
+end

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

@@ -14,7 +14,7 @@ module Merb
   #
   # To use Cookie Sessions, set in config/merb.yml
   #  :session_secret_key - your secret digest key
-  #  :session_store: cookie
+  #  :session_store - cookie
   class CookieSession < SessionContainer
     # TODO (maybe):
     # include request ip address
@@ -30,6 +30,7 @@ module Merb
     MAX = 4096
     DIGEST = OpenSSL::Digest::Digest.new('SHA1') # or MD5, RIPEMD160, SHA256?
     
+    # :api: private
     attr_accessor :_original_session_data
     
     # The session store type
@@ -41,7 +42,7 @@ module Merb
       # ==== Returns
       # SessionContainer:: The new session.
       # 
-      # @api private
+      # :api: private
       def generate
         self.new(Merb::SessionMixin.rand_uuid, "", Merb::Request._session_secret_key)
       end
@@ -55,7 +56,7 @@ module Merb
       # SessionContainer:: a SessionContainer. If no sessions were found,
       # a new SessionContainer will be generated.
       # 
-      # @api private
+      # :api: private
       def setup(request)
         session = self.new(Merb::SessionMixin.rand_uuid,
           request.session_cookie_value, request._session_secret_key)
@@ -73,7 +74,7 @@ module Merb
     # ==== Raises
     # ArgumentError:: blank or insufficiently long secret.
     # 
-    # @api private
+    # :api: private
     def initialize(session_id, cookie, secret)
       super session_id
       if secret.blank? || secret.length < 16
@@ -93,7 +94,7 @@ module Merb
     # ==== Parameters
     # request<Merb::Request>:: request object created from Rack environment.
     # 
-    # @api private
+    # :api: private
     def finalize(request)
       if @_destroy
         request.destroy_session_cookie
@@ -104,7 +105,7 @@ module Merb
     
     # Regenerate the session_id.
     # 
-    # @api private
+    # :api: private
     def regenerate
       self.session_id = Merb::SessionMixin.rand_uuid
     end
@@ -122,7 +123,7 @@ module Merb
     # choose to marshal it, which would make it persist
     # attributes like 'needs_new_cookie', which it shouldn't.
     # 
-    # @api private
+    # :api: private
     def to_cookie
       unless self.empty?
         data = self.serialize
@@ -143,7 +144,7 @@ module Merb
     # ==== Returns
     # String:: an HMAC digest of the cookie data.
     # 
-    # @api private
+    # :api: private
     def generate_digest(data)
       OpenSSL::HMAC.hexdigest(DIGEST, @secret, data)
     end
@@ -159,7 +160,7 @@ module Merb
     # ==== Returns
     # Hash:: The stored session data.
     # 
-    # @api private
+    # :api: private
     def unmarshal(cookie)
       if cookie.blank?
         {}
@@ -184,7 +185,7 @@ module Merb
     # ==== Returns
     # String:: Base64 encoded dump of the session hash.
     # 
-    # @api private
+    # :api: private
     def serialize
       Base64.encode64(Marshal.dump(self.to_hash)).chop
     end
@@ -194,7 +195,7 @@ module Merb
     # ==== Returns
     # Hash:: the session hash Base64 decoded from the data dump.
     # 
-    # @api private
+    # :api: private
     def unserialize(data)
       Marshal.load(Base64.decode64(data)) rescue {}
     end

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

@@ -37,7 +37,7 @@ module Merb
     # ==== Returns
     # ContainerSession:: The session corresponding to the ID.
     # 
-    # @api private
+    # :api: private
     def retrieve_session(session_id)
       get("session:#{session_id}")
     end
@@ -46,13 +46,15 @@ module Merb
     # session_id<String>:: ID of the session to set.
     # data<ContainerSession>:: The session to set.
     # 
-    # @api private
+    # :api: private
     def store_session(session_id, data)
       set("session:#{session_id}", data)
     end
     
     # ==== Parameters
     # session_id<String>:: ID of the session to delete.
+    #
+    # :api: private
     def delete_session(session_id)
       delete("session:#{session_id}")
     end

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

@@ -21,11 +21,13 @@ module Merb
     self.session_store_type = :memory
     
     # Bypass normal implicit class attribute reader - see below.
+    # :api: private    
     def store
       self.class.store
     end
     
     # Lazy load/setup of MemorySessionStore.
+    # :api: private
     def self.store
       @_store ||= MemorySessionStore.new(Merb::Config[:memory_session_ttl])
     end
@@ -38,7 +40,7 @@ module Merb
     # ==== Parameters
     # ttl<Fixnum>:: Session validity time in seconds. Defaults to 1 hour.
     # 
-    # @api private
+    # :api: private
     def initialize(ttl=nil)
       @sessions = Hash.new
       @timestamps = Hash.new
@@ -53,7 +55,7 @@ module Merb
     # ==== Returns
     # ContainerSession:: The session corresponding to the ID.
     # 
-    # @api private
+    # :api: private
     def retrieve_session(session_id)
       @mutex.synchronize {
         @timestamps[session_id] = Time.now
@@ -65,7 +67,7 @@ module Merb
     # session_id<String>:: ID of the session to set.
     # data<ContainerSession>:: The session to set.
     # 
-    # @api private
+    # :api: private
     def store_session(session_id, data)
       @mutex.synchronize {
         @timestamps[session_id] = Time.now
@@ -76,7 +78,7 @@ module Merb
     # ==== Parameters
     # session_id<String>:: ID of the session to delete.
     # 
-    # @api private
+    # :api: private
     def delete_session(session_id)
       @mutex.synchronize {
         @timestamps.delete(session_id)
@@ -86,7 +88,7 @@ module Merb
     
     # Deletes any sessions that have reached their maximum validity.
     # 
-    # @api private
+    # :api: private
     def reap_expired_sessions
       @timestamps.each do |session_id,stamp|
         delete_session(session_id) if (stamp + @session_ttl) < Time.now 
@@ -96,7 +98,7 @@ module Merb
     
     # Starts the timer that will eventually reap outdated sessions.
     # 
-    # @api private
+    # :api: private
     def start_timer
       Thread.new do
         loop {

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

@@ -3,6 +3,7 @@ module Merb
   class SessionStoreContainer < SessionContainer
     
     class_inheritable_accessor :store
+    # :api: private
     attr_accessor  :_fingerprint
     
     # The class attribute :store holds a reference to an object that implements 
@@ -51,7 +52,7 @@ module Merb
       # ==== Returns
       # SessionStoreContainer:: The new session.
       # 
-      # @api private
+      # :api: private
       def generate
         session = new(Merb::SessionMixin.rand_uuid)
         session.needs_new_cookie = true
@@ -69,7 +70,7 @@ module Merb
       # ==== Returns
       # SessionContainer:: a SessionContainer.
       # 
-      # @api private
+      # :api: private
       def setup(request)
         session = retrieve(request.session_id)
         request.session = session
@@ -91,7 +92,7 @@ module Merb
       # If there are persisted exceptions callbacks to execute, they all get executed
       # when Memcache library raises an exception.
       # 
-      # @api private
+      # :api: private
       def retrieve(session_id)
         unless session_id.blank?
           begin
@@ -130,7 +131,7 @@ module Merb
     # choose to do a full Marshal on the data, which would make it persist 
     # attributes like 'needs_new_cookie', which it shouldn't.
     # 
-    # @api private
+    # :api: private
     def finalize(request)
       if @_destroy
         store.delete_session(self.session_id)
@@ -151,7 +152,7 @@ module Merb
     
     # Regenerate the session ID.
     # 
-    # @api private
+    # :api: private
     def regenerate
       store.delete_session(self.session_id)
       self.session_id = Merb::SessionMixin.rand_uuid

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

@@ -1,26 +1,43 @@
 module Merb
   class Worker
     
+    # :api: private
     attr_accessor :thread
     
-    # ==== Returns
-    # Merb::Worker:: instance of a worker.
-    # 
-    # @api private
-    def self.start
-      new
+    class << self
+      # ==== Returns
+      # Merb::Worker:: instance of a worker.
+      # 
+      # :api: private
+      def start
+        @worker ||= new
+        Merb.at_exit do 
+          if Merb::Dispatcher.work_queue.empty?
+            @worker.thread.abort_on_exception = false
+            @worker.thread.raise
+          else
+            @worker.thread.join
+          end
+        end
+        @worker
+      end      
     end
     
     # Creates a new worker thread that loops over the work queue.
     # 
-    # @api private
+    # :api: private
     def initialize
-      @thread = Thread.new { loop { process_queue } }
+      @thread = Thread.new do
+        loop do
+          process_queue
+          break if Merb::Dispatcher.work_queue.empty? && Merb.exiting
+        end
+      end
     end
     
     # Processes tasks in the Merb::Dispatcher.work_queue.
     # 
-    # @api private
+    # :api: private
     def process_queue
       begin
         while blk = Merb::Dispatcher.work_queue.pop
@@ -31,6 +48,7 @@ module Merb
            # it's own processing
           Thread.pass
           blk.call
+          break if Merb::Dispatcher.work_queue.empty? && Merb.exiting
         end
       rescue Exception => e
         Merb.logger.warn! %Q!Worker Thread Crashed with Exception:\n#{Merb.exception(e)}\nRestarting Worker Thread!
@@ -39,4 +57,4 @@ module Merb
     end
     
   end
-end
+end

data/lib/merb-core/gem_ext/erubis.rb

@@ -3,7 +3,7 @@ module Erubis
   # This adds support for embedding the return value of a block call:
   #   <%= foo do %>...<% end =%>
   #
-  # @api private
+  # :api: private
   module Basic::Converter
     def convert_input(src, input)
       pat = @pattern
@@ -75,7 +75,9 @@ module Erubis
   # binding<Binding>::
   #   The binding to use when evaluating the ERB tags. Defaults to the current
   #   binding.
+  #
+  # :api: private
   def self.load_yaml_file(file, binding = binding)
     YAML::load(Erubis::MEruby.new(IO.read(File.expand_path(file))).result(binding))
   end
-end
+end

data/lib/merb-core/logger.rb

@@ -1,10 +1,12 @@
 # Merb::Logger = Extlib::Logger
 
 class Merb::Logger < Extlib::Logger
+  # :api: public
   def verbose!(message, level = :warn)
     send("#{level}!", message) if Merb::Config[:verbose]
   end
 
+  # :api: public
   def verbose(message, level = :warn)
     send(level, message) if Merb::Config[:verbose]
   end
@@ -71,28 +73,6 @@ module Merb
 
     @@mutex = {}
 
-    private
-
-    # Readies a log for writing.
-    #
-    # ==== Parameters
-    # log<IO, String>:: Either an IO object or a name of a logfile.
-    def initialize_log(log)
-      close if @log # be sure that we don't leave open files laying around.
-
-      if log.respond_to?(:write)
-        @log = log
-      elsif File.exist?(log)
-        @log = open(log, (File::WRONLY | File::APPEND))
-        @log.sync = true
-      else
-        FileUtils.mkdir_p(File.dirname(log)) unless File.directory?(File.dirname(log))
-        @log = open(log, (File::WRONLY | File::APPEND | File::CREAT))
-        @log.sync = true
-        @log.write("#{Time.now.httpdate} #{delimiter} info #{delimiter} Logfile created\n")
-      end
-    end
-
     public
 
     # To initialize the logger you create a new object, proxies to set_log.
@@ -131,6 +111,7 @@ module Merb
       end
 
       @log                      = stream
+      @log.sync                 = true
       @mutex = (@@mutex[@log] ||= Mutex.new)
     end