mack-facets.rb in mack-facets-0.8.3

- old
+ new
@@ -1,32 +1,28 @@
+fl = File.join(File.dirname(__FILE__), "mack-facets")
+
+require File.join(fl, "extensions", 'kernel')
+
 require File.join(File.dirname(__FILE__), 'gems')
 
-fl = File.join(File.dirname(__FILE__), "mack-facets")
-# require 'rubygems'
+if v1_9?
+  $:.unshift(File.expand_path(File.join(fl, '1_9')))
+end
+
 require 'digest'
-require File.join(fl, "extensions", "time") # we need this here, otherwise facets 2.4.3 breaks!
-require 'facets'
-require 'facets/string'
-require 'facets/blank'
-require 'facets/hash'
-require 'facets/hash/symbolize_keys'
-require 'facets/hash/stringify_keys'
-require 'facets/module'
-require 'facets/infinity'
-require 'facets/times'
-require 'facets/time'
+require 'active_support'
 require 'english/inflect'
 require 'english/numerals'
 require 'extlib/assertions'
 require 'extlib/hook'
 require 'extlib/inflection'
 
-[:inflector, :inflections, :options_merger, :registry_list, :registry_map, :blank_slate].each do |k|
+[:inflector, :inflections, :options_merger, :registry_list, :registry_map, :method_list].each do |k|
   path = File.join(fl, "utils", "#{k}")
   require path
 end
 
-[:array, :class, :hash, :kernel, :math, :module, :object, :string, :symbol, :nil_class, :date_time, :file].each do |k|
+[:array, :class, :duration, :hash, :math, :module, :object, :string, :symbol, :nil_class, :date_time, :file, :time].each do |k|
   path = File.join(fl, "extensions", "#{k}")
   require path
 end
 
 [:numerals, :inflect].each do |k|