Merge branch 'release/v0.2.9'

instead of jeweler

.gitignore

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

.rspec

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

Gemfile

@@ -0,0 +1,4 @@
+source 'http://rubygems.org/'
+
+# Specify your gem's dependencies in time_ext.gemspec
+gemspec

README.md

@@ -99,5 +99,5 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 [as]: http://as.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Time/Calculations.html
-[docs]: http://rdoc.info/projects/jimeh/time_ext
+[docs]: http://rdoc.info/gems/time_ext/frames
 [rdoc.info]: http://rdoc.info/

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.1

lib/time_ext.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
-require 'active_support'
 
-require 'time_ext/backwards_compatibility'
 require 'time_ext/calculations'
 require 'time_ext/iterations'
-require 'time_ext/method_chain'
+require 'time_ext/support'
 require 'time_ext/core_ext/time'
+require 'time_ext/core_ext/numeric'

lib/time_ext/backwards_compatibility.rb

@@ -1,14 +0,0 @@
-module TimeExt
-  # Provides helper methods used by TimeExt::Calculations for backwards compatibility with ActiveSupport.
-  module BackwardsCompatibility
-    
-    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
-    
-  end
-end

lib/time_ext/core_ext/numeric.rb

@@ -0,0 +1,6 @@
+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
+end

lib/time_ext/core_ext/time.rb

@@ -1,6 +1,9 @@
+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::MethodChain
+  include TimeExt::Support
-  include TimeExt::BackwardsCompatibility
   include TimeExt::Calculations
   include TimeExt::Iterations
   

lib/time_ext/iterations.rb

@@ -4,16 +4,23 @@ module TimeExt
 
     # 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)
+      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]
-        @until ||= (!parent_unit.nil?) ? self.send("#{parent_unit}s_since", 1) : self.send("#{unit}s_since", 1)
+        if @of_the.nil?
-        time = self.clone
+          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)
@@ -46,6 +53,14 @@ module TimeExt
       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)
@@ -60,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)
@@ -69,7 +83,14 @@ 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
+        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

lib/time_ext/method_chain.rb

@@ -1,19 +0,0 @@
-module TimeExt
-  # Allows iterators' #until and #from methods to chain back to the parent iteration method.
-  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.9"
+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

@@ -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
@@ -68,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,29 @@
+# -*- 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.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