facets 3.1.0 → 3.2.0

data/lib/core/facets/dir/recurse.rb

@@ -1,35 +1,17 @@
+require 'facets/dir/find'
+
 class Dir
 
-  # Recursively scan a directory and pass each file to the given block.
-  #
-  #   Dir.recurse('.') do |path|
-  #     # ...
-  #   end
-  #
-  # CREDIT: George Moschovitis
-  #
-  # TODO: If fully compatible, reimplement as alias of Find.find,
-  # or just copy and paste Find.find code here if it looks more robust.
-  #
+  # @deprecated Use Dir.find or Find.find instead.
   def self.recurse(path='.', &block)
-    list = []
-    stoplist = ['.', '..']
-    Dir.foreach(path) do |f|
-      next if stoplist.include?(f)
-      filename = (path == '.' ? f : path + '/' + f)
-      list << filename
-      block.call(filename) if block
-      if FileTest.directory?(filename) and not FileTest.symlink?(filename)
-        list.concat(Dir.recurse(filename, &block))
-      end
-    end
-    list
+    warn "Dir.recurse is deprecated. Use Dir.find or Find.find instead.", uplevel: 1
+    Dir.find(path, &block)
   end
 
-  # Same as Dir#recurse.
+  # @deprecated Use Dir.find or Find.find instead.
   def self.ls_r(path='.', &block)
-    recurse(path, &block)
+    warn "Dir.ls_r is deprecated. Use Dir.find or Find.find instead.", uplevel: 1
+    Dir.find(path, &block)
   end
 
 end
-

data/lib/core/facets/enumerable/compact_map.rb

@@ -15,18 +15,8 @@ module Enumerable
   # does almost the same thing and enum.map{}.compact works too.
 
   def compact_map(&block)
-    y = []
-    if block_given?
-      each do |*a|
-        r = yield(*a)
-        y << r unless r.nil?
-      end
-    else
-      each do |r|
-        y << r unless r.nil?
-      end
-    end
-    y
+    warn "Enumerable#compact_map is deprecated. Use Enumerable#filter_map instead.", uplevel: 1
+    filter_map(&block)
   end
 
   #

data/lib/core/facets/enumerable/defer.rb

@@ -27,19 +27,8 @@ module Enumerable
   # to output each result and discard it.
   #
   def defer(&blk)
-    if block_given?
-      Denumerator.new do |output|
-        each do |*input|
-          yield(output, *input)
-        end
-      end
-    else
-      Denumerator.new do |output|
-        each do |*input|
-          output.yield(*input)
-        end
-      end
-    end
+    warn "Enumerable#defer is deprecated. Use Enumerable#lazy instead.", uplevel: 1
+    lazy
   end
 
 end

data/lib/core/facets/enumerable/each_by.rb

@@ -1,5 +1,3 @@
-require 'facets/enumerator'
-
 module Enumerable
 
   # Iterate through slices. If slice +steps+ is not

data/lib/core/facets/enumerable/frequency.rb

@@ -16,8 +16,8 @@ module Enumerable
   #++
 
   def frequency
-    p = Hash.new(0); each{ |v| p[v] += 1 }; p
-
+    warn "Enumerable#frequency is deprecated. Use Enumerable#tally instead.", uplevel: 1
+    tally
   end
 
 end

data/lib/core/facets/enumerable/hinge.rb

@@ -9,10 +9,9 @@ module Enumerable
   #
   # TODO: Enumerable#hinge will get a new name.
   #
-  def hinge(init={})
-    h = init
-    each{ |v| yield(h,v) }
-    h
+  def hinge(init={}, &block)
+    warn "Enumerable#hinge is deprecated. Use Enumerable#each_with_object instead (note: block args are reversed).", uplevel: 1
+    each_with_object(init) { |e, obj| block.call(obj, e) }
   end
 
 end

data/lib/core/facets/enumerable/map_with_index.rb

@@ -7,12 +7,9 @@ module Enumerable
   #
   # CREDIT: Gavin Sinclair
 
-  def map_with_index
-    r = []
-    each_with_index do |e, i|
-      r << yield(e, i)
-    end
-    r
+  def map_with_index(&block)
+    warn "Enumerable#map_with_index is deprecated. Use Enumerable#map.with_index instead.", uplevel: 1
+    map.with_index(&block)
   end
 
   # Alias for map_with_index.

data/lib/core/facets/enumerable/mash.rb

@@ -1,34 +1,11 @@
-module Enumerable
+require 'facets/enumerable/graph'
 
-  # Like `#map`/`#collect`, but generates a Hash. The block is expected
-  # to return two values: the key and the value for the new hash.
-  #
-  #   numbers  = (1..3)
-  #   squares  = numbers.mash{ |n| [n, n*n] }   # { 1=>1, 2=>4, 3=>9 }
-  #   sq_roots = numbers.mash{ |n| [n*n, n] }   # { 1=>1, 4=>2, 9=>3 }
-  #
-  # CREDIT: Andrew Dudzik (adudzik), Trans
+module Enumerable
 
+  # @deprecated Use Enumerable#graph instead.
   def mash(&yld)
-    if yld
-      h = {}
-      each do |*kv|
-        r = yld[*kv]
-        case r
-        when Hash
-          nk, nv = *r.to_a[0]
-        when Range
-          nk, nv = r.first, r.last
-        else
-          nk, nv = *r
-        end
-        h[nk] = nv
-      end
-      h
-    else
-      Enumerator.new(self,:graph)
-    end
+    warn "Enumerable#mash is deprecated. Use Enumerable#graph instead.", uplevel: 1
+    graph(&yld)
   end
 
 end
-

data/lib/core/facets/enumerable/uniq_by.rb

@@ -1,13 +1,9 @@
 module Enumerable
 
-  # Like #uniq, but determines uniqueness based on a given block.
-  #
-  #   (-5..5).to_a.uniq_by {|i| i*i }
-  #   #=> [-5, -4, -3, -2, -1, 0]
-  #
-  def uniq_by #:yield:
-    h = {}; inject([]) {|a,x| h[yield(x)] ||= a << x}
+  # @deprecated Use Enumerable#uniq with a block instead (Ruby 1.9.2+).
+  def uniq_by(&block)
+    warn "Enumerable#uniq_by is deprecated. Use Enumerable#uniq(&block) instead.", uplevel: 1
+    uniq(&block)
   end
 
 end
-

data/lib/core/facets/enumerable/with_position.rb

@@ -0,0 +1,58 @@
+
+module Enumerable
+	class Position
+		def initialize
+			@first = true
+			@last = false
+		end
+		
+		def after_first!
+			@first = false
+		end
+		
+		def at_end!
+			@last = true
+		end
+		
+		def first?
+			@first
+		end
+		
+		def middle?
+			not (@first or @last)
+		end
+		
+		def last?
+			@last
+		end
+	end
+	
+	# Allows one to know the position of the enumeration easily.
+	#
+	#    5.times.collect.with_position do |i, position|
+	#        $stdout.write "#{i}#{position.middle? ? ',' : ''}"
+	#    end
+	#
+	# Where this becomes more useful, is when it's easy to determine the position of elements, e.g.
+	#
+	#    10.times.select(&:odd?).with_position{|n,p| ... }
+	#
+	def with_position
+		return to_enum(:with_position) unless block_given?
+		
+		position = Position.new
+		
+		while item = self.next
+			begin
+				self.peek
+			rescue StopIteration
+				position.at_end!
+			end
+			
+			yield item, position.dup
+			
+			position.after_first!
+		end
+	rescue StopIteration
+	end
+end

data/lib/core/facets/enumerator.rb

@@ -1,75 +1,2 @@
-if RUBY_VERSION < '1.9'
-
-  require 'enumerator'
-
-  # for Ruby 1.8 -> 1.9 transition
-  Enumerator = Enumerable::Enumerator unless defined?(::Enumerator)
-
-  class Enumerator
-
-    private
-
-    alias :old_initialize :initialize
-
-    # Provides the ruby-1.9 block form of Enumerator, where you can write:
-    #
-    #    obj = Enumerator.new do |yielder|
-    #      # ...
-    #      yielder.yield(data)  # or: yielder << data
-    #      # ...
-    #    end
-    #
-    # When obj.each is called, the block is run once. It should call
-    # yielder.yield with each item it wishes to generate.
-    #
-    # Example:
-    #
-    #   fib = Enumerator.new { |y|
-    #     a = b = 1
-    #     loop {   
-    #       y << a
-    #       a, b = b, a + b
-    #     }
-    #   }  
-    #
-    #   fib.take(10)  #=> [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
-    #                                                 
-    def initialize(*args, &block)
-      if block
-        @body = block
-        old_initialize(self, :_start)
-      else
-        old_initialize(*args)
-      end
-    end
-
-    def _start(*args,&receiver) #:nodoc:
-      @body.call(Yielder.new(&receiver), *args)
-    end
-
-    # Wrapper to allow yielder.yield(output) or yielder << output
-    # in the same way as ruby-1.9
-    #
-    # TODO: Why can't Yielder take a block instead of a proc argument?
-
-    class Yielder #:nodoc:
-      def initialize(&proc)
-        @proc = proc
-      end
-      def yield(*args)
-        @proc[*args]
-      end
-      alias :<< :yield
-    end
-
-  end
-
-end
-
-path = __FILE__.chomp('.rb')
-base = File.basename(path)
-Dir[File.join(path, '*.rb')].each do |lib|
-  #require lib # why is this so much slower?
-  require "facets/#{base}/#{File.basename(lib)}"
-end
-
+require_relative 'enumerator/fx'
+require_relative 'enumerator/lazy/squeeze'

data/lib/core/facets/exception/error_print.rb

@@ -1,80 +1,15 @@
 class Exception
 
-  # Formats the Exception so that it looks *familiar*,
-  # i.e. exactly like your interpreter does it.
-  #
-  # Port of MRI native `error_print` function.
-  #
-  # @author Evgeniy Dolzhenko
-
+  # @deprecated Use Exception#full_message instead (built-in since Ruby 2.5).
   def self.error_print(e)
-    warn_print = ""
-    backtrace = e.backtrace
-    backtrace = [ backtrace ] if backtrace.is_a?(String) # 1.9 returns single String for SystemStackError
-
-    warn_print << backtrace[0]
-    if e.is_a?(RuntimeError) && e.message.empty?
-      warn_print << ": unhandled exception\n"
-    else
-      if e.message.empty?
-        warn_print << ": #{ e.class.name }\n"
-      else
-        split_message = e.message.split("\n")
-        warn_print << ": "
-        if split_message.size == 1
-          warn_print << "#{ e.message } (#{ e.class.name })\n"
-        else
-          warn_print << split_message[0]
-          warn_print << " (#{ e.class.name })\n"
-          warn_print << split_message[1..-1].join("\n").chomp << "\n"
-        end
-      end
-    end
-
-    len = backtrace.size
-
-    ## int skip = eclass == rb_eSysStackError;
-    skip = e.is_a?(SystemStackError)
-
-    ## #define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
-    ## #define TRACE_HEAD 8
-    ## #define TRACE_TAIL 5
-    trace_head = 8
-    trace_tail = 5
-    trace_max = (trace_head + trace_tail + 5)
-    ##
-    ##	for (i = 1; i < len; i++) {
-    i = 1
-    while i < len
-      ##	    if (TYPE(ptr[i]) == T_STRING) {
-      ##		warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
-      ##	    }
-      warn_print << "\tfrom %s\n" % e.backtrace[i]
-
-      ##	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
-      if skip && i == trace_head && len > trace_max
-      ##		warn_printf("\t ... %ld levels...\n",
-      ##			    len - TRACE_HEAD - TRACE_TAIL);
-        warn_print << "\t ... %d levels...\n" % (len - trace_head - trace_tail)
-      ##		i = len - TRACE_TAIL;
-        i = len - trace_tail
-      ##	    }
-      end
-      ##	}
-      i += 1
-    end
-    warn_print
+    warn "Exception.error_print is deprecated. Use Exception#full_message instead.", uplevel: 1
+    e.full_message
   end
 
-  # Formats the Exception so that it looks *familiar*,
-  # i.e. exactly like your interpreter does it.
-  #
-  # @author Evgeniy Dolzhenko
-  #
-  # @todo Anyone have a better name for this method?
+  # @deprecated Use Exception#full_message instead (built-in since Ruby 2.5).
   def error_print
-    Exception.error_print(self)
+    warn "Exception#error_print is deprecated. Use Exception#full_message instead.", uplevel: 1
+    full_message
   end
 
 end
-

data/lib/core/facets/file/null.rb

@@ -1,21 +1,9 @@
 class File
 
-  # Platform dependent null device.
-  #
-  # CREDIT: Daniel Burger
-
+  # @deprecated Use File::NULL constant instead (built-in since Ruby 1.9.3).
   def self.null
-    case RUBY_PLATFORM
-    when /mswin/i
-      'NUL'
-    when /amiga/i
-      'NIL:'
-    when /openvms/i
-      'NL:'
-    else
-      '/dev/null'
-    end
+    warn "File.null is deprecated. Use File::NULL instead.", uplevel: 1
+    File::NULL
   end
 
 end
-

data/lib/core/facets/file/read_binary.rb

@@ -1,18 +1,9 @@
 class File
 
-  # Read in a file as binary data.
-  #
-  # Assuming we had a binary file 'binary.dat'.
-  #
-  #   File.read_binary('binary.dat')
-  #
-  # CREDIT: George Moschovitis
-
+  # @deprecated Use File.binread instead (built-in since Ruby 1.9.3).
   def self.read_binary(fname)
-    open(fname, 'rb') do |f|
-      return f.read
-    end
+    warn "File.read_binary is deprecated. Use File.binread instead.", uplevel: 1
+    binread(fname)
   end
 
 end
-

data/lib/core/facets/hash/except.rb

@@ -1,12 +1,5 @@
 class Hash
 
-  # Returns a new hash less the given keys.
-  def except(*less_keys)
-    hash = dup
-    less_keys.each{ |k| hash.delete(k) }
-    hash
-  end
-
   # Replaces hash with new hash less the given keys.
   #
   #   h = {:a=>1, :b=>2, :c=>3}

data/lib/core/facets/hash/fetch_nested.rb

@@ -1,18 +1,17 @@
 class Hash
 
-  # Similar to Hash#fetch but supports nested lookup and is `nil` safe.
+  # @deprecated Use Hash#dig instead (built-in since Ruby 2.3).
   #
-  #     {}.fetch_nested('anything','at','all')  #=> nil
+  # Similar to Hash#dig but supports a block for missing keys,
+  # like Hash#fetch does. Ruby's #dig does not support a block.
   #
-  #     h = {'hello'=>{'world'=>42}}
-  #     h.fetch_nested(*['hello','world'])  #=> 42
+  # TODO: Consider proposing block support for Hash#dig to Ruby core.
   #
-  # CREDIT: T. Yamada and Sean Mackesey
-
-  def fetch_nested(*keys)
+  def fetch_nested(*keys, &block)
+    warn "Hash#fetch_nested is deprecated. Use Hash#dig instead.", uplevel: 1
     begin
-      keys.reduce(self){|accum, k| accum.fetch(k)}
-	rescue (RUBY_VERSION<'1.9' ? IndexError : KeyError)
+      keys.reduce(self) { |accum, k| accum.fetch(k) }
+    rescue KeyError
       block_given? ? yield(*keys) : nil
     end
   end

data/lib/core/facets/hash/graph.rb

@@ -1,4 +1,4 @@
-require 'facets/enumerable/mash'
+require 'facets/enumerable/graph'
 
 class Hash
 

data/lib/core/facets/hash/rekey.rb

@@ -40,13 +40,13 @@ class Hash
 
     if block
       hash = dup.clear
-      if block.arity.abs == 1
+      if block.arity == 2
         each_pair do |k, v|
-          hash[block[k]] = v     #hash[block[k] || k] = v
+          hash[block[k,v]] = v
         end
       else
         each_pair do |k, v|
-          hash[block[k,v]] = v   #hash[block[k,v] || k] = v
+          hash[block[k]] = v
         end
       end
     else

data/lib/core/facets/hash/revalue.rb

@@ -21,13 +21,13 @@ class Hash
 
     if block
       hash = dup.clear  # to keep default_proc
-      if block.arity.abs == 1
+      if block.arity == 2
         each_pair do |k, v|
-          hash[k] = block[v]     #hash[k] = block[v] || v
+          hash[k] = block[k,v]
         end
       else
         each_pair do |k, v|
-          hash[k] = block[k,v]   #hash[k] = block[k,v] || v
+          hash[k] = block[v]
         end
       end
     else

data/lib/core/facets/hash/{to_proc.rb → setter.rb}

@@ -1,7 +1,7 @@
 class Hash
 
-  # Constructs a Proc object from a hash such that the parameter
-  # of the Proc is assigned the hash keys as attributes.
+  # Constructs a Proc that assigns the hash's key-value pairs as
+  # attributes on a given object.
   #
   #   c = Class.new do
   #     attr_accessor :a
@@ -9,20 +9,20 @@ class Hash
   #
   #   h = {:a => 1}
   #   o = c.new
-  #   h.to_proc.call(o)
+  #   h.setter.call(o)
   #   o.a  #=> 1
   #
-  # If +response+ is set to +true+, then assignment will only occur
-  # if receiver responds_to? the writer method.
+  # If +safe+ is set to +true+, then assignment will only occur
+  # if the receiver responds_to? the writer method.
   #
   # CREDIT: Trans
 
-  def to_proc(response=false)
-    if response
+  def setter(safe=false)
+    if safe
       lambda do |o|
         self.each do |k,v|
           ke = "#{k}="
-          o.__send__(ke, v) if respond_to?(ke)
+          o.__send__(ke, v) if o.respond_to?(ke)
         end
       end
     else
@@ -36,4 +36,3 @@ class Hash
   end
 
 end
-

data/lib/core/facets/hash/slice.rb

@@ -1,25 +1,5 @@
 class Hash
 
-  # Returns a new hash with only the given keys.
-  #
-  #   h = {:a=>1, :b=>2, :c=>3}
-  #   h.slice(:a, :c)  #=> {:a=>1, :c=>3}
-  #   h.slice(:a, :d)  #=> {:a=>1}
-  #
-  def slice(*keep_keys)
-    if block_given?
-      each do |k, v|
-        keep_keys << k if yield(k, v)
-      end
-    end
-
-    hash = {}
-    keep_keys.each do |key|
-      hash[key] = fetch(key) if key?(key)
-    end
-    hash
-  end
-
   # Replaces hash with a new hash having only the given keys.
   # This return the hash of keys removed.
   #
@@ -29,12 +9,6 @@ class Hash
   #
   # Returns a Hash of the removed pairs.
   def slice!(*keep_keys)
-    if block_given?
-      each do |k, v|
-        keep_keys << k if yield(k, v)
-      end
-    end
-
     rejected = keys - keep_keys
     removed = {}
     rejected.each{ |k| removed[k] = delete(k) }

data/lib/core/facets/hash/update_keys.rb

@@ -1,21 +1,14 @@
 class Hash
 
-  # Iterate over hash updating just the keys.
+  # @deprecated Use Hash#transform_keys! (Ruby 2.5+) or Hash#rekey! instead.
   #
-  #   h = {:a=>1, :b=>2}
-  #   h.update_keys{ |k| "#{k}!" }
-  #   h  #=> { "a!"=>1, "b!"=>2 }
-  #
-  # @author Trans
-  # @author Evgeniy Dolzhenko (bug fix)
-
-  def update_keys #:yield:
+  def update_keys(&block)
+    warn "Hash#update_keys is deprecated. Use Hash#transform_keys! or Hash#rekey! instead.", uplevel: 1
     if block_given?
-      keys.each { |old_key| store(yield(old_key), delete(old_key)) }
+      transform_keys!(&block)
     else
       to_enum(:update_keys)
     end
   end
 
 end
-