RubySunrise 0.1.1 → 0.2

data/lib/solareventcalculator.rb

@@ -1,5 +1,6 @@
 require 'bigdecimal'
 require 'date'
+require 'tzinfo'
 
 class SolarEventCalculator
 
@@ -123,7 +124,7 @@ class SolarEventCalculator
     mins = pad_minutes(mins.to_i)
     hours = timeParts[0]
 
-    Time.gm(@date.year, @date.mon, @date.mday, hours, pad_minutes(mins.to_i))
+    Time.utc(@date.year, @date.mon, @date.mday, hours, pad_minutes(mins.to_i))
   end
 
   def compute_utc_civil_sunrise
@@ -158,6 +159,54 @@ class SolarEventCalculator
     compute_utc_solar_event(108, false)
   end
 
+  def compute_civil_sunrise(timezone)
+    put_in_timezone(compute_utc_civil_sunrise, timezone)
+  end
+
+  def compute_civil_sunset(timezone)
+    put_in_timezone(compute_utc_civil_sunset, timezone)
+  end
+
+  def compute_official_sunrise(timezone)
+    put_in_timezone(compute_utc_official_sunrise, timezone)
+  end
+
+  def compute_official_sunset(timezone)
+    put_in_timezone(compute_utc_official_sunset, timezone)
+  end
+
+  def compute_nautical_sunrise(timezone)
+    put_in_timezone(compute_utc_nautical_sunrise, timezone)
+  end
+
+  def compute_nautical_sunset(timezone)
+    put_in_timezone(compute_utc_nautical_sunset, timezone)
+  end
+
+  def compute_astronomical_sunrise(timezone)
+    put_in_timezone(compute_utc_astronomical_sunrise, timezone)
+  end
+
+  def compute_astronomical_sunset(timezone)
+    put_in_timezone(compute_utc_astronomical_sunset, timezone)
+  end
+
+  def put_in_timezone(utcTime, timezone)
+    tz = TZInfo::Timezone.get(timezone)
+    noonUTC = Time.gm(@date.year, @date.mon, @date.mday, 12, 0)
+    noonLocal = tz.utc_to_local(noonUTC)
+    offset = noonLocal - noonUTC
+
+    local = utcTime + get_utc_offset(timezone)
+    Time.parse("#{@date.strftime('%a %b %d')} #{local.strftime(' %H:%M:%S')} #{offset} #{@date.year}")
+  end
+
+  def get_utc_offset(timezone)
+    tz = TZInfo::Timezone.get(timezone)
+    noonUTC = Time.gm(@date.year, @date.mon, @date.mday, 12, 0)
+    tz.utc_to_local(noonUTC) - noonUTC
+  end
+
   def pad_minutes(minutes)
     if(minutes < 10)
       "0" + minutes.to_s

data/rubysunrise.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do | s |
   s.name = "RubySunrise"
-  s.version = "0.1.1"
+  s.version = "0.2"
   s.author = "Mike Reedell / LuckyCatLabs"
   s.email = "mike@luckycatlabs.com"
   s.homepage = "http://www.luckycatlabs.com"

data/test/bulkdatatest.rb

@@ -0,0 +1,65 @@
+require '../lib/solareventcalculator'
+
+describe SolarEventCalculator, "Test the sunset algorithm" do
+
+  it "returns correct sunrise/sunset data over a year" do
+    dataFile = File.open("39_9937N-75_7850W#America-New_York.txt", 'r')
+    tz = TZInfo::Timezone.get("America/New_York")
+
+    dataFile.readlines.each do |dataLine|
+      parts = dataLine.split(',')
+      date = Date.parse(parts.shift)
+      calc = SolarEventCalculator.new(date, BigDecimal.new("39.9937"), BigDecimal.new("-75.7850"))
+
+      time = parts[0].split(':')
+      expectedAstronomicalRise = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_astronomical_sunrise("America/New_York").should be_close_to(expectedAstronomicalRise)
+
+      time = parts[1].split(':')
+      expectedNauticalRise = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_nautical_sunrise("America/New_York").should be_close_to(expectedNauticalRise)
+
+      time = parts[2].split(':')
+      expectedCivilRise = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_civil_sunrise("America/New_York").should be_close_to(expectedCivilRise.getlocal)
+
+      time = parts[3].split(':')
+      expectedOfficialRise = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_official_sunrise("America/New_York").should be_close_to(expectedOfficialRise.getlocal)
+
+      time = parts[4].split(':')
+      expectedOfficialSet = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_official_sunset("America/New_York").should be_close_to(expectedOfficialSet)
+
+      time = parts[5].split(':')
+      expectedCivilSet = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_civil_sunset("America/New_York").should be_close_to(expectedCivilSet)
+
+      time = parts[6].split(':')
+      expectedNauticalSet = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_nautical_sunset("America/New_York").should be_close_to(expectedNauticalSet)
+
+      time = parts[7].split(':')
+      expectedAstronomicalSet = Time.local(date.year, date.mon, date.mday, time[0], time[1])
+      calc.compute_astronomical_sunset("America/New_York").should be_close_to(expectedAstronomicalSet)
+    end
+  end
+end
+
+Spec::Matchers.define :be_close_to do |expected|
+  match do |actual|
+    (expected - 61) < actual && actual < (expected + 61)
+  end
+
+  failure_message_for_should do |actual|
+    " actual #{actual} is outside +-1 minute of expected #{expected}"
+  end
+
+  failure_message_for_should_not do |actual|
+
+  end
+
+  description do
+    " tests whether the actual time is within a minute of the expected time"
+  end
+end

data/test/sunrisetest.rb

@@ -70,6 +70,22 @@ describe SolarEventCalculator, "test the math for home" do
   it "returns correct astronomical sunrise time" do
     @calc.compute_utc_astronomical_sunrise.should eql(Time.gm(@date.year, @date.mon, @date.mday, 10, 1))
   end
+
+  it "returns correct 'America/New_York' official sunrise time" do
+    @calc.compute_official_sunrise('America/New_York').should eql(Time.local(@date.year, @date.mon, @date.mday, 7, 33))
+  end
+
+  it "returns correct 'America/New_York' civil sunrise time" do
+    @calc.compute_civil_sunrise('America/New_York').should eql(Time.local(@date.year, @date.mon, @date.mday, 7, 4))
+  end
+
+  it "returns correct 'America/New_York' nautical sunrise time" do
+    @calc.compute_nautical_sunrise('America/New_York').should eql(Time.local(@date.year, @date.mon, @date.mday, 6, 32))
+  end
+
+  it "returns correct 'America/New_York' astronomical sunrise time" do
+    @calc.compute_astronomical_sunrise('America/New_York').should eql(Time.local(@date.year, @date.mon, @date.mday, 6, 1))
+  end
 end
 
 describe SolarEventCalculator, "test the math for areas where there could be no rise/set" do

data/test/sunsettest.rb

@@ -3,7 +3,7 @@ require '../lib/solareventcalculator'
 describe SolarEventCalculator, "Test the sunset algorithm" do
 
   before do
-    @date = Date.parse('2008-11-01') #01 November 2008
+    @date = Date.parse('2008-11-01') #01 November 2008 (DST)
     @calc = SolarEventCalculator.new(@date, BigDecimal.new("39.9537"), BigDecimal.new("-75.7850"))
   end
 
@@ -55,21 +55,38 @@ describe SolarEventCalculator, "Test the sunset algorithm" do
     @calc.compute_local_mean_time(trueLong, longHour, t, localHour).should eql(BigDecimal.new("22.4675"))
   end
 
-  it "returns correct civil sunset time" do
+  it "returns correct UTC civil sunset time" do
     @calc.compute_utc_civil_sunset.should eql(Time.gm(@date.year, @date.mon, @date.mday, 22, 28))
   end
 
-  it "returns correct official sunset time" do
+  it "returns correct UTC official sunset time" do
     @calc.compute_utc_official_sunset.should eql(Time.gm(@date.year, @date.mon, @date.mday, 21, 59))
   end
 
-  it "returns correct nautical sunset time" do
+  it "returns correct UTC nautical sunset time" do
     @calc.compute_utc_nautical_sunset.should eql(Time.gm(@date.year, @date.mon, @date.mday, 23, 0))
   end
 
-  it "returns correct astronomical sunset time" do
+  it "returns correct UTC astronomical sunset time" do
     @calc.compute_utc_astronomical_sunset.should eql(Time.gm(@date.year, @date.mon, @date.mday, 23, 31))
   end
+
+  it "returns correct 'America/New_York' offical sunset time" do
+    @calc.compute_official_sunset("America/New_York").should eql(Time.local(@date.year, @date.mon, @date.mday, 17, 59))
+  end
+
+  it "returns correct 'America/New_York' civil sunset time" do
+    @calc.compute_civil_sunset("America/New_York").should eql(Time.local(@date.year, @date.mon, @date.mday, 18, 28))
+  end
+
+  it "returns correct 'America/New_York' nautical sunset time" do
+    @calc.compute_nautical_sunset("America/New_York").should eql(Time.local(@date.year, @date.mon, @date.mday, 19, 00))
+  end
+
+  it "returns correct 'America/New_York' astronomical sunset time" do
+    @calc.compute_astronomical_sunset("America/New_York").should eql(Time.local(@date.year, @date.mon, @date.mday, 19, 31))
+  end
+  # 18:00,18:28,19:00,19:32
 end
 
 describe SolarEventCalculator, "test the math for areas where the sun doesn't set" do

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Mike Reedell / LuckyCatLabs
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-03-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -60,5 +59,6 @@ signing_key:
 specification_version: 3
 summary: Calculate the sunrise/sunset given lat/long coordinates and the date.  Computes civil, official, nautical, and astronomical sunrise/sunset.
 test_files: 
+- test/bulkdatatest.rb
 - test/sunrisetest.rb
 - test/sunsettest.rb