Merge branch 'dev' of github.com:jimeh/time_ext into dev

lib/time_ext.rb

@@ -1,8 +1,4 @@
 require 'rubygems'
-require 'active_support'
-
-# support both Active Support 2.x and 3.x
-require 'active_support/time' if !Time.respond_to?(:days_in_month)
 
 require 'time_ext/calculations'
 require 'time_ext/iterations'

lib/time_ext/core_ext/numeric.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/numeric/time' unless Numeric.new.respond_to?(:seconds) # fixes rare loading issue
+
 class Numeric
   alias :sec :seconds
   alias :min :minutes

lib/time_ext/core_ext/time.rb

@@ -1,3 +1,7 @@
+require 'active_support'
+require 'active_support/time' unless Time.respond_to?(:days_in_month) # support both Active Support 2.x and 3.x
+require 'active_support/core_ext/time/calculations' unless Time.new.respond_to?(:ago) # fixes rare loading issue
+
 class Time
   include TimeExt::Support
   include TimeExt::Calculations

lib/time_ext/version.rb

@@ -1,3 +1,3 @@
 module TimeExt
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

time_ext.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency 'activesupport', '>= 2.3.0'
+  s.add_runtime_dependency 'activesupport', '>= 2.3.2'
   s.add_runtime_dependency 'i18n', '>= 0.4.2'
   
+  s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '>= 2.1.0'
   s.add_development_dependency 'yard', '>= 0.6.3'
+  s.add_development_dependency 'ruby-debug'
 end