extlib 0.9.5 → 0.9.6

data/lib/extlib.rb

@@ -14,19 +14,25 @@ require dir / "object"
 require dir / "object_space"
 
 require dir / "string"
+require dir / "symbol"
 require dir / "hash"
 require dir / "mash"
 require dir / "virtual_file"
 require dir / "logger"
 require dir / "time"
+require dir / "datetime"
 
 require dir / 'assertions'
 require dir / 'blank'
+require dir / 'boolean'
 require dir / 'inflection'
 require dir / 'lazy_array'
 require dir / 'module'
+require dir / 'nil'
+require dir / 'numeric'
 require dir / 'blank'
 require dir / 'pooling'
 require dir / 'simple_set'
 require dir / 'struct'
 require dir / 'hook'
+require dir / 'symbol'

data/lib/extlib/boolean.rb

@@ -0,0 +1,11 @@
+class TrueClass
+  def try_dup
+    self
+  end
+end
+
+class FalseClass
+  def try_dup
+    self
+  end
+end

data/lib/extlib/datetime.rb

@@ -0,0 +1,9 @@
+class DateTime
+  def to_time
+    Time.parse self.to_s
+  end
+  
+  def to_datetime
+    self
+  end
+end

data/lib/extlib/module.rb

@@ -6,6 +6,10 @@ class Module
       nested_const_lookup(const_name)
     end
   end
+  
+  def try_dup
+    self
+  end
 
   private
 

data/lib/extlib/nil.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def try_dup
+    self
+  end
+end

data/lib/extlib/numeric.rb

@@ -0,0 +1,5 @@
+class Numeric
+  def try_dup
+    self
+  end
+end

data/lib/extlib/object.rb

@@ -129,6 +129,13 @@ class Object
     end
   end
   
+  # Override this in a child if it cannot be dup'ed
+  #
+  # @return <Object>
+  def try_dup
+    self.dup
+  end
+  
   # @param arrayish<#include?> Container to check, to see if it includes the object.
   # @param *more<Array>:: additional args, will be flattened into arrayish
   #
@@ -141,4 +148,17 @@ class Object
     arrayish = more.unshift(arrayish) unless more.empty?
     arrayish.include?(self)
   end
+  
+  # @note
+  #   For instances of objects that don't override the #inspect method, there
+  #   is an encoded hash to uniquely identify the object. This method
+  #   reproduces this to be used in #inspect in order to keep the same look
+  #   as well as provide this information.
+  #   This is inessential, but may be useful.
+  # 
+  # @return <String>
+  #   Returns the 16-byte encoded hash for the object
+  def encoded_hash
+    (self.hash * 2).to_s(16)
+  end
 end

data/lib/extlib/pooling.rb

@@ -29,19 +29,21 @@ module Extlib
       @scavenger || begin
         @scavenger = Thread.new do
           loop do
+            # Sleep before we actually start doing anything.
+            # Otherwise we might clean up something we just made
+            sleep(scavenger_interval)
             lock.synchronize do
               pools.each do |pool|
                 # This is a useful check, but non-essential, and right now it breaks lots of stuff.
                 # if pool.expired?
                 pool.lock.synchronize do
-                  if pool.reserved_count == 0
+                  if pool.used.size == 0
                     pool.dispose
                   end
                 end
                 # end
               end
             end
-            sleep(scavenger_interval)
           end # loop
         end
 
@@ -65,10 +67,7 @@ module Extlib
       @lock ||= Mutex.new
     end
 
-    class CrossPoolError < StandardError
-    end
-
-    class OrphanedObjectError < StandardError
+    class InvalidResourceError < StandardError
     end
 
     class ThreadStopError < StandardError
@@ -82,11 +81,16 @@ module Extlib
 
         @__pools = Hash.new { |h,k| __pool_lock.synchronize { h[k] = Pool.new(target.pool_size, target, k) } }
         @__pool_lock = Mutex.new
+        @__pool_wait = ConditionVariable.new
 
         def self.__pool_lock
           @__pool_lock
         end
 
+        def self.__pool_wait
+          @__pool_wait
+        end
+
         def self.new(*args)
           @__pools[args].new
         end
@@ -106,6 +110,9 @@ module Extlib
     end
 
     class Pool
+      attr_reader :available
+      attr_reader :used
+
       def initialize(max_size, resource, args)
         raise ArgumentError.new("+max_size+ should be a Fixnum but was #{max_size.inspect}") unless Fixnum === max_size
         raise ArgumentError.new("+resource+ should be a Class but was #{resource.inspect}") unless Class === resource
@@ -115,44 +122,59 @@ module Extlib
         @args = args
 
         @available = []
-        @reserved_count = 0
+        @used      = Set.new
+        Extlib::Pooling::append_pool(self)
       end
 
       def lock
         @resource.__pool_lock
       end
 
+      def wait
+        @resource.__pool_wait
+      end
+
       def scavenge_interval
         @resource.scavenge_interval
       end
 
       def new
         instance = nil
-
-        lock.synchronize do
-          instance = acquire
-        end
-
-        Extlib::Pooling::append_pool(self)
-
-        if instance.nil?
-          # Account for the current thread, and the pool scavenger.
-          if ThreadGroup::Default.list.size == 2 && @reserved_count >= @max_size
-            raise ThreadStopError.new(size)
-          else
-            sleep(0.05)
-            new
+        begin
+          lock.synchronize do
+            if @available.size > 0
+              instance = @available.pop
+              @used.add instance
+            elsif @used.size < @max_size
+              instance = @resource.__new(*@args)
+              raise InvalidResourceError.new("#{@resource} constructor created a nil object") if instance.nil?
+              raise InvalidResourceError.new("#{instance} is already part of the pool") if @used.include? instance
+              instance.instance_variable_set(:@__pool, self)
+              instance.instance_variable_set(:@__allocated_in_pool, Time.now)
+              @used.add instance
+            else
+              # Let's see whether we have multiple threads
+              # If we do, there is a chance we might be released
+              # at some point in the future and thus we wait.
+              # If there are no other threads, we exhaust the pool
+              # here and there is no more hope... So we throw an
+              # exception.
+              if ThreadGroup::Default.list.size <= 2
+                raise ThreadStopError.new(size)
+              else
+                wait.wait(lock)
+              end
+            end
           end
-        else
-          instance
-        end
+        end until instance
+        instance
       end
 
       def release(instance)
         lock.synchronize do
-          instance.instance_variable_set(:@__pool, nil)
-          @reserved_count -= 1
+          @used.delete instance
           @available.push(instance)
+          wait.signal
         end
         nil
       end
@@ -160,18 +182,18 @@ module Extlib
       def delete(instance)
         lock.synchronize do
           instance.instance_variable_set(:@__pool, nil)
-          @reserved_count -= 1
+          used.delete instance
         end
         nil
       end
 
       def size
-        @available.size + @reserved_count
+        @used.size + @available.size
       end
       alias length size
 
       def inspect
-        "#<Extlib::Pooling::Pool<#{@resource.name}> available=#{@available.size} reserved_count=#{@reserved_count}>"
+        "#<Extlib::Pooling::Pool<#{@resource.name}> available=#{@available.size} used=#{@used.size} size=#{@max_size}>"
       end
 
       def flush!
@@ -190,7 +212,7 @@ module Extlib
       #   lock.synchronize do
       #     @available.each do |instance|
       #       if instance.instance_variable_get(:@__allocated_in_pool) + scavenge_interval < Time.now
-      #         instance.dispose
+      #         instance.release
       #         @available.delete(instance)
       #       end
       #     end
@@ -199,31 +221,6 @@ module Extlib
       #   end
       # end
 
-      def reserved_count
-        @reserved_count
-      end
-
-      private
-
-      def acquire
-        instance = if !@available.empty?
-          @available.pop
-        elsif size < @max_size
-          @resource.__new(*@args)
-        else
-          nil
-        end
-
-        if instance.nil?
-          instance
-        else
-          raise CrossPoolError.new(instance) if instance.instance_variable_get(:@__pool)
-          @reserved_count += 1
-          instance.instance_variable_set(:@__pool, self)
-          instance.instance_variable_set(:@__allocated_in_pool, Time.now)
-          instance
-        end
-      end
     end
 
     def self.scavenger_interval

data/lib/extlib/symbol.rb

@@ -0,0 +1,17 @@
+class Symbol
+  
+  def try_dup
+    self
+  end
+  
+  ##
+  # @param o<String, Symbol> The path component to join with the string.
+  #
+  # @return <String> The original path concatenated with o.
+  #
+  # @example
+  #   :merb/"core_ext" #=> "merb/core_ext"
+  def /(o)
+    File.join(self.to_s, o.to_s)
+  end
+end

data/lib/extlib/time.rb

@@ -9,4 +9,11 @@ class Time
     self.xmlschema.to_json
   end
   
+  def to_time
+    self
+  end
+  
+  def to_datetime
+    DateTime.parse self.to_s
+  end
 end

data/lib/extlib/version.rb

@@ -1,3 +1,3 @@
 module Extlib
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extlib
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 +03:00
+date: 2008-09-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,9 @@ files:
 - lib/extlib
 - lib/extlib/assertions.rb
 - lib/extlib/blank.rb
+- lib/extlib/boolean.rb
 - lib/extlib/class.rb
+- lib/extlib/datetime.rb
 - lib/extlib/hash.rb
 - lib/extlib/hook.rb
 - lib/extlib/inflection.rb
@@ -46,6 +48,8 @@ files:
 - lib/extlib/logger.rb
 - lib/extlib/mash.rb
 - lib/extlib/module.rb
+- lib/extlib/nil.rb
+- lib/extlib/numeric.rb
 - lib/extlib/object.rb
 - lib/extlib/object_space.rb
 - lib/extlib/pathname.rb
@@ -54,6 +58,7 @@ files:
 - lib/extlib/simple_set.rb
 - lib/extlib/string.rb
 - lib/extlib/struct.rb
+- lib/extlib/symbol.rb
 - lib/extlib/tasks
 - lib/extlib/tasks/release.rb
 - lib/extlib/time.rb