sun-times 0.1.3 → 0.1.4

data/{README → README.md}

@@ -1,18 +1,21 @@
-== SunTimes
+# SunTimes
+[![Build Status](https://secure.travis-ci.org/timoschilling/sun-times.png?branch=master)](http://travis-ci.org/timoschilling/sun-times)
+
+* this is a Fork of [joeyates/ruby-sun-times](https://github.com/joeyates/ruby-sun-times) and is avalible as [sun-times gem](https://rubygems.org/gems/sun-times) so there is no explicit `require` necessary in rails projects *
 
 Calculates sunrise and sunset times.
 
-An implementation of the algorithm descibed at http://williams.best.vwh.net/sunrise_sunset_algorithm.htm
+An implementation of the algorithm described at http://williams.best.vwh.net/sunrise_sunset_algorithm.htm
 
-== References
+## References
 
 * http://www.astro.uu.nl/~strous/AA/en/reken/zonpositie.html - Calculations
 * http://williams.best.vwh.net/sunrise_sunset_algorithm.htm - Algorithm
 * http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/264573 - Ken Bloom's implementation
 
-== Licence
+## Licence
 
-This code is free to use under the terms of the MIT licence:
+This code is free to use under the terms of the MIT license:
 
   Copyright (c) 2010 Joe Yates
 

data/Rakefile

@@ -1,13 +1,13 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 require 'rake/testtask'
 require 'rake/clean'
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 require 'sun_times'
 
-RDOC_OPTS = ['--quiet', '--title', 'Sun Times Calculator', '--main', 'README', '--inline-source']
+RDOC_OPTS = ['--quiet', '--title', 'Sun Times Calculator', '--main', 'README.md', '--inline-source']
 CLEAN.include 'doc'
 
 task :default => :test
@@ -21,6 +21,6 @@ end
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.options += RDOC_OPTS
-  rdoc.main = "README"
-  rdoc.rdoc_files.add ['README', 'COPYING', 'lib/**/*.rb']
+  rdoc.main = "README.md"
+  rdoc.rdoc_files.add ['README.md', 'COPYING', 'lib/**/*.rb']
 end

data/lib/sun_times.rb

@@ -30,7 +30,7 @@ module SunTimes
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -126,26 +126,6 @@ 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

data/test/calculate_test.rb

@@ -2,28 +2,27 @@
 $:.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(Time.gm(2010, 3, 8, 5, 39, 53), rise)
+    assert_equal(rise.to_i, 1268026793)
   end
 
   def test_set_20100308_pontassieve
-    set = SunTimes.calculate(:set, Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(Time.gm(2010, 3, 8, 17, 11, 16), set)
+    rise = SunTimes.calculate(:set, Date.new(2010, 3, 8), 43.779, 11.432)
+    assert_equal(rise.to_i, 1268068276)
   end
 
   def test_rise_helper
     rise = SunTimes.rise(Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(Time.gm(2010, 3, 8, 5, 39, 53), rise)
+    assert_equal(rise.to_i, 1268026793)
   end
 
   def test_set_helper
-    set = SunTimes.set(Date.new(2010, 3, 8), 43.779, 11.432)
-    assert_equal(Time.gm(2010, 3, 8, 17, 11, 16), set)
+    rise = SunTimes.set(Date.new(2010, 3, 8), 43.779, 11.432)
+    assert_equal(rise.to_i, 1268068276)
   end
 
   def test_midnight_sun_on_20100621_north_cape
@@ -37,24 +36,4 @@ 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,31 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: sun-times
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
 - Joe Yates
+- Timo Schilling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: joe.g.yates@gmail.com
+email:
+- joe.g.yates@gmail.com
+- timo@schilling.io
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
+- README.md
 - COPYING
 files:
-- README
+- README.md
 - COPYING
 - Rakefile
 - lib/sun_times.rb
 - test/calculate_test.rb
 - test/test_all.rb
-homepage: http://github.com/joeyates/ruby-sun-times
+homepage: http://github.com/timoschilling/sun-times
 licenses: []
 post_install_message: 
 rdoc_options: []