when_sun 0.1.0 → 0.2.0

data/README.rdoc

@@ -4,6 +4,8 @@ WhenSun is a RubyGem for calculating the sunrise and sunset for locations based
 
 This gem is based on https://github.com/joeyates/ruby-sun-times implementation of http://williams.best.vwh.net/sunrise_sunset_algorithm.htm
 
+Note: Currently this gem is only being tested against Ruby 1.8.6. If you are using a different version please run the unit tests against it and patch as needed.
+
 == Contributing to when_sun
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/when_sun.rb

@@ -87,16 +87,10 @@ class WhenSun
     local_mean_time = suns_local_hour_hours + sun_right_ascension_hours - (0.06571 * approximate_time) - 6.622
 
     # UT = T - lngHour
-    gmt_hours = local_mean_time - longitude_hour
-    gmt_hours -= 24.0 if gmt_hours > 24
-    gmt_hours += 24.0 if gmt_hours <  0
 
-    hour = gmt_hours.floor
-    hour_remainder = (gmt_hours.to_f - hour.to_f) * 60.0
-    minute = hour_remainder.floor
-    seconds = (hour_remainder - minute) * 60.0
+    local_mean_time %= 24
 
-    Time.gm(date.year, date.month, date.day, hour, minute, seconds)
+    return (date.to_datetime() +(local_mean_time - longitude_hour)/24).to_time
   end
 
   private
@@ -120,5 +114,27 @@ class WhenSun
     end
     d
   end
-
+end
+
+
+#Backporting some ruby 1.9 stuff. #TODO: Ensure this works on 1.9.2 and turn this patch off for 1.9.2
+Date::HALF_DAYS_IN_DAY = Rational(1, 2)
+class Date
+   def to_datetime()
+     DateTime.new!(jd_to_ajd(jd, 0, 0), @of, @sg)
+   end
+
+   def jd_to_ajd(jd, fr, of=0)
+     jd + fr - of - HALF_DAYS_IN_DAY
+   end
+end
+class DateTime
+  def to_time
+    d = new_offset(0)
+    d.instance_eval do
+      Time.utc(year, mon, mday, hour, min, sec,
+               (sec_fraction * 86400000000).to_i)
+    end.
+        getlocal
+  end
 end

data/test/test_when_sun.rb

@@ -36,4 +36,9 @@ class TestWhenSun < Test::Unit::TestCase
     assert_raise(RuntimeError) { WhenSun.calculate(:foo, Date.new(2010, 3, 8), 43.779, 11.432) }
   end
 
+  def test_sunset_should_be_greater_than_sunrise
+    rise = WhenSun.rise(Date.new(2011, 8, 22), 37.38605170, -122.08385110)
+    set = WhenSun.set(Date.new(2011, 8, 22), 37.38605170, -122.08385110)
+    assert_operator(set, '>', rise)
+  end
 end

data/when_sun.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{when_sun}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Cranston"]
-  s.date = %q{2011-08-18}
+  s.date = %q{2011-08-22}
   s.description = %q{WhenSun is a RubyGem for calculating the sunrise and sunset for locations based on the date, latitude and longitude.}
   s.email = %q{ecranston@enphaseenergy.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: when_sun
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Eric Cranston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 -07:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency