timezone 0.1.1 → 0.1.2

data/README.markdown

@@ -7,7 +7,7 @@ A simple way to get accurate current and historical timezone information based o
 Add the following to your Gemfile:
 
     gem 'timezone'
-    
+
 Then install your bundle.
 
     bundle install
@@ -16,14 +16,14 @@ Then install your bundle.
 
 Getting the current time or any historical time in any timezone, with daylight savings time taken into consideration, is easy:
 
-    timezone = Timezone.new :zone => 'America/Los_Angeles'
+    timezone = Timezone::Zone.new :zone => 'America/Los_Angeles'
     timezone.time Time.now
     => 2011-02-11 17:29:05 UTC
     timezone.time Time.utc(2010, 1, 1, 0, 0, 0)
     => 2009-12-31 16:00:00 UTC
-    
+
 Time is always returned in the UTC timezone, but it accurately reflects the actual time in the specified timezone. The reason for this is that this function also takes into account daylight savings time, which can alter the timezone offset and hence put Ruby in the wrong timezone.
-    
+
 ## Getting the timezone for a specific latitude and longitude
 
 First, make sure you have a geonames username. It's free and easy to setup, you can do so [here](http://www.geonames.org/login).
@@ -33,11 +33,11 @@ Second, add the following to your application.rb file, or before you perform a c
     Timezone::Configure.begin do |c|
       c.username = 'your_geonames_username_goes_here'
     end
-    
+
 Finally, pass the coordinates to your timezone initialization function.
 
-    timezone = Timezone.new :latlon => [-34.92771808058, 138.477041423321]
+    timezone = Timezone::Zone.new :latlon => [-34.92771808058, 138.477041423321]
     timezone.zone
     => "Australia/Adelaide"
     timezone.time Time.now
-    => 2011-02-12 12:02:13 UTC
+    => 2011-02-12 12:02:13 UTC

data/lib/timezone/version.rb

@@ -1,3 +1,3 @@
 module Timezone
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/timezone/zone.rb

@@ -9,9 +9,9 @@ module Timezone
   class Zone
     include Comparable
     attr_accessor :rules, :zone
-    
+
     # Create a new Timezone object.
-    # 
+    #
     #   Timezone.new(options)
     #
     # :zone       - The actual name of the zone. For example, Australia/Sydney or Americas/Los_Angeles.
@@ -48,24 +48,27 @@ module Timezone
     # offset in the timezone rules. Once the offset has been found that offset is added to the reference UTC time
     # to calculate the reference time in the timezone.
     def time reference
-      reference = reference.utc
-      rule = rules.detect{ |rule| _parsetime(rule['_from']) <= reference && _parsetime(rule['_to']) >= reference }
-      reference + rule['offset']
+      reference.utc + rule_for_reference(reference)['offset']
     end
-    
+
     # Get the current UTC offset in seconds for this timezone.
     #
-    #   timezone.utc_offset
-    def utc_offset
-      @rules.last['offset']-(@rules.last['dst'] ? 3600 : 0)
+    #   timezone.utc_offset(reference)
+    def utc_offset reference=Time.now
+      rule_for_reference(reference)['offset']
     end
-    
+
     def <=> zone #:nodoc:
       utc_offset <=> zone.utc_offset
     end
-    
+
     private
 
+    def rule_for_reference reference
+      reference = reference.utc
+      rules.detect{ |rule| _parsetime(rule['_from']) <= reference && _parsetime(rule['_to']) > reference }
+    end
+
     def timezone_id lat, lon #:nodoc:
       begin
         response = Net::HTTP.get('ws.geonames.org', "/timezoneJSON?lat=#{lat}&lng=#{lon}&username=#{Timezone::Configure.username}")
@@ -83,4 +86,4 @@ module Timezone
       end
     end
   end
-end
+end

data/test/timezone_test.rb

@@ -9,19 +9,19 @@ class TimezoneTest < Test::Unit::TestCase
       Timezone::Zone.new :zone => 'Australia/Sydney'
     end
   end
-  
+
   def test_nil_timezone
     assert_raise Timezone::Error::NilZone do
       Timezone::Zone.new :zone => nil
     end
   end
-  
+
   def test_invalid_timezone
     assert_raise Timezone::Error::InvalidZone do
       Timezone::Zone.new :zone => 'Foo/Bar'
     end
   end
-  
+
   def time_timezone_equivalence
     gmt = Timezone::Zone.new :zone => 'GMT'
     australia = Timezone::Zone.new :zone => 'Australia/Sydney'
@@ -29,42 +29,45 @@ class TimezoneTest < Test::Unit::TestCase
     assert gmt <= australia
     assert gmt < australia
   end
-  
+
   def test_getting_utc_offset
-    assert_equal 36000, Timezone::Zone.new(:zone => 'Australia/Sydney').utc_offset
-    assert_equal -28800, Timezone::Zone.new(:zone => 'America/Los_Angeles').utc_offset
-    assert_equal 20700, Timezone::Zone.new(:zone => 'Asia/Kathmandu').utc_offset
+    assert_equal 36000, Timezone::Zone.new(:zone => 'Australia/Sydney').utc_offset(Time.parse('2011-06-05'))
+    assert_equal -25200, Timezone::Zone.new(:zone => 'America/Los_Angeles').utc_offset(Time.parse('2011-06-05'))
+    assert_equal 20700, Timezone::Zone.new(:zone => 'Asia/Kathmandu').utc_offset(Time.parse('2011-06-05'))
+
+    assert_equal -18000, Timezone::Zone.new(:zone => 'America/New_York').utc_offset(Time.parse('2011-01-11'))
+    assert_equal -14400, Timezone::Zone.new(:zone => 'America/New_York').utc_offset(Time.parse('2011-06-11'))
   end
-  
+
   def test_loading_GMT_timezone
     timezone = Timezone::Zone.new :zone => 'GMT'
     assert_equal Time.now.utc.to_i, timezone.time(Time.now).to_i
   end
-  
+
   def test_loading_historical_time
     timezone = Timezone::Zone.new :zone => 'America/Los_Angeles'
     local = Time.strptime('2011-02-11T13:20:00Z', '%Y-%m-%dT%H:%M:%SZ')
     utc = Time.strptime('2011-02-11T21:20:00Z', '%Y-%m-%dT%H:%M:%SZ')
     assert_equal local.to_i, timezone.time(utc).to_i
   end
-  
+
   def test_loading_half_hour_timezone
     timezone = Timezone::Zone.new :zone => 'Asia/Kathmandu'
     utc = Time.utc(2011, 1, 4, 3, 51, 29)
     local = Time.utc(2011, 1, 4, 9, 36, 29)
     assert_equal local.to_i, timezone.time(utc).to_i
   end
-  
+
   def test_using_lat_lon_coordinates
     Timezone::Configure.begin { |c| c.username = 'timezone' }
     timezone = Timezone::Zone.new :latlon => [-34.92771808058, 138.477041423321]
     assert_equal 'Australia/Adelaide', timezone.zone
   end
-  
+
   def test_australian_timezone_with_dst
     timezone = Timezone::Zone.new :zone => 'Australia/Adelaide'
     utc = Time.utc(2010, 12, 23, 19, 37, 15)
     local = Time.utc(2010, 12, 24, 6, 7, 15)
     assert_equal local.to_i, timezone.time(utc).to_i
   end
-end
+end

metadata

@@ -1,30 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: timezone
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-06-06 00:00:00.000000000 -07:00
 default_executable: 
 dependencies: []
-
-description: A simple way to get accurate current and historical timezone information based on zone or latitude and longitude coordinates. This gem uses the tz database (http://www.twinsun.com/tz/tz-link.htm) for historical timezone information. It also uses the geonames API for timezone latitude and longitude lookup (http://www.geonames.org/export/web-services.html).
-email: 
+description: A simple way to get accurate current and historical timezone information
+  based on zone or latitude and longitude coordinates. This gem uses the tz database
+  (http://www.twinsun.com/tz/tz-link.htm) for historical timezone information. It
+  also uses the geonames API for timezone latitude and longitude lookup (http://www.geonames.org/export/web-services.html).
+email:
 - pan.thomakos@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
 - License.txt
-files: 
+files:
 - .gitignore
 - Gemfile
 - License.txt
@@ -499,30 +498,28 @@ files:
 has_rdoc: true
 homepage: http://github.com/panthomakos/timezone
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: timezone
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: timezone-0.1.1
-test_files: 
+summary: timezone-0.1.2
+test_files:
 - test/timezone_test.rb