timing 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f6f145028cd5331680c01a8365eaa4f56cfee1
-  data.tar.gz: 3c032ab78e222d16d58ccbeb8a741c2e47c54519
+  metadata.gz: e9d92a18e938feee6b80f8aaa64a028be7bf2a11
+  data.tar.gz: afc68085d3083b521a802ae80fc5416df7dcca07
 SHA512:
-  metadata.gz: 7e6b80824b06f9db1a4561214a518b79321cb75123558dc525f21a948b5805b0920a17b9ec1763b2d35f319afefdc81f490ba43028e3dc1b2097ceae62635945
-  data.tar.gz: 25bec6e9461646ba7d789ca0b98f576e772162527f19187fedb15347d38da5a4dea5c6bb3b92dee883a89cb1e72078e30341f725bf499e1dd299031b85888573
+  metadata.gz: 2ebafcc6ae241ec71978cc47571d21fe9e7f20e393f00321373cd4edabde9e186c092f3a2affee979b900d0a3928cd8fdcedf432515529a327ac005e2132c3a3
+  data.tar.gz: c8375675559778a628314ee196517ad9efd8a3239b253e00a6cf5f05c073e1204df2c2bf41fa885b7243c0a8c2e7bace04b5581a685c7da23523996cefa9bd3d

data/lib/timing/interval.rb

@@ -1,5 +1,5 @@
 module Timing
-  class Interval < SimpleDelegator
+  class Interval < TransparentProxy
     
     UNITS_NAMES = {
       s: :seconds,

data/lib/timing/natural_time_language_interpreters.rb

@@ -312,7 +312,7 @@ module Timing
 
     class ZoneOffset < Treetop::Runtime::SyntaxNode
       def value
-        ::ZoneOffset.parse text_value
+        Timing::ZoneOffset.parse text_value
       end
     end
 

data/lib/timing/time_in_zone.rb

@@ -24,11 +24,14 @@ module Timing
     alias_method :gmtoff,     :zone_offset
 
     def +(seconds)
+      raise ArgumentError, "#{seconds} must be a valid seconds count" unless seconds.is_a? Numeric
       self.class.new (time + seconds), zone_offset
     end
 
     def -(seconds)
-      self.class.new (time - seconds), zone_offset
+      raise ArgumentError, "#{seconds} must be a time or a valid seconds count" unless seconds.respond_to? :to_f
+      result = self.class.at (time.to_f - seconds.to_f), zone_offset
+      seconds.is_a?(Numeric) ? result : result.to_f
     end
 
     def utc?
@@ -58,6 +61,18 @@ module Timing
       time_with_offset.strftime format.gsub('%Z', '').gsub('%z', zone_offset.to_s)
     end
 
+    def iso8601
+      strftime "%FT%T#{zone_offset.iso8601}"
+    end
+
+    def as_json(*args)
+      iso8601
+    end
+
+    def to_json(*args)
+      "\"#{as_json(*args)}\""
+    end
+
     %w(hour day week month year).each do |interval|
       beginning_method_name = "beginning_of_#{interval}"
       define_method beginning_method_name do

data/lib/timing/version.rb

@@ -1,3 +1,3 @@
 module Timing
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/timing/zone_offset.rb

@@ -1,5 +1,5 @@
 module Timing
-  class ZoneOffset < SimpleDelegator
+  class ZoneOffset < TransparentProxy
 
     REGEXP = /^([+-]?)(\d\d):?(\d\d)$/
 
@@ -9,11 +9,11 @@ module Timing
     end
 
     def to_s
-      hours = Interval.new(to_f).to_hours.to_i
-      minutes = Interval.new(to_f % Interval.hours(1)).to_minutes.to_i
-      sign = self < 0 ? '-' : '+'
+      "#{sign}#{hour.to_s.rjust(2, '0')}#{minute.to_s.rjust(2, '0')}"
+    end
 
-      "#{sign}#{hours.to_s.rjust(2, '0')}#{minutes.to_s.rjust(2, '0')}"
+    def iso8601
+      "#{sign}#{hour.to_s.rjust(2, '0')}:#{minute.to_s.rjust(2, '0')}"
     end
 
     def inspect
@@ -32,5 +32,19 @@ module Timing
       new (Interval.hours(hours) + Interval.minutes(minutes)) * sign
     end
 
+    private
+
+    def hour
+      Interval.new(to_f).to_hours.to_i
+    end
+
+    def minute
+      Interval.new(to_f % Interval.hours(1)).to_minutes.to_i
+    end
+
+    def sign
+      self < 0 ? '-' : '+'
+    end
+
   end
 end

data/lib/timing.rb

@@ -1,6 +1,6 @@
 require 'time'
 require 'date'
-require 'delegate'
+require 'transparent_proxy'
 require 'forwardable'
 require 'treetop'
 

data/timing.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'treetop'
+  spec.add_dependency 'treetop', '~> 1.6.3'
+  spec.add_dependency 'transparent_proxy', '~> 0.0.4'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timing
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gabriel Naiman
@@ -14,16 +14,30 @@ dependencies:
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: transparent_proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement