tod 1.0.0 → 1.1.0

data/README.markdown

@@ -83,7 +83,12 @@ then require 'tod/time_of_day' instead of 'tod'.
     Date.today.at tod                               # => 2010-12-29 08:30:00 -0600
     Time.now.to_time_of_day                         # => 16:30:43
 
+Rails Time Zone Support
+=======================
+
+If Rails time zone support is loaded, Date#on and TimeOfDay#at will automatically use Time.zone.
+
 License
 =======
 
-Copyright (c) 2010 Jack Christensen, released under the MIT license
+Copyright (c) 2010-2103 Jack Christensen, released under the MIT license

data/lib/tod/date.rb

@@ -1,6 +1,7 @@
 class Date
   # Returns a local Time instance with this date and time_of_day
-  def at(time_of_day)
-    Time.local year, month, day, time_of_day.hour, time_of_day.minute, time_of_day.second
+  # Pass in time_zone to use ActiveSupport::TimeZone
+  def at(time_of_day, time_zone=Tod::TimeOfDay.time_zone)
+    time_zone.local year, month, day, time_of_day.hour, time_of_day.minute, time_of_day.second
   end
 end

data/lib/tod/time_of_day.rb

@@ -46,7 +46,7 @@ module Tod
       raise ArgumentError, "second must be between 0 and 59" unless (0..59).include?(@second)
 
       @second_of_day = @hour * 60 * 60 + @minute * 60 + @second
-      
+
       freeze # TimeOfDay instances are value objects
     end
 
@@ -76,8 +76,9 @@ module Tod
     end
 
     # Returns a Time instance on date using self as the time of day
-    def on(date)
-      Time.local date.year, date.month, date.day, @hour, @minute, @second
+    # Optional time_zone will build time in that zone
+    def on(date, time_zone=Tod::TimeOfDay.time_zone)
+      time_zone.local date.year, date.month, date.day, @hour, @minute, @second
     end
 
     # Build a new TimeOfDay instance from second_of_day
@@ -123,6 +124,11 @@ module Tod
         raise ArgumentError, "Invalid time of day string"
       end
     end
+
+    # If ActiveSupport TimeZone is available and set use current time zone else return Time
+    def self.time_zone
+      (Time.respond_to?(:zone) && Time.zone) || Time
+    end
   end
 end
 

data/lib/tod/version.rb

@@ -1,3 +1,3 @@
 class TimeOfDay
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/tod/a_a_a_time_of_day_time_zone_without_active_support_test.rb

@@ -0,0 +1,12 @@
+# This test depends on not having ActiveSupport loaded yet. So it is named
+# with AAA prefix to ensure it runs before anything that loads it.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+
+class AAATimeOfDayWithoutActiveSupportTest < Test::Unit::TestCase
+  context "self.time_zone" do
+    should "be Time" do
+      assert_equal Time, TimeOfDay.time_zone
+    end
+  end
+end

data/test/tod/date_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'active_support/time'
 
 class DateTest < Test::Unit::TestCase
   context "at" do
@@ -7,5 +8,14 @@ class DateTest < Test::Unit::TestCase
       tod = TimeOfDay.new 8,30
       assert_equal Time.local(2000,1,1, 8,30), date.at(tod)
     end
+
+    context "with a time zone" do
+      should "accept TimeOfDay and TimeWithZone on same date" do
+        date = Date.civil 2000,1,1
+        tod = TimeOfDay.new 8,30
+        time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+        assert_equal time_zone.local(2000,1,1, 8,30), date.at(tod, time_zone)
+      end
+    end
   end
 end

data/test/tod/time_of_day_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'active_support/time'
 
 class TimeOfDayTest < Test::Unit::TestCase
   context "initialize" do
@@ -179,5 +180,14 @@ class TimeOfDayTest < Test::Unit::TestCase
     should "be local Time on given date" do
       assert_equal Time.local(2010,12,29, 8,30), TimeOfDay.new(8,30).on(Date.civil(2010,12,29))
     end
+
+    context "with a time zone" do
+      should "be TimeWithZone on given date" do
+        date = Date.civil 2000,1,1
+        tod = TimeOfDay.new 8,30
+        time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+        assert_equal time_zone.local(2000,1,1, 8,30), tod.on(date, time_zone)
+      end
+    end
   end
 end

data/test/tod/time_of_day_time_zone_with_active_support_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'active_support/time'
+
+class TimeOfDayWithActiveSupportTest < Test::Unit::TestCase
+  context "self.time_zone" do
+    context "when Time.zone is nil" do
+      should "be Time" do
+        assert_equal Time, TimeOfDay.time_zone
+      end
+    end
+
+    context "when Time.zone is set" do
+      should "be Time.zone" do
+        Time.zone = "Central Time (US & Canada)"
+        assert_equal Time.zone, TimeOfDay.time_zone
+      end
+    end
+  end
+end

data/tod.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "test-unit"
   s.add_development_dependency "shoulda"
   s.add_development_dependency "mocha"
+  s.add_development_dependency "active_support", ">= 3.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,71 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tod
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-29 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: test-unit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-description: Supplies TimeOfDay class that includes parsing, strftime, comparison, and arithmetic.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Supplies TimeOfDay class that includes parsing, strftime, comparison,
+  and arithmetic.
+email:
 - jack@jackchristensen.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - MIT-LICENSE
 - README.markdown
@@ -76,41 +93,40 @@ files:
 - lib/tod/time_of_day.rb
 - lib/tod/version.rb
 - test/test_helper.rb
+- test/tod/a_a_a_time_of_day_time_zone_without_active_support_test.rb
 - test/tod/date_test.rb
 - test/tod/time_of_day_test.rb
+- test/tod/time_of_day_time_zone_with_active_support_test.rb
 - test/tod/time_test.rb
 - tod.gemspec
-has_rdoc: true
 homepage: https://github.com/JackC/tod
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Supplies TimeOfDay class
-test_files: []
-
+test_files:
+- test/test_helper.rb
+- test/tod/a_a_a_time_of_day_time_zone_without_active_support_test.rb
+- test/tod/date_test.rb
+- test/tod/time_of_day_test.rb
+- test/tod/time_of_day_time_zone_with_active_support_test.rb
+- test/tod/time_test.rb