new_time 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86c25b0008c1dadb0688466d715a0b87859fed0
-  data.tar.gz: ace76a625c8af3981a8d2f14e9fc76ba3647a80e
+  metadata.gz: ecf87326a298905488030af21a6fea616fbd52fa
+  data.tar.gz: cd7f3bf81f047ab7adcc3b8745dfef7d2e1bdf64
 SHA512:
-  metadata.gz: 5925b6b0073a9ad1ea3d113844b38899dbe1e9dfbe52441cb66929f7aa1ebdf3ac7353d74e985938b1e8ebc9e1d6deb7e60f7971570fb3d8f3db0c02bcfb587d
-  data.tar.gz: 2424df0db905db66038ddc3779a3c6f4f6e56a85aae957ab301e0149c1d77177a465d1059df76643b236d6247b81338af0cebe445127f1d2a16a6afb1d18ae47
+  metadata.gz: 9b6e2389d3c4e479eb63cc4a8894e539b41bedf1f322f765ddbcd81fcca84987aa9c61bccca235d0bdd1b3c5a295abe0eca35ee5c4b8ae51483310fa0e699ec6
+  data.tar.gz: 563ba3fbb987eabf1b56b12d7176e42825959daa068a222754186d7fa217ee9d0cc3fc1778ccf8952600f7a75a3c49f73e628de87dcf8afa26edfa19b29351e9

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/new_time

@@ -2,8 +2,6 @@
 
 require "new_time"
 
-latitude = -33.714955
-longitude = 150.311407
-tz = "Australia/Sydney"
+point = NewTime::Point.new(-33.714955, 150.311407, "Australia/Sydney")
 
-puts NewTime.current_time(latitude, longitude, tz)
+puts NewTime::NewTime.current_time(point)

data/lib/new_time/version.rb

@@ -1,3 +1,3 @@
 module NewTime
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/new_time.rb

@@ -1,55 +1,109 @@
 require 'solareventcalculator'
 
-class NewTime
-  attr_accessor :hours, :minutes, :seconds, :fractional
+module NewTime
+  class Point
+    attr_accessor :latitude, :longitude, :tz
 
-  def initialize(hours, minutes, seconds, fractional)
-    @hours, @minutes, @seconds, @fractional = hours, minutes, seconds, fractional
+    def initialize(latitude, longitude, tz)
+      @latitude, @longitude, @tz = latitude, longitude, tz
+    end
   end
 
-  def self.current_time(latitude, longitude, tz)
-    convert(DateTime.now, latitude, longitude, tz)
-  end
+  class NewTime
+    attr_accessor :year, :month, :day, :hours, :minutes, :seconds, :fractional
 
-  def self.convert(date_time, latitude, longitude, tz)
-    yesterday = SolarEventCalculator.new(date_time.to_date - 1, latitude, longitude)
-    today = SolarEventCalculator.new(date_time.to_date, latitude, longitude)
-    tomorrow = SolarEventCalculator.new(date_time.to_date + 1, latitude, longitude)
-
-    sunset_yesterday = yesterday.compute_official_sunset(tz)
-    sunrise_today = today.compute_official_sunrise(tz)
-    sunset_today = today.compute_official_sunset(tz)
-    sunrise_tomorrow = tomorrow.compute_official_sunrise(tz)
-
-    if date_time < sunrise_today
-      start, finish = sunset_yesterday, sunrise_today
-      start_hour = 18
-    elsif date_time < sunset_today
-      start, finish = sunrise_today, sunset_today
-      start_hour = 6
-    else
-      start, finish = sunset_today, sunrise_tomorrow
-      start_hour = 18
-    end
-
-    seconds = (start_hour + (date_time - start).to_f / (finish - start) * 12) * 60 * 60
-
-    fractional = seconds - seconds.floor
-    seconds = seconds.floor
-    minutes = seconds / 60
-    seconds -= minutes * 60
-    hours = minutes / 60
-    minutes -= hours * 60
-    hours -= 24 if hours >= 24
-
-    NewTime.new(hours, minutes, seconds, fractional)
-  end
+    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)
+    end
+
+    def self.sunrise(date, point)
+      SolarEventCalculator.new(date, point.latitude, point.longitude).compute_official_sunrise(point.tz)
+    end
+
+    def self.sunset(date, point)
+      SolarEventCalculator.new(date, point.latitude, point.longitude).compute_official_sunset(point.tz)
+    end
+
+    # Convert back to "normal" time
+    def convert(point)
+      today = Date.new(year, month, day)
+      new_seconds = seconds + fractional + (minutes + hours * 60) * 60
+
+      # During daylight hours?
+      if hours >= 6 && hours < 18
+        start = NewTime.sunrise(today, point)
+        finish = NewTime.sunset(today, point)
+        new_start_hour = 6
+      else
+        # Is it before sunrise or after sunset?
+        if hours < 6
+          start = NewTime.sunset(today - 1, point)
+          finish = NewTime.sunrise(today, point)
+          new_start_hour = 18 - 24
+        else
+          start = NewTime.sunset(today, point)
+          finish = NewTime.sunrise(today + 1, point)
+          new_start_hour = 18
+        end
+      end
+      start + (new_seconds / (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)
+
+      # During daylight hours?
+      if date_time >= sunrise_today && date_time < sunset_today
+        start, finish = sunrise_today, sunset_today
+        new_start_hour = 6
+        new_date = date_time.to_date
+      else
+        # Is it before sunrise or after sunset?
+        if date_time < sunrise_today
+          new_date = date_time.to_date - 1
+        else
+          new_date = 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_fractional = new_seconds - new_seconds.floor
+      new_seconds = new_seconds.floor
+      new_minutes = new_seconds / 60
+      new_seconds -= new_minutes * 60
+      new_hours = new_minutes / 60
+      new_minutes -= new_hours * 60
+      if new_hours >= 24
+        new_hours -= 24
+        new_date += 1
+      end
+
+      NewTime.new(new_date.year, new_date.month, new_date.day, new_hours, new_minutes, new_seconds, new_fractional)
+    end
+
+    def time_to_s
+      if hours > 12
+        "%i:%02i pm" % [hours - 12, minutes]
+      else
+        "%i:%02i am" % [hours, minutes]
+      end
+    end
+
+    def date_to_s
+      Date.new(year, month, day).to_s
+    end
 
-  def to_s
-    if hours > 12
-      "%i:%02i pm" % [hours - 12, minutes]
-    else
-      "%i:%02i am" % [hours, minutes]
+    def to_s
+      date_to_s + " " + time_to_s
     end
   end
 end

data/new_time.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency "rspec"
 
   spec.add_dependency "RubySunrise", '~> 0'
 end

data/spec/new_time_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+describe NewTime do
+  it 'has a version number' do
+    expect(NewTime::VERSION).not_to be nil
+  end
+
+  context "For a fixed place in the northern hemisphere" 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
+    end
+
+    def i(month, hour)
+      t1 = DateTime.new(2015,month,1,hour,0,0,"+0")
+      t2 = NewTime::NewTime.convert(t1, point).convert(point)
+      expect(t2).to eq t1
+    end
+
+    describe ".convert" do
+      context "2015-01-01" do
+        it { expect(c(1, 0)).to eq "2014-12-31 11:55 pm" }
+        it { expect(c(1, 6)).to eq "2015-01-01 4:23 am" }
+        it { expect(c(1, 12)).to eq "2015-01-01 11:50 am" }
+        it { expect(c(1, 18)).to eq "2015-01-01 7:27 pm" }
+      end
+
+      context "2015-07-01" do
+        it { expect(c(7, 0)).to eq "2015-06-30 11:49 pm" }
+        it { expect(c(7, 6)).to eq "2015-07-01 7:35 am" }
+        it { expect(c(7, 12)).to eq "2015-07-01 11:55 am" }
+        it { expect(c(7, 18)).to eq "2015-07-01 4:15 pm" }
+      end
+    end
+
+    describe "it should be invertable" do
+      it { i(1, 0) }
+      it { i(1, 6) }
+      it { i(1, 12) }
+      it { i(1, 18) }
+      it { i(7, 0) }
+      it { i(7, 6) }
+      it { i(7, 12) }
+      it { i(7, 18) }
+    end
+  end
+
+  context "For a fixed place in the southern hemisphere" 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
+    end
+
+    def i(month, hour)
+      t1 = DateTime.new(2015,month,1,hour,0,0,"+11")
+      t2 = NewTime::NewTime.convert(t1, point).convert(point)
+      expect(t2).to eq t1
+    end
+
+    describe ".convert" do
+      context "2015-01-01" do
+        it { expect(c(1, 0)).to eq "2014-12-31 10:43 pm" }
+        it { expect(c(1, 6)).to eq "2015-01-01 6:07 am" }
+        it { expect(c(1, 12)).to eq "2015-01-01 11:08 am" }
+        it { expect(c(1, 18)).to eq "2015-01-01 4:09 pm" }
+      end
+
+      context "2015-07-01" do
+        it { expect(c(7, 0)).to eq "2015-06-30 11:07 pm" }
+        it { expect(c(7, 6)).to eq "2015-07-01 4:14 am" }
+        it { expect(c(7, 12)).to eq "2015-07-01 10:45 am" }
+        it { expect(c(7, 18)).to eq "2015-07-01 6:00 pm" }
+      end
+    end
+
+    describe "it should be invertable" do
+      it { i(1, 0) }
+      it { i(1, 6) }
+      it { i(1, 12) }
+      it { i(1, 18) }
+      it { i(7, 0) }
+      it { i(7, 6) }
+      it { i(7, 12) }
+      it { i(7, 18) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'new_time'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: new_time
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matthew Landauer
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: RubySunrise
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +84,8 @@ files:
 - lib/new_time.rb
 - lib/new_time/version.rb
 - new_time.gemspec
+- spec/new_time_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/mlandauer/new_time
 licenses:
 - MIT
@@ -94,4 +110,6 @@ rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A new kind of time that anchors you to the movement of the sun
-test_files: []
+test_files:
+- spec/new_time_spec.rb
+- spec/spec_helper.rb