teasy 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de5ae5fd3b0dda6d2e663589ef9bbaed872dd9777dedb1d4a66e5c6fd5ec784
-  data.tar.gz: 2eff70a6be7c0aae001355a4373060d61cc0083593724e9adda781c46d7db4f2
+  metadata.gz: c8bbffed19dc702847e0096485c0540b12ec6b28e4f5a14165ccb46ae13103a6
+  data.tar.gz: cc76f08f0630726cfc371ea2a4bc8142a4245f408ca5a358e544781e4d4b812a
 SHA512:
-  metadata.gz: 1767af8c4df3f4c23d50a510364d689ae693ab4cf69148238e3d4b30f86fec9f2c461023d2c31a8b65c62abf5defcde10c55db872f133f543d9561896ba83ae1
-  data.tar.gz: 8be5bd06ef3fad9d0cf60c922a4cd1a4516e881551b0782f9b33bd9f362d3f287b03c136919f0a6f67e52d31a54ddc45b1d66c82e3917b5f0e45fd918827deed
+  metadata.gz: 0d00df4b7245a715e319eefefa17392d9e5068a289937e8978d52b2e690b6368c79e1289a8f98b86cbbc9b7397ec636047837ccb7f74c6d544b553bbec2aa25b
+  data.tar.gz: d5d3c5d28d40941738d7ad3ac272c980993abe0e4dd1640d032755238bb7f1b9014653fb389ef9f875cca9c92ba194940097e46f4c6de04fc6614bec78c2e29c

data/.rubocop.yml

@@ -1,12 +1,13 @@
 AllCops:
   Exclude:
     - teasy.gemspec
-    - 'vendor/**/*'
-    - 'test/**/*'
+    - "vendor/**/*"
+    - "test/**/*"
+  NewCops: enable
 
 # Setting the line length to a maximum of 80 chars.
-LineLength:
+Layout/LineLength:
   Enabled: true
   Max: 80
-Documentation:
+Style/Documentation:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.7.1

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+Please group changes into `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed`
+and `Security` as described in [Keep a Changelog](http://keepachangelog.com/),
+taking the above order into account.
+
+## [Unreleased]
+
+
+________________________________________________________________________________
+
+## [0.2.4] - 2018-04-20
+
+### Added
+- this Changelog
+
+### Changed
+- yield `zone` to block in `Teasy.with_zone`
+- always use `Teasy.with_zone` internally when looking up the
+  `TZInfo::Timezone`. That way one could support other time zone names than the
+  TZInfo Identifier by making `Teasy.with_zone` convert those

data/lib/teasy.rb

@@ -22,7 +22,7 @@ module Teasy
     def with_zone(zone)
       old_zone = default_zone
       self.default_zone = zone
-      yield
+      yield zone
     ensure
       self.default_zone = old_zone
     end

data/lib/teasy/ambiguous_time_handling.rb

@@ -37,9 +37,9 @@ module Teasy
         # By returning nil TZInfo will raise TZInfo::AmbigousTime. It'd be
         # better to raise our own error, but that would break the API that's out
         # there. So that will have to wait for a 1.x release.
-        raise:                 ->(_time, _periods) {},
-        daylight_savings_time: ->(_time, periods)  { periods.select(&:dst?) },
-        standard_time:         ->(_time, periods)  { periods.reject(&:dst?) }
+        raise: ->(_time, _periods) {},
+        daylight_savings_time: ->(_time, periods) { periods.select(&:dst?) },
+        standard_time: ->(_time, periods) { periods.reject(&:dst?) }
       }.freeze
     end
   end

data/lib/teasy/floating_time.rb

@@ -58,6 +58,7 @@ module Teasy
     def <=>(other)
       return nil unless other.respond_to?(:to_time) &&
                         other.respond_to?(:utc_offset)
+
       to_time - other.utc_offset <=> other.to_time.utc
     end
 
@@ -113,7 +114,7 @@ module Teasy
 
     def prefix_zone_info(format)
       # prefixes zone directives with a % s.t. they are ignored in strftime
-      format.gsub(zone_directives_matcher) { |m| '%' + m }
+      format.gsub(zone_directives_matcher) { |m| "%#{m}" }
     end
   end
 end

data/lib/teasy/period_not_found_handling.rb

