timezone 0.5.0 → 0.6.0

data/lib/timezone/active_support.rb

@@ -134,7 +134,7 @@ module Timezone
       "Pacific/Fakaofo"=>"Tokelau Is.",
       "Pacific/Chatham"=>"Chatham Is.",
       "Pacific/Apia"=>"Samoa"
-    }
+    }.freeze
 
     def self.format(zone)
       TIMEZONE_MAPPING[zone] || zone

data/lib/timezone/configure.rb

@@ -70,7 +70,13 @@ module Timezone
       use_google? && !!google_client_id
     end
 
+    def self.lookup=(lookup)
+      @lookup = lookup && lookup.new(self)
+    end
+
     def self.lookup
+      return @lookup if @lookup
+
       use_google? ? google_lookup : geonames_lookup
     end
 
@@ -99,7 +105,7 @@ module Timezone
     end
 
     class << self
-      alias_method :url=, :geonames_url=
+      alias url= geonames_url=
     end
 
     # The Google API URL

data/lib/timezone/error.rb

@@ -13,6 +13,7 @@ module Timezone
     class GeoNames < Base; end
     class Google < Base; end
     class ParseTime < Base; end
+    class Test < Base ; end
     class InvalidConfig < Base ; end
   end
 end

data/lib/timezone/lookup/test.rb

@@ -0,0 +1,29 @@
+require 'timezone/lookup/basic'
+require 'timezone/error'
+
+module Timezone
+  module Lookup
+    class Test < ::Timezone::Lookup::Basic
+      def initialize(config)
+        @stubs = {}
+        # Regular config w/ protocol and URL checks does not apply for stubs.
+      end
+
+      def stub(lat, lng, timezone)
+        @stubs[key(lat, lng)] = timezone
+      end
+
+      def lookup(lat, lng)
+        @stubs.fetch(key(lat, lng)) do
+          raise ::Timezone::Error::Test, 'missing stub'
+        end
+      end
+
+      private
+
+      def key(lat, lng)
+        "#{lat},#{lng}"
+      end
+    end
+  end
+end

data/lib/timezone/parser.rb

@@ -4,7 +4,7 @@ module Timezone
   class Parser
     LINE = /\s*(.+)\s*=\s*(.+)\s*isdst=(\d+)\s*gmtoff=([\+\-]*\d+)/
 
-    ZONEINFO_DIR = '/usr/share/zoneinfo'
+    ZONEINFO_DIR = '/usr/share/zoneinfo'.freeze
 
     attr_reader :zoneinfo
 
@@ -24,7 +24,7 @@ module Timezone
     class Line
       attr_accessor :source, :name, :dst, :offset
 
-      SOURCE_FORMAT = '%a %b %e %H:%M:%S %Y %Z'
+      SOURCE_FORMAT = '%a %b %e %H:%M:%S %Y %Z'.freeze
 
       def initialize(match)
         self.source = Time.strptime(match[1]+'C', SOURCE_FORMAT).to_i

data/lib/timezone/version.rb

@@ -1,3 +1,3 @@
 module Timezone
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'.freeze
 end

data/lib/timezone/zone.rb

@@ -60,7 +60,7 @@ module Timezone
       reference.utc + utc_offset(reference)
     end
 
-    alias_method :utc_to_local, :time
+    alias utc_to_local time
 
     # Determine the UTC time for a given time in the timezone.
     #

data/test/test_lookup_test.rb

@@ -0,0 +1,39 @@
+require 'timezone/configure'
+require 'timezone/lookup/test'
+require 'timezone/zone'
+require 'minitest/autorun'
+
+class TestLookupTest < ::Minitest::Unit::TestCase
+  def setup
+    Timezone::Configure.begin do |c|
+      c.lookup = ::Timezone::Lookup::Test
+    end
+  end
+
+  def test_simple_stub
+    ::Timezone::Configure.lookup.stub(-10, 10, 'America/Los_Angeles')
+
+    assert_equal(
+      'America/Los_Angeles',
+      ::Timezone::Zone.new(lat: -10, lon: 10).zone)
+  end
+
+  def test_missing_stub
+    assert_raises(::Timezone::Error::Test) do
+      ::Timezone::Zone.new(lat: 100, lon: 100)
+    end
+  end
+
+  def test_clear_lookup
+    ::Timezone::Configure.begin do |c|
+      c.username = 'foo'
+      c.lookup = nil
+    end
+
+    assert ::Timezone::Lookup::Geonames, ::Timezone::Configure.lookup.class
+  end
+
+  def teardown
+    Timezone::Configure.begin{ |c| c.lookup = nil }
+  end
+end

data/test/timezone_test.rb

@@ -256,7 +256,7 @@ class TimezoneTest < ::Minitest::Unit::TestCase
     :time_with_offset,
     :dst?,
     :utc_offset
-  ]
+  ].freeze
 
   def check_equivalence(zone, time, other)
     tz = Timezone::Zone.new(:zone => zone)
@@ -279,14 +279,18 @@ class TimezoneTest < ::Minitest::Unit::TestCase
   end
 
   def test_datetime_equivalence
+    zone = ENV['TZ']
+    ENV['TZ'] = 'UTC'
     time = Time.new(2011, 2, 3, 13, 5, 0)
-    datetime = DateTime.new(2011, 2, 3, 13, 5, 0)
+    datetime = DateTime.new(2011, 2, 3, 13, 5, 0, 0)
 
     check_equivalence('America/Los_Angeles', time, datetime)
 
     time = Time.new(2011, 6, 3, 13, 5, 0)
-    datetime = DateTime.new(2011, 6, 3, 13, 5, 0)
+    datetime = DateTime.new(2011, 6, 3, 13, 5, 0, 0)
 
     check_equivalence('America/Los_Angeles', time, datetime)
+  ensure
+    ENV['TZ'] = zone
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -698,6 +698,7 @@ files:
 - lib/timezone/lookup/basic.rb
 - lib/timezone/lookup/geonames.rb
 - lib/timezone/lookup/google.rb
+- lib/timezone/lookup/test.rb
 - lib/timezone/net_http_client.rb
 - lib/timezone/parser.rb
 - lib/timezone/version.rb
@@ -712,6 +713,7 @@ files:
 - test/mocks/google_lat_lon_coords.txt
 - test/mocks/google_request_denied.txt
 - test/mocks/lat_lon_coords.txt
+- test/test_lookup_test.rb
 - test/timezone_test.rb
 - timezone.gemspec
 homepage: http://github.com/panthomakos/timezone
@@ -738,7 +740,7 @@ rubyforge_project: timezone
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: timezone-0.5.0
+summary: timezone-0.6.0
 test_files:
 - test/basic_lookup_test.rb
 - test/data/Helsinki_rules_without_timestamps.json
@@ -750,5 +752,6 @@ test_files:
 - test/mocks/google_lat_lon_coords.txt
 - test/mocks/google_request_denied.txt
 - test/mocks/lat_lon_coords.txt
+- test/test_lookup_test.rb
 - test/timezone_test.rb
 has_rdoc: