facets 2.9.2 → 2.9.3

data/lib/core/facets/functor.rb

@@ -13,6 +13,22 @@
 #
 class Functor #< BasicObject
 
+  # Functors can be somewhat inefficient if a new Functor
+  # is frequently recreated for the same use. So this cache
+  # can be used to speed things up.
+  #
+  # The +key+ will always be an array, wich makes it easier
+  # to cache functor for multiple factors.
+  #
+  def self.cache(*key, &function)
+    @cache ||= {}
+    if function
+      @cache[key] = new(&function)
+    else
+      @cache[key]
+    end
+  end
+
   EXCEPTIONS = [:binding, :inspect, :object_id]
   if defined?(::BasicObject)
     EXCEPTIONS.concat(::BasicObject.instance_methods)

data/lib/core/facets/hash.rb

@@ -1,110 +1,56 @@
-# Load all Hash core extensions.
+require 'facets/kernel/require_relative'
 
-if RUBY_VERSION < '1.9'
-  require "facets/hash/alias.rb"
-  require "facets/hash/argumentize.rb"
-  require "facets/hash/at.rb"
-  require "facets/hash/autonew.rb"
-  require "facets/hash/collate.rb"
-  require "facets/hash/count.rb"
-  require "facets/hash/data.rb"
-  require "facets/hash/dearray_values.rb"
-  require "facets/hash/deep_merge.rb"
-  require "facets/hash/delete.rb"
-  require "facets/hash/delete_at.rb"
-  require "facets/hash/delete_unless.rb"
-  require "facets/hash/delete_values.rb"
-  require "facets/hash/diff.rb"
-  require "facets/hash/except.rb"
-  require "facets/hash/graph.rb"
-  require "facets/hash/insert.rb"
-  require "facets/hash/inverse.rb"
-  require "facets/hash/join.rb"
-  require "facets/hash/keys.rb"
-  require "facets/hash/mash.rb"
-  require "facets/hash/new_with.rb"
-  require "facets/hash/op.rb"
-  require "facets/hash/op_add.rb"
-  require "facets/hash/op_and.rb"
-  require "facets/hash/op_mul.rb"
-  require "facets/hash/op_or.rb"
-  require "facets/hash/op_push.rb"
-  require "facets/hash/op_sub.rb"
-  require "facets/hash/recurse.rb"
-  require "facets/hash/recursively.rb"
-  require "facets/hash/rekey.rb"
-  require "facets/hash/replace_each.rb"
-  require "facets/hash/reverse_merge.rb"
-  require "facets/hash/select.rb"
-  require "facets/hash/slice.rb"
-  require "facets/hash/stringify_keys.rb"
-  require "facets/hash/subset.rb"
-  require "facets/hash/swap.rb"
-  require "facets/hash/symbolize_keys.rb"
-  require "facets/hash/to_h.rb"
-  require "facets/hash/to_mod.rb"
-  require "facets/hash/to_options.rb"
-  require "facets/hash/to_proc.rb"
-  require "facets/hash/to_struct.rb"
-  require "facets/hash/traverse.rb"
-  require "facets/hash/update.rb"
-  require "facets/hash/update_each.rb"
-  require "facets/hash/update_keys.rb"
-  require "facets/hash/update_values.rb"
-  require "facets/hash/weave.rb"
-  require "facets/hash/zip.rb"
-else
-  require_relative "hash/alias.rb"
-  require_relative "hash/argumentize.rb"
-  require_relative "hash/at.rb"
-  require_relative "hash/autonew.rb"
-  require_relative "hash/collate.rb"
-  require_relative "hash/count.rb"
-  require_relative "hash/data.rb"
-  require_relative "hash/dearray_values.rb"
-  require_relative "hash/deep_merge.rb"
-  require_relative "hash/delete.rb"
-  require_relative "hash/delete_at.rb"
-  require_relative "hash/delete_unless.rb"
-  require_relative "hash/delete_values.rb"
-  require_relative "hash/diff.rb"
-  require_relative "hash/except.rb"
-  require_relative "hash/graph.rb"
-  require_relative "hash/insert.rb"
-  require_relative "hash/inverse.rb"
-  require_relative "hash/join.rb"
-  require_relative "hash/keys.rb"
-  require_relative "hash/mash.rb"
-  require_relative "hash/new_with.rb"
-  require_relative "hash/op.rb"
-  require_relative "hash/op_add.rb"
-  require_relative "hash/op_and.rb"
-  require_relative "hash/op_mul.rb"
-  require_relative "hash/op_or.rb"
-  require_relative "hash/op_push.rb"
-  require_relative "hash/op_sub.rb"
-  require_relative "hash/recurse.rb"
-  require_relative "hash/recursively.rb"
-  require_relative "hash/rekey.rb"
-  require_relative "hash/replace_each.rb"
-  require_relative "hash/reverse_merge.rb"
-  require_relative "hash/select.rb"
-  require_relative "hash/slice.rb"
-  require_relative "hash/stringify_keys.rb"
-  require_relative "hash/subset.rb"
-  require_relative "hash/swap.rb"
-  require_relative "hash/symbolize_keys.rb"
-  require_relative "hash/to_h.rb"
-  require_relative "hash/to_mod.rb"
-  require_relative "hash/to_options.rb"
-  require_relative "hash/to_proc.rb"
-  require_relative "hash/to_struct.rb"
-  require_relative "hash/traverse.rb"
-  require_relative "hash/update.rb"
-  require_relative "hash/update_each.rb"
-  require_relative "hash/update_keys.rb"
-  require_relative "hash/update_values.rb"
-  require_relative "hash/weave.rb"
-  require_relative "hash/zip.rb"
-end
+require_relative 'hash/alias.rb'
+require_relative 'hash/argumentize.rb'
+require_relative 'hash/at.rb'
+require_relative 'hash/autonew.rb'
+require_relative 'hash/collate.rb'
+require_relative 'hash/count.rb'
+require_relative 'hash/data.rb'
+require_relative 'hash/dearray_values.rb'
+require_relative 'hash/deep_merge.rb'
+require_relative 'hash/delete.rb'
+require_relative 'hash/delete_at.rb'
+require_relative 'hash/delete_unless.rb'
+require_relative 'hash/delete_values.rb'
+require_relative 'hash/diff.rb'
+require_relative 'hash/except.rb'
+require_relative 'hash/graph.rb'
+require_relative 'hash/insert.rb'
+require_relative 'hash/inverse.rb'
+require_relative 'hash/join.rb'
+require_relative 'hash/keys.rb'
+require_relative 'hash/mash.rb'
+require_relative 'hash/new_with.rb'
+require_relative 'hash/op.rb'
+require_relative 'hash/op_add.rb'
+require_relative 'hash/op_and.rb'
+require_relative 'hash/op_mul.rb'
+require_relative 'hash/op_or.rb'
+require_relative 'hash/op_push.rb'
+require_relative 'hash/op_sub.rb'
+require_relative 'hash/recurse.rb'
+require_relative 'hash/recursively.rb'
+require_relative 'hash/rekey.rb'
+require_relative 'hash/replace_each.rb'
+require_relative 'hash/reverse_merge.rb'
+require_relative 'hash/select.rb'
+require_relative 'hash/slice.rb'
+require_relative 'hash/stringify_keys.rb'
+require_relative 'hash/subset.rb'
+require_relative 'hash/swap.rb'
+require_relative 'hash/symbolize_keys.rb'
+require_relative 'hash/to_h.rb'
+require_relative 'hash/to_mod.rb'
+require_relative 'hash/to_options.rb'
+require_relative 'hash/to_proc.rb'
+require_relative 'hash/to_struct.rb'
+require_relative 'hash/traverse.rb'
+require_relative 'hash/update.rb'
+require_relative 'hash/update_each.rb'
+require_relative 'hash/update_keys.rb'
+require_relative 'hash/update_values.rb'
+#require_relative 'hash/url_params.rb'      # uncommon
+require_relative 'hash/weave.rb'
+require_relative 'hash/zip.rb'
 

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

@@ -6,7 +6,9 @@ class Hash
   #   { :a=>1, :b=>2 }.collate(:a=>3, :b=>4, :c=>5)
   #   #=> { :a=>[1,3], :b=>[2,4], :c=>[5] }
   #
-  # CREDIT: Tilo Sloboda, Gavin Kistner (Phrogz)
+  # @author Trans         (rewrite)
+  # @author Tilo Sloboda  (bug fixes)
+  # @author Gavin Kistner (original)
 
   def collate(other)
     h = Hash.new
@@ -29,34 +31,5 @@ class Hash
     replace(result)
   end
 
-  # Old version ...
-  #
-  #  def collate!(other_hash)
-  #    # Prepare, ensuring every existing key is already an Array
-  #    each do |key, value|
-  #      if value.is_a?(Array)
-  #        self[key] = value
-  #      else
-  #        self[key] = [value]
-  #      end
-  #    end
-  #    # Collate with values from other_hash
-  #    other_hash.each do |key, value|
-  #      if self[key]
-  #        if value.is_a?(Array)
-  #          self[key].concat( value )
-  #        else
-  #          self[key] << value
-  #        end
-  #      elsif value.is_a?(Array)
-  #        self[key] = value
-  #      else
-  #        self[key] = [value]
-  #      end
-  #    end
-  #    #each{ |key, value| value.uniq! } if options[ :uniq ]
-  #    self
-  #  end
-
 end
 

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

@@ -5,6 +5,7 @@ class Hash
   # If an array is given then matching keys are removed.
   #
   # CREDIT: Trans
+  # CREDIT: Xavier Shay (bug fix)
 
   def -(other)
     h = self.dup

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

@@ -3,7 +3,9 @@ require 'facets/na'
 
 class Hash
 
-  # Rekey a hash, ...
+  # TODO: Improve Hash#rekey code!!!
+
+  # Rekey a hash:
   #
   #   rekey()
   #   rekey(from_key => to_key, ...)
@@ -39,7 +41,7 @@ class Hash
 
     key_map ||= {} 
 
-    hash = {}
+    hash = dup.replace({})  # to keep default_proc
 
     (keys - key_map.keys).each do |key|
       hash[key] = self[key]
@@ -49,13 +51,21 @@ class Hash
       hash[to] = self[from] if key?(from)
     end
 
-    hash2 = {}
-
     if block
-      hash.each do |k, v|
-        nk = block[k]
-        nk = (NA == nk ? k : nk)
-        hash2[nk] = v
+      hash2 = dup.replace({})
+      case block.arity
+      when 2  # TODO: is this condition needed?
+        hash.each do |k, v|
+          nk = block.call(k,v)
+          nk = (NA == nk ? k : nk)
+          hash2[nk] = v
+        end
+      else
+        hash.each do |k, v|
+          nk = block.call(k)
+          nk = (NA == nk ? k : nk)
+          hash2[nk] = v
+        end
       end
     else
       hash2 = hash

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

@@ -31,7 +31,8 @@ class Hash
 end
 
 # NOTE: ActiveSupport defines this method but adds a check for #convert_key.
-#       If the method id defined, then it converts the keys with it. However
+#       If the method is defined, then it converts the keys with it. However
 #       it doesn't look to be supported by all Hash methods, just
 #       HashWithIndifferentAccess. I'm not so sure support for this kind of
-#       things is appropriate for Facets.
+#       thing is appropriate for Facets.
+

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

@@ -6,7 +6,8 @@ class Hash
   #   h.update_keys{ |k| "#{k}!" }
   #   h  #=> { "a!"=>1, "b!"=>2 }
   #
-  # CREDIT: Trans
+  # @author Trans
+  # @author Evgeniy Dolzhenko (bug fix)
 
   def update_keys #:yield:
     if block_given?

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

@@ -0,0 +1,21 @@
+class Hash
+
+  # Allows for taking a hash and turning it into CGI params
+  # Since 1.8.x does not have ordered hashes the params might not
+  # be ordered.
+  #
+  # @todo Hash#url_params may require some URL escaping.
+  #
+  # @author Matt Kirk
+
+  def url_params
+    map do |k,v|
+      if v.respond_to?(:join)
+        "#{k}=#{v.join(",")}"
+      else
+        "#{k}=#{v}"
+      end
+    end.join("&")
+  end
+
+end

data/lib/core/facets/indexable.rb

@@ -1,5 +1,3 @@
-# = Indexable
-#
 # Indexable is a mixin that provides index based methods,
 # working soley with four methods: #index, #slice, #splice
 # and #size.

data/lib/core/facets/integer.rb

@@ -1,22 +1,12 @@
-# Load all Integer core extensions.
+require 'facets/kernel/require_relative'
 
-if RUBY_VERSION < '1.9'
-  require "facets/integer/bit.rb"
-  require "facets/integer/bitmask.rb"
-  require "facets/integer/even.rb"
-  require "facets/integer/factorial.rb"
-  require "facets/integer/multiple.rb"
-  require "facets/integer/odd.rb"
-  require "facets/integer/of.rb"
-  require "facets/integer/ordinal.rb"
-else
-  require_relative "integer/bit.rb"
-  require_relative "integer/bitmask.rb"
-  require_relative "integer/even.rb"
-  require_relative "integer/factorial.rb"
-  require_relative "integer/multiple.rb"
-  require_relative "integer/odd.rb"
-  require_relative "integer/of.rb"
-  require_relative "integer/ordinal.rb"
-end
+require_relative 'integer/bit.rb'
+require_relative 'integer/bitmask.rb'
+require_relative 'integer/even.rb'
+require_relative 'integer/factorial.rb'
+require_relative 'integer/multiple.rb'
+require_relative 'integer/odd.rb'
+require_relative 'integer/of.rb'
+require_relative 'integer/ordinal.rb'
+#require_relative 'integer/roman.rb'     # uncommon
 

data/lib/core/facets/integer/roman.rb

@@ -0,0 +1 @@
+require 'facets/roman'

data/lib/core/facets/kernel.rb

@@ -1,142 +1,79 @@
-# Load all Kernel core extensions.
+require 'facets/kernel/require_relative'
 
-if RUBY_VERSION < '1.9'
-  require "facets/kernel/__callee__.rb"
-  require "facets/kernel/__class__.rb"
-  require "facets/kernel/__dir__.rb"
-  require "facets/kernel/__get__.rb"
-  require "facets/kernel/__method__.rb"
-  require "facets/kernel/__set__.rb"
-  require "facets/kernel/as.rb"
-  require "facets/kernel/ask.rb"
-  require "facets/kernel/assign.rb"
-  require "facets/kernel/assign_from.rb"
-  require "facets/kernel/attr_singleton.rb"
-  require "facets/kernel/blank.rb"
-  require "facets/kernel/call_stack.rb"
-  require "facets/kernel/callstack.rb"
-  require "facets/kernel/case.rb"
-  require "facets/kernel/complete.rb"
-  require "facets/kernel/constant.rb"
-  require "facets/kernel/d.rb"
-  require "facets/kernel/deep_clone.rb"
-  require "facets/kernel/deep_copy.rb"
-  require "facets/kernel/disable_warnings.rb"
-  require "facets/kernel/enable_warnings.rb"
-  require "facets/kernel/equate.rb"
-  require "facets/kernel/ergo.rb"
-  require "facets/kernel/extend.rb"
-  require "facets/kernel/extension.rb"
-  require "facets/kernel/false.rb"
-  require "facets/kernel/here.rb"
-  require "facets/kernel/identical.rb"
-  require "facets/kernel/in.rb"
-  require "facets/kernel/instance_assign.rb"
-  require "facets/kernel/instance_class.rb"
-  require "facets/kernel/instance_send.rb"
-  require "facets/kernel/load_all.rb"
-  require "facets/kernel/load_relative.rb"
-  require "facets/kernel/maybe.rb"
-  require "facets/kernel/meta_alias.rb"
-  require "facets/kernel/meta_class.rb"
-  require "facets/kernel/meta_def.rb"
-  require "facets/kernel/meta_eval.rb"
-  require "facets/kernel/method.rb"
-  require "facets/kernel/no.rb"
-  require "facets/kernel/not.rb"
-  require "facets/kernel/not_nil.rb"
-  require "facets/kernel/object_class.rb"
-  require "facets/kernel/object_hexid.rb"
-  require "facets/kernel/object_send.rb"
-  require "facets/kernel/p.rb"
-  require "facets/kernel/presence.rb"
-  require "facets/kernel/present.rb"
-  require "facets/kernel/qua_class.rb"
-  require "facets/kernel/require_all.rb"
-  require "facets/kernel/require_relative.rb"
-  require "facets/kernel/respond.rb"
-  require "facets/kernel/returning.rb"
-  require "facets/kernel/silence.rb"
-  require "facets/kernel/silence_warnings.rb"
-  require "facets/kernel/singleton_class.rb"
-  require "facets/kernel/source_location.rb"
-  require "facets/kernel/super_method.rb"
-  require "facets/kernel/tap.rb"
-  require "facets/kernel/temporarily.rb"
-  require "facets/kernel/true.rb"
-  require "facets/kernel/try.rb"
-  require "facets/kernel/val.rb"
-  require "facets/kernel/with.rb"
-  require "facets/kernel/writers.rb"
-  require "facets/kernel/yes.rb"
-else
-  require_relative "kernel/__callee__.rb"
-  require_relative "kernel/__class__.rb"
-  require_relative "kernel/__dir__.rb"
-  require_relative "kernel/__get__.rb"
-  require_relative "kernel/__method__.rb"
-  require_relative "kernel/__set__.rb"
-  require_relative "kernel/as.rb"
-  require_relative "kernel/ask.rb"
-  require_relative "kernel/assign.rb"
-  require_relative "kernel/assign_from.rb"
-  require_relative "kernel/attr_singleton.rb"
-  require_relative "kernel/blank.rb"
-  require_relative "kernel/call_stack.rb"
-  require_relative "kernel/callstack.rb"
-  require_relative "kernel/case.rb"
-  require_relative "kernel/complete.rb"
-  require_relative "kernel/constant.rb"
-  require_relative "kernel/d.rb"
-  require_relative "kernel/deep_clone.rb"
-  require_relative "kernel/deep_copy.rb"
-  require_relative "kernel/disable_warnings.rb"
-  require_relative "kernel/enable_warnings.rb"
-  require_relative "kernel/equate.rb"
-  require_relative "kernel/ergo.rb"
-  require_relative "kernel/extend.rb"
-  require_relative "kernel/extension.rb"
-  require_relative "kernel/false.rb"
-  require_relative "kernel/here.rb"
-  require_relative "kernel/identical.rb"
-  require_relative "kernel/in.rb"
-  require_relative "kernel/instance_assign.rb"
-  require_relative "kernel/instance_class.rb"
-  require_relative "kernel/instance_send.rb"
-  require_relative "kernel/load_all.rb"
-  require_relative "kernel/load_relative.rb"
-  require_relative "kernel/maybe.rb"
-  require_relative "kernel/meta_alias.rb"
-  require_relative "kernel/meta_class.rb"
-  require_relative "kernel/meta_def.rb"
-  require_relative "kernel/meta_eval.rb"
-  require_relative "kernel/method.rb"
-  require_relative "kernel/no.rb"
-  require_relative "kernel/not.rb"
-  require_relative "kernel/not_nil.rb"
-  require_relative "kernel/object_class.rb"
-  require_relative "kernel/object_hexid.rb"
-  require_relative "kernel/object_send.rb"
-  require_relative "kernel/p.rb"
-  require_relative "kernel/presence.rb"
-  require_relative "kernel/present.rb"
-  require_relative "kernel/qua_class.rb"
-  require_relative "kernel/require_all.rb"
-  require_relative "kernel/require_relative.rb"
-  require_relative "kernel/respond.rb"
-  require_relative "kernel/returning.rb"
-  require_relative "kernel/silence.rb"
-  require_relative "kernel/silence_warnings.rb"
-  require_relative "kernel/singleton_class.rb"
-  require_relative "kernel/source_location.rb"
-  require_relative "kernel/super_method.rb"
-  require_relative "kernel/tap.rb"
-  require_relative "kernel/temporarily.rb"
-  require_relative "kernel/true.rb"
-  require_relative "kernel/try.rb"
-  require_relative "kernel/val.rb"
-  require_relative "kernel/with.rb"
-  require_relative "kernel/writers.rb"
-  require_relative "kernel/yes.rb"
-end
+require_relative 'kernel/as.rb'
+require_relative 'kernel/ask.rb'
+require_relative 'kernel/assign.rb'
+require_relative 'kernel/assign_from.rb'
+require_relative 'kernel/attr_singleton.rb'
+require_relative 'kernel/blank.rb'
+require_relative 'kernel/callstack.rb'
+require_relative 'kernel/call_stack.rb'
+require_relative 'kernel/case.rb'
+require_relative 'kernel/complete.rb'
+require_relative 'kernel/constant.rb'
+require_relative 'kernel/d.rb'
+require_relative 'kernel/deep_clone.rb'
+require_relative 'kernel/deep_copy.rb'
+#require_relative 'kernel/demo.rb'              # uncommon
+require_relative 'kernel/disable_warnings.rb'
+require_relative 'kernel/eigen.rb'
+#require_relative 'kernel/eigenclass.rb'        # uncommon
+require_relative 'kernel/enable_warnings.rb'
+require_relative 'kernel/equate.rb'
+require_relative 'kernel/ergo.rb'
+require_relative 'kernel/extend.rb'
+require_relative 'kernel/extension.rb'
+require_relative 'kernel/false.rb'
+require_relative 'kernel/here.rb'
+#require_relative 'kernel/hierarchical_send'    # uncommon
+require_relative 'kernel/identical.rb'
+require_relative 'kernel/in.rb'
+require_relative 'kernel/instance_assign.rb'
+require_relative 'kernel/instance_class.rb'
+#require_relative 'kernel/instance_exec.rb'     # uncommon
+require_relative 'kernel/instance_send.rb'
+require_relative 'kernel/load_all.rb'
+require_relative 'kernel/load_relative.rb'
+require_relative 'kernel/maybe.rb'
+#require_relative 'kernel/memo.rb'              # uncommon
+require_relative 'kernel/meta_alias.rb'
+require_relative 'kernel/meta_class.rb'
+require_relative 'kernel/meta_def.rb'
+require_relative 'kernel/meta_eval.rb'
+require_relative 'kernel/method.rb'
+require_relative 'kernel/no.rb'
+require_relative 'kernel/not.rb'
+require_relative 'kernel/not_nil.rb'
+require_relative 'kernel/object_class.rb'
+require_relative 'kernel/object_hexid.rb'
+require_relative 'kernel/object_send.rb'
+require_relative 'kernel/p.rb'
+require_relative 'kernel/presence.rb'
+require_relative 'kernel/present.rb'
+require_relative 'kernel/qua_class.rb'
+require_relative 'kernel/require_all.rb'
+require_relative 'kernel/require_relative.rb'
+require_relative 'kernel/respond.rb'
+require_relative 'kernel/returning.rb'
+require_relative 'kernel/silence.rb'
+require_relative 'kernel/silence_warnings.rb'
+require_relative 'kernel/singleton_class.rb'
+require_relative 'kernel/source_location.rb'
+require_relative 'kernel/super_method.rb'
+require_relative 'kernel/tap.rb'
+require_relative 'kernel/temporarily.rb'
+#require_relative 'kernel/trap_chain.rb'        # uncommon
+require_relative 'kernel/true.rb'
+require_relative 'kernel/try.rb'
+require_relative 'kernel/val.rb'
+require_relative 'kernel/with.rb'
+require_relative 'kernel/writers.rb'
+#require_relative 'kernel/y.rb'                 # uncommon
+require_relative 'kernel/yes.rb'
+require_relative 'kernel/__callee__.rb'
+require_relative 'kernel/__class__.rb'
+require_relative 'kernel/__dir__.rb'
+require_relative 'kernel/__get__.rb'
+require_relative 'kernel/__method__.rb'
+require_relative 'kernel/__set__.rb'