tz_offset 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6caf2eb01f0a29365f5fa0e7b590a2fc6578d7d8
-  data.tar.gz: bd8383c6df9c377fd99e0abdd20bf35dfb4d49e2
+  metadata.gz: d716ba97e8b1595d4bc8a4d3300ebed994d6949d
+  data.tar.gz: 578f31e9594e61aebea530d92682414e26b3f95e
 SHA512:
-  metadata.gz: 83943865999ffb0dd7df78ae68cc9eb5fd9ed2337e0bbb71de722edead758a1f337507cabe205891122a833e1bb2ad405009bce172067a4eeb903efe1da31d2c
-  data.tar.gz: 723be526b08eb9ab0a4479115357540207648bf8de5a6d3aa6b869c25e32965175efb50c62f7ddcd24a8c708ffd8d513f0d343c0000b13b0f2ea9e5bf1187fa9
+  metadata.gz: 5da76c72269067cb144806ea8002ed99cc5ac1ce9c6f070be0e8cf90c2f2b0ccaf9753da4d4bf51b3a47326969746d059f7ca197a0480d8d73ac08c2cf824ec3
+  data.tar.gz: 289a1b4ca57d650c84bac18aa0230734c631fa9a386fcc8b9224ffa3d3cce3ccfdfbed8427f12f9a13d76d9a408a667544352c5a7ce6b2f53a8971f498816a3c

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 TZOffset Changelog
 ==================
 
+0.0.3 - 2016-01-14
+------------------
+
+* TZOffset is now detailed up to seconds;
+* Add simple arithmetics (`+`, unary and binary `-`);
+* Add some handy synonims (like `TZOffset.utc` and `TZOffset#utc?`).
+
 0.0.2 - 2016-10-25
 ------------------
 

data/README.md

@@ -98,6 +98,13 @@ eet.opposite
 # => #<TZOffset +03:00 (EEST)>
 eet.opposite.now
 # => 2016-10-25 21:39:26 +0300
+
+# Parsing time string into desired timezone
+off = TZOffset.parse('-02:30')
+off.parse('2014-10-01 12:30')
+# => 2014-10-01 12:30:00 -0230
+off.parse('12:30')
+# => 2016-10-26 12:30:00 -0230
 ```
 
 ## Author

data/lib/tz_offset/abbrev.rb

@@ -15,7 +15,7 @@ class TZOffset
     .load_file(PATH)
     .map { |row|
       TZOffset.new(
-        row.fetch(:val),
+        row.fetch(:val) * 60,
         name: row.fetch(:abbr),
         description: row.fetch(:title),
         region: row.fetch(:region),

data/lib/tz_offset/data/abbreviations.yaml

@@ -699,6 +699,11 @@
   :region: Phoenix Island
   :dst: false
   :val: 780
+- :abbr: PHT
+  :title: Philippine Time
+  :region: Philippine
+  :dst: false
+  :val: 480
 - :abbr: PKT
   :title: Pakistan Standard Time
   :region: Pakistan

data/lib/tz_offset/version.rb

@@ -1,3 +1,3 @@
 class TZOffset
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/lib/tz_offset.rb

@@ -18,10 +18,10 @@ require 'time'
 # ```
 #
 class TZOffset
-  # Number of minutes in offset.
+  # Number of seconds in offset.
   #
   # @return [Fixnum]
-  attr_reader :minutes
+  attr_reader :seconds
 
   # Symbolic offset name if available (like "EEST").
   #
@@ -43,59 +43,133 @@ class TZOffset
   # @return [String]
   attr_reader :region
 
-  # @private
-  MINUSES = /[−—–]/
+  class << self
+    # @private
+    MINUSES = /[−—–]/
 
-  # Parses TZOffset from string. Understands several options like:
-  #
-  # * `GMT` (not all TZ names, just well-known
-  #   [abbreviations](https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations));
-  # * `UTC+3` (or `GMT+3`);
-  # * `+03:30`;
-  # * ..and several combinations.
-  #
-  # @return [TZOffset]
-  def self.parse(text)
-    return ABBREV[text.upcase] if ABBREV.key?(text.upcase)
+    # Parses TZOffset from string. Understands several options like:
+    #
+    # * `GMT` (not all TZ names, just well-known
+    #   [abbreviations](https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations));
+    # * `UTC+3` (or `GMT+3`);
+    # * `+03:30`;
+    # * ..and several combinations.
+    #
+    # @return [TZOffset]
+    def parse(text)
+      return ABBREV[text.upcase] if ABBREV.key?(text.upcase)
+
+      sec = parse_text(text.gsub(MINUSES, '-'))
+      sec && new(sec)
+    end
+
+    # Returns zero (UTC) offset.
+    #
+    # @return [TZOffset]
+    def zero
+      @zero ||= new(0)
+    end
+
+    alias_method :utc, :zero
+
+    private
+
+    def parse_text(text)
+      case text
+      when /^[A-Z]{3}$/
+        Time.zone_offset(text)
+      when /^(?:UTC|GMT)?([+-]\d{1,2}:?\d{2})$/
+        parse_zone_offset($1)
+
+      when /^(?<sign>[+-]?)(?<hours>\d{1,2})(:(?<minutes>\d{2})(:(?<seconds>\d{2}))?)?$/
+        parse_with_seconds(Regexp.last_match)
 
-    text = text.gsub(MINUSES, '-')
-    sec = case text
-          when /^[A-Z]{3}$/
-            Time.zone_offset(text)
-          when /^(?:UTC|GMT)?([+-]\d{1,2}:?\d{2})$/
-            offset = $1
-            Time.zone_offset(offset.sub(/^([+-])(\d):/, '\10\2:'))
-          when /^(?:UTC|GMT)?([+-]\d{1,2})/
-            $1.to_i * 3600
-          end
+      when /^(?:UTC|GMT)?([+-]\d{1,2})/
+        $1.to_i * 3600
+      end
+    end
+
+    def parse_zone_offset(offset)
+      Time.zone_offset(offset.sub(/^([+-])(\d):/, '\10\2:'))
+    end
 
-    sec && new(sec / 60)
+    def parse_with_seconds(match)
+      (match[:sign] == '-' ? -1 : +1) *
+        (match[:hours].to_i * 3600 + match[:minutes].to_i * 60 + match[:seconds].to_i)
+    end
   end
 
-  # Constructs offset from number of minutes. In most cases, you don't
+  # Constructs offset from number of seconds. In most cases, you don't
   # want to use it, but rather {TZOffset.parse}.
   #
-  # @param minutes [Fixnum] Number of minutes in offset.
-  def initialize(minutes, name: nil, description: nil, region: nil, isdst: nil)
-    @minutes = minutes
+  # @param seconds [Fixnum] Number of seconds in offset.
+  def initialize(seconds, name: nil, description: nil, region: nil, isdst: nil)
+    @seconds = seconds
     @name = name
     @description = description
     @isdst = isdst
     @region = region
   end
 
+  # Minutes component of offset.
+  #
+  # @return [Integer]
+  def minutes
+    seconds.abs / 60 * (seconds <=> 0)
+  end
+
+  alias_method :to_i, :seconds
+
   # @return [String]
   def inspect
-    if name
-      '#<%s %s%02i:%02i (%s)>' % [self.class.name, sign, *minutes.abs.divmod(60), name]
-    else
-      '#<%s %s%02i:%02i>' % [self.class.name, sign, *minutes.abs.divmod(60)]
-    end
+    nm = name ? " (#{name})" : ''
+
+    '#<%s %s%02i:%02i%s%s>' %
+      [self.class.name, sign, *minutes.abs.divmod(60), inspectable_seconds, nm]
   end
 
   # @return [String]
   def to_s
-    '%s%02i:%02i' % [sign, *minutes.abs.divmod(60)]
+    '%s%02i:%02i%s' % [sign, *minutes.abs.divmod(60), inspectable_seconds]
+  end
+
+  # @return [TZOffset] Offset negated.
+  def -@
+    TZOffset.new(-seconds)
+  end
+
+  # Sums offset with other or just number of seconds.
+  #
+  # @example
+  #   TZOffset.parse('+2') + TZOffset.parse('+5')
+  #   # => #<TZOffset +07:00>
+  #   TZOffset.parse('+2') + 1200
+  #   # => #<TZOffset +02:20>
+  #
+  # @return [TZOffset]
+  def +(other)
+    case other
+    when TZOffset
+      TZOffset.new(seconds + other.seconds)
+    when Numeric
+      TZOffset.new(seconds + other)
+    else
+      fail ArgumentError, "Can't sum with #{other.class}"
+    end
+  end
+
+  # Substracts other offset or number of seconds.
+  #
+  # @example
+  #   TZOffset.parse('+2') - TZOffset.parse('+5')
+  #   # => #<TZOffset -03:00>
+  #   TZOffset.parse('+2') - 1200
+  #   # => #<TZOffset +01:40>
+  #
+  # @return [TZOffset]
+  def -(other)
+    other.respond_to?(:-@) or fail ArgumentError, "Can't subtract #{other.class} from TZOffset"
+    self + -other
   end
 
   # If offset is symbolic (e.g., "EET", not just "+02:00"), returns whether it is daylight
@@ -106,9 +180,16 @@ class TZOffset
     @isdst
   end
 
+  # If this offset is zero (UTC).
+  def zero?
+    @seconds.zero?
+  end
+
+  alias_method :utc?, :zero?
+
   # @return [Boolean]
   def <=>(other)
-    other.is_a?(TZOffset) or raise ArgumentError, "Can't compare TZOffset with #{other.class}"
+    return nil unless other.is_a?(TZOffset)
     minutes <=> other.minutes
   end
 
@@ -132,7 +213,7 @@ class TZOffset
   # @param tm [Time] Time object to convert (with any offset);
   # @return [Time] Converted object.
   def convert(tm)
-    t = tm.getutc + minutes * 60
+    t = tm.getutc + seconds
 
     # FIXME: usec are lost
     mk(t.year, t.month, t.day, t.hour, t.min, t.sec)
@@ -189,12 +270,16 @@ class TZOffset
 
   private
 
+  def inspectable_seconds
+    (seconds.abs % 60).zero? ? '' : ':%02i' % (seconds.abs % 60)
+  end
+
   def sign
     minutes < 0 ? '-' : '+'
   end
 
   def mk(*components)
-    Time.new(*components, to_s)
+    Time.new(*components, to_i)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tz_offset
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop