solcal 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce20de0e91a3f7575b44bcacf6d9710b61953d5f
-  data.tar.gz: f50b80342f7c647a5c456565b9cf3103d6f453fa
+  metadata.gz: 2afbb64769ab3034ea32fa6ddb97a9a2e628e411
+  data.tar.gz: d8d4789eeb5a351226410fe08346222a20e26e36
 SHA512:
-  metadata.gz: 62fc500956aae9a20f175db75f870fd4c21b1a26fd415d311150b2acb43cdd00fffdc3f4f03b8c2a8100683a73e80253fee38e19341a2f4327f1310d348fc1a5
-  data.tar.gz: c66bfb77c4519f09555034a84fb29103d74ee7ae45d53b7d91c453883c18c230378991c70add50b64a17c387a3ec3437e80f1fc1377a99325bf5db74a4b3dbf6
+  metadata.gz: a79f0fc3f6245d736e4df3d1eaaee189bdf979402dfe1fb4912a0eb28ebba023958a4fd5cdd83702914016c8dc4c671feb0b520df13c342ede59e66fcb16ef92
+  data.tar.gz: 561a9b6a8a84628074dbabf6adebe2d0e8f741a0650565a5ff70f18eb3d523228d38edd505ee4059fd29746adcfadf8ccdee19a76df0befc67160d2b47498db3

data/lib/solcal/commands.rb

@@ -24,6 +24,7 @@ module SolCal
 		autoload :HaCivilTwighlightCommand,		'solcal/commands/ha_civil_twighlight_command'
 		autoload :CivilDawnCommand,				'solcal/commands/civil_dawn_command'
 		autoload :CivilDuskCommand,				'solcal/commands/civil_dusk_command'
+		autoload :TimeToAngleFromZenithCommand,	'solcal/commands/time_to_angle_from_zenith_command'
 
 		extend NamingConvention
 

data/lib/solcal/commands/time_to_angle_from_zenith_command.rb

@@ -0,0 +1,16 @@
+module SolCal
+	module Commands
+		class TimeToAngleFromZenithCommand < BaseCommand
+			protected
+			def do_execute
+				a = Math.cos(Angle.from_deg(angle_from_zenith).to_rad)
+				b = Math.cos(latitude.to_rad)*Math.cos(declination.to_rad)
+				c = Math.tan(latitude.to_rad)*Math.tan(declination.to_rad)
+				d = a/b-c
+				return "The sun will not reach #{angle_from_zenith} degrees from zenith today." unless d >= 0 and d<=1
+				ha_angle_to_zenith = Angle.from_rad(Math.acos(d))
+				SolCal::TimeOfDay.new(solar_noon-ha_angle_to_zenith.to_deg*4/1440)
+			end
+		end
+	end
+end

data/lib/solcal/location.rb

@@ -18,6 +18,13 @@ module SolCal
 			results
 		end
 
+		def time_to_angle_from_zenith(year, month, day, time_zone, angle_from_zenith)
+			results = create_data(year, month, day, time_zone)
+			results[:angle_from_zenith] = angle_from_zenith
+			Commands.run(:time_to_angle_from_zenith, results)
+			results
+		end
+
 		def date_pair(year, month, day, time_zone)
 			results = create_data(year,month,day, time_zone)
 			Commands.run(:duration, results)

data/lib/solcal/version.rb

@@ -1,3 +1,3 @@
 module Solcal
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/commands/app_longitude_command_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe "AppLongitudeCommand" do
-	before :each do
-		@result = {true_longitude:SolCal::Angle.from_deg(247.9944),julian_century:0.149125142596397}
-		@command = SolCal::Commands::AppLongitudeCommand.new(@result)
+	it "should calculate the applied longitude on 2014-12-01" do
+		result = {true_longitude:SolCal::Angle.from_deg(247.9944),julian_century:0.149125142596397}
+		SolCal::Commands::AppLongitudeCommand.new(result).execute
+		expect(result[:app_longitude].to_deg).to be_within(0.01).of(247.99)
 	end
 
-	it "should execute" do
-		@command.execute
-		expect(@result[:app_longitude].to_deg).to be_within(0.01).of(247.99)
+	it "should calculate the applied longitude on 2015-08-05" do
+		result = {true_longitude:SolCal::Angle.from_deg(247.9944),julian_century:0.15592060232717317}
+		SolCal::Commands::AppLongitudeCommand.new(result).execute
+		expect(result[:app_longitude].to_deg).to be_within(0.01).of(247.99)
 	end
 end

data/spec/commands/declination_command_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
 describe "DeclinationCommand" do
-	before :each do
+	it "should calculate declination for the applied longitude" do
 		@result = {oblique_correction:SolCal::Angle.from_deg(247.99),app_longitude:SolCal::Angle.from_deg(23.4349)}
-		@command = SolCal::Commands::DeclinationCommand.new(@result)
-	end
-
-	it "should execute" do
-		@command.execute
+		SolCal::Commands::DeclinationCommand.new(@result).execute
 		expect(@result[:declination].to_deg).to be_within(0.001).of(-21.6368)
 	end
+
 end

data/spec/commands/geometric_mean_long_command_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe "GeometricMeanLongCommand" do
-	before :each do
-		@result = {julian_century:0.149125142596397}
-		@command = SolCal::Commands::GeometricMeanLongCommand.new(@result)
+	it "should calculate the geometric mean longitude on 2014-12-01" do
+		result = {julian_century:0.149125142596397}
+		SolCal::Commands::GeometricMeanLongCommand.new(result).execute
+		expect(result[:geometric_mean_long].to_deg).to be_within(0.0001).of(249.0864)
 	end
 
-	it "should execute" do
-		@command.execute
-		expect(@result[:geometric_mean_long].to_deg).to be_within(0.0001).of(249.0864)
+	it "should calculate the geometric mean longitude on 2015-08-05" do
+		result = {julian_century:0.15592060232717317}
+		SolCal::Commands::GeometricMeanLongCommand.new(result).execute
+		expect(result[:geometric_mean_long].to_deg).to be_within(0.0001).of(133.7282)
 	end
 end

data/spec/commands/julian_century_command_spec.rb

@@ -2,13 +2,26 @@ require 'spec_helper'
 
 describe "JulianCenturyCommand" do
 	before :each do
-		@results = {date:Date.new(2014,12,1), time_zone: -7}
-		@command = SolCal::Commands::JulianCenturyCommand.new(@results)
+		@results = {time_zone: -7}
 	end
 
-	it "should calculate julian century from date" do
-		@command.execute
+	it "should calculate julian century from 2014-12-01" do
+		@results[:date] = Date.new(2014,12,1)
+		SolCal::Commands::JulianCenturyCommand.new(@results).execute
 		expect(@results[:julian_century]).not_to be_nil
 		expect(@results[:julian_century]).to be_within(0.0001).of(0.14912526)
 	end
+
+	it "should calculate julian century from 2015-08-05" do
+		@results[:date] = Date.new(2015,8,5)
+		SolCal::Commands::JulianCenturyCommand.new(@results).execute
+		expect(@results[:julian_century]).not_to be_nil
+		expect(@results[:julian_century]).to be_within(0.0000001).of(0.15592060232717317)
+	end
+
+	it "should calculate julian century from 2015-12-21" do
+		@results[:date] = Date.new(2015,12,21)
+		SolCal::Commands::JulianCenturyCommand.new(@results).execute
+		expect(@results[:julian_century]).to be_within(0.0000001).of(0.15969883641341548)
+	end
 end

data/spec/commands/mean_oblique_ecliptic_command_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe "MeanObliqueEclipticCommand" do
-	before :each do
+	it "should execute on 2014-12-01" do
 		@result = {julian_century:0.149125142596397}
-		@command = SolCal::Commands::MeanObliqueEclipticCommand.new(@result)
+		SolCal::Commands::MeanObliqueEclipticCommand.new(@result).execute
+		expect(@result[:mean_oblique_ecliptic]).to be_within(0.001).of(23.43735)
 	end
 
-	it "should execute" do
-		@command.execute
+	it "should execute on 2015-08-05" do
+		@result = {julian_century:0.15592060232717317}
+		SolCal::Commands::MeanObliqueEclipticCommand.new(@result).execute
 		expect(@result[:mean_oblique_ecliptic]).to be_within(0.001).of(23.43735)
 	end
 end

data/spec/commands/oblique_correction_command_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe "ObliqueCorrectionCommand" do
-	before :each do
-		@result = {julian_century:0.149125142596397,mean_oblique_ecliptic:23.43735}
-		@command = SolCal::Commands::ObliqueCorrectionCommand.new(@result)
+	it "should calculate oblique correction on 2014-12-01" do
+		result = {julian_century:0.149125142596397,mean_oblique_ecliptic:23.43735}
+		SolCal::Commands::ObliqueCorrectionCommand.new(result).execute
+		expect(result[:oblique_correction].to_deg).to be_within(0.001).of(23.4349)
 	end
 
-	it "should execute" do
-		@command.execute
-		expect(@result[:oblique_correction].to_deg).to be_within(0.001).of(23.4349)
+	it "should calculate the oblique correction on 2015-08-05" do
+		result = {julian_century: 0.15592060232717317}
+		SolCal::Commands::ObliqueCorrectionCommand.new(result).execute
+		expect(result[:oblique_correction].to_deg).to be_within(0.001).of(23.4349)
 	end
 end

data/spec/commands/time_to_angle_from_zenith_command_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe "TimeToAngleFromZenithCommand" do
+	it "should calculate the time the sun will reach a 90deg angle from the zenith" do
+		@result = {julian_century:0.149125142596397, latitude:SolCal::Angle.from_deg(53.5333),declination:SolCal::Angle.from_deg(-21.7958) ,solar_noon:0.515931}
+		@result[:angle_from_zenith] = 90
+		SolCal::Commands::TimeToAngleFromZenithCommand.new(@result).execute
+		expect(@result[:time_to_angle_from_zenith].to_s).to eql("08:33")
+	end
+
+	it "should calculate the time the sun will reach a 72deg angle from the zenith on 2015-08-05" do
+		@result = {julian_century:0.15592060, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
+		@result[:angle_from_zenith] = 72
+		SolCal::Commands::TimeToAngleFromZenithCommand.new(@result).execute
+		expect(@result[:time_to_angle_from_zenith].to_s).to eql("07:10")
+	end
+
+	it "should calculate the time the sun will reach a 72deg angle from the zenith on 2015-08-05" do
+		@result = {julian_century:0.15592060, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
+		@result[:angle_from_zenith] = 72
+		SolCal::Commands::TimeToAngleFromZenithCommand.new(@result).execute
+		expect(@result[:time_to_angle_from_zenith].to_s).to eql("07:10")
+	end
+
+	it "should calculate the time the sun will reach max angle on 2015-12-21" do
+		@result = {julian_century:0.15969883641341548, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
+		@result[:angle_from_zenith] = 76.97
+		SolCal::Commands::TimeToAngleFromZenithCommand.new(@result).execute
+		expect(@result[:time_to_angle_from_zenith].to_s).to eql("12:28")
+	end
+
+	it "should return error when requesting time sun will reach above max angle on 2015-12-21" do
+		@result = {julian_century:0.15969883641341548, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
+		@result[:angle_from_zenith] = 76.96
+		SolCal::Commands::TimeToAngleFromZenithCommand.new(@result).execute
+		expect(@result[:time_to_angle_from_zenith].to_s).to eql("The sun will not reach 76.96 degrees from zenith today.")
+	end
+end

data/spec/commands/true_longitude_command_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe "TrueLongitudeCommand" do
-	before :each do
-		@result = {geometric_mean_long:SolCal::Angle.from_deg(249.0864),equation_of_center:-1.092}
-		@command = SolCal::Commands::TrueLongitudeCommand.new(@result)
+	it "should calculate the true longitude on 2014-12-01" do
+		result = {geometric_mean_long:SolCal::Angle.from_deg(249.0864),equation_of_center:-1.092}
+		SolCal::Commands::TrueLongitudeCommand.new(result).execute
+		expect(result[:true_longitude].to_deg).to be_within(0.0001).of(247.9944)
 	end
 
-	it "should execute" do
-		@command.execute
-		expect(@result[:true_longitude].to_deg).to be_within(0.0001).of(247.9944)
+	it "should calculate the true longitude on 2015-08-05" do
+		result = {geometric_mean_long:SolCal::Angle.from_deg(133.7282),equation_of_center:-1.092}
+		SolCal::Commands::TrueLongitudeCommand.new(result).execute
+		expect(result[:true_longitude].to_deg).to be_within(0.0001).of(132.6362)
 	end
 end

data/spec/location_spec.rb

@@ -78,5 +78,30 @@ describe "Location" do
 		expect(results[:civil_dawn].to_s).to eql("06:32") 
 		expect(results[:civil_dusk].to_s).to eql("17:21") 
 	end
+
+	it "should calculate time to 70deg from zenith on 2015-09-06 in Edmonton" do
+		results = @edmonton.time_to_angle_from_zenith(2015, 9, 6, -6, 70)
+		expect(results[:time_to_angle_from_zenith].to_s).to eql("09:13")
+	end
+
+	it "should calculate time to 70deg from zenith on 2015-09-06 in Miami" do
+		results = @miami.time_to_angle_from_zenith(2015, 9, 6, -4, 70)
+		expect(results[:time_to_angle_from_zenith].to_s).to eql("08:35")
+	end
+
+	it "should calculate time to 70deg from zenith on 2015-09-06 in Sydney" do
+		results = @sydney.time_to_angle_from_zenith(2015, 9, 6, +10, 70)
+		expect(results[:time_to_angle_from_zenith].to_s).to eql("07:51")
+	end
+
+	it "should return that the sun will never reach 47deg from zenith on 2015-09-06 in Edmonton" do
+		results = @edmonton.time_to_angle_from_zenith(2015, 9, 6, -6, 47)
+		expect(results[:time_to_angle_from_zenith].to_s).to eql("The sun will not reach 47 degrees from zenith today.")
+	end
+
+	it "should return that the sun will never reach 19.3deg from zenith on 2015-09-06 in Miami" do
+		results = @miami.time_to_angle_from_zenith(2015, 9, 6, -6, 19.3)
+		expect(results[:time_to_angle_from_zenith].to_s).to eql("The sun will not reach 19.3 degrees from zenith today.")
+	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solcal
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Neil Bourgeois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - lib/solcal/commands/solar_noon_command.rb
 - lib/solcal/commands/sunrise_command.rb
 - lib/solcal/commands/sunset_command.rb
+- lib/solcal/commands/time_to_angle_from_zenith_command.rb
 - lib/solcal/commands/true_longitude_command.rb
 - lib/solcal/commands/var_y_command.rb
 - lib/solcal/location.rb
@@ -104,6 +105,7 @@ files:
 - spec/commands/solar_noon_command_spec.rb
 - spec/commands/sunrise_command_spec.rb
 - spec/commands/sunset_command_spec.rb
+- spec/commands/time_to_angle_from_zenith_command_spec.rb
 - spec/commands/true_longitude_command_spec.rb
 - spec/commands/var_y_command_spec.rb
 - spec/date_pair_spec.rb
@@ -159,6 +161,7 @@ test_files:
 - spec/commands/solar_noon_command_spec.rb
 - spec/commands/sunrise_command_spec.rb
 - spec/commands/sunset_command_spec.rb
+- spec/commands/time_to_angle_from_zenith_command_spec.rb
 - spec/commands/true_longitude_command_spec.rb
 - spec/commands/var_y_command_spec.rb
 - spec/date_pair_spec.rb