solar 0.0.1 → 0.0.2

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+
+gem 'activesupport'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -27,6 +27,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler (~> 1)
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/solar.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/time'
+
 # Calculation of solar position, rise & set times for a given position & time.
 # Algorithms are taken from Jean Meeus, Astronomical Algorithms
 # Some code & ideas taken from John P. Power's astro-algo: http://astro-algo.rubyforge.org/astro-algo/
@@ -20,16 +23,40 @@ module Solar
     # * :day_zenith zenith for the san at sunrise and sun set.
     #   Default: :official (sun aparently under the horizon, tangent to it)
     # These parameters can be assigned zenith values in degrees of the symbols:
-    # :official, :civil, :nautical or :astronomical.
+    #   :official, :civil, :nautical or :astronomical.
+    # Simple day night result (returning :day or :night) can be requested
+    # by setting :simple=>true (which usses the official day definition)
+    # or by setting a :zenith parameter to the fine the kind of day-night
+    # distinction.
+    # By passing :detailed=>true, the result will be one of:
+    #   :night, :astronomical_twilight, :nautical_twilight, :civil_twilight, :day
     def day_or_night(t, longitude, latitude, options={})
-      if options[:zenith]
-        twilight_altitude = day_altitude = altitude_from_options(options)
+      h, az = position(t, longitude, latitude)
+      options = {:zenith=>:official} if options[:simple]
+      if options[:detailed]
+        if h<Solar::ALTITUDES[:astronomical]
+          :night
+        elsif h<Solar::ALTITUDES[:nautical]
+          :astronomical_twilight
+        elsif h<Solar::ALTITUDES[:civil]
+          :nautical_twilight
+        elsif h<Solar::ALTITUDES[:official]
+          :civil_twilight
+        else
+          :day
+        end
       else
-        twilight_altitude = altitude_from_options(:zenith => options[:twilight_zenith] || :civil)
-        day_altitude = altitude_from_options(:zenith => options[:day_zenith] || :official)
+        # Determined :night / :twilight / :day state;
+        # twilight/day definition can be changed with options :zenith or :twilight_zenith, :day_zenith
+        if options[:zenith]
+          # only :day / :night distinction as defined by :zenith
+          twilight_altitude = day_altitude = altitude_from_options(options)
+        else
+          twilight_altitude = altitude_from_options(:zenith => options[:twilight_zenith] || :civil)
+          day_altitude = altitude_from_options(:zenith => options[:day_zenith] || :official)
+        end
+        (h > day_altitude) ? :day : (h <= twilight_altitude) ? :night : :twilight
       end
-      al,az = position(t, longitude, latitude)
-      (al > day_altitude) ? :day : (al <= twilight_altitude) ? :night : :twilight
     end
 
     # Sun horizontal coordinates (relative position) in degrees:

data/solar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "solar"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-10-07"
+  s.date = "2012-10-08"
   s.description = "# Calculation of solar position, rise & set times for a given position & time."
   s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [
@@ -39,17 +39,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1"])

data/test/test_solar.rb

@@ -1,3 +1,29 @@
 require 'helper'
 
-# TODO: write tests!!
+class TestSolar < Test::Unit::TestCase
+
+  should "calculate transits for the required date" do
+    d = Date.new(2012,10,7)
+    for lon in -360..360
+      for lat in -5..5
+        lat *= 10
+        r,trans,s = Solar.passages(d, lon, lat)
+        assert_equal d, trans.utc.to_date, "longitude: #{lon} latitude: #{lat}"
+      end
+    end
+  end
+
+  should "determine if it's day or night" do
+    assert_equal :day, Solar.day_or_night(Time.utc(2012,10,7,9,0,0), 0, 42)
+    assert_equal :day, Solar.day_or_night(Time.utc(2012,10,7,9,0,0), 0, 42, :detailed=>true)
+    assert_equal :day, Solar.day_or_night(Time.utc(2012,10,7,9,0,0), 0, 42, :simple=>true)
+    assert_equal :night, Solar.day_or_night(Time.utc(2012,10,7,21,0,0), 0, 42)
+    assert_equal :night, Solar.day_or_night(Time.utc(2012,10,7,21,0,0), 0, 42, :detailed=>true)
+    assert_equal :night, Solar.day_or_night(Time.utc(2012,10,7,21,0,0), 0, 42, :simple=>true)
+    assert_equal :night, Solar.day_or_night(Time.utc(2012,12,7,9,0,0), 0, 89)
+    assert_equal :twilight, Solar.day_or_night(Time.utc(2012,10,7,9,0,0), 0, 89)
+    assert_equal :day, Solar.day_or_night(Time.utc(2012,12,7,9,0,0), 0, -89)
+    assert_equal :day, Solar.day_or_night(Time.utc(2012,10,7,9,0,0), 0, -89)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1434105629411668525
+      hash: -3223580498560321012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: