new_time 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3844189bf4a61688714fd85e39a4d617f18650a5
-  data.tar.gz: ed77ac05becb69df09d68d23d932298adcf51144
+  metadata.gz: 2956b5184ecf0ac747d4424632fedd0259833920
+  data.tar.gz: 4d5e30bab00c92b96a2a4f2156f86658aca70d95
 SHA512:
-  metadata.gz: 48ee8db0feb7569a2c1d0393f8de0df5f82c15388e707ee92d60406db0c92435a2f3ef5684c43197c570df9daeb0fe203a9f702baf4b153ac42f9e602e4f64e7
-  data.tar.gz: 12cb94d9966d7290bfe7ddbe4aff3e7a6261ae6536bd06a2cc13b11e46383282ed2478fed8a155eca1b908d83ec0a9ad330bc668ed8e3b1d7929f833e69a8cef
+  metadata.gz: 955696ff54d8f8788f85b22ffcfb82ad6c8c330637fbf916f876837c1f896e8597ee90520eb6ec2f65cd636f6053e3d4d8d0fd32b48e957f4f48f0b7072680a1
+  data.tar.gz: f64b34d918bcbd266370df8c5cc6f71325c099c1adcdd86ea6f3e5636614acfc04688c603617ba91aef78d491d0c1563fbef86f3dd4c05cd3d755e8fc9d37e16

data/lib/new_time.rb

@@ -12,20 +12,21 @@ module NewTime
   class NewTime
     attr_accessor :year, :month, :day, :hours, :minutes, :seconds, :fractional
 
+    # TODO Make seconds a float and get rid of fractional
     def initialize(year, month, day, hours, minutes, seconds, fractional)
       @year, @month, @day, @hours, @minutes, @seconds, @fractional = year, month, day, hours, minutes, seconds, fractional
     end
 
     def self.current_time(point)
-      convert(DateTime.now, point)
+      convert(Time.now, point)
     end
 
     def self.sunrise(date, point)
-      SolarEventCalculator.new(date, point.latitude, point.longitude).compute_official_sunrise(point.tz)
+      SolarEventCalculator.new(date, point.latitude, point.longitude).compute_official_sunrise(point.tz).to_time
     end
 
     def self.sunset(date, point)
-      SolarEventCalculator.new(date, point.latitude, point.longitude).compute_official_sunset(point.tz)
+      SolarEventCalculator.new(date, point.latitude, point.longitude).compute_official_sunset(point.tz).to_time
     end
 
     # Convert back to "normal" time
@@ -53,28 +54,28 @@ module NewTime
       start + (new_seconds.to_f / (60 * 60) - new_start_hour) * (finish - start) / 12
     end
 
-    def self.convert(date_time, point)
-      sunrise_today = sunrise(date_time.to_date, point)
-      sunset_today = sunset(date_time.to_date, point)
+    def self.convert(time, point)
+      sunrise_today = sunrise(time.to_date, point)
+      sunset_today = sunset(time.to_date, point)
 
       # During daylight hours?
-      if date_time >= sunrise_today && date_time < sunset_today
+      if time >= sunrise_today && time < sunset_today
         start, finish = sunrise_today, sunset_today
         new_start_hour = 6
-        new_date = date_time.to_date
+        new_date = time.to_date
       else
         # Is it before sunrise or after sunset?
-        if date_time < sunrise_today
-          new_date = date_time.to_date - 1
+        if time < sunrise_today
+          new_date = time.to_date - 1
         else
-          new_date = date_time.to_date
+          new_date = time.to_date
         end
         new_start_hour = 18
         start = sunset(new_date, point)
         finish = sunrise(new_date + 1, point)
       end
 
-      new_seconds = (new_start_hour + (date_time - start).to_f / (finish - start) * 12) * 60 * 60
+      new_seconds = (new_start_hour + (time - start).to_f / (finish - start) * 12) * 60 * 60
 
       new_fractional = new_seconds - new_seconds.floor
       new_seconds = new_seconds.floor

data/lib/new_time/version.rb

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

data/spec/new_time_spec.rb

@@ -9,13 +9,13 @@ describe NewTime do
     let(:point) { NewTime::Point.new(51.829731, -0.860455, "Europe/London") }
 
     def c(month, hour)
-      NewTime::NewTime.convert(DateTime.new(2015,month,1,hour,0,0,"+0"), point).to_s
+      NewTime::NewTime.convert(Time.new(2015,month,1,hour,0,0,"+00:00"), point).to_s
     end
 
     def i(month, hour)
-      t1 = DateTime.new(2015,month,1,hour,0,0,"+0")
+      t1 = Time.new(2015,month,1,hour,0,0,"+00:00")
       t2 = NewTime::NewTime.convert(t1, point).convert(point)
-      expect(t2).to eq t1
+      expect(t2.to_f).to eq t1.to_f
     end
 
     describe ".convert" do
@@ -50,13 +50,13 @@ describe NewTime do
     let(:point) { NewTime::Point.new(-33.714955, 150.311407, "Australia/Sydney") }
 
     def c(month, hour)
-      NewTime::NewTime.convert(DateTime.new(2015,month,1,hour,0,0,"+11"), point).to_s
+      NewTime::NewTime.convert(Time.new(2015,month,1,hour,0,0,"+11:00"), point).to_s
     end
 
     def i(month, hour)
-      t1 = DateTime.new(2015,month,1,hour,0,0,"+11")
+      t1 = Time.new(2015,month,1,hour,0,0,"+11:00")
       t2 = NewTime::NewTime.convert(t1, point).convert(point)
-      expect(t2).to eq t1
+      expect(t2.to_f).to eq t1.to_f
     end
 
     describe ".convert" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new_time
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Landauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler