solcal 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848951985cdcf0671f66fdc25b2ef4a4785acc76
-  data.tar.gz: 3097df8b686ac93f491e0e4a5b45797a2e3cb05e
+  metadata.gz: ce20de0e91a3f7575b44bcacf6d9710b61953d5f
+  data.tar.gz: f50b80342f7c647a5c456565b9cf3103d6f453fa
 SHA512:
-  metadata.gz: 1abbd6f9aaa58a259a44c85c1a668cace5751c719ed818d55df6857f2a46b493556d3a6c713fb5052c92312726aabbaf4edb29be72d6ff1336840817fd330b3c
-  data.tar.gz: 218bf343db317d62d310896a31642a756a7a7629954725d6e8b8dd00f9f35f800415ba55eff32e89b4a0705d7cf48fedc4eeced6e26dc7641c475f174ab20a49
+  metadata.gz: 62fc500956aae9a20f175db75f870fd4c21b1a26fd415d311150b2acb43cdd00fffdc3f4f03b8c2a8100683a73e80253fee38e19341a2f4327f1310d348fc1a5
+  data.tar.gz: c66bfb77c4519f09555034a84fb29103d74ee7ae45d53b7d91c453883c18c230378991c70add50b64a17c387a3ec3437e80f1fc1377a99325bf5db74a4b3dbf6

data/.gitignore

@@ -15,4 +15,5 @@ mkmf.log
 .vagrant
 bootstrap.sh
 Vagrantfile
-solcal*.gem
+solcal*.gem
+._*.rb

data/lib/solcal/commands.rb

@@ -21,6 +21,9 @@ module SolCal
 		autoload :SunriseCommand,				'solcal/commands/sunrise_command'
 		autoload :SunsetCommand,				'solcal/commands/sunset_command'
 		autoload :DaylightCommand,				'solcal/commands/daylight_command'
+		autoload :HaCivilTwighlightCommand,		'solcal/commands/ha_civil_twighlight_command'
+		autoload :CivilDawnCommand,				'solcal/commands/civil_dawn_command'
+		autoload :CivilDuskCommand,				'solcal/commands/civil_dusk_command'
 
 		extend NamingConvention
 

data/lib/solcal/commands/civil_dawn_command.rb

@@ -0,0 +1,10 @@
+module SolCal
+	module Commands
+		class CivilDawnCommand < BaseCommand
+			protected
+			def do_execute
+				SolCal::TimeOfDay.new(solar_noon-ha_civil_twighlight.to_deg*4/1440)
+			end
+		end
+	end
+end

data/lib/solcal/commands/civil_dusk_command.rb

@@ -0,0 +1,10 @@
+module SolCal
+	module Commands
+		class CivilDuskCommand < BaseCommand
+			protected
+			def do_execute
+				SolCal::TimeOfDay.new(solar_noon+ha_civil_twighlight.to_deg*4/1440)
+			end
+		end
+	end
+end

data/lib/solcal/commands/ha_civil_twighlight_command.rb

@@ -0,0 +1,13 @@
+module SolCal
+	module Commands
+		class HaCivilTwighlightCommand < BaseCommand
+			protected
+			def do_execute
+				a = Math.cos(Angle.from_deg(96).to_rad)
+				b = Math.cos(latitude.to_rad)*Math.cos(declination.to_rad)
+				c = Math.tan(latitude.to_rad)*Math.tan(declination.to_rad)
+				Angle.from_rad(Math.acos(a/b-c))
+			end
+		end
+	end
+end

data/lib/solcal/location.rb

@@ -13,6 +13,8 @@ module SolCal
 			Commands.run(:sunrise, results)
 			Commands.run(:sunset, results)
 			Commands.run(:duration, results)
+			Commands.run(:civil_dawn, results)
+			Commands.run(:civil_dusk, results)
 			results
 		end
 

data/lib/solcal/version.rb

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

data/spec/commands/civil_dawn_command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "CivilDawnCommand" do
+	before :each do
+		@result = {julian_century:0.149125142596397, latitude:SolCal::Angle.from_deg(53.5333),declination:SolCal::Angle.from_deg(-21.7958) ,solar_noon:0.515931}
+		@command = SolCal::Commands::CivilDawnCommand.new(@result)
+	end
+
+	it "should execute" do
+		@command.execute
+		expect(@result[:civil_dawn].to_s).to eql("07:45")
+	end
+end

data/spec/commands/civil_dusk_command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "CivilDuskCommand" do
+	before :each do
+		@result = {julian_century:0.149125142596397, latitude:SolCal::Angle.from_deg(53.5333),declination:SolCal::Angle.from_deg(-21.7958) ,solar_noon:0.515931}
+		@command = SolCal::Commands::CivilDuskCommand.new(@result)
+	end
+
+	it "should execute" do
+		@command.execute
+		expect(@result[:civil_dusk].to_s).to eql("17:00")
+	end
+end

data/spec/commands/ha_civil_twightlight_command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "HaCivilTwighlightCommand" do
+	before :each do
+		@result = {julian_century:0.149125142596397, latitude:SolCal::Angle.from_deg(53.5333),declination:SolCal::Angle.from_deg(-21.7958) ,solar_noon:0.515931}
+		@command = SolCal::Commands::HaCivilTwighlightCommand.new(@result)
+	end
+
+	it "should execute" do
+		@command.execute
+		expect(@result[:ha_civil_twighlight].to_deg).to be_within(0.0001).of(69.4109)
+	end
+end

data/spec/location_spec.rb

@@ -27,42 +27,56 @@ describe "Location" do
 		expect(results[:sunrise].to_s).to eql("08:27")
 		expect(results[:sunset].to_s).to eql("16:18")
 		expect(results[:duration]).to be_within(1).of(472.16513)
+		expect(results[:civil_dawn].to_s).to eql("07:45")
+		expect(results[:civil_dusk].to_s).to eql("17:00")
 	end
 
 	it "should calculate daylight information in Edmonton on winter solstice" do
 		results = @edmonton.daylight(2014,12,21,-7)
 		expect(results[:sunrise].to_s).to eql("08:48")
 		expect(results[:sunset].to_s).to eql("16:15")
+		expect(results[:civil_dawn].to_s).to eql("08:05")
+		expect(results[:civil_dusk].to_s).to eql("16:59")
 	end
 
 	it "should calculate daylight information in Edmonton on summer solstice" do
 		results = @edmonton.daylight(2014,6,21,-6)
 		expect(results[:sunrise].to_s).to eql("05:04")
 		expect(results[:sunset].to_s).to eql("22:07")
+		expect(results[:civil_dawn].to_s).to eql("04:11")
+		expect(results[:civil_dusk].to_s).to eql("23:00")
 	end
 
 	it "should calculate daylight information in Miami on winter solstice" do
 		results = @miami.daylight(2014,12,21,-5)
 		expect(results[:sunrise].to_s).to eql("07:03")
 		expect(results[:sunset].to_s).to eql("17:34")
+		expect(results[:civil_dawn].to_s).to eql("06:37")
+		expect(results[:civil_dusk].to_s).to eql("17:59")
 	end
 
 	it "should calculate daylight information in Miami on summer solstice" do
 		results = @miami.daylight(2014,6,21,-4)
 		expect(results[:sunrise].to_s).to eql("06:30")
 		expect(results[:sunset].to_s).to eql("20:15")
+		expect(results[:civil_dawn].to_s).to eql("06:04") 
+		expect(results[:civil_dusk].to_s).to eql("20:41") 
 	end
 
 	it "should calculate daylight information in Sydney on winter solstice" do
 		results = @sydney.daylight(2014,12,21,+11)
 		expect(results[:sunrise].to_s).to eql("05:41")
 		expect(results[:sunset].to_s).to eql("20:05")
+		expect(results[:civil_dawn].to_s).to eql("05:11") 
+		expect(results[:civil_dusk].to_s).to eql("20:34") 
 	end
 
 	it "should calculate daylight information in Sydney on summer solstice" do
 		results = @sydney.daylight(2014,6,21,+10)
 		expect(results[:sunrise].to_s).to eql("07:00")
 		expect(results[:sunset].to_s).to eql("16:53")
+		expect(results[:civil_dawn].to_s).to eql("06:32") 
+		expect(results[:civil_dusk].to_s).to eql("17:21") 
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solcal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Neil Bourgeois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,8 @@ files:
 - lib/solcal/commands.rb
 - lib/solcal/commands/app_longitude_command.rb
 - lib/solcal/commands/base_command.rb
+- lib/solcal/commands/civil_dawn_command.rb
+- lib/solcal/commands/civil_dusk_command.rb
 - lib/solcal/commands/declination_command.rb
 - lib/solcal/commands/duration_command.rb
 - lib/solcal/commands/eccent_earth_orbit_command.rb
@@ -64,6 +66,7 @@ files:
 - lib/solcal/commands/equation_of_time_command.rb
 - lib/solcal/commands/geometric_mean_anom_command.rb
 - lib/solcal/commands/geometric_mean_long_command.rb
+- lib/solcal/commands/ha_civil_twighlight_command.rb
 - lib/solcal/commands/ha_sunrise_command.rb
 - lib/solcal/commands/julian_century_command.rb
 - lib/solcal/commands/mean_oblique_ecliptic_command.rb
@@ -82,6 +85,8 @@ files:
 - spec/angle_spec.rb
 - spec/commands/app_longitude_command_spec.rb
 - spec/commands/base_command_spec.rb
+- spec/commands/civil_dawn_command_spec.rb
+- spec/commands/civil_dusk_command_spec.rb
 - spec/commands/declination_command_spec.rb
 - spec/commands/duration_command_spec.rb
 - spec/commands/eccent_earth_orbit_command_spec.rb
@@ -89,6 +94,7 @@ files:
 - spec/commands/equation_of_time_command_spec.rb
 - spec/commands/geometric_mean_anom_command_spec.rb
 - spec/commands/geometric_mean_long_command_spec.rb
+- spec/commands/ha_civil_twightlight_command_spec.rb
 - spec/commands/ha_sunrise_command_spec.rb
 - spec/commands/julian_century_command_spec.rb
 - spec/commands/mean_oblique_ecliptic_command_spec.rb
@@ -134,6 +140,8 @@ test_files:
 - spec/angle_spec.rb
 - spec/commands/app_longitude_command_spec.rb
 - spec/commands/base_command_spec.rb
+- spec/commands/civil_dawn_command_spec.rb
+- spec/commands/civil_dusk_command_spec.rb
 - spec/commands/declination_command_spec.rb
 - spec/commands/duration_command_spec.rb
 - spec/commands/eccent_earth_orbit_command_spec.rb
@@ -141,6 +149,7 @@ test_files:
 - spec/commands/equation_of_time_command_spec.rb
 - spec/commands/geometric_mean_anom_command_spec.rb
 - spec/commands/geometric_mean_long_command_spec.rb
+- spec/commands/ha_civil_twightlight_command_spec.rb
 - spec/commands/ha_sunrise_command_spec.rb
 - spec/commands/julian_century_command_spec.rb
 - spec/commands/mean_oblique_ecliptic_command_spec.rb