RubySunrise 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e36babfce42eb42418ae75fb536897c8e72a5797
-  data.tar.gz: f5f4f3ff61c529a41017d2a64bc0e442364bdb52
+SHA256:
+  metadata.gz: 2925333b6dad5cdec7f8b89883b3e0e94e2511aa928924ab7221dcf330ee44d6
+  data.tar.gz: 8c7eb64768f429d7e61561e8edf6f900329b87eb622a5d467370dcbee0c325ad
 SHA512:
-  metadata.gz: 7d44ac4e648cc9537442b7a5af5ec585806e0bf718daeb94838fa0612daa4097fac6d622420a14a6ac809c9d15a431475344b76f18dfea057eb30b1611c38ce0
-  data.tar.gz: 7aabe8fa9fe349867a1909731b04a1c036addcba2fed6b5821ff4265a314fa1b7b68f194f47b205294e61b5bc3c8c248f9fd2b447684187c67b7c506a9f07698
+  metadata.gz: 6389404d2377c5dd2bbff2bc05deb5344d777d0d1b09edae4afcd8545f7f8eca640a09e40e00ffe55a83084d5d8b161c74348d35f7a54cd8dd887f0894bf7c57
+  data.tar.gz: a3a3fd2991867b29b49babec552b261fe63dffa1a9ef3773b823392dcf32189ca64c2a23ff68b00cce2a6b48d90770e7fd4ab8a325cc8a0649117a0bdc11ee1c

data/lib/solareventcalculator.rb

@@ -4,10 +4,6 @@ require 'tzinfo'
 
 class SolarEventCalculator
 
-  @date
-  @latitude
-  @longitude
-
   def initialize(date, latitude, longitude)
     @date = date
     @latitude = latitude
@@ -15,64 +11,64 @@ class SolarEventCalculator
   end
 
   def compute_lnghour
-    lngHour = @longitude / BigDecimal.new("15")
+    lngHour = @longitude / BigDecimal("15")
     lngHour.round(4)
   end
 
   def compute_longitude_hour(isSunrise)
-    minuend = (isSunrise) ? BigDecimal.new("6") : BigDecimal.new("18")
-    longHour = @date.yday + ((minuend - compute_lnghour) / BigDecimal.new("24"))
+    minuend = (isSunrise) ? BigDecimal("6") : BigDecimal("18")
+    longHour = @date.yday + ((minuend - compute_lnghour) / BigDecimal("24"))
     longHour.round(4)
   end
 
   def compute_sun_mean_anomaly(longHour)
-    constant = BigDecimal.new("0.9856")
-    ((longHour * constant) - BigDecimal.new("3.289")).round(4)
+    constant = BigDecimal("0.9856")
+    ((longHour * constant) - BigDecimal("3.289")).round(4)
   end
 
   def compute_sun_true_longitude(meanAnomaly)
     mAsRads = degrees_as_rads(meanAnomaly)
-    sinM = BigDecimal.new(Math.sin(mAsRads.to_f).to_s)
-    sinTwoM = BigDecimal.new(Math.sin((2 * mAsRads).to_f).to_s)
-    firstParens = BigDecimal.new("1.916") * sinM
-    secondParens = BigDecimal.new("0.020") * sinTwoM
-    trueLong = meanAnomaly + firstParens + secondParens + BigDecimal.new("282.634")
+    sinM = BigDecimal(Math.sin(mAsRads.to_f).to_s)
+    sinTwoM = BigDecimal(Math.sin((2 * mAsRads).to_f).to_s)
+    firstParens = BigDecimal("1.916") * sinM
+    secondParens = BigDecimal("0.020") * sinTwoM
+    trueLong = meanAnomaly + firstParens + secondParens + BigDecimal("282.634")
     trueLong = put_in_range(trueLong, 0, 360, 360)
     trueLong.round(4)
   end
 
   def compute_right_ascension(sunTrueLong)
-    tanL = BigDecimal.new(Math.tan(degrees_as_rads(sunTrueLong).to_f).to_s)
-    ra = rads_as_degrees(BigDecimal.new(Math.atan(BigDecimal.new("0.91764") * tanL).to_s))
+    tanL = BigDecimal(Math.tan(degrees_as_rads(sunTrueLong).to_f).to_s)
+    ra = rads_as_degrees(BigDecimal(Math.atan(BigDecimal("0.91764") * tanL).to_s))
 
     ra = put_in_range(ra, 0, 360, 360)
     ra.round(4)
   end
 
   def put_ra_in_correct_quadrant(sunTrueLong)
-    lQuadrant = BigDecimal.new("90") * (sunTrueLong / BigDecimal.new("90")).floor
-    raQuadrant = BigDecimal.new("90") * (compute_right_ascension(sunTrueLong) / BigDecimal.new("90")).floor
+    lQuadrant = BigDecimal("90") * (sunTrueLong / BigDecimal("90")).floor
+    raQuadrant = BigDecimal("90") * (compute_right_ascension(sunTrueLong) / BigDecimal("90")).floor
 
     ra = compute_right_ascension(sunTrueLong) + (lQuadrant - raQuadrant)
-    ra = ra / BigDecimal.new("15")
+    ra = ra / BigDecimal("15")
     ra.round(4)
   end
 
   def compute_sin_sun_declination(sunTrueLong)
-    sinL = BigDecimal.new(Math.sin(degrees_as_rads(sunTrueLong).to_f).to_s)
-    sinDec = sinL * BigDecimal.new("0.39782")
+    sinL = BigDecimal(Math.sin(degrees_as_rads(sunTrueLong).to_f).to_s)
+    sinDec = sinL * BigDecimal("0.39782")
     sinDec.round(4)
   end
 
   def compute_cosine_sun_declination(sinSunDeclination)
-    cosDec = BigDecimal.new(Math.cos(Math.asin(sinSunDeclination)).to_s)
+    cosDec = BigDecimal(Math.cos(Math.asin(sinSunDeclination)).to_s)
     cosDec.round(4)
   end
 
   def compute_cosine_sun_local_hour(sunTrueLong, zenith)
-    cosZenith = BigDecimal.new(Math.cos(degrees_as_rads(BigDecimal.new(zenith.to_s))).to_s)
-    sinLatitude = BigDecimal.new(Math.sin(degrees_as_rads(@latitude)).to_s)
-    cosLatitude = BigDecimal.new(Math.cos(degrees_as_rads(@latitude)).to_s)
+    cosZenith = BigDecimal(Math.cos(degrees_as_rads(BigDecimal(zenith.to_s))).to_s)
+    sinLatitude = BigDecimal(Math.sin(degrees_as_rads(@latitude)).to_s)
+    cosLatitude = BigDecimal(Math.cos(degrees_as_rads(@latitude)).to_s)
 
     sinSunDeclination = compute_sin_sun_declination(sunTrueLong)
     top = cosZenith - (sinSunDeclination * sinLatitude)
@@ -83,11 +79,11 @@ class SolarEventCalculator
   end
 
   def compute_local_hour_angle(cosSunLocalHour, isSunrise)
-    acosH = BigDecimal.new(Math.acos(cosSunLocalHour).to_s)
+    acosH = BigDecimal(Math.acos(cosSunLocalHour).to_s)
     acosHDegrees = rads_as_degrees(acosH)
 
-    localHourAngle = (isSunrise) ? BigDecimal.new("360") - acosHDegrees : acosHDegrees
-    localHourAngle = localHourAngle / BigDecimal.new("15")
+    localHourAngle = (isSunrise) ? BigDecimal("360") - acosHDegrees : acosHDegrees
+    localHourAngle = localHourAngle / BigDecimal("15")
     localHourAngle.round(4)
   end
 
@@ -95,8 +91,8 @@ class SolarEventCalculator
     h = sunLocalHour
     ra = put_ra_in_correct_quadrant(sunTrueLong)
 
-    parens = BigDecimal.new("0.06571") * t
-    time = h + ra - parens - BigDecimal.new("6.622")
+    parens = BigDecimal("0.06571") * t
+    time = h + ra - parens - BigDecimal("6.622")
 
     utcTime = time - longHour
     utcTime = put_in_range(utcTime, 0, 24, 24)
@@ -111,7 +107,7 @@ class SolarEventCalculator
     sunTrueLong = compute_sun_true_longitude(meanAnomaly)
     cosineSunLocalHour = compute_cosine_sun_local_hour(sunTrueLong, zenith)
 
-    if(cosineSunLocalHour > BigDecimal.new("1") || cosineSunLocalHour < BigDecimal.new("-1"))
+    if(cosineSunLocalHour > BigDecimal("1") || cosineSunLocalHour < BigDecimal("-1"))
       return nil
     end
 
@@ -119,7 +115,7 @@ class SolarEventCalculator
     localMeanTime = compute_local_mean_time(sunTrueLong, longHour, eventLongHour, sunLocalHour)
 
     timeParts = localMeanTime.to_f.to_s.split('.')
-    mins = BigDecimal.new("." + timeParts[1]) * BigDecimal.new("60")
+    mins = BigDecimal("." + timeParts[1]) * BigDecimal("60")
     mins = mins.truncate()
     mins = pad_minutes(mins.to_i)
     hours = timeParts[0]
@@ -235,13 +231,14 @@ class SolarEventCalculator
 
   def degrees_as_rads(degrees)
     pi = BigDecimal(Math::PI.to_s)
-    radian = pi / BigDecimal.new("180")
+    radian = pi / BigDecimal("180")
     degrees * radian
   end
 
   def rads_as_degrees(radians)
     pi = BigDecimal(Math::PI.to_s)
-    degree = BigDecimal.new("180") / pi
+    degree = BigDecimal("180") / pi
     radians * degree
   end
+
 end

data/rubysunrise.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do | s |
   s.name = "RubySunrise"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
   s.author = "Mike Reedell / LuckyCatLabs"
   s.email = "mike@reedell.com"
   s.homepage = "http://www.mikereedell.com"
@@ -10,4 +10,4 @@ spec = Gem::Specification.new do | s |
   s.test_files = Dir.glob("{test}/**/*test.rb")
   s.has_rdoc = false
   s.add_runtime_dependency "tzinfo"
-end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: RubySunrise
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Mike Reedell / LuckyCatLabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -30,8 +30,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- rubysunrise.gemspec
 - lib/solareventcalculator.rb
+- rubysunrise.gemspec
 - test/bulkdatatest.rb
 - test/sunrisetest.rb
 - test/sunsettest.rb
@@ -44,17 +44,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Calculate the sunrise/sunset given lat/long coordinates and the date.  Computes