timezone 0.3.9 → 0.3.10

data/lib/timezone/configure.rb

@@ -29,7 +29,7 @@ module Timezone
     # @return [String]
     #   the Google API key ('abc123')
     def self.google_api_key
-      @google_api_key
+      @google_api_key ||= nil
     end
 
     # Google API key
@@ -165,7 +165,7 @@ module Timezone
     # @return [String]
     #   the Geonames API username ('foo-bar')
     def self.username
-      @@username
+      @@username ||= nil
     end
 
     # The Geonames API username

data/lib/timezone/error.rb

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

data/lib/timezone/lookup/basic.rb

@@ -1,9 +1,19 @@
+require 'timezone/error'
+
 module Timezone
   module Lookup
     class Basic
       attr_reader :config
 
       def initialize(config)
+        if config.protocol.nil?
+          raise(::Timezone::Error::InvalidConfig, 'missing protocol')
+        end
+
+        if config.url.nil?
+          raise(::Timezone::Error::InvalidConfig, 'missing url')
+        end
+
         @config = config
       end
 

data/lib/timezone/lookup/geonames.rb

@@ -6,6 +6,14 @@ require 'uri'
 module Timezone
   module Lookup
     class Geonames < ::Timezone::Lookup::Basic
+      def initialize(config)
+        if config.username.nil?
+          raise(::Timezone::Error::InvalidConfig, 'missing username')
+        end
+
+        super
+      end
+
       def lookup(lat, lng)
         response = client.get(url(lat, lng))
 

data/lib/timezone/lookup/google.rb

@@ -6,6 +6,13 @@ require 'uri'
 module Timezone
   module Lookup
     class Google < ::Timezone::Lookup::Basic
+      def initialize(config)
+        if config.google_api_key.nil?
+          raise(::Timezone::Error::InvalidConfig, 'missing api key')
+        end
+        super
+      end
+
       def lookup(lat,lng)
         response = client.get(url(lat,lng))
 

data/lib/timezone/version.rb

@@ -1,3 +1,3 @@
 module Timezone
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/test/basic_lookup_test.rb

@@ -0,0 +1,26 @@
+require 'timezone/lookup/basic'
+require 'minitest/autorun'
+
+class BasicLookupTest < ::Minitest::Unit::TestCase
+  def config
+    @config ||= Struct.new(:protocol, :url).new('http', 'example.com')
+  end
+
+  def lookup
+    ::Timezone::Lookup::Basic.new(config)
+  end
+
+  def test_missing_protocol
+    config.protocol = nil
+    assert_raises(::Timezone::Error::InvalidConfig){ lookup }
+  end
+
+  def test_missing_url
+    config.url = nil
+    assert_raises(::Timezone::Error::InvalidConfig){ lookup }
+  end
+
+  def test_initialization
+    assert_equal lookup.config, config
+  end
+end

data/test/geonames_lookup_test.rb

@@ -1,9 +1,9 @@
 require 'timezone/configure'
 require 'timezone/lookup/geonames'
-require 'test/unit'
+require 'minitest/autorun'
 require_relative 'http_test_client'
 
-class GeonamesLookupTest < ::Test::Unit::TestCase
+class GeonamesLookupTest < ::Minitest::Unit::TestCase
   def setup
     Timezone::Configure.begin do |c|
       c.google_api_key = nil
@@ -20,6 +20,13 @@ class GeonamesLookupTest < ::Test::Unit::TestCase
     ::Timezone::Lookup::Geonames.new(Timezone::Configure)
   end
 
+  def test_missing_username
+    Timezone::Configure.begin{ |c| c.username = nil }
+    assert_raises(::Timezone::Error::InvalidConfig){ lookup }
+  ensure
+    Timezone::Configure.begin{ |c| c.username = 'timezone' }
+  end
+
   def test_lookup
     HTTPTestClient.body = File.open(mock_path + '/lat_lon_coords.txt').read
 
@@ -29,7 +36,7 @@ class GeonamesLookupTest < ::Test::Unit::TestCase
   def test_api_limit
     HTTPTestClient.body = File.open(mock_path + '/api_limit_reached.txt').read
 
-    assert_raise Timezone::Error::GeoNames, 'api limit reached' do
+    assert_raises Timezone::Error::GeoNames, 'api limit reached' do
       lookup.lookup(*coordinates)
     end
   end

data/test/google_lookup_test.rb

@@ -1,12 +1,11 @@
 require 'timezone/configure'
 require 'timezone/lookup/google'
-require 'test/unit'
+require 'minitest/autorun'
 require_relative 'http_test_client'
 
-class GoogleLookupTest < ::Test::Unit::TestCase
+class GoogleLookupTest < ::Minitest::Unit::TestCase
   def setup
     Timezone::Configure.begin do |c|
-      c.google_api_key = nil
       c.http_client = HTTPTestClient
       c.google_api_key = '123abc'
     end
@@ -20,6 +19,13 @@ class GoogleLookupTest < ::Test::Unit::TestCase
     ::Timezone::Lookup::Google.new(Timezone::Configure)
   end
 
+  def test_missing_api_key
+    Timezone::Configure.begin{ |c| c.google_api_key = nil }
+    assert_raises(::Timezone::Error::InvalidConfig){ lookup }
+  ensure
+    Timezone::Configure.begin{ |c| c.google_api_key = '123abc' }
+  end
+
   def test_google_using_lat_lon_coordinates
     HTTPTestClient.body = File.open(mock_path + '/google_lat_lon_coords.txt').read
 
@@ -27,7 +33,8 @@ class GoogleLookupTest < ::Test::Unit::TestCase
   end
 
   def test_google_request_denied_read_lat_lon_coordinates
-    assert_raise Timezone::Error::Google, 'The provided API key is invalid.' do
+    HTTPTestClient.body = nil
+    assert_raises Timezone::Error::Google, 'The provided API key is invalid.' do
       lookup.lookup(*coordinates)
     end
   end

data/test/timezone_test.rb

@@ -1,24 +1,22 @@
 require 'timezone'
 require 'timezone/zone'
-require 'test/unit'
+require 'minitest/autorun'
 require "mocha/setup"
 require 'timecop'
 
-class TimezoneTest < Test::Unit::TestCase
+class TimezoneTest < ::Minitest::Unit::TestCase
   def test_valid_timezone
-    assert_nothing_raised do
-      Timezone::Zone.new :zone => 'Australia/Sydney'
-    end
+    refute_nil(Timezone::Zone.new(:zone => 'Australia/Sydney'))
   end
 
   def test_nil_timezone
-    assert_raise Timezone::Error::NilZone do
+    assert_raises Timezone::Error::NilZone do
       Timezone::Zone.new :zone => nil
     end
   end
 
   def test_invalid_timezone
-    assert_raise Timezone::Error::InvalidZone do
+    assert_raises Timezone::Error::InvalidZone do
       Timezone::Zone.new :zone => 'Foo/Bar'
     end
   end
@@ -28,7 +26,7 @@ class TimezoneTest < Test::Unit::TestCase
     assert list.is_a?(Array)
     assert list.count == 2
     assert list.first.is_a?(Hash)
-    assert list.first[:zone] == "Australia/Sydney"
+    assert(list.any?{ |l| l[:zone] == 'Australia/Sydney' })
   end
 
   def test_timezone_list_current_time
@@ -53,7 +51,7 @@ class TimezoneTest < Test::Unit::TestCase
     Timezone::Configure.default_for_list = "America/Chicago", "Australia/Sydney"
     list = Timezone::Zone.list
     assert list.count == 2
-    assert list.first.has_value? "Australia/Sydney"
+    assert(list.any?{ |l| l.has_value?("Australia/Sydney") })
   end
 
   def test_timezone_names
@@ -198,6 +196,7 @@ class TimezoneTest < Test::Unit::TestCase
   end
 
   def test_configure_url_default
+    Timezone::Configure.begin{ |c| c.google_api_key = nil }
     assert_equal 'api.geonames.org', Timezone::Configure.url
   end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple way to get accurate current and historical timezone information
@@ -80,8 +80,8 @@ extra_rdoc_files:
 - README.markdown
 - License.txt
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.markdown
 - CONTRIBUTING.markdown
 - Gemfile
@@ -685,6 +685,7 @@ files:
 - lib/timezone/parser.rb
 - lib/timezone/version.rb
 - lib/timezone/zone.rb
+- test/basic_lookup_test.rb
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
 - test/geonames_lookup_test.rb
@@ -702,26 +703,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: timezone
-rubygems_version: 2.0.14
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
-summary: timezone-0.3.9
+summary: timezone-0.3.10
 test_files:
+- test/basic_lookup_test.rb
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
 - test/geonames_lookup_test.rb