teasy 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9237135fe6b6ebdbbfda965105575687619541dd
-  data.tar.gz: 743861f57815c7d9e71cbd2430068babeb91869c
+  metadata.gz: 54fb405363968ca96e3690d23559425f212a96f5
+  data.tar.gz: 65ab60376126736884d7a5b4faf3b4fe6e194736
 SHA512:
-  metadata.gz: 6f991d7d9055565b603ee4fdac3ee055e2350a85335d5222ed759d973d4a1f0b0e350d7e8e567c6bfc3a2de037db8b47b7c57930d9b4936157c97b79612551f5
-  data.tar.gz: 97a5e37bd8be859daa782683f278157448cddca72f76385a762bd38f456534e25b860c1771cc31d91cb67c859bacf865b650601040bc9c72736a5dcc96395236
+  metadata.gz: 1dcaa1eb6b607f0061f570c84b8a0de4d4f081fa86f313d953617556749dba4966638341255d3135d132a7c7c5423258dc0567b2a27b78f637a84d3ff742204e
+  data.tar.gz: 0b432bb95e49c19ace3c6d0f751908be1a930de43e9e266de8b1fc78c61b58451e4d7f3aa6ff0c94f0a069154281e9a42b510b07eb4ddc809c3239ca78699062

data/lib/teasy.rb

@@ -14,8 +14,8 @@ module Teasy
   def self.with_zone(zone)
     old_zone = Thread.current[:teasy_default_zone]
     Thread.current[:teasy_default_zone] = zone
-    block_result = yield
+    yield
+  ensure
     Thread.current[:teasy_default_zone] = old_zone
-    block_result
   end
 end

data/lib/teasy/time_with_zone.rb

@@ -13,7 +13,8 @@ module Teasy
                    :sunday?
     def_delegators :period, :dst?
     def_delegator :period, :utc_total_offset, :utc_offset
-    def_delegators :to_time, :to_i, :to_r, :to_f
+    def_delegators :to_time, :to_i, :to_r, :to_f, :to_datetime, :to_date,
+                   :httpdate, :rfc2822, :rfc822, :xmlschema, :iso8601
 
     # rubocop:disable Metrics/ParameterLists
     def initialize(year, month = nil, day = nil,
@@ -35,10 +36,11 @@ module Teasy
     end
 
     def in_time_zone!(zone = Teasy.default_zone)
-      time = to_time
+      time = utc_time
       @zone = TZInfo::Timezone.get(zone)
       @time = @zone.utc_to_local(time)
       @period = @zone.period_for_utc(time)
+      remove_instance_variable(:@local_time) unless @local_time.nil?
       self
     end
 
@@ -93,12 +95,12 @@ module Teasy
     alias_method :ctime, :asctime
 
     def +(other)
-      TimeWithZone.from_utc(to_time + other, @zone.identifier)
+      TimeWithZone.from_utc(utc_time + other, @zone.identifier)
     end
 
     def -(other)
       if other.is_a? Numeric
-        TimeWithZone.from_utc(to_time - other, @zone.identifier)
+        TimeWithZone.from_utc(utc_time - other, @zone.identifier)
       elsif other.respond_to? :to_time
         to_time - other.to_time
       else
@@ -124,11 +126,18 @@ module Teasy
     end
 
     def to_time
-      @utc_time ||= @zone.local_to_utc(@time)
+      return @local_time unless @local_time.nil?
+      params = %i(year mon day hour min).map! { |m| @time.send(m) }
+      params << @time.sec + @time.subsec
+      @local_time = utc? ? Time.utc(*params) : Time.new(*params, utc_offset)
     end
 
     private
 
+    def utc_time
+      @utc_time ||= @zone.local_to_utc(@time)
+    end
+
     attr_reader :time, :period
 
     # matches valid format directives for zones

data/lib/teasy/version.rb

@@ -1,3 +1,3 @@
 module Teasy
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/test/teasy/teasy_test.rb

@@ -30,12 +30,17 @@ class TeasyTest < Minitest::Test
     threads.each(&:join)
   end
 
-  def test_with_zone
+  def test_with_zone_changes_default_zone_only_within_block
     assert_equal 'UTC', Teasy.default_zone
     Teasy.with_zone('Europe/Berlin') do
       assert_equal 'Europe/Berlin', Teasy.default_zone
+      fail 'exception within block'
     end
+  rescue
     assert_equal 'UTC', Teasy.default_zone
+  end
+
+  def test_with_zone_returns_block_result
     assert_equal 1, Teasy.with_zone('Europe/Berlin') { 1 }
   end
 end

data/test/teasy/time_with_zone_test.rb

@@ -313,6 +313,31 @@ class TimeWithZoneTest < Minitest::Test
     assert_equal [45, 30, 0, 2, 4, 2042, 3, 92, true, 'CEST'], berlin_to_a
   end
 
+  def test_to_time
+    assert_instance_of Time, @timestamptz.to_time
+    assert_equal 0, @timestamptz.to_time.utc_offset
+    assert @timestamptz.to_time.utc?
+    assert_equal @timestamptz, @timestamptz.to_time
+
+    assert_equal 7200, @timestamptz_berlin.to_time.utc_offset
+    assert_equal @timestamptz_berlin, @timestamptz_berlin.to_time
+  end
+
+  def test_to_datetime
+    assert_instance_of DateTime, @timestamptz.to_datetime
+    assert_equal 0, @timestamptz.to_datetime.offset
+    assert_equal @timestamptz, @timestamptz.to_datetime
+
+    assert_equal Rational(2, 24), @timestamptz_berlin.to_datetime.offset
+    assert_equal @timestamptz_berlin, @timestamptz_berlin.to_datetime
+  end
+
+  def test_to_date
+    assert_instance_of Date, @timestamptz.to_date
+    assert_equal @timestamptz.day, @timestamptz.to_date.day
+    assert_equal @timestamptz_berlin.day, @timestamptz_berlin.to_date.day
+  end
+
   def test_to_f
     assert_instance_of Float, @timestamptz.to_f
     assert_in_epsilon 2_280_011_445.000_001, @timestamptz.to_f
@@ -413,4 +438,29 @@ class TimeWithZoneTest < Minitest::Test
     assert_equal 'UTC', @timestamptz.zone
     assert_equal 'Europe/Berlin', @timestamptz_berlin.zone
   end
+
+  def test_httpdate
+    assert_equal 'Wed, 02 Apr 2042 00:30:45 GMT', @timestamptz.httpdate
+    assert_equal 'Tue, 01 Apr 2042 22:30:45 GMT', @timestamptz_berlin.httpdate
+  end
+
+  def test_rfc2822
+    assert_equal 'Wed, 02 Apr 2042 00:30:45 -0000', @timestamptz.rfc2822
+    assert_equal 'Wed, 02 Apr 2042 00:30:45 +0200', @timestamptz_berlin.rfc2822
+  end
+
+  def test_rfc822
+    assert_equal 'Wed, 02 Apr 2042 00:30:45 -0000', @timestamptz.rfc822
+    assert_equal 'Wed, 02 Apr 2042 00:30:45 +0200', @timestamptz_berlin.rfc822
+  end
+
+  def test_xmlschema
+    assert_equal '2042-04-02T00:30:45Z', @timestamptz.xmlschema
+    assert_equal '2042-04-02T00:30:45+02:00', @timestamptz_berlin.xmlschema
+  end
+
+  def test_iso8601
+    assert_equal '2042-04-02T00:30:45Z', @timestamptz.iso8601
+    assert_equal '2042-04-02T00:30:45+02:00', @timestamptz_berlin.iso8601
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teasy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Kai Kuchenbecker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo