ruby-sun-times 0.1.1 → 0.1.2

data/lib/sun_times.rb

@@ -30,13 +30,14 @@ module SunTimes
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY = 1
- 
+    TINY  = 2
+
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
- 
+
   DEFAULT_ZENITH = 90.83333
   KNOWN_EVENTS = [:rise, :set]
+  DEGREES_PER_HOUR = 360.0 / 24.0
 
   # Helper method: calculates sunrise, with the same parameters as calculate
   def SunTimes.rise(date, latitude, longitude, options = {})
@@ -65,7 +66,7 @@ module SunTimes
     zenith = options.delete(:zenith) || DEFAULT_ZENITH
 
     # lngHour
-    longitude_hour = longitude / 15.0
+    longitude_hour = longitude / DEGREES_PER_HOUR
 
     # t
     base_time = event == :rise ? 6.0 : 18.0
@@ -85,21 +86,21 @@ module SunTimes
     tan_right_ascension = 0.91764 * Math.tan(degrees_to_radians(sun_true_longitude))
     sun_right_ascension = radians_to_degrees(Math.atan(tan_right_ascension))
     sun_right_ascension = coerce_degrees(sun_right_ascension)
- 
+
     # right ascension value needs to be in the same quadrant as L
     sun_true_longitude_quadrant  = (sun_true_longitude  / 90.0).floor * 90.0
     sun_right_ascension_quadrant = (sun_right_ascension / 90.0).floor * 90.0
     sun_right_ascension += (sun_true_longitude_quadrant - sun_right_ascension_quadrant)
 
     # RA = RA / 15
-    sun_right_ascension_hours = sun_right_ascension / 15.0
+    sun_right_ascension_hours = sun_right_ascension / DEGREES_PER_HOUR
 
     sin_declination = 0.39782 * Math.sin(degrees_to_radians(sun_true_longitude))
     cos_declination = Math.cos(Math.asin(sin_declination))
 
     cos_local_hour_angle =
       (Math.cos(degrees_to_radians(zenith)) - (sin_declination * Math.sin(degrees_to_radians(latitude)))) /
-                                 (cos_declination * Math.cos(degrees_to_radians(latitude)))
+      (cos_declination * Math.cos(degrees_to_radians(latitude)))
 
     # the sun never rises on this location (on the specified date)
     return nil if cos_local_hour_angle > 1
@@ -112,10 +113,10 @@ module SunTimes
         360 - radians_to_degrees(Math.acos(cos_local_hour_angle))
       else
         radians_to_degrees(Math.acos(cos_local_hour_angle))
-      end  
+      end
 
     # H = H / 15
-    suns_local_hour_hours = suns_local_hour / 15.0
+    suns_local_hour_hours = suns_local_hour / DEGREES_PER_HOUR
 
     # T = H + RA - (0.06571 * t) - 6.622
     local_mean_time = suns_local_hour_hours + sun_right_ascension_hours - (0.06571 * approximate_time) - 6.622
@@ -125,6 +126,26 @@ module SunTimes
     gmt_hours -= 24.0 if gmt_hours > 24
     gmt_hours += 24.0 if gmt_hours <  0
 
+    case
+    when date.respond_to?( :offset )
+      offset_hours = date.offset * 24
+    when date.respond_to?( :gmt_offset )
+      offset_hours = date.gmt_offset / 3600
+    else
+      offset_hours = nil
+    end
+
+    if ! offset_hours.nil?
+      if gmt_hours + offset_hours < 0
+        next_day = Date.new(date.year, date.month, date.day + 1)
+        return calculate(event, next_day, latitude, longitude, options = {})
+      end
+      if gmt_hours + offset_hours > 24
+        previous_day = Date.new(date.year, date.month, date.day + 1)
+        return calculate(event, previous_day, latitude, longitude, options = {})
+      end
+    end
+
     hour = gmt_hours.floor
     hour_remainder = (gmt_hours.to_f - hour.to_f) * 60.0
     minute = hour_remainder.floor
@@ -138,7 +159,7 @@ module SunTimes
   def SunTimes.degrees_to_radians(d)
     d.to_f / 360.0 * 2.0 * Math::PI
   end
-    
+
   def SunTimes.radians_to_degrees(r)
     r.to_f * 360.0 / (2.0 * Math::PI)
   end

data/test/calculate_test.rb

@@ -2,27 +2,28 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'test/unit'
 require 'sun_times'
+require 'date'
 
 class SunTimesTest < Test::Unit::TestCase
 
   def test_rise_20100308_pontassieve
     rise = SunTimes.calculate(:rise, Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(rise.to_i, 1268026793)
+    assert_equal(Time.gm(2010, 3, 8, 5, 39, 53), rise)
   end
 
   def test_set_20100308_pontassieve
-    rise = SunTimes.calculate(:set, Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(rise.to_i, 1268068276)
+    set = SunTimes.calculate(:set, Date.new(2010, 3, 8), 43.779, 11.432)
+    assert_equal(Time.gm(2010, 3, 8, 17, 11, 16), set)
   end
 
   def test_rise_helper
     rise = SunTimes.rise(Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(rise.to_i, 1268026793)
+    assert_equal(Time.gm(2010, 3, 8, 5, 39, 53), rise)
   end
 
   def test_set_helper
-    rise = SunTimes.set(Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(rise.to_i, 1268068276)
+    set = SunTimes.set(Date.new(2010, 3, 8), 43.779, 11.432)
+    assert_equal(Time.gm(2010, 3, 8, 17, 11, 16), set)
   end
 
   def test_midnight_sun_on_20100621_north_cape
@@ -36,4 +37,24 @@ class SunTimesTest < Test::Unit::TestCase
     assert_raise(RuntimeError) { SunTimes.calculate(:foo, Date.new(2010, 3, 8), 43.779, 11.432) }
   end
 
+  def test_time
+    datetime = Time.gm(2010, 6, 13, 0, 0, 0)
+    set = SunTimes.calculate(:set, datetime, 43.779, 11.432)
+    assert_equal(Time.gm(2010, 6, 13, 18, 56, 55), set)
+  end
+
+  def test_datetime
+    datetime = DateTime.new(2010, 6, 13, 0, 0, 0)
+    set = SunTimes.calculate(:set, datetime, 43.779, 11.432)
+    assert_equal(Time.gm(2010, 6, 13, 18, 56, 55), set)
+  end
+
+  def test_respects_timezone_if_supplied
+    pst = DateTime.new(2011, 12, 13, 0, 0, 0, Rational(-8, 24))
+    set = SunTimes.calculate(:set, pst, 45.52, -122.681944)
+    result_datetime = DateTime.new(set.year, set.month, set.day, set.hour, set.min, set.sec, 0)
+    assert(pst < result_datetime)
+    assert(pst + 1 > result_datetime)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-sun-times
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joe Yates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2011-12-20 00:00:00 +00:00
 default_executable: 
 dependencies: []