mack-facets.rb in mack-facets-0.6.1

- old
+ new
@@ -7,25 +7,28 @@
 require 'facets/hash'
 require 'facets/hash/symbolize_keys'
 require 'facets/hash/stringify_keys'
 require 'facets/module'
 require 'facets/infinity'
+require 'facets/times'
 require 'english/inflect'
 require 'english/numerals'
-[:inflector, :inflections, :options_merger].each do |k|
-  path = File.join File.dirname(__FILE__), "utils", "#{k}"
-  #puts "requiring #{path}"
+require 'extlib/assertions'
+require 'extlib/hook'
+
+fl = File.join(File.dirname(__FILE__), "mack-facets")
+
+[:inflector, :inflections, :options_merger, :registry_list, :registry_map].each do |k|
+  path = File.join(fl, "utils", "#{k}")
   require path
 end
 
-[:array, :class, :hash, :kernel, :math, :module, :object, :string, :symbol].each do |k|
-  path = File.join File.dirname(__FILE__), "extensions", "#{k}"
-  #puts "requiring #{path}"
+[:array, :class, :hash, :kernel, :math, :module, :object, :string, :symbol, :nil_class].each do |k|
+  path = File.join(fl, "extensions", "#{k}")
   require path
 end
 
 [:numerals, :inflect].each do |k|
-  path = File.join File.dirname(__FILE__), "english_extensions", "#{k}"
-  #puts "requiring #{path}"
+  path = File.join(fl, "english_extensions", "#{k}")
   require path
 end
 