ozone 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c585fbf22c931b863f9fddcdf007c5ae2fc4f92
-  data.tar.gz: fe8603a322ab57aa36896ee45a5575bebee510b0
+  metadata.gz: 98d2324e166daa336808e183a8d594f0b18e4cb3
+  data.tar.gz: 2d0b60a51b1d5d5f2a3547a311cb4247476513f2
 SHA512:
-  metadata.gz: 9ee36d054417a3cbc4f9a79e3b746d64739933bdb6c3b36fd8e592f2572c01ec20162bba2513acacb5f75ce89833d973cfe20d24affca7598af9f4450395c826
-  data.tar.gz: b205d566b1da27dcb1bc3df74511af671bee64c63e174371f1e0f5be64b1ef6e2c123e54a65d973810bee9454752a26be0339216fa51734cacc32ccd69a440de
+  metadata.gz: 1949c0b5bc446edbd87fcc33be20d49c841fcc263864d0f7b187d06a5f93075e7a8a487c325f9c1b142dab6a40db1211b521a91e93f9da3a43d69c593df36fc0
+  data.tar.gz: c00a22953650d7de68a9c1c0f60aaa733b06176824648a2c5dda7582aa91d0bdb266846787d75514b2b93b90a999362ee6b6b0ea0cbfd4f6f7f4ee1416143de2

data/README.md

@@ -74,6 +74,8 @@ Ozone::Formatter has one method -- call -- which takes a time, offset (from utc,
 
 This functionality can also be accessed via the Ozone::Time#strftime method.
 
+### NOTE: Since all operations are executing in UTC time, the time zone in the format string will *always* be UTC
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ozone/version.rb

@@ -1,3 +1,3 @@
 module Ozone
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/ozone.rb

@@ -1,4 +1,4 @@
-require "ozone/version"
+require 'ozone/version'
 
 require 'active_support/time'
 
@@ -7,68 +7,61 @@ module Ozone
     module_function
 
     def call(time:, offset:, observes_dst: true, format: '%Y-%m-%d %H:%M')
-      timezone = ActiveSupport::TimeZone[offset/60]
-      time_with_zone = time.in_time_zone(timezone)
-      if time_with_zone.dst? && !observes_dst
-        # If we're during daylight savings time, but
-        # we are not observing daylight savings,
-        # there is a one-hour window where there is not
-        # an equivalent time between standard and daylight
-        # savings times. In order to deal with this,
-        # we subtract two hours from the offset and then
-        # take 2 hours from the given time. This frees
-        # us to string format the time without ruby
-        # making adjustments internally.
-        offset -= 120
-        timezone = ActiveSupport::TimeZone[offset/60]
-        2.hours.since(time.in_time_zone(timezone)).strftime(format)
-      else
-        time_with_zone.strftime(format)
-      end
+      ::Ozone::Time.new(time: time, offset: offset, observes_dst: observes_dst).strftime(format: format)
     end
   end
 
   class Time
     def initialize(time:, offset:, observes_dst: true)
       @offset = offset
-      @timezone = ActiveSupport::TimeZone[offset/60]
       @observes_dst = observes_dst
       @time = time
     end
 
-    def <=> (time_with_zone)
-      if after?(time_with_zone)
-        1
-      elsif before?(time_with_zone)
-        -1
-      else
-        0
-      end
+    def <=>(time_with_zone)
+      adjusted_time <=> to_ozone_time(time_with_zone).adjusted_time
     end
 
     def before?(time_with_zone)
-      adjusted_time < time_with_zone
+      adjusted_time < to_ozone_time(time_with_zone).adjusted_time
     end
 
     def after?(time_with_zone)
-      adjusted_time > time_with_zone
+      adjusted_time > to_ozone_time(time_with_zone).adjusted_time
     end
 
     def strftime(format: '%Y-%m-%d %H:%M')
-      Formatter.call(time: @time, offset: @offset, observes_dst: @observes_dst, format: format)
+      adjusted_time.strftime(format)
     end
 
     alias_method :<, :before?
     alias_method :>, :after?
     alias_method :to_s, :strftime
 
-    private
+    protected
 
     def adjusted_time
-      time_with_zone = @time.in_time_zone(@timezone)
-      time_with_zone.dst? && !@observes_dst ?
-        1.hour.until(time_with_zone) :
-        time_with_zone
+      offset = @offset
+
+      # Apply the DST offset if the practice observes DST and if DST is currently in effect in a timezone known to
+      # observe DST.
+      offset += 60 if @observes_dst && @time.in_time_zone(PST).dst?
+
+      if offset > 0
+        offset.minutes.until(@time)
+      elsif offset < 0
+        offset.minutes.since(@time)
+      else
+        @time
+      end
+    end
+
+    private
+
+    PST = ActiveSupport::TimeZone['Pacific Time (US & Canada)']
+
+    def to_ozone_time(time)
+      Ozone::Time.new(time: time.utc, offset: @offset, observes_dst: @observes_dst)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ozone
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Hubert Huang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport