Merge branch 'release-0.2.6' into stable

aliases

VERSION

@@ -1 +1 @@
-0.2.4
+0.2.6

lib/time_ext.rb

@@ -1,6 +1,9 @@
 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'
 require 'time_ext/support'

lib/time_ext/iterations.rb

@@ -75,7 +75,6 @@ module TimeExt
     def map_each(unit, options = {}, &block)
       iterate(unit, options.merge(:map_result => true), &block)
     end
-    alias :map :map_each
 
     # Executes passed block for each "unit" of time specified, returning an array with the return values from passed block. Additionally the time object passed into the block is set to the beginning of specified "unit".
     def map_beginning_of_each(unit, options = {}, &block)
@@ -84,7 +83,7 @@ module TimeExt
 
     # Dynamically define convenience methods, like #each_hour instead of #each(:hour).
     [:year, :month, :day, :hour, :min, :sec].each do |unit|
-      [:each, :beginning_of_each, :map_each, :map_beginning_of_each, :map].each do |method|
+      [:each, :beginning_of_each, :map_each, :map_beginning_of_each].each do |method|
         define_method "#{method}_#{unit}" do |*args, &block|
           send(method, unit, *args, &block)
         end

spec/core_ext_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Core Extensions" do
+  
+  it "should alias Numeric class methods" do
+    number = 1
+    number.sec.should == number.second
+    number.min.should == number.minute
+  end
+  
+  it "should alias Time instance methods" do
+    time = Time.now
+    time.secs_ago(10).should == time.ago(10)
+    time.seconds_ago(10).should == time.ago(10)
+    time.secs_since(10).should == time.since(10)
+    time.seconds_since(10).should == time.since(10)
+  end
+
+end

spec/time_iterations_spec.rb

@@ -52,8 +52,6 @@ describe "Time Iterations" do
     match = (1..6).map { |i| @now + i.hours }
     @now.map_each_hour.until(@now + 6.hours) { |time| time }.should == match
     @now.until(@now + 6.hours).map_each(:hour) { |time| time }.should == match
-    # check so the #map alias for #map_each works
-    @now.map_hour.until(@now + 6.hours) { |time| time }.should == match
   end
   
   it "should iterate over time objects backwards with #until set in the past" do