@@ -35,17 +35,17 @@ module Teasy
       end
 
       HANDLER = {
-        raise:           ->(_time, _zone) { raise },
+        raise: ->(_time, _zone) { raise },
         # the biggest change in offsets known to me is when Samoa went from -11
         # to +13 (a full day!) so hopefully we're sure to leave the unknown
         # period by adding/subtracting 3 days
-        next_period:     lambda do |time, zone|
+        next_period: lambda do |time, zone|
           period = zone.period_for_local(time + 3 * 86_400)
-          [period, period.start_transition.time + period.utc_total_offset]
+          [period, period.start_transition.at.to_time + period.utc_total_offset]
         end,
         previous_period: lambda do |time, zone|
           period = zone.period_for_local(time - 3 * 86_400)
-          [period, period.end_transition.time + period.utc_total_offset]
+          [period, period.end_transition.at.to_time + period.utc_total_offset]
         end
       }.freeze
     end

data/lib/teasy/time_with_zone.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'tzinfo'
+require 'time'
 require 'forwardable'
 
 module Teasy
@@ -22,7 +23,7 @@ module Teasy
     def initialize(year, month = nil, day = nil,
                    hour = nil, minute = nil, second = nil, usec_with_frac = nil,
                    zone = Teasy.default_zone)
-      @zone = TZInfo::Timezone.get(zone)
+      @zone = tzinfo_time_zone(zone)
       @time = Time.utc(year, month, day, hour, minute, second, usec_with_frac)
       @period = determine_period(@time, @zone)
     end
@@ -46,17 +47,15 @@ module Teasy
     end
 
     def self.strptime(string, format, zone = Teasy.default_zone)
-      # rubocop:disable Style/DateTime
       new(*DateTime._strptime(string, format).values, 'UTC').in_time_zone!(zone)
-      # rubocop:enable Style/DateTime
     end
 
     def in_time_zone!(zone = Teasy.default_zone)
       time = utc_time
-      @zone = TZInfo::Timezone.get(zone)
+      @zone = tzinfo_time_zone(zone)
       @time = @zone.utc_to_local(time)
       @period = @zone.period_for_utc(time)
-      remove_instance_variable(:@local_time) unless @local_time.nil?
+      remove_instance_variable(:@local_time) if defined?(@local_time)
       self
     end
 
@@ -74,7 +73,7 @@ module Teasy
 
     def utc!
       @time = @zone.local_to_utc(@time, @period.dst?)
-      @zone = TZInfo::Timezone.get('UTC')
+      @zone = tzinfo_time_zone('UTC')
       @period = @zone.period_for_local(@time)
       self
     end
@@ -126,6 +125,7 @@ module Teasy
 
     def <=>(other)
       return nil unless other.respond_to? :to_time
+
       to_time <=> other.to_time
     end
 
@@ -142,7 +142,8 @@ module Teasy
     end
 
     def to_time
-      return @local_time unless @local_time.nil?
+      return @local_time if defined?(@local_time)
+
       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)
@@ -167,10 +168,10 @@ module Teasy
     attr_reader :time, :period
 
     # matches valid format directives for zones
-    ZONE_ABBREV = /(?<!%)%Z/
-    ZONE_NO_COLON_OFFSET = /(?<!%)%z/
-    ZONE_COLON_OFFSET = /(?<!%)%:z/
-    ZONE_COLONS_OFFSET = /(?<!%)%::z/
+    ZONE_ABBREV = /(?<!%)%Z/.freeze
+    ZONE_NO_COLON_OFFSET = /(?<!%)%z/.freeze
+    ZONE_COLON_OFFSET = /(?<!%)%:z/.freeze
+    ZONE_COLONS_OFFSET = /(?<!%)%::z/.freeze
 
     def zone_directives_matcher
       @zone_directives_matcher ||= Regexp.union(
@@ -195,17 +196,24 @@ module Teasy
       format_with_zone
     end
 
+    # rubocop:disable Style/OptionalBooleanParameter
     def formatted_offset(offset_in_seconds, colon = false, seconds = false)
-      string_format = +'%s%02d:%02d'
-      string_format.concat(':%02d') if seconds
-      string_format.delete!(':') unless colon
-
       sign = offset_in_seconds.negative? ? '-' : '+'
       hours = offset_in_seconds.abs / 3600
       minutes = (offset_in_seconds.abs % 3600) / 60
-      seconds = (offset_in_seconds.abs % 60)
 
-      format(string_format, sign, hours, minutes, seconds)
+      separator = colon ? ':' : ''
+      string_format = ['%s%02d', '%02d', ('%02d' if seconds)]
+                      .compact.join(separator)
+      args = [sign, hours, minutes, ((offset_in_seconds.abs % 60) if seconds)]
+             .compact
+
+      format(string_format, *args)
+    end
+    # rubocop:enable Style/OptionalBooleanParameter
+
+    def tzinfo_time_zone(time_zone)
+      Teasy.with_zone(time_zone) { |zone| TZInfo::Timezone.get(zone) }
     end
   end
   # rubocop:enable Metrics/ClassLength

data/lib/teasy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Teasy
-  VERSION = '0.2.3'
+  VERSION = '0.2.8'
 end

data/teasy.gemspec

@@ -1,33 +1,31 @@
-# coding: utf-8
-require File.expand_path("../lib/teasy/version", __FILE__)
+require File.expand_path('lib/teasy/version', __dir__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'teasy'
   spec.version       = Teasy::VERSION
   spec.authors       = ['Kai Kuchenbecker']
   spec.email         = ['Kai.Kuchenbecker@invision.de']
-  spec.summary       = %q{Teasy intends to make handling time zones easy.}
-  spec.description   = %q{Teasy builds on tzinfo to get time zone data and
+  spec.summary       = 'Teasy intends to make handling time zones easy.'
+  spec.description   = "Teasy builds on tzinfo to get time zone data and
                           provides time classes to ease working with time zones.
                           It provides TimeWithZone which is similiar to Rails'
                           ActiveSupport::TimeWithZone but with less quirks. And
                           it provides FloatingTime which is time without a zone.
-                        }
+                        "
   spec.homepage      = ''
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.required_ruby_version = '> 2.0'
 
-  spec.add_runtime_dependency 'tzinfo', '~> 1.2'
-  spec.add_runtime_dependency 'tzinfo-data', '~> 1.2018.4'
+  spec.add_runtime_dependency 'tzinfo', '~> 2.0'
+  spec.add_runtime_dependency 'tzinfo-data', '~> 1.2020.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'
 end

data/test/teasy/time_with_zone_test.rb

@@ -44,7 +44,7 @@ class TimeWithZoneTest < Minitest::Test
 
   def test_constructor_defaults_to_teasy_default_zone
     assert_equal Teasy.default_zone, @timestamptz.zone
-    Teasy.stub(:default_zone, 'Europe/Berlin') do
+    Teasy.with_zone('Europe/Berlin') do
       timestamptz = Teasy::TimeWithZone.new(*@params)
       assert_equal 'Europe/Berlin', timestamptz.zone
     end
@@ -243,7 +243,7 @@ class TimeWithZoneTest < Minitest::Test
   def test_inspect
     assert_equal '2042-04-02 00:30:45 UTC', @timestamptz.inspect
     assert_equal '2042-04-02 00:30:45 +0200', @timestamptz_berlin.inspect
-    timestamptz = Teasy.stub(:default_zone, 'Europe/Berlin') do
+    timestamptz = Teasy.with_zone('Europe/Berlin') do
       Teasy::TimeWithZone.new(2042)
     end
     assert_equal '2042-01-01 00:00:00 +0100', timestamptz.inspect
@@ -386,7 +386,7 @@ class TimeWithZoneTest < Minitest::Test
   end
 
   def test_to_i
-    assert_instance_of Fixnum, @timestamptz.to_i
+    assert_instance_of Integer, @timestamptz.to_i
     assert_equal 2_280_011_445, @timestamptz.to_i
     assert_equal 2_280_004_245, @timestamptz_berlin.to_i
   end
@@ -402,7 +402,7 @@ class TimeWithZoneTest < Minitest::Test
   def test_to_s
     assert_equal '2042-04-02 00:30:45 UTC', @timestamptz.to_s
     assert_equal '2042-04-02 00:30:45 +0200', @timestamptz_berlin.to_s
-    timestamptz = Teasy.stub(:default_zone, 'Europe/Berlin') do
+    timestamptz = Teasy.with_zone('Europe/Berlin') do
       Teasy::TimeWithZone.new(2042)
     end
     assert_equal '2042-01-01 00:00:00 +0100', timestamptz.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teasy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - Kai Kuchenbecker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -16,58 +16,58 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2018.4
+        version: 1.2020.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2018.4
+        version: 1.2020.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +122,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -156,13 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Teasy intends to make handling time zones easy.
-test_files:
-- test/teasy/floating_time_test.rb
-- test/teasy/teasy_test.rb
-- test/teasy/time_with_zone_test.rb
-- test/test_helper.rb
+test_files: []