sun_time 0.0.1 → 0.0.2

data/lib/sun_time.rb

@@ -3,7 +3,8 @@ require 'date'
 require File.expand_path(File.join(File.dirname(__FILE__), "sun_time/degree_trig"))
 
 class SunTime
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
+  MEAN_SOLAR_ANOMALY_DELTA = 0.000001
   
   class AlwaysDarkError < ::StandardError; end
   class AlwaysLightError < ::StandardError; end
@@ -97,7 +98,7 @@ private
   def recalculate_m
     current_m = m(j_transit)
     last_m = nil
-    until current_m == last_m
+    until close_enough(current_m, last_m)
       last_m = current_m
       current_m = m(j_transit(last_m))
     end
@@ -123,7 +124,15 @@ private
   
   
   def jd2time (jd)
-    dt = DateTime.jd(jd, 12)
-    Time.utc(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec)
+    dt = DateTime.jd(jd)
+    twelve_hour_offset_in_seconds = 12*60*60
+    Time.utc(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec) + twelve_hour_offset_in_seconds
   end 
-end
+
+  # There are some edge cases where comparing values was never returning true.
+  # This gets around that by ensuring they are "close enough"
+  def close_enough(actual, expected)
+    return false if expected.nil?
+    (actual - expected).abs <= MEAN_SOLAR_ANOMALY_DELTA
+  end
+end

data/test/test_date_ext.rb

@@ -10,13 +10,13 @@ class TestDate < Test::Unit::TestCase
   end
   
   def test_sunrise
-    sunrise = Time.mktime(2009, 7, 23, 4, 50, 32)
+    sunrise = Time.utc(2009, 7, 23, 2, 50, 32)
     assert_equal(sunrise, @date.sunrise(@lat, @lng))
   end
   
   def test_sunset
-    sunset =  Time.mktime(2009, 7, 23, 21, 48, 56)
+    sunset =  Time.utc(2009, 7, 23, 19, 48, 56)
   
     assert_equal(sunset, @date.sunset(@lat, @lng))
   end
-end
+end

data/test/test_sun_time.rb

@@ -11,13 +11,13 @@ class TestSunTime < Test::Unit::TestCase
   end
   
   def test_sunrise
-    sunrise = Time.mktime(2009, 7, 23, 4, 50, 32)
+    sunrise = Time.utc(2009, 7, 23, 2, 50, 32)
     
     assert_equal(sunrise, @sun_time.sunrise)
   end
   
   def test_sunset
-    sunset =  Time.mktime(2009, 7, 23, 21, 48, 56)
+    sunset =  Time.utc(2009, 7, 23, 19, 48, 56)
   
     assert_equal(sunset, @sun_time.sunset)
   end
@@ -33,6 +33,12 @@ class TestSunTime < Test::Unit::TestCase
     assert_nil(winter_in_sweden.sunrise)
     assert_nil(winter_in_sweden.sunset)
   end
+
+  def test_infinite_loop
+    sunrise = Time.utc(2012, 4, 24, 10, 4, 51)
+    infinite_loop_location = SunTime.new(Date.new(2012,4,24), 40.9674702, -74.2278852)
+    assert_equal(sunrise, infinite_loop_location.sunrise)
+  end
   
   # Private methods
   
@@ -79,4 +85,4 @@ class TestSunTime < Test::Unit::TestCase
   def test_j_rise
     assert_in_delta(2455035.6184334, @sun_time.send(:j_rise), 2 ** -20)
   end
-end
+end

metadata

@@ -1,38 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sun_time
-version: !ruby/object:Gem::Version 
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Carl-Johan Kihlbom
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-07-23 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70104349007540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70104349007540
+- !ruby/object:Gem::Dependency
+  name: newgem
+  requirement: &70104349007060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :development
+  prerelease: false
+  version_requirements: *70104349007060
+- !ruby/object:Gem::Dependency
   name: hoe
+  requirement: &70104349006560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
+  prerelease: false
+  version_requirements: *70104349006560
 description: Calculate the time of sunrise and sunset for location on a specific date.
-email: 
+email:
 - cj@elabs.se
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+- README.rdoc
+files:
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -46,34 +67,34 @@ files:
 - test/test_date_ext.rb
 - test/test_degree_trig.rb
 - test/test_sun_time.rb
-has_rdoc: true
+- .gemtest
 homepage: http://github.com/elabs/sun_time
+licenses: []
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: elabs
-rubygems_version: 1.3.1
+rubygems_version: 1.8.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Calculate the time of sunrise and sunset for location on a specific date.
-test_files: 
+test_files:
 - test/test_date_ext.rb
 - test/test_degree_trig.rb
 - test/test_sun_time.rb