earth_tools 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 Find the changes below for each version.
 
+## 0.1.1
+* Upgrade `rest-client` to resolve security issue (OSVDB-117461) in dependency
+* Fix tests
+* Add coveralls
+* Drop support for ruby 1.9.2
+
 ## 0.1.0
 * Add cache handling
 

data/Gemfile

@@ -1,3 +1,11 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec
+
+gem "rake"
+
+group :test do
+  if ENV["CI"]
+    gem "coveralls", require: false
+  end
+end

data/README.md

@@ -1,11 +1,11 @@
 # earth_tools
-[![Gem Version](https://badge.fury.io/rb/earth_tools.png)](http://badge.fury.io/rb/earth_tools) [![Dependency Status](https://gemnasium.com/mckramer/earth_tools.png?travis)](https://gemnasium.com/mckramer/earth_tools) [![Code Climate](https://codeclimate.com/github/mckramer/earth_tools.png)](https://codeclimate.com/github/mckramer/earth_tools) [![Build Status](https://secure.travis-ci.org/mckramer/earth_tools.png?branch=master)](http://travis-ci.org/mckramer/earth_tools)
+[![Gem Version](https://badge.fury.io/rb/earth_tools.png)](http://badge.fury.io/rb/earth_tools) [![Dependency Status](https://gemnasium.com/mckramer/earth_tools.png?travis)](https://gemnasium.com/mckramer/earth_tools) [![Code Climate](https://codeclimate.com/github/mckramer/earth_tools.png)](https://codeclimate.com/github/mckramer/earth_tools) [![Coverage Status](https://img.shields.io/coveralls/mckramer/earth_tools.svg)](https://coveralls.io/r/mckramer/earth_tools?branch=master) [![Build Status](https://secure.travis-ci.org/mckramer/earth_tools.png?branch=master)](http://travis-ci.org/mckramer/earth_tools)
 
 `earth_tools` is a wrapper around the wonderful [earthtools.org webservices](http://www.earthtools.org/webservices.htm), which allows you to determine the sea level height, time zone, and surise/sunset times from a set of coordinates.
 
 ## Compatibility
 
-* Supports Ruby 1.9.2 & 1.9.3
+* Supports Ruby 1.9.3, 2.0.0, & 2.1.5
 
 Will be testing on other versions in the future.
 
@@ -13,12 +13,16 @@ Will be testing on other versions in the future.
 
 Add to your Gemfile:
 
-  `gem 'earth_tools'`
+```ruby
+gem 'earth_tools'
+```
 
-and then bundle your gemfile:
+and then run bundle:
+
+```sh
+$ bundle install
+```
 
-  `bundle install`
-  
 and you are done!
 
 ## API
@@ -27,45 +31,53 @@ The run down of the 3 major functions available
 
 ### Time zone
 
-    # API
-    result = EarthTools.time_zone(latitude, longitude)
-    # Example
-    result = EarthTools.time_zone(40.71417, -74.00639) # New York City
-    result.iso_time   # => 2012-06-14 12:56:40 -0500
-    result.utc_offset # => -5
-    result.utc_time   # => 2012-06-14 17:56:40 +0000
+```ruby
+# API
+result = EarthTools.time_zone(latitude, longitude)
+# Example
+result = EarthTools.time_zone(40.71417, -74.00639) # New York City
+result.iso_time   # => 2012-06-14 12:56:40 -0500
+result.utc_offset # => -5
+result.utc_time   # => 2012-06-14 17:56:40 +0000
+```
 
 ### Height above/below sea level
 
-    # API
-    result = EarthTools.height(latitude, longitude)
-    # Example
-    result = EarthTools.height(52.4822, -1.8946) # Birmingham, AL
-    result.meters # => 141
-    result.feet   # => 462.6
-    result.height # => 462.6 (when EarthTools::Configuration.units is set to :english units)
+```ruby
+# API
+result = EarthTools.height(latitude, longitude)
+# Example
+result = EarthTools.height(52.4822, -1.8946) # Birmingham, AL
+result.meters # => 141
+result.feet   # => 462.6
+result.height # => 462.6 (when EarthTools::Configuration.units is set to :english units)
+```
 
 ### Sunrise/sunset times
 
-    # API
-    result = EarthTools.sunrise_sunset(latitude, longitude, month, day, timezone, dst)
-    # Example
-    result = EarthTools.sunrise_sunset(40.71417, -74.00639, 12, 4, -5, 0) # New York City, December 4th
-    result.sunrise     # => 2012-12-04 07:05:50 -0500
-    result.sunset      # => 2012-12-04 16:26:59 -0500
+```ruby
+# API
+result = EarthTools.sunrise_sunset(latitude, longitude, month, day, timezone, dst)
+# Example
+result = EarthTools.sunrise_sunset(40.71417, -74.00639, 12, 4, -5, 0) # New York City, December 4th
+result.sunrise     # => 2012-12-04 07:05:50 -0500
+result.sunset      # => 2012-12-04 16:26:59 -0500
+```
 
 ### Configuration
 
-    # Configure block (set to defaults)
-    EarthTools.configure do |config|
-      config.always_raise = []              # Add any errors that you would like to be custom handled, see "Error handling" section below
-      config.cache = nil                    # Cache object (see Caching section for what methods are required)
-      config.cache_prefix = "earth_tools:"  # Prefix to use for cache keys
-      config.timeout = 3                    # Timeout in seconds
-      config.units = :english               # Also, can specify :metric
-    end
-    # Static call
-    EarthTools::Configuration.timeout = 5   # Set timeout to 5 seconds
+```ruby
+# Configure block (set to defaults)
+EarthTools.configure do |config|
+  config.always_raise = []              # Add any errors that you would like to be custom handled, see "Error handling" section below
+  config.cache = nil                    # Cache object (see Caching section for what methods are required)
+  config.cache_prefix = "earth_tools:"  # Prefix to use for cache keys
+  config.timeout = 3                    # Timeout in seconds
+  config.units = :english               # Also, can specify :metric
+end
+# Static call
+EarthTools::Configuration.timeout = 5   # Set timeout to 5 seconds
+```
 
 ## Earth Tool API restrictions
 
@@ -112,8 +124,10 @@ The cache store can be any object that supports the following methods:
 
 If you need to expire cached content:
 
-    EarthTools.cache.expire("http://...") # Expire cached result for a URL
-    EarthTools.cache.expire(:all)         # Expire all cached results
+```ruby
+EarthTools.cache.expire("http://...") # Expire cached result for a URL
+EarthTools.cache.expire(:all)         # Expire all cached results
+```
 
 There is no need to include the prefix when passing a URL to be expired. Expiring `:all` will only expire keys with the configured prefix (won't kill every entry in your key/value store).
 
@@ -121,16 +135,16 @@ There is no need to include the prefix when passing a URL to be expired. Expirin
 
 By default Earth Tools will rescue any exceptions raised by calls to the webservice and return an empty array (using warn() to inform you of the error). You can override this and implement custom error handling for certain exceptions by using the `:always_raise` option:
 
-    EarthTools::Configuration.always_raise = [SocketError, TimeoutError]
+```ruby
+EarthTools::Configuration.always_raise = [SocketError, TimeoutError]
+```
 
 ## Issues & contributing
 
-No outstanding issues right now.  Please post any issues to the [issues queue on github](https://github.com/mckramer/earth_tools/issues).
-
-## Future
-
-I would love to see this functionality brought into the `geocoder` gem or similar in the future.
+Please post any issues to the [issues queue on github](https://github.com/mckramer/earth_tools/issues).
 
 # License and attributions
 
-This gem's structure and design borrows heavily from `geocoder`, so thanks to its author.  Find me on twitter [@maxckramer](https://twitter.com/maxckramer).
+This gem's structure and design borrows heavily from [geocoder](https://github.com/alexreisner/geocoder), so thanks to its author. This repository is released under the MIT license (see the [LICENSE](LICENSE) for full text).
+
+Find me on twitter [@maxckramer](https://twitter.com/maxckramer).

data/lib/earth_tools/result/base.rb

@@ -28,7 +28,7 @@ module EarthTools
       # See {http://en.wikipedia.org/wiki/Latitude}.
       # @return [Float] the latitude
       def latitude
-        @data['latitude'].to_f
+        @data['location']['latitude'].to_f
       end
       
       ##
@@ -36,7 +36,7 @@ module EarthTools
       # See {http://en.wikipedia.org/wiki/Longitude}.
       # @return the longitude
       def longitude
-        @data['longitude'].to_f
+        @data['location']['longitude'].to_f
       end
       
       ##

data/lib/earth_tools/result/time_zone.rb

@@ -19,7 +19,7 @@ module EarthTools::Result
     # Whether or not the {#local_time} and {#iso_time} is currently in DST
     # @return [boolean] true || false || nil
     def dst?
-      case @data['dst']
+      case dst
       when 'True' then 
         true
       when 'False'

data/lib/earth_tools/version.rb

@@ -1,4 +1,4 @@
 module EarthTools
   # The gem version
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/cache_test.rb

@@ -16,7 +16,7 @@ class CacheTest < MiniTest::Unit::TestCase
   def test_store_and_retrieve_from_cache
     @cache['test/1'] = :data
     
-    assert_equal :data, @cache['test/1'], 'The cache was not stored properly.'
+    assert_equal :data, @cache['test/1']
   end
   
   def test_remove_single_url
@@ -25,16 +25,16 @@ class CacheTest < MiniTest::Unit::TestCase
     
     @cache.expire('test/1')
     
-    assert_nil @cache['test/1'], 'The cache should have deleted entry.'
-    assert_equal :data, @cache['test/2'], 'The cache should not have deleted entry.'
+    assert_nil @cache['test/1']
+    assert_equal :data, @cache['test/2']
   end
   
   def test_remove_all_prefixed_urls
     @raw_cache['test']        = :data
     @raw_cache['other:test']  = :data
-    @cache['test/1'] = :data
-    @cache['test/2'] = :data
-    @cache['test/3'] = :data
+    @cache['test/1']          = :data
+    @cache['test/2']          = :data
+    @cache['test/3']          = :data
     
     @cache.expire(:all)
     assert_equal :data, @raw_cache['test'], 'The cache should not affect non-prefixed entries.'

data/test/configuration_test.rb

@@ -7,45 +7,32 @@ class ConfigurationTest < MiniTest::Unit::TestCase
     EarthTools::Configuration.set_defaults
   end
   
-  # --- class method configuration ---
-  def test_configurated_by_class_method
+  def test_configure_by_class_method
     EarthTools::Configuration.units = :metric
-    assert_equal EarthTools::Configuration.units, :metric
+    assert_equal :metric, EarthTools::Configuration.units
+    
     result = EarthTools.height(52.4822, -1.8946)
-    if result.height == 0
-      assert_equal result.height, result.feet
-    else
-      refute_equal result.height, result.feet
-    end
+    refute_equal result.height, result.feet
   end
   
-  # --- EarthTools#configure distances configuration ---
-  def test_configuration
-    
-    # DSL
+  def test_block_configuration
     EarthTools.configure do |config|
       config.units  = :metric
     end
+    assert_equal :metric, EarthTools::Configuration.units
     
-    assert_equal EarthTools::Configuration.units, :metric
     result = EarthTools.height(52.4822, -1.8946)
-    if result.height == 0
-      assert_equal result.height, result.feet
-    else
-      refute_equal result.height, result.feet
-    end
+    refute_equal result.height, result.feet
     
-    # Direct
+  end
+  
+  def test_property_configuration
     EarthTools.configure.units  = :metric
+    assert_equal :metric, EarthTools::Configuration.units
     
-    assert_equal EarthTools::Configuration.units, :metric
     result = EarthTools.height(52.4822, -1.8946)
     assert_equal result.height, result.meters
-    if result.height == 0
-      assert_equal result.height, result.feet
-    else
-      refute_equal result.height, result.feet
-    end
+    refute_equal result.height, result.feet
   end
   
 end

data/test/earth_tools_test.rb

@@ -12,15 +12,15 @@ require 'mock_lookup'
 class EarthToolsTest < MiniTest::Unit::TestCase
   
   def test_time_zone_method_returns_result_object
-    assert EarthTools.time_zone(40.71417, -74.00639).is_a?(EarthTools::Result::TimeZone)
+    assert_instance_of EarthTools::Result::TimeZone, EarthTools.time_zone(40.71417, -74.00639)
   end
   
   def test_sunrise_sunset_method_returns_result_object
-    assert EarthTools.sunrise_sunset(40.71417, -74.00639, 12, 4).is_a?(EarthTools::Result::SunriseSunset)
+    assert_instance_of EarthTools::Result::SunriseSunset, EarthTools.sunrise_sunset(40.71417, -74.00639, 12, 4)
   end
   
   def test_height_method_returns_result_object
-    assert EarthTools.height(52.4822, -1.8946).is_a?(EarthTools::Result::Height)
+    assert_instance_of EarthTools::Result::Height, EarthTools.height(52.4822, -1.8946)
   end
   
 end

data/test/fixtures/timezone/40.71655,-12.12318.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<timezone xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.earthtools.org/timezone-1.1.xsd">
+  <version>1.1</version>
+  <location>
+    <latitude>40.71655</latitude>
+    <longitude>-12.12318</longitude>
+  </location>
+  <offset>-5</offset>
+  <suffix>R</suffix>
+  <localtime>14 Jun 2012 13:29:06</localtime>
+  <isotime>2012-06-14 13:29:06 -0500</isotime>
+  <utctime>2012-06-14 18:29:06</utctime>
+  <dst>True</dst>
+</timezone>

data/test/fixtures/timezone/50.21655,-54.87656.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<timezone xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.earthtools.org/timezone-1.1.xsd">
+  <version>1.1</version>
+  <location>
+    <latitude>40.71655</latitude>
+    <longitude>-12.12318</longitude>
+  </location>
+  <offset>-5</offset>
+  <suffix>R</suffix>
+  <localtime>14 Jun 2012 13:29:06</localtime>
+  <isotime>2012-06-14 13:29:06 -0500</isotime>
+  <utctime>2012-06-14 18:29:06</utctime>
+  <dst>False</dst>
+</timezone>

data/test/height_test.rb

@@ -13,26 +13,22 @@ class HeightTest < MiniTest::Unit::TestCase
     @result = EarthTools.height(52.4822, -1.8946)
   end
   
-  def test_height_is_float
-    assert @result.height.is_a?(Float), 'Height should be a float'
+  # @see configuration_test.rb for tests for height configuration
+  def test_height
+    assert_instance_of Float, @result.height
   end
   
-  # Tests for height configuration in configuration_test.rb
-  
-  def test_feet_is_float
-    assert @result.feet.is_a?(Float), 'Feet should be a float'
-  end
-  
-  def test_feet_parsed_correctly
-    assert_equal 462.6, @result.feet, 'Feet was not parsed correctly'
-  end
-  
-  def test_meters_is_float
-    assert @result.meters.is_a?(Float), 'Meters should be a float'
+  def test_feet
+    feet = @result.feet
+    assert_instance_of Float, feet
+    assert_equal 462.6, feet
   end
   
-  def test_meters_parsed_correctly
-    assert_equal 141, @result.meters, 'Meters was not parsed correctly'
+  def test_meters
+    meters = @result.meters
+    
+    assert_instance_of Float, meters
+    assert_equal 141, meters
   end
   
 end

data/test/mock_lookup.rb

@@ -16,7 +16,7 @@ class EarthTools::Lookup::Base
   #
   def retrieve(query)
     query = query.split('/')
-    read_fixture "#{ query[3] }_(#{ query[4, query.size-1].join(',') }).xml"
+    read_fixture "#{ query[3] }/#{ query[4, query.size-1].join(',') }.xml"
   end
   
 end

data/test/sunrise_sunset_test.rb

@@ -11,85 +11,164 @@ class SunriseSunsetTest < MiniTest::Unit::TestCase
   
   def setup
     @result = EarthTools.sunrise_sunset(40.71417, -74.00639, 12, 4)
+    @year = Time.now.year
   end
   
-  # ---------------------------------------------------------------------------
-  # sunrise
-  # ---------------------------------------------------------------------------
+  def test_location
+    assert_equal 40.71417, @result.latitude
+    assert_equal -74.00639, @result.longitude
+    assert_equal [40.71417, -74.00639], @result.location
+  end
   
   def test_sunrise_is_time
-    assert @result.sunrise.is_a?(Time), 'Sunrise should be a time'
+    sunrise = @result.sunrise
+    
+    assert_instance_of Time, sunrise
+    assert_equal Time.new(@year, 12, 4, 7, 5, 50, '-05:00'), sunrise
+  end
+  
+  def test_sunset
+    sunset = @result.sunset
+    
+    assert_instance_of Time, sunset
+    assert_equal Time.new(@year, 12, 4, 16, 26, 59, '-05:00'), sunset
+  end
+  
+  def test_twilight_as_morning_and_astronomical
+    morning_astronomical_twilight = @result.twilight(:morning, :astronomical)
+    
+    assert_instance_of Time, morning_astronomical_twilight
+    assert_equal Time.new(@year, 12, 4, 5, 27, 39, '-05:00'), morning_astronomical_twilight
   end
   
-  def test_sunrise_parsed_correctly
-    assert_equal Time.new(Time.now.year, 12, 4, 7, 5, 50, '-05:00'), @result.sunrise, 'Sunrise was not parsed correctly'
+  def test_twilight_as_morning_and_civil
+    morning_civil_twilight = @result.twilight(:morning, :civil)
+    
+    assert_instance_of Time, morning_civil_twilight
+    assert_equal Time.new(@year, 12, 4, 6, 35, 6, '-05:00'), morning_civil_twilight
   end
   
-  # ---------------------------------------------------------------------------
-  # sunset
-  # ---------------------------------------------------------------------------
+  def test_twilight_as_morning_and_nautical
+    morning_nautical_twilight = @result.twilight(:morning, :nautical)
+    
+    assert_instance_of Time, morning_nautical_twilight
+    assert_equal Time.new(@year, 12, 4, 6, 0, 50, '-05:00'), morning_nautical_twilight
+  end
   
-  def test_sunset_is_time
-    assert @result.sunset.is_a?(Time), 'Sunset should be a time'
+  def test_twilight_as_evening_and_astronomical
+    evening_astronomical_twilight = @result.twilight(:evening, :astronomical)
+    
+    assert_instance_of Time, evening_astronomical_twilight
+    assert_equal Time.new(@year, 12, 4, 18, 5, 10, '-05:00'), evening_astronomical_twilight
   end
   
-  def test_sunset_parsed_correctly
-    assert_equal Time.new(Time.now.year, 12, 4, 16, 26, 59, '-05:00'), @result.sunset, 'Sunset was not parsed correctly'
+  def test_twilight_as_evening_and_civil
+    evening_civil_twilight = @result.twilight(:evening, :civil)
+    
+    assert_instance_of Time, evening_civil_twilight
+    assert_equal Time.new(@year, 12, 4, 16, 57, 43, '-05:00'), evening_civil_twilight
   end
   
-  # ---------------------------------------------------------------------------
-  # twilight :time, :type
-  # ---------------------------------------------------------------------------
+  def test_twilight_as_evening_and_nautical
+    evening_nautical_twilight = @result.twilight(:evening, :nautical)
+    
+    assert_instance_of Time, evening_nautical_twilight
+    assert_equal Time.new(@year, 12, 4, 17, 31, 59, '-05:00'), evening_nautical_twilight
+  end
   
-  def test_twilight_is_time
-    assert @result.twilight(:morning, :astronomical).is_a?(Time), 'Twilight should be a time'
-    assert @result.twilight(:morning, :civil).is_a?(Time), 'Twilight should be a time'
-    assert @result.twilight(:morning, :nautical).is_a?(Time), 'Twilight should be a time'
-    assert @result.twilight(:evening, :astronomical).is_a?(Time), 'Twilight should be a time'
-    assert @result.twilight(:evening, :civil).is_a?(Time), 'Twilight should be a time'
-    assert @result.twilight(:evening, :nautical).is_a?(Time), 'Twilight should be a time'
+  def test_morning_twilight_as_astronomical
+    morning_astronomical_twilight = @result.morning_twilight(:astronomical)
+    
+    assert_instance_of Time, morning_astronomical_twilight
+    assert_equal Time.new(@year, 12, 4, 5, 27, 39, '-05:00'), morning_astronomical_twilight
   end
   
-  def test_twilight_parsed_correctly
-    year = Time.now.year
-    assert_equal Time.new(year, 12, 4, 5, 27, 39, '-05:00'), @result.twilight(:morning, :astronomical), 'Twilight was not parsed correctly'
-    assert_equal Time.new(year, 12, 4, 6, 35, 6, '-05:00'), @result.twilight(:morning, :civil), 'Twilight was not parsed correctly'
-    assert_equal Time.new(year, 12, 4, 6, 0, 50, '-05:00'), @result.twilight(:morning, :nautical), 'Twilight was not parsed correctly'
-    assert_equal Time.new(year, 12, 4, 18, 5, 10, '-05:00'), @result.twilight(:evening, :astronomical), 'Twilight was not parsed correctly'
-    assert_equal Time.new(year, 12, 4, 16, 57, 43, '-05:00'), @result.twilight(:evening, :civil), 'Twilight was not parsed correctly'
-    assert_equal Time.new(year, 12, 4, 17, 31, 59, '-05:00'), @result.twilight(:evening, :nautical), 'Twilight was not parsed correctly'
+  def test_morning_twilight_as_civil
+    morning_civil_twilight = @result.morning_twilight(:civil)
+    
+    assert_instance_of Time, morning_civil_twilight
+    assert_equal Time.new(@year, 12, 4, 6, 35, 6, '-05:00'), morning_civil_twilight
   end
   
-  # ---------------------------------------------------------------------------
-  # morning_twilight :type
-  # ---------------------------------------------------------------------------
+  def test_morning_twilight_as_nautical
+    morning_nautical_twilight = @result.morning_twilight(:nautical)
+    
+    assert_instance_of Time, morning_nautical_twilight
+    assert_equal Time.new(@year, 12, 4, 6, 0, 50, '-05:00'), morning_nautical_twilight
+  end
   
-  # ---------------------------------------------------------------------------
-  # evening_twilight :type
-  # ---------------------------------------------------------------------------
+  def test_evening_twilight_as_astronomical
+    evening_astronomical_twilight = @result.evening_twilight(:astronomical)
+    
+    assert_instance_of Time, evening_astronomical_twilight
+    assert_equal Time.new(@year, 12, 4, 18, 5, 10, '-05:00'), evening_astronomical_twilight
+  end
   
-  # ---------------------------------------------------------------------------
-  # *_*_twilight
-  # ---------------------------------------------------------------------------
+  def test_evening_twilight_as_civil
+    evening_civil_twilight = @result.evening_twilight(:civil)
+    
+    assert_instance_of Time, evening_civil_twilight
+    assert_equal Time.new(@year, 12, 4, 16, 57, 43, '-05:00'), evening_civil_twilight
+  end
   
-  def test_morning_astronomical_twilight_is_time
-    assert @result.morning_astronomical_twilight.is_a?(Time), 'Morning astronomical twilight should be a time'
+  def test_evening_twilight_as_nautical
+    evening_nautical_twilight = @result.evening_twilight(:nautical)
+    
+    assert_instance_of Time, evening_nautical_twilight
+    assert_equal Time.new(@year, 12, 4, 17, 31, 59, '-05:00'), evening_nautical_twilight
   end
   
-  def test_morning_astronomical_twilight_parsed_correctly
-    assert_equal Time.new(Time.now.year, 12, 4, 5, 27, 39, '-05:00'), @result.morning_astronomical_twilight, 'Twilight was not parsed correctly'
+  def test_morning_astronomical_twilight
+    morning_astronomical_twilight = @result.morning_astronomical_twilight
+    
+    assert_instance_of Time, morning_astronomical_twilight
+    assert_equal Time.new(@year, 12, 4, 5, 27, 39, '-05:00'), morning_astronomical_twilight
   end
   
-  # ---------------------------------------------------------------------------
-  # utc_offset
-  # ---------------------------------------------------------------------------
+  def test_morning_civil_twilight
+    morning_civil_twilight = @result.morning_civil_twilight
+    
+    assert_instance_of Time, morning_civil_twilight
+    assert_equal Time.new(@year, 12, 4, 6, 35, 6, '-05:00'), morning_civil_twilight
+  end
+  
+  def test_morning_nautical_twilight
+    morning_nautical_twilight = @result.morning_nautical_twilight
+    
+    assert_instance_of Time, morning_nautical_twilight
+    assert_equal Time.new(@year, 12, 4, 6, 0, 50, '-05:00'), morning_nautical_twilight
+  end
+  
+  def test_evening_astronomical_twilight
+    evening_astronomical_twilight = @result.evening_astronomical_twilight
+    
+    assert_instance_of Time, evening_astronomical_twilight
+    assert_equal Time.new(@year, 12, 4, 18, 5, 10, '-05:00'), evening_astronomical_twilight
+  end
+  
+  def test_evening_civil_twilight
+    evening_civil_twilight = @result.evening_civil_twilight
+    
+    assert_instance_of Time, evening_civil_twilight
+    assert_equal Time.new(@year, 12, 4, 16, 57, 43, '-05:00'), evening_civil_twilight
+  end
+  
+  def test_evening_nautical_twilight
+    evening_nautical_twilight = @result.evening_nautical_twilight
+    
+    assert_instance_of Time, evening_nautical_twilight
+    assert_equal Time.new(@year, 12, 4, 17, 31, 59, '-05:00'), evening_nautical_twilight
+  end
   
-  def test_utc_offset_is_integer
-    assert @result.utc_offset.is_a?(Integer), 'UTC offset should be an integer'
+  def test_utc_offset
+    utc_offset = @result.utc_offset
+    
+    assert_kind_of Integer, utc_offset
+    assert_equal -5, utc_offset
   end
   
-  def test_utc_offset_parsed_correctly
-    assert_equal -5, @result.utc_offset, 'UTC offset was not parsed correctly'
+  def test_version
+    assert_equal 1.0, @result.version
   end
   
 end

data/test/test_helper.rb

@@ -1,4 +1,9 @@
-require 'rubygems'
+if ENV["CI"]
+  require 'coveralls'
+  Coveralls.wear!
+end
+
+require 'rubygems'
 require 'minitest/autorun'
 
 require 'earth_tools/configuration'

data/test/time_zone_test.rb

@@ -10,51 +10,63 @@ require 'mock_lookup'
 class TimeZoneTest < MiniTest::Unit::TestCase
   
   def setup
-    @result = EarthTools.time_zone(40.71417, -74.00639)
+    @result  = EarthTools.time_zone(40.71417, -74.00639)
+    @result2 = EarthTools.time_zone(40.71655, -12.12318)
+    @result3 = EarthTools.time_zone(50.21655, -54.87656)
   end
   
-  def test_time_zone_method_returns_result_object
-    assert @result.is_a?(EarthTools::Result::TimeZone), 'Result should be a time zone object'
+  def test_time_zone_returns_result
+    assert_instance_of EarthTools::Result::TimeZone, @result
   end
   
-  def test_iso_time_is_time
-    assert @result.iso_time.is_a?(Time), 'ISO time should be a time object'
+  def test_iso_time
+    iso_time = @result.iso_time
+    
+    assert_instance_of Time, iso_time
+    assert_equal Time.new(2012, 6, 14, 13, 29, 6, '-05:00'), iso_time
   end
   
-  def test_iso_time_parsed_correctly
-    assert_equal Time.new(2012, 6, 14, 13, 29, 6, '-05:00'), @result.iso_time, 'ISO time was not parsed correctly'
+  def test_local_time
+    local_time = @result.local_time
+    
+    assert_instance_of Time, local_time
+    assert_equal Time.new(2012, 6, 14, 13, 29, 6, '-05:00'), local_time
   end
   
-  def test_local_time_is_time
-    assert @result.local_time.is_a?(Time), 'Local time should be a time object'
+  def test_suffix
+    suffix = @result.suffix
+    
+    assert_instance_of String, suffix
+    assert_equal 'R', suffix
   end
   
-  def test_local_time_parsed_correctly
-    assert_equal Time.new(2012, 6, 14, 13, 29, 6, '-05:00'), @result.local_time, 'Local time was not parsed correctly'
+  def test_utc_offset
+    utc_offset = @result.utc_offset
+    
+    assert_kind_of Integer, utc_offset
+    assert_equal -5, utc_offset
   end
   
-  def test_suffix_is_string
-    assert @result.suffix.is_a?(String), 'Suffix should be a string'
+  def test_utc_time
+    utc_time = @result.utc_time
+    
+    assert_instance_of Time, utc_time
+    assert_equal Time.utc(2012, 6, 14, 18, 29, 6), utc_time
   end
   
-  def test_suffix_parsed_correctly
-    assert_equal 'R', @result.suffix, 'Suffix was not parsed correctly'
+  def test_dst_as_true
+    assert_equal 'True', @result2.dst
+    assert @result2.dst?
   end
   
-  def test_utc_offset_is_integer
-    assert @result.utc_offset.is_a?(Integer), 'UTC offset should be an integer'
+  def test_dst_as_false
+    assert_equal 'False', @result3.dst
+    refute @result3.dst?
   end
   
-  def test_utc_offset_parsed_correctly
-    assert_equal -5, @result.utc_offset, 'UTC offset was not parsed correctly'
-  end
-  
-  def test_utc_time_is_time
-    assert @result.utc_time.is_a?(Time), 'UTC time should be a time object'
-  end
-  
-  def test_utc_time_parsed_correctly
-    assert_equal Time.utc(2012, 6, 14, 18, 29, 6), @result.utc_time, 'UTC time was not parsed correctly'
+  def test_dst_as_unknown
+    assert_equal 'Unknown', @result.dst
+    assert_nil @result.dst?
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
@@ -73,9 +73,11 @@ files:
 - test/cache_test.rb
 - test/configuration_test.rb
 - test/earth_tools_test.rb
-- test/fixtures/height_(52.4822,-1.8946).xml
-- test/fixtures/sun_(40.71417,-74.00639,4,12,99,0).xml
-- test/fixtures/timezone_(40.71417,-74.00639).xml
+- test/fixtures/height/52.4822,-1.8946.xml
+- test/fixtures/sun/40.71417,-74.00639,4,12,99,0.xml
+- test/fixtures/timezone/40.71417,-74.00639.xml
+- test/fixtures/timezone/40.71655,-12.12318.xml
+- test/fixtures/timezone/50.21655,-54.87656.xml
 - test/height_test.rb
 - test/integration/height_smoke_test.rb
 - test/integration/sunrise_sunset_smoke_test.rb
@@ -96,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: