time_calc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3222784ca4e6f520d4402ce84f5ea6f8a9becccb66e3640071d0a29b332297b7
-  data.tar.gz: 9746e03e5a3e560a5f63780e87ea75f87597faa44e594228f075ae5daca3a83b
+  metadata.gz: b611cfb8c2a45b600235a6a7b3c1c2ce0688205cf9b2be7130b2efa3a5f6b0bd
+  data.tar.gz: cd1ea75b65a186e5f444a4c1fbd20f146d36635857bbe901797a770d8249ec00
 SHA512:
-  metadata.gz: a6f3315fe5e4bc9334cbee7f089f50aebf7dfa854a6580f7cc53488afa0c8cb9ef0601f0d47c691b8427cbeea4dcc2842c97022666009e3b01b8e4056883b67c
-  data.tar.gz: d0ccd1540d9010f5c4cec6c3fb4708b75c3fc795cbe8913f7a7e43455caa6bf209f6d39ca828dd83bae8d73f4a7e8b7a0a7a432eaeaaec33442e6ef1afe5716d
+  metadata.gz: 91f750a32bf00c3bec57458cf89cabcaf0a307204b5a94d4bc5fb1210af88849b8c5e07feb63a75f6d05b242f5b390b2c64610df13156d7c19bd8db598227543
+  data.tar.gz: 89d16a28e6744ee4d7fd0c0cb18cbaf7dba2e8c8d1e459760b271c87e4927ca5e6a898af5220bb8e5bc9ce3148665fc7eb8d0a23a1bceef7ba356d2b3543355a

data/Changelog.md

@@ -1,5 +1,10 @@
 # TimeCalc changelog
 
+## 0.0.4 / 2020-04-11
+
+* Support `ActiveSupport::TimeWithZone` as a calculation target.
+
+
 ## 0.0.3 / 2019-12-14
 
 * Add `TimeCalc#iterate` to easily operate in "business date/time" contexts.
@@ -11,4 +16,4 @@
 
 ## 0.0.1 / 2019-07-05
 
-First release. Rip-off of [time_math2](https://github.com/zverok/time_math2) with full API redesign and dropping of some less-used features ("resamplers").
+First release. Rip-off of [time_math2](https://github.com/zverok/time_math2) with full API redesign and dropping of some less-used features ("resamplers").

data/README.md

@@ -16,7 +16,8 @@ _**NB:** TimeCalc is a continuation of [TimeMath](https://github.com/zverok/time
 * Tries its best to preserve timezone/offset information:
   * **on Ruby 2.6+**, for `Time` with real timezones, preserves them;
   * on Ruby < 2.6, preserves at least `utc_offset` of `Time`;
-  * for `DateTime` preserves zone name.
+  * for `DateTime` preserves zone name;
+* _Since 0.0.4,_ supports `ActiveSupport::TimeWithZone`, too. While in ActiveSupport-enabled context TimeCalc may seem redundant (you'll probably use `time - 1.day` anyways), some of the functionality is easier with TimeCalc (rounding to different units) or just not present in ActiveSupport (time sequences, iterate with skippking); also may be helpful for third-party libraries which want to use TimeCalc underneath but don't want to be broken in Rails context.
 
 ## Synopsis
 

data/lib/time_calc/types.rb

@@ -7,11 +7,16 @@ class TimeCalc
     extend self
 
     ATTRS = {
-      Time => %i[year month day hour min sec subsec utc_offset],
-      Date => %i[year month day],
-      DateTime => %i[year month day hour min sec sec_fraction zone]
+      'Time' => %i[year month day hour min sec subsec utc_offset],
+      'Date' => %i[year month day],
+      'DateTime' => %i[year month day hour min sec sec_fraction zone],
+      'ActiveSupport::TimeWithZone' => %i[year month day hour min sec sec_fraction time_zone]
     }.freeze
 
+    # @private
+    # Because AS::TimeWithZone so frigging smart that it returns "Time" from redefined class name.
+    CLASS_NAME = Class.instance_method(:name)
+
     def compatible?(v1, v2)
       [v1, v2].all?(Date) || [v1, v2].all?(Time)
     end
@@ -46,6 +51,22 @@ class TimeCalc
         .values.then { |components| DateTime.new(*components) }
     end
 
+    def merge_activesupport__timewithzone(value, **attrs)
+      # You'd imagine we should be able to use just value.change(...) ActiveSupport's API here...
+      # But it is not available if you don't require all the core_ext's of Time, so I decided to
+      # be on the safe side and use similar approach everywhere.
+
+      # When we truncate, we use :subsec key as a sign to zeroefy second fractions
+      attrs[:sec_fraction] ||= attrs.delete(:subsec) if attrs.key?(:subsec)
+
+      _merge(value, **attrs)
+        .then { |components|
+          zone = components.delete(:time_zone)
+          components.merge!(mday: components.delete(:day), mon: components.delete(:month))
+          zone.__send__(:parts_to_time, components, value)
+        }
+    end
+
     private
 
     REAL_TIMEZONE = ->(z) { z.respond_to?(:utc_to_local) } # Ruby 2.6 real timezones
@@ -63,7 +84,7 @@ class TimeCalc
     end
 
     def _merge(value, attrs)
-      attr_names = ATTRS.fetch(value.class)
+      attr_names = ATTRS.fetch(CLASS_NAME.bind(value.class).call)
       attr_names.to_h { |u| [u, value.public_send(u)] }.merge(**attrs.slice(*attr_names))
     end
   end

data/lib/time_calc/value.rb

@@ -6,27 +6,7 @@ require 'backports/2.6.0/hash/to_h'
 require 'backports/2.6.0/kernel/then'
 require 'backports/2.5.0/hash/slice'
 require 'backports/2.5.0/enumerable/all'
-
-if RUBY_VERSION < '2.7'
-  # @private
-  # TODO: Replace with backports after 2.7 release
-  class Enumerator
-    NOVALUE = Object.new.freeze
-
-    def self.produce(initial = NOVALUE)
-      fail ArgumentError, 'No block given' unless block_given?
-
-      Enumerator.new do |y|
-        val = initial == NOVALUE ? yield() : initial
-
-        loop do
-          y << val
-          val = yield(val)
-        end
-      end
-    end
-  end
-end
+require 'backports/2.7.0/enumerator/produce'
 
 class TimeCalc
   # Wrapper (one can say "monad") around date/time value, allowing to perform several TimeCalc
@@ -40,10 +20,17 @@ class TimeCalc
     # @private
     TIMEY = proc { |t| t.respond_to?(:to_time) }
 
+    # @private
+    # Because AS::TimeWithZone so frigging smart that it returns "Time" from redefined class name.
+    CLASS_NAME = Class.instance_method(:name)
+
     # @private
     def self.wrap(value)
       case value
       when Time, Date, DateTime
+        # NB: ActiveSupport::TimeWithZone will also pass to this branch if
+        # active_support/core_ext/time is required. But it is doubtfully it is not -- TWZ will be
+        # mostly unusable :)
         new(value)
       when Value
         value
@@ -100,7 +87,8 @@ class TimeCalc
     # @param attrs [Hash<Symbol => Integer>]
     # @return [Value]
     def merge(**attrs)
-      Value.new(Types.public_send("merge_#{internal.class.name.downcase}", internal, **attrs))
+      class_name = CLASS_NAME.bind(internal.class).call.tr(':', '_')
+      Value.new(Types.public_send("merge_#{class_name.downcase}", internal, **attrs))
     end
 
     # Truncates all time components lower than `unit`. In other words, "floors" (rounds down)

data/lib/time_calc/version.rb

@@ -2,5 +2,5 @@
 
 class TimeCalc
   # @private
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_calc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.15.0
+        version: 3.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.15.0
+        version: 3.17.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 1.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 1.38.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -110,18 +110,32 @@ dependencies:
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement