facets 2.6.0 → 2.7.0

data/lib/core/facets/module/instance_method.rb

@@ -0,0 +1,24 @@
+$FIRST_CLASS_INSTANCE_METHODS = Hash.new{ |h,k| h[k] = {} }
+
+#
+class Module
+
+  # Access method as a singleton object and retain state.
+  #
+  #   module K
+  #     def hello
+  #       puts "Hello World!"
+  #     end
+  #   end
+  #   p K.instance_method!(:hello)   #=> <UnboundMethod: #hello>
+  #
+  # NOTE: This is limited to the scope of the current module/class.
+
+  def instance_method!(s)
+    #( @@__instance_methods__ ||= {} )[s] ||= instance_method(s)  # TODO: use class vars for 1.9+ ?
+    #( @__instance_methods__ ||= {} )[s.to_sym] ||= instance_method(s.to_sym)
+    $FIRST_CLASS_INSTANCE_METHODS[self][s.to_sym] ||= instance_method(s.to_sym)
+  end
+
+end
+

data/lib/core/facets/module/module_load.rb

@@ -1,56 +1,72 @@
 class Module
 
-  #unless (RUBY_VERSION[0,3] == '1.9')
+  # Load file directly into module/class namespace.
+  #
+  # Please use this with careful consideration.
+  # It is best suited to loading plugin-type scripts,
+  # and should generally not be used as a substitue for
+  # Ruby's standard load system.
+  #
+  # CREDIT: Trans
 
-    # Load file into module/class namespace.
-    #
-    # CREDIT: Trans
-
-    def module_load( path )
-      if path =~ /^[\/~.]/
-        file = File.expand_path(path)
-      else
-        $LOAD_PATH.each do |lp|
-          file = File.join(lp,path)
-          break if File.exist?(file)
-          file = nil
-        end
+  def module_load( path )
+    if path =~ /^[\/~.]/
+      file = File.expand_path(path)
+    else
+      $LOAD_PATH.each do |lp|
+        file = File.join(lp,path)
+        break if File.exist?(file)
+        file = nil
       end
-      raise LoadError, "no such file to load -- #{path}" unless file
-      module_eval(File.read(file))
     end
+    raise LoadError, "no such file to load -- #{path}" unless file
+    module_eval(File.read(file))
+  end
 
-    # Require file into module/class namespace.
-    #
-    # CREDIT: Trans
+  # Require file into module/class namespace.
+  #
+  # Unlike load this keeps a per-module cache and will
+  # not load the same file into the same module more
+  # than once despite repeated attempts.
+  #
+  # The cache is kept in a global var called +$module_require+.
+  #
+  # Please use this with careful consideration.
+  # It is best suited to loading plugin-type scripts,
+  # and should generally not be used as a substitue for
+  # Ruby's standard load system.
+  #
+  # CREDIT: Trans
 
-    def module_require( path )
-      if path =~ /^[\/~.]/
-        file = File.expand_path(path)
-      else
-        $LOAD_PATH.each do |lp|
-          file = File.join(lp,path)
-          break if File.exist?(file)
-          file += '.rb'
-          break if File.exist?(file)
-          file = nil
-        end
-      end
-      raise LoadError, "no such file to load -- #{path}" unless file
-      @loaded ||= {}
-      if @loaded.key?(file)
-        false
-      else
-        @loaded[file] = true
-        script = File.read(file)
-        module_eval(script)
-        true
+  def module_require( path )
+    if path =~ /^[\/~.]/
+      file = File.expand_path(path)
+    else
+      $LOAD_PATH.each do |lp|
+        file = File.join(lp,path)
+        break if File.exist?(file)
+        file += '.rb'
+        break if File.exist?(file)
+        file = nil
       end
     end
+    raise LoadError, "no such file to load -- #{path}" unless file
+    # per-module load cache
+    $module_require ||= {}
+    $module_require[self] ||= {}
+    loaded = $module_require[self]
+    if loaded.key?(file)
+      false
+    else
+      loaded[file] = true
+      script = File.read(file)
+      module_eval(script)
+      true
+    end
+  end
 
-    alias_method :class_require, :module_require
-    alias_method :class_load, :module_load
-
-  #end
+  alias_method :class_require, :module_require
+  alias_method :class_load, :module_load
 
 end
+

data/lib/core/facets/module/module_require.rb

@@ -0,0 +1 @@
+require 'facets/module/module_load'

data/lib/core/facets/nilclass/to_f.rb

@@ -1,6 +1,6 @@
 class NilClass
 
-  unless defined? to_f
+  unless method_defined?(:to_f)
 
     # Allows <tt>nil</tt> to respond to #to_f.
     # Always returns <tt>0</tt>.

data/lib/core/facets/objectspace/op_fetch.rb

@@ -0,0 +1,3 @@
+class << ObjectSpace
+  alias_method :[], :_id2ref
+end

data/lib/core/facets/proc/curry.rb

@@ -8,18 +8,19 @@ class Proc
     if args.empty?
       idx = (0...arity).to_a
     else
-      raise ArgumentError, "argument count is greater than arity (#{args.size} > #{arity})" if args.size > arity
+      raise ArgumentError, "argument count is greater than prok.arity (#{args.size} > #{arity})" if args.size > arity
       raise ArgumentError, "arguments must be unique indexes" if args.uniq != args
       raise ArgumentError, "arguments must be indexes" if args.any?{ |a| !Fixnum===a }
       idx = (0...arity).to_a
-      idx = args + (idx - args)  
+      idx = args + (idx - args)
     end
 
+    pro = self
     rec = ''
     idx.each do |i|
       rec << "proc { |a#{i}| "
     end
-    rec << "self["
+    rec << "pro["
     rec << (0...arity).to_a.collect{|i| "a#{i}"}.join(',')
     rec << "]"
     rec << "}" * arity

data/lib/core/facets/string/bytes.rb

@@ -1,12 +1,18 @@
-unless (RUBY_VERSION[0,3] == '1.9')
+class String
 
-  class String
+  unless method_defined?(:bytes) # 1.8.7+
 
     # Upacks string into bytes.
     #
+    # Note, this is not 100% compatible with 1.8.7+
+    # which returns an enumerator instead of an array.
     #
-    def bytes
-      self.unpack('C*')
+    def bytes(&blk)
+      if block_given?
+        self.unpack('C*').each(&blk)
+      else
+        self.unpack('C*')
+      end
     end
 
   end

data/lib/core/facets/string/camelcase.rb

@@ -2,7 +2,7 @@ class String
 
   # Converts a string to camelcase.
   #
-  # By default camelcase leaves the first charcter of the string as given.
+  # By default camelcase leaves the first character of the string as given.
   # If +first_letter+ is set to +:lower+ or +false+, then +#camelcase+ will
   # produce lowerCamelCase. If it is set to +:upper+ or +true+ it will
   # produce UpperCamelCase.
@@ -11,10 +11,11 @@ class String
   # paths to namespaces.
   #
   # Examples
-  #   "camel_case".camelcase             #=> "CamelCase"
-  #   "camel/case".camelcase             #=> "Camel::Case"
-  #   "camel_case".camelcase(false)      #=> "camelCase"
+  #   "camel_case".camelcase             #=> "camelCase"
+  #   "camel/case".camelcase(true)       #=> "Camel::Case"
+  #   "Camel_case".camelcase(false)      #=> "camelCase"
   #
+  # TODO: Is this the best approach? Should lowerCamelCase be default instead?
   def camelcase(first_letter=nil)
     case first_letter
     when :upper, true
@@ -42,7 +43,7 @@ class String
     str = dup
     str.gsub!(/\/(.?)/){ "::#{$1.upcase}" }  # NOT SO SURE ABOUT THIS
     str.gsub!(/(?:_+|-+)([a-z])/){ $1.upcase }
-    str.gsub!(/(\A|\s)([a-z])/){ $1 + $2.downcase }
+    str.gsub!(/(\A|\s)([A-Z])/){ $1 + $2.downcase }
     str
   end
 

data/lib/core/facets/string/chars.rb

@@ -1,6 +1,10 @@
 class String
 
-  unless defined?(chars) or defined?(::ActiveSupport) # 1.9 & ActiveSupport
+  # Some other library is defining this method but it is
+  # returning an Enumerator, not an array. Therefore we're
+  # overriding it regardless of it's inclusion in 1.9.
+  #
+  unless defined?(::ActiveSupport) # 1.9 & ActiveSupport
 
     # Returns an array of characters.
     #

data/lib/core/facets/string/each_char.rb

@@ -1,6 +1,6 @@
 class String
 
-  unless defined? each_char # 1.9
+  unless method_defined?(:each_char) # 1.9
 
     require 'strscan'
 

data/lib/core/facets/string/each_word.rb

@@ -4,7 +4,7 @@ class String
 
   # Iterate through each word of a string.
   #
-  #   "a string".each_word { |word, range| ... }
+  #   "a string".each_word { |word| ... }
   #
   def each_word(&block)
     words.each(&block)

data/lib/core/facets/string/lines.rb

@@ -1,13 +1,20 @@
-unless (RUBY_VERSION[0,3] == '1.9')
+class String
 
-  class String
+  unless method_defined?(:lines)  # 1.8.7+
 
     # Returns an array of characters.
     #
     #   "abc\n123".lines  #=> ["abc","123"]
     #
-    def lines
-      self.split(/\n/)
+    # Note, this is not 100% compatible with 1.8.7+
+    # which returns an enumerator instead of an array.
+    #
+    def lines(&blk)
+      if block_given?
+        self.split(/\n/).each(&blk)
+      else
+        self.split(/\n/)
+      end
     end
 
   end

data/lib/core/facets/string/start_with.rb

@@ -1,6 +1,6 @@
-unless (RUBY_VERSION[0,3] == '1.9')
+class String
 
-  class String
+  unless method_defined?(:start_with?) # 1.8.7+
 
     # Does a string start with the given prefix.
     #
@@ -13,6 +13,10 @@ unless (RUBY_VERSION[0,3] == '1.9')
       self.index(prefix) == 0
     end
 
+  end
+
+  unless method_defined?(:end_with?) # 1.8.7+
+
     # Does a string end with the given suffix?
     #
     #   "hello".ends_with?("lo")    #=> true
@@ -26,5 +30,8 @@ unless (RUBY_VERSION[0,3] == '1.9')
 
   end
 
+  alias_method :starts_with?, :start_with?
+  alias_method :ends_with?  , :ends_with?
+
 end
 

data/lib/core/facets/string/unfold.rb

@@ -0,0 +1,27 @@
+class String
+
+  # Unfold paragrpahs.
+  #
+  # FIXME: Sometimes adds one too many blank lines. TEST!!!
+  #
+  def unfold
+    blank = false
+    text  = ''
+    split(/\n/).each do |line|
+      if /\S/ !~ line
+        text << "\n\n"
+        blank = true
+      else
+        if /^(\s+|[*])/ =~ line
+          text << (line.rstrip + "\n")
+        else
+          text << (line.rstrip + " ")
+        end
+        blank = false
+      end
+    end
+    text = text.gsub(/(\n){3,}/,"\n\n")
+    text.rstrip
+  end
+
+end

data/lib/core/facets/symbol/succ.rb

@@ -1,6 +1,6 @@
-unless (RUBY_VERSION[0,3] == '1.9')
+class Symbol
 
-  class Symbol
+  unless method_defined?(:succ)  # 1.9+ TODO: is this right?
 
     # Successor method for symobol. This simply converts
     # the symbol to a string uses String#succ and then
@@ -8,7 +8,7 @@ unless (RUBY_VERSION[0,3] == '1.9')
     #
     #   :a.succ => :b
     #
-    # TODO: Make this  work more like a simple character dial?
+    # TODO: Make this work more like a simple character dial?
 
     def succ
       self.to_s.succ.intern

data/lib/core/facets/symbol/thrown.rb

@@ -0,0 +1,20 @@
+class Symbol
+
+  # Does the block throw the symbol?
+  # 
+  def thrown?
+    catch(self) do
+      begin
+        yield
+        true
+      rescue ArgumentError => err     # 1.9 exception
+        #msg += ", not #{err.message.split(/ /).last}"
+        false
+      rescue NameError => err         # 1.8 exception
+        #msg += ", not #{err.name.inspect}"
+        false
+      end
+    end
+  end
+
+end

data/lib/core/facets/symbol/to_proc.rb

@@ -1,6 +1,6 @@
-unless (RUBY_VERSION[0,3] == '1.9')
+class Symbol
 
-  class Symbol
+  unless method_defined?(:to_proc)  # 1.8.7+
 
     # Turn a symbol into a proc calling the method to
     # which it refers.
@@ -35,3 +35,4 @@ unless (RUBY_VERSION[0,3] == '1.9')
   end
 
 end
+

data/lib/core/facets/time/to_time.rb

@@ -1,6 +1,6 @@
 class Time
 
-  unless defined? to_time #1.9
+  unless method_defined?(:to_time) # 1.9
 
     # To be able to keep Dates and Times interchangeable
     # on conversions.

data/lib/core/facets/to_hash.rb

@@ -1,5 +1,4 @@
-require 'enumerator' if RUBY_VERSION < "1.9"
-
+require 'facets/enumerator'
 require 'facets/hash/dearray_values'
 
 class Array
@@ -267,112 +266,54 @@ class NilClass
 end
 
 
-if RUBY_VERSION < "1.9"
-
-  class Enumerable::Enumerator
-  
-    # Convert an Enumerable::Enumerator object into a hash.
-    # This is equivalent to Array#to_h.
-    #
-    #   e1 = [[1,:a],[2,:b],[3,:c]].to_enum
-    #   e1.to_h #=> { 1=>:a, 2=>:b, 3=>:c }
-    # 
-    #   e2 = [1,2,3,4,5].to_enum
-    #   e2.to_h  #=> {5=>nil, 1=>2, 3=>4}
-    #
-    #   e3 = [1,2,1,3,1,5].to_enum
-    #   e3.to_h #=> {1=>5}
-    #
-    # CREDIT: Sandor Szücs
-
-    def to_h(mode=nil)
-      to_a.to_h(mode)
-    end
-
-    # This is equivalent to Array#to_h_auto.
-    #
-    def to_h_auto
-      to_a.to_h_auto
-    end
-
-    # This is equivalent to Array#to_h_splat.
-    #
-    def to_h_splat
-      to_a.to_h_splat
-    end
+class Enumerator
 
-    # This is equivalent to Array#to_h_flat.
-    #
-    def to_h_flat
-      to_a.to_h_flat
-    end
-
-    # This is equivalent to Array#to_h_assoc.
-    #
-    def to_h_assoc
-      to_a.to_h_assoc
-    end
-
-    # This is equivalent to Array#to_h_multi.
-    #
-    def to_h_multi
-      to_a.to_h_multi
-    end
+  # Convert an Enumerator object into a hash.
+  # This is equivalent to Array#to_h.
+  #
+  #   e1 = [[1,:a],[2,:b],[3,:c]].to_enum
+  #   e1.to_h #=> { 1=>:a, 2=>:b, 3=>:c }
+  #
+  #   e2 = [1,2,3,4,5].to_enum
+  #   e2.to_h  #=> {5=>nil, 1=>2, 3=>4}
+  #
+  #   e3 = [1,2,1,3,1,5].to_enum
+  #   e3.to_h #=> {1=>5}
+  #
+  # CREDIT: Sandor Szücs
 
+  def to_h(mode=nil)
+    to_a.to_h(mode)
   end
 
-else
-
-  class Enumerator
-
-    # Convert an Enumerator object into a hash.
-    # This is equivalent to Array#to_h.
-    #
-    #   e1 = [[1,:a],[2,:b],[3,:c]].to_enum
-    #   e1.to_h #=> { 1=>:a, 2=>:b, 3=>:c }
-    #
-    #   e2 = [1,2,3,4,5].to_enum
-    #   e2.to_h  #=> {5=>nil, 1=>2, 3=>4}
-    #
-    #   e3 = [1,2,1,3,1,5].to_enum
-    #   e3.to_h #=> {1=>5}
-    #
-    # CREDIT: Sandor Szücs
-
-    def to_h(mode=nil)
-      to_a.to_h(mode)
-    end
-
-    # This is equivalent to Array#to_h_auto.
-    #
-    def to_h_auto
-      to_a.to_h_auto
-    end
-
-    # This is equivalent to Array#to_h_splat.
-    #
-    def to_h_splat
-      to_a.to_h_splat
-    end
+  # This is equivalent to Array#to_h_auto.
+  #
+  def to_h_auto
+    to_a.to_h_auto
+  end
 
-    # This is equivalent to Array#to_h_flat.
-    #
-    def to_h_flat
-      to_a.to_h_flat
-    end
+  # This is equivalent to Array#to_h_splat.
+  #
+  def to_h_splat
+    to_a.to_h_splat
+  end
 
-    # This is equivalent to Array#to_h_assoc.
-    #
-    def to_h_assoc
-      to_a.to_h_assoc
-    end
+  # This is equivalent to Array#to_h_flat.
+  #
+  def to_h_flat
+    to_a.to_h_flat
+  end
 
-    # This is equivalent to Array#to_h_multi.
-    #
-    def to_h_multi
-      to_a.to_h_multi
-    end
+  # This is equivalent to Array#to_h_assoc.
+  #
+  def to_h_assoc
+    to_a.to_h_assoc
+  end
 
+  # This is equivalent to Array#to_h_multi.
+  #
+  def to_h_multi
+    to_a.to_h_multi
   end
 
 end