Merge branch 'release/v0.2.8'

instead of jeweler

.gitignore

@@ -16,9 +16,10 @@ tmtags
 ## PROJECT::GENERAL
 coverage
 rdoc
-pkg
+pkg/*
+*.gem
+.bundle
 
 ## PROJECT::SPECIFIC
-.yardoc/*
+.yardoc
-*.gemspec
 doc/*

.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

Gemfile

@@ -0,0 +1,9 @@
+source 'http://rubygems.org/'
+
+# Specify your gem's dependencies in time_ext.gemspec
+gemspec
+
+group :development do
+  gem 'rspec', '>= 2.1.0'
+  gem 'yard', '>= 0.6.3'
+end

Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    time_ext (0.2.7)
+      activesupport (>= 2.3.0)
+      i18n (>= 0.4.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    diff-lcs (1.1.2)
+    i18n (0.4.2)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    yard (0.6.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.3.0)
+  i18n (>= 0.4.2)
+  rspec (>= 2.1.0)
+  time_ext!
+  yard (>= 0.6.3)

README.md

@@ -14,7 +14,7 @@ This gem extends the abilities of Ruby's built-in Time class by building on top
 
     require "time/ext" # or "time_ext"
     Time.utc(2010, 6, 19).round(:month) #=> Thu Jul 01 00:00:00 UTC 2010
-    #=> Beginning of this week, or next week depending on which date is closest
+    #=> Beginning of this month, or beginning of next month depending on which is closest
     Time.now.each_hour.until(6.hours.from_now) { |t| puts t.to_s }
     #=> Prints the time at one hour interals from now till 6 hours from now
 

Rakefile

@@ -1,43 +1,27 @@
-require 'rubygems'
+require 'bundler'
-require 'rake'
+Bundler::GemHelper.install_tasks
 
-begin
+
-  require 'jeweler'
+#
-  Jeweler::Tasks.new do |gem|
+# Rspec
-    gem.name = "time_ext"
+#
-    gem.summary = %Q{Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport.}
+
-    gem.description = %Q{Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport.}
+require 'rspec/core/rake_task'
-    gem.email = "contact@jimeh.me"
+RSpec::Core::RakeTask.new(:spec) do |spec|
-    gem.homepage = "http://github.com/jimeh/time_ext"
+  spec.pattern = 'spec/**/*_spec.rb'
-    gem.authors = ["Jim Myhrberg"]
-    gem.add_dependency "activesupport", ">= 2.3.0"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "yard", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
-task :console do
+
-  exec "irb -r spec/spec_helper"
+#
-end
+# Yard
+#
 
 begin
   require 'yard'
@@ -47,3 +31,14 @@ rescue LoadError
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
+
+
+#
+# Misc.
+#
+
+desc "Start an irb console with TimeExt pre-loaded."
+task :console do
+  exec "irb -r spec/spec_helper"
+end
+task :c => :console

VERSION

@@ -1 +0,0 @@
-0.2.0

lib/time_ext.rb

@@ -1,13 +1,11 @@
 require 'rubygems'
 require 'active_support'
-require 'time_ext/method_chain'
-require 'time_ext/core_ext/time/calculations'
-require 'time_ext/core_ext/time/iterations'
 
-module TimeExt
+# support both Active Support 2.x and 3.x
-  
+require 'active_support/time' if !Time.respond_to?(:days_in_month)
-  module Base
+
-    TIME_EXT_UNITS = [:year, :month, :day, :hour, :min, :sec, :usec]
+require 'time_ext/calculations'
-  end
+require 'time_ext/iterations'
-  
+require 'time_ext/support'
-end
+require 'time_ext/core_ext/time'
+require 'time_ext/core_ext/numeric'

lib/time_ext/calculations.rb

@@ -0,0 +1,193 @@
+module TimeExt
+  # Adds an even greater extent of calculation methods on top of those already provided by ActiveSupport.
+  module Calculations
+  
+    # Returns a new Time representing the start of the unit specified (second by default).
+    def floor(unit = :sec)
+      self.send("beginning_of_#{unit}")
+    end
+    alias :beginning_of :floor
+    alias :at_beginning_of :floor
+  
+    # Returns a new Time representing the start of the next unit specified (second by default).
+    def ceil(unit = :sec)
+      self.send("next_#{unit}").send("beginning_of_#{unit}")
+    end
+    alias :beginning_of_next :ceil
+    alias :at_beginning_of_next :ceil
+  
+    # Returns a new Time representing the start of the current or next unit specified (second by default) depending which is closest
+    def round(unit = :sec)
+      next_unit = self.ceil(unit)
+      this_unit = self.floor(unit)
+      (self - this_unit) < (next_unit - self) ? this_unit : next_unit
+    end
+    alias :beginning_of_closest :round
+  
+    # Returns a new Time representing the previoius unit specified (defaults to second).
+    def prev(unit = :sec)
+      send("prev_#{unit}")
+    end
+  
+    # Returns a new Time representing the next unit specified (defaults to second).
+    def next(unit = :sec)
+      send("next_#{unit}")
+    end
+  
+    # Short-hand for seconds_ago(1).
+    def prev_second
+      seconds_ago(1)
+    end
+    alias :prev_sec :prev_second
+  
+    # Short-hand for seconds_since(1).
+    def next_second
+      seconds_since(1)
+    end
+    alias :next_sec :next_second
+  
+    # Short-hand for minutes_ago(1).
+    def prev_minute
+      minutes_ago(1)
+    end
+    alias :prev_min :prev_minute
+  
+    # Short-hand for minutes_since(1).
+    def next_minute
+      minutes_since(1)
+    end
+    alias :next_min :next_minute
+  
+    # Short-hand for hours_ago(1).
+    def prev_hour
+      hours_ago(1)
+    end
+  
+    # Short-hand for hours_since(1).
+    def next_hour
+      hours_since(1)
+    end
+  
+    # Short-hand for days_ago(1).
+    def prev_day
+      days_ago(1)
+    end
+  
+    # Short-hand for days_since(1).
+    def next_day
+      days_since(1)
+    end
+  
+    # Returns a new Time representing the start of the given day in the previous week (default is Monday).
+    def prev_week(day = :monday)
+      weeks_ago(1).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
+    end
+  
+    # Short-hand for quarters_since(1).beginning_of_quarter.
+    def next_quarter
+      quarters_since(1).beginning_of_quarter
+    end
+  
+    # Short-hand for quarters_ago(1).beginning_of_quarter.
+    def prev_quarter
+      quarters_ago(1).beginning_of_quarter
+    end
+  
+    # Returns a new Time representing the time a number of specified minutes ago.
+    def minutes_ago(minutes)
+      ago(minutes.minutes)
+    end
+    alias :mins_ago :minutes_ago
+  
+    # Returns a new Time representing the time a number of specified minutes in the future.
+    def minutes_since(minutes)
+      since(minutes.minutes)
+    end
+    alias :mins_since :minutes_since
+  
+    # Returns a new Time representing the time a number of specified hours ago.
+    def hours_ago(hours)
+      ago(hours.hours)
+    end
+  
+    # Returns a new Time representing the time a number of specified hours in the future.
+    def hours_since(hours)
+      since(hours.hours)
+    end
+  
+    # Returns a new Time representing the time a number of specified days ago.
+    def days_ago(days)
+      ago(days.days)
+    end
+  
+    # Returns a new Time representing the time a number of specified days in the future.
+    def days_since(days)
+      since(days.days)
+    end
+  
+    # Returns a new Time representing the time a number of specified weeks ago.
+    def weeks_ago(weeks)
+      ago(weeks.weeks)
+    end
+  
+    # Returns a new Time representing the time a number of specified weeks in the future.
+    def weeks_since(weeks)
+      since(weeks.weeks)
+    end
+  
+    # Returns a new Time representing the time a number of specified quarters (3 months) ago.
+    def quarters_ago(quarters)
+      ago((quarters * 3).months)
+    end
+  
+    # Returns a new Time representing the time a number of specified quarters (3 months) in the future.
+    def quarters_since(quarters)
+      since((quarters * 3).months)
+    end
+  
+    # Returns a new Time representing the end of the unit specified (defaults to second).
+    def end_of(unit = :sec)
+      send("end_of_#{unit}")
+    end
+  
+    # Returns a new Time representing the start of the second, XX:XX:XX.000000 (.000000000 in ruby1.9).
+    def beginning_of_second
+      change(:usec => 0)
+    end
+    alias :beginning_of_sec :beginning_of_second
+    alias :at_beginning_of_sec :beginning_of_second
+    alias :at_beginning_of_second :beginning_of_second
+  
+    # Returns a new Time representing the end of the hour, XX:XX:XX.999999 (.999999999 in ruby1.9).
+    def end_of_second
+      change(:usec => 999999.999)
+    end
+    alias :end_of_sec :end_of_second
+  
+    # Returns a new Time representing the start of the minute (XX:XX:00).
+    def beginning_of_minute
+      change(:sec => 0, :usec => 0)
+    end
+    alias :beginning_of_min :beginning_of_minute
+    alias :at_beginning_of_min :beginning_of_minute
+    alias :at_beginning_of_minute :beginning_of_minute
+  
+    # Returns a new Time representing the end of the hour, XX:XX:59.999999 (.999999999 in ruby1.9).
+    def end_of_minute
+      change(:sec => 59, :usec => 999999.999)
+    end
+    alias :end_of_min :end_of_minute
+  
+    # Returns a new Time representing the start of the hour (XX:00:00).
+    def beginning_of_hour
+      change(:min => 0, :sec => 0, :usec => 0)
+    end
+    alias :at_beginning_of_hour :beginning_of_hour
+  
+    # Returns a new Time representing the end of the hour, XX:59:59.999999 (.999999999 in ruby1.9).
+    def end_of_hour
+      change(:min => 59, :sec => 59, :usec => 999999.999)
+    end
+  
+  end
+end

lib/time_ext/core_ext/numeric.rb

@@ -0,0 +1,4 @@
+class Numeric
+  alias :sec :seconds
+  alias :min :minutes
+end

lib/time_ext/core_ext/time.rb

@@ -0,0 +1,11 @@
+class Time
+  include TimeExt::Support
+  include TimeExt::Calculations
+  include TimeExt::Iterations
+  
+  # Aliases to keep available method names to a standard pattern.
+  alias :secs_ago :ago
+  alias :seconds_ago :ago
+  alias :secs_since :since
+  alias :seconds_since :since
+end

lib/time_ext/core_ext/time/calculations.rb

@@ -1,206 +0,0 @@
-class Time
-  
-  # Helper method for backwards compatibility with ActiveSupport.
-  def days_into_week
-    defined?(DAYS_INTO_WEEK) ? DAYS_INTO_WEEK : { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
-  end
-  
-  # Helper method for backwards compatibility with ActiveSupport.
-  def common_year_days_in_month
-    defined?(COMMON_YEAR_DAYS_IN_MONTH) ? COMMON_YEAR_DAYS_IN_MONTH : [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-  end
-  
-  # Returns a new Time representing the start of the unit specified (second by default).
-  def floor(unit = :sec)
-    self.send("beginning_of_#{unit}")
-  end
-  alias :beginning_of :floor
-  alias :at_beginning_of :floor
-  
-  # Returns a new Time representing the start of the next unit specified (second by default).
-  def ceil(unit = :sec)
-    self.send("next_#{unit}").send("beginning_of_#{unit}")
-  end
-  alias :beginning_of_next :ceil
-  alias :at_beginning_of_next :ceil
-  
-  # Returns a new Time representing the start of the current or next unit specified (second by default) depending which is closest
-  def round(unit = :sec)
-    next_unit = self.ceil(unit)
-    this_unit = self.floor(unit)
-    (self - this_unit) < (next_unit - self) ? this_unit : next_unit
-  end
-  alias :beginning_of_closest :round
-  
-  # Returns a new Time representing the previoius unit specified (defaults to second).
-  def prev(unit = :sec)
-    send("prev_#{unit}")
-  end
-  
-  # Returns a new Time representing the next unit specified (defaults to second).
-  def next(unit = :sec)
-    send("next_#{unit}")
-  end
-  
-  # Short-hand for seconds_ago(1).
-  def prev_second
-    seconds_ago(1)
-  end
-  alias :prev_sec :prev_second
-  
-  # Short-hand for seconds_since(1).
-  def next_second
-    seconds_since(1)
-  end
-  alias :next_sec :next_second
-  
-  # Short-hand for minutes_ago(1).
-  def prev_minute
-    minutes_ago(1)
-  end
-  alias :prev_min :prev_minute
-  
-  # Short-hand for minutes_since(1).
-  def next_minute
-    minutes_since(1)
-  end
-  alias :next_min :next_minute
-  
-  # Short-hand for hours_ago(1).
-  def prev_hour
-    hours_ago(1)
-  end
-  
-  # Short-hand for hours_since(1).
-  def next_hour
-    hours_since(1)
-  end
-  
-  # Short-hand for days_ago(1).
-  def prev_day
-    days_ago(1)
-  end
-  
-  # Short-hand for days_since(1).
-  def next_day
-    days_since(1)
-  end
-  
-  # Returns a new Time representing the start of the given day in the previous week (default is Monday).
-  def prev_week(day = :monday)
-    weeks_ago(1).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
-  end
-  
-  # Short-hand for quarters_since(1).beginning_of_quarter.
-  def next_quarter
-    quarters_since(1).beginning_of_quarter
-  end
-  
-  # Short-hand for quarters_ago(1).beginning_of_quarter.
-  def prev_quarter
-    quarters_ago(1).beginning_of_quarter
-  end
-  
-  # Aliases to keep available method names to a standard pattern.
-  alias :secs_ago :ago
-  alias :seconds_ago :ago
-  alias :secs_since :since
-  alias :seconds_since :since
-  
-  # Returns a new Time representing the time a number of specified minutes ago.
-  def minutes_ago(minutes)
-    ago(minutes.minutes)
-  end
-  alias :mins_ago :minutes_ago
-  
-  # Returns a new Time representing the time a number of specified minutes in the future.
-  def minutes_since(minutes)
-    since(minutes.minutes)
-  end
-  alias :mins_since :minutes_since
-  
-  # Returns a new Time representing the time a number of specified hours ago.
-  def hours_ago(hours)
-    ago(hours.hours)
-  end
-  
-  # Returns a new Time representing the time a number of specified hours in the future.
-  def hours_since(hours)
-    since(hours.hours)
-  end
-  
-  # Returns a new Time representing the time a number of specified days ago.
-  def days_ago(days)
-    ago(days.days)
-  end
-  
-  # Returns a new Time representing the time a number of specified days in the future.
-  def days_since(days)
-    since(days.days)
-  end
-  
-  # Returns a new Time representing the time a number of specified weeks ago.
-  def weeks_ago(weeks)
-    ago(weeks.weeks)
-  end
-  
-  # Returns a new Time representing the time a number of specified weeks in the future.
-  def weeks_since(weeks)
-    since(weeks.weeks)
-  end
-  
-  # Returns a new Time representing the time a number of specified quarters (3 months) ago.
-  def quarters_ago(quarters)
-    ago((quarters * 3).months)
-  end
-  
-  # Returns a new Time representing the time a number of specified quarters (3 months) in the future.
-  def quarters_since(quarters)
-    since((quarters * 3).months)
-  end
-  
-  # Returns a new Time representing the end of the unit specified (defaults to second).
-  def end_of(unit = :sec)
-    send("end_of_#{unit}")
-  end
-  
-  # Returns a new Time representing the start of the second, XX:XX:XX.000000 (.000000000 in ruby1.9).
-  def beginning_of_second
-    change(:usec => 0)
-  end
-  alias :beginning_of_sec :beginning_of_second
-  alias :at_beginning_of_sec :beginning_of_second
-  alias :at_beginning_of_second :beginning_of_second
-  
-  # Returns a new Time representing the end of the hour, XX:XX:XX.999999 (.999999999 in ruby1.9).
-  def end_of_second
-    change(:usec => 999999.999)
-  end
-  alias :end_of_sec :end_of_second
-  
-  # Returns a new Time representing the start of the minute (XX:XX:00).
-  def beginning_of_minute
-    change(:sec => 0, :usec => 0)
-  end
-  alias :beginning_of_min :beginning_of_minute
-  alias :at_beginning_of_min :beginning_of_minute
-  alias :at_beginning_of_minute :beginning_of_minute
-  
-  # Returns a new Time representing the end of the hour, XX:XX:59.999999 (.999999999 in ruby1.9).
-  def end_of_minute
-    change(:sec => 59, :usec => 999999.999)
-  end
-  alias :end_of_min :end_of_minute
-  
-  # Returns a new Time representing the start of the hour (XX:00:00).
-  def beginning_of_hour
-    change(:min => 0, :sec => 0, :usec => 0)
-  end
-  alias :at_beginning_of_hour :beginning_of_hour
-  
-  # Returns a new Time representing the end of the hour, XX:59:59.999999 (.999999999 in ruby1.9).
-  def end_of_hour
-    change(:min => 59, :sec => 59, :usec => 999999.999)
-  end
-  
-end

lib/time_ext/core_ext/time/iterations.rb

@@ -1,79 +0,0 @@
-class Time
-  include TimeExt::MethodChain
-  
-  # Used by #each, #map_each and similar methods to iterate over ranges of time.
-  def iterate(unit, options = {}, &block)
-    options.reverse_merge!(:map_result => false, :beginning_of => false, :include_start => false)
-    if block_given?
-      units = [:year, :month, :day, :hour, :min, :sec, :usec]
-      parent_unit = units[units.index(unit)-1]
-      @until ||= (!parent_unit.nil?) ? self.send("#{parent_unit}s_since", 1) : self.send("#{unit}s_since", 1)
-      time = self.clone
-      direction = (self < @until) ? :f : :b
-      succ_method = (direction == :f) ? "next_#{unit}" : "prev_#{unit}"
-      time = time.beginning_of(unit) if options[:beginning_of]
-      time = time.send(succ_method) if !options[:include_start]
-      results = []
-      while (direction == :f && time <= @until) || (direction == :b && time >= @until)
-        options[:map_result] ? results << yield(time) : yield(time)
-        time = time.send(succ_method)
-      end
-      options[:map_result] ? results : self
-    else
-      add_to_chain(:iterate, unit, options)
-      self
-    end
-  end
-  
-  # Used togeter with #each and other iteration methods to specify end of interation.
-  def until(time, &block)
-    time = time.to_time if time.is_a?(::Date)
-    @until = time
-    return call_chain(block) if block_given?
-    self
-  end
-  alias :till :until
-  
-  # Used together with #each and other interation methods to specify start of iteration, and end will be current object.
-  def from(time, &block)
-    time = time.to_time if time.is_a?(::Date)
-    method, args = @method_chain.pop if block_given?
-    if !method.nil?
-      time.until(self).send(method, *args, &block)
-    else
-      time.until(self)
-    end
-  end
-  
-  # Executes passed block for each "unit" of time specified, with a new time object for each interval passed to the block.
-  def each(unit, options = {}, &block)
-    iterate(unit, options.merge(:map_result => false), &block)
-  end
-  
-  # Executes passed block for each "unit" of time specified, with a new time object set to the beginning of "unit" for each interval passed to the block.
-  def beginning_of_each(unit, options = {}, &block)
-    iterate(unit, options.merge(:map_result => false, :beginning_of => true), &block)
-  end
-  
-  # Executes passed block for each "unit" of time specified, returning an array with the return values from the passed block.
-  def map_each(unit, options = {}, &block)
-    iterate(unit, options.merge(:map_result => true), &block)
-  end
-  
-  # 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)
-    iterate(unit, options.merge(:map_result => true, :beginning_of => true), &block)
-  end
-  
-  # 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].each do |method|
-      define_method "#{method}_#{unit}" do |*args, &block|
-        send(method, unit, *args, &block)
-      end
-      class_eval { alias :"#{method}_minute" :"#{method}_min" } if unit == :min
-      class_eval { alias :"#{method}_second" :"#{method}_sec" } if unit == :sec
-    end
-  end
-  
-end

lib/time_ext/iterations.rb

@@ -0,0 +1,103 @@
+module TimeExt
+  # Allows you to iterate over Time objects with #each and other methods almost as if it was an Array or Hash.
+  module Iterations
+
+    # Used by #each, #map_each and similar methods to iterate over ranges of time.
+    def iterate(unit, options = {}, &block)
+      options.reverse_merge!(:map_result => false, :beginning_of => false, :include_start => false, :include_end => true)
+      if block_given?
+        units = [:year, :month, :day, :hour, :min, :sec, :usec]
+        parent_unit = units[units.index(unit)-1]
+        if @of_the.nil?
+          time = self.clone
+          @until ||= (!parent_unit.nil?) ? self.send("#{parent_unit}s_since", 1) : self.send("#{unit}s_since", 1)
+        else
+          time = self.beginning_of(@of_the)
+          @until = self.next(@of_the).beginning_of(@of_the)
+          options.merge!(:beginning_of => true, :include_start => true, :include_end => false)
+        end
+        direction = (self < @until) ? :f : :b
+        succ_method = (direction == :f) ? "next_#{unit}" : "prev_#{unit}"
+        time = time.beginning_of(unit) if options[:beginning_of]
+        time = time.send(succ_method) if !options[:include_start]
+        @until = @until.prev(unit).end_of(unit) if !options[:include_end]
+        results = []
+        while (direction == :f && time <= @until) || (direction == :b && time >= @until)
+          options[:map_result] ? results << yield(time) : yield(time)
+          time = time.send(succ_method)
+        end
+        options[:map_result] ? results : self
+      else
+        add_to_chain(:iterate, unit, options)
+        self
+      end
+    end
+
+    # Used togeter with #each and other iteration methods to specify end of interation.
+    def until(time, &block)
+      time = time.to_time if time.is_a?(::Date)
+      @until = time
+      return call_chain(block) if block_given?
+      self
+    end
+    alias :till :until
+
+    # Used together with #each and other interation methods to specify start of iteration, and end will be current object.
+    def from(time, &block)
+      time = time.to_time if time.is_a?(::Date)
+      method, args = @method_chain.pop if block_given?
+      if !method.nil?
+        time.until(self).send(method, *args, &block)
+      else
+        time.until(self)
+      end
+    end
+
+    # Let's you iterate over every unit specified in the #each or #map call for the specified unit.
+    def of_the(unit, &block)
+      @of_the = unit
+      return call_chain(block) if block_given?
+      self
+    end
+    alias :of :of_the
+
+    # Executes passed block for each "unit" of time specified, with a new time object for each interval passed to the block.
+    def each(unit, options = {}, &block)
+      iterate(unit, options.merge(:map_result => false), &block)
+    end
+
+    # Executes passed block for each "unit" of time specified, with a new time object set to the beginning of "unit" for each interval passed to the block.
+    def beginning_of_each(unit, options = {}, &block)
+      iterate(unit, options.merge(:map_result => false, :beginning_of => true), &block)
+    end
+
+    # Executes passed block for each "unit" of time specified, returning an array with the return values from the passed block.
+    def map_each(unit, options = {}, &block)
+      iterate(unit, options.merge(:map_result => true), &block)
+    end
+
+    # 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)
+      iterate(unit, options.merge(:map_result => true, :beginning_of => true), &block)
+    end
+
+    # 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].each do |method|
+        define_method "#{method}_#{unit}" do |*args, &block|
+          send(method, unit, *args, &block)
+        end
+        class_eval { alias :"#{method}_minute" :"#{method}_min" } if unit == :min
+        class_eval { alias :"#{method}_second" :"#{method}_sec" } if unit == :sec
+      end
+      [:of_the, :of].each do |method|
+        define_method "#{method}_#{unit}" do |*args, &block|
+          send(method, unit, *args, &block)
+        end
+        class_eval { alias :"#{method}_minute" :"#{method}_min" } if unit == :min
+        class_eval { alias :"#{method}_second" :"#{method}_sec" } if unit == :sec
+      end
+    end
+
+  end
+end

lib/time_ext/method_chain.rb

@@ -1,18 +0,0 @@
-module TimeExt
-  module MethodChain
-    
-    def add_to_chain(method, *args, &block)
-      @method_chain ||= []
-      @method_chain << [method.to_sym, args, block]
-    end
-    
-    def call_chain(custom_block = nil, &block)
-      method, args, iblock = @method_chain.pop
-      return nil if method.nil?
-      iblock = custom_block if !custom_block.nil?
-      method, args, iblock = yield(method, args, iblock) if block_given?
-      self.send(method, *args, &iblock)
-    end
-    
-  end
-end

lib/time_ext/support.rb

@@ -0,0 +1,27 @@
+module TimeExt
+  # Provides helper methods used by TimeExt::Calculations for backwards compatibility with ActiveSupport, and method chaining helpers for TimeExt::Iterations.
+  module Support
+    
+    def days_into_week
+      defined?(DAYS_INTO_WEEK) ? DAYS_INTO_WEEK : { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
+    end
+  
+    def common_year_days_in_month
+      defined?(COMMON_YEAR_DAYS_IN_MONTH) ? COMMON_YEAR_DAYS_IN_MONTH : [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+    end
+    
+    def add_to_chain(method, *args, &block)
+      @method_chain ||= []
+      @method_chain << [method.to_sym, args, block]
+    end
+    
+    def call_chain(custom_block = nil, &block)
+      method, args, iblock = @method_chain.pop
+      return nil if method.nil?
+      iblock = custom_block if !custom_block.nil?
+      method, args, iblock = yield(method, args, iblock) if block_given?
+      self.send(method, *args, &iblock)
+    end
+    
+  end
+end

lib/time_ext/version.rb

@@ -0,0 +1,3 @@
+module TimeExt
+  VERSION = "0.2.8"
+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/spec.opts

@@ -1,2 +0,0 @@
---format specdoc
---color

spec/spec_helper.rb

@@ -1,9 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'time_ext'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
+require 'time_ext'
-  
+require 'rspec'
-end
+require 'rspec/autorun'

spec/time_iterations_spec.rb

@@ -66,4 +66,32 @@ describe "Time Iterations" do
     (@now + 6.hours).from(@now).map_each(:hour) { |time| time }.should == match
   end
   
-end
+  it "should iterate over time objects with #map_each and #of_the via method chaining" do
+    match = (0..23).map { |i| ((@now - (@now.hour).hours) + i.hours).beginning_of_hour }
+    @now.map_each_hour.of_the(:day) { |time| time }.should == match
+    @now.map_each_hour.of_the_day { |time| time }.should == match
+    match = @now.beginning_of_month.map_beginning_of_each_hour(:include_start => true, :include_end => false).until(@now.next_month.beginning_of_month) { |time| time }
+    @now.map_each_hour.of_the(:month) { |time| time }.should == match
+  end
+  
+  it "should iterate and respect the include_start and include_end options" do
+    match = (1..6).map { |i| @now + i.hours }
+    @now.map_each_hour.until(@now + 6.hours) { |time| time }.should == match
+    match = (1..6).map { |i| @now + i.hours }
+    @now.map_each_hour(:include_end => true).until(@now + 6.hours) { |time| time }.should == match
+    @now.map_each_hour(:include_start => false).until(@now + 6.hours) { |time| time }.should == match
+    match = (0..6).map { |i| @now + i.hours }
+    @now.map_each_hour(:include_start => true).until(@now + 6.hours) { |time| time }.should == match
+    match = (0..5).map { |i| @now + i.hours }
+    @now.map_each_hour(:include_start => true, :include_end => false).until(@now + 6.hours) { |time| time }.should == match
+    match = (0..6).map { |i| @now + i.hours }
+    @now.map_each_hour(:include_start => true, :include_end => true).until(@now + 6.hours) { |time| time }.should == match
+  end
+  
+  it "should iterate and respect the beginning_of option" do
+    match = (1..6).map { |i| @now.beginning_of_hour + i.hours }
+    @now.map_beginning_of_each_hour.until(@now.beginning_of_hour + 6.hours) { |time| time }.should == match
+    @now.map_each_hour(:beginning_of => true).until(@now.beginning_of_hour + 6.hours) { |time| time }.should == match
+  end
+  
+end

time_ext.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "time_ext/version"
+
+Gem::Specification.new do |s|
+  s.name        = "time_ext"
+  s.version     = TimeExt::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jim Myhrberg"]
+  s.email       = ["contact@jimeh.me"]
+  s.homepage    = "http://github.com/jimeh/time_ext"
+  s.summary     = "Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport."
+  s.description = "Extends the abilities of Ruby's built-in Time class by building on top of ActiveSupport."
+
+  s.rubyforge_project = "time_ext"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  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 'i18n', '>= 0.4.2'
+end