timecop 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ad5f132158245aadf9f2afbfbfaa2e0ed8298e69037270f51cb801f9794b88
-  data.tar.gz: ec1d3177b1ca8f8f03c2bef0316f97953a4fe021d250903ea9159cdca8079550
+  metadata.gz: '079905b60d7144434c07560dadc7a1dbd36d19ad27f25ecaf52e0143e0656d23'
+  data.tar.gz: f34eb8593ccdd28571a4ccbdd710f518e628da6113eeb0f904e2f04d91dc5bf1
 SHA512:
-  metadata.gz: 82b29e41644233b3aa80205a40e1f72e8616fc45b0c4e10fb12cbe5abf1e13dba36423667ba8ab4ec0e592633056d30d6f760a462137333ed629cffaf4272729
-  data.tar.gz: 81f1c484e1254c6b72bd55bcac4dda7aa5b73d2af04125fdbb433ef69baaf796efe022b3384555ef9241261a799af495bbf49fac88d1ca90b3a497908a9f4df6
+  metadata.gz: bd112c3657079e9c927d266725ba6d231a23658da5f385f1dca760011eff2021a30a1607cc187b26737b6d20244a0e9d54130a5a4c46b93e04c0ddebd3ba4fad
+  data.tar.gz: fa6dc270173399ff8c112624913703f612ea0d25720f13b01be67ee41781b07bd6661a502b0db1e1fdbc34fc91b4acd2966526f2ee1f1acd7463d8db26f40b8e

data/lib/timecop/time_extensions.rb

@@ -18,12 +18,16 @@ class Time #:nodoc:
 
     alias_method :new_without_mock_time, :new
 
-    def new_with_mock_time(*args)
-      args.size <= 0 ? now : new_without_mock_time(*args)
+    def new_with_mock_time(*args, **kwargs)
+      if args.empty? && kwargs.empty?
+        now
+      elsif kwargs.any?
+        new_without_mock_time(*args, **kwargs)
+      else
+        new_without_mock_time(*args)
+      end
     end
 
-    ruby2_keywords :new_with_mock_time if Module.private_method_defined?(:ruby2_keywords)
-
     alias_method :new, :new_with_mock_time
   end
 end
@@ -50,7 +54,12 @@ class Date #:nodoc:
 
       d = Date._strptime(str, fmt)
       now = Time.now.to_date
-      year = d[:year] || d[:cwyear] || now.year
+
+      # If "current" time falls near a year boundary, with a year-ambiguous str, we need to explicitly handle it
+      cwday = d[:cwday] && (now + (d[:cwday] - now.wday))
+      wday = d[:wday] && (now + (d[:wday] - now.wday))
+
+      year = d[:year] || d[:cwyear] || (cwday || wday || now).year
       mon = d[:mon] || now.mon
       if d.keys == [:year]
         Date.new(year, 1, 1, start)
@@ -59,7 +68,8 @@ class Date #:nodoc:
       elsif d[:yday]
         Date.new(year, 1, 1, start).next_day(d[:yday] - 1)
       elsif d[:cwyear] || d[:cweek] || d[:wnum0] || d[:wnum1] || d[:wday] || d[:cwday]
-        week = d[:cweek] || d[:wnum1] || d[:wnum0] || now.strftime('%W').to_i
+        # When only a day (wday/cwday) is present, derive the week from the resolved date; otherwise fall back to now's week
+        week = d[:cweek] || d[:wnum1] || d[:wnum0] || (cwday || wday || now).strftime('%W').to_i
         if d[:wnum0] #Week of year where week starts on sunday
           if d[:cwday] #monday based day of week
             Date.strptime_without_mock_date("#{year} #{week} #{d[:cwday]}", '%Y %U %u', start)
@@ -154,6 +164,8 @@ class DateTime #:nodoc:
         Date.closest_wday(date_hash[:wday]).to_datetime
       when date_hash[:hour] && date_hash[:min] && date_hash[:sec]
         DateTime.new(mocked_time_stack_item.year, mocked_time_stack_item.month, mocked_time_stack_item.day, date_hash[:hour], date_hash[:min], date_hash[:sec])
+      when date_hash[:hour] && date_hash[:min]
+        DateTime.new(mocked_time_stack_item.year, mocked_time_stack_item.month, mocked_time_stack_item.day, date_hash[:hour], date_hash[:min], 0)
       else
         parsed_date + mocked_time_stack_item.travel_offset_days
       end
@@ -168,58 +180,56 @@ class DateTime #:nodoc:
   end
 end
 
-if RUBY_VERSION >= '2.1.0'
-  module Process #:nodoc:
-    class << self
-      alias_method :clock_gettime_without_mock, :clock_gettime
-
-      def clock_gettime_mock_time(clock_id, unit = :float_second)
-        mock_time = case clock_id
-                    when Process::CLOCK_MONOTONIC
-                      mock_time_monotonic
-                    when Process::CLOCK_REALTIME
-                      mock_time_realtime
-                    end
-
-        return clock_gettime_without_mock(clock_id, unit) unless Timecop.mock_process_clock? && mock_time
-
-        divisor = case unit
-                  when :float_second
-                    1_000_000_000.0
-                  when :second
-                    1_000_000_000
-                  when :float_millisecond
-                    1_000_000.0
-                  when :millisecond
-                    1_000_000
-                  when :float_microsecond
-                    1000.0
-                  when :microsecond
-                    1000
-                  when :nanosecond
-                    1
+module Process #:nodoc:
+  class << self
+    alias_method :clock_gettime_without_mock, :clock_gettime
+
+    def clock_gettime_mock_time(clock_id, unit = :float_second)
+      mock_time = case clock_id
+                  when Process::CLOCK_MONOTONIC
+                    mock_time_monotonic
+                  when Process::CLOCK_REALTIME
+                    mock_time_realtime
                   end
 
-        (mock_time / divisor)
-      end
+      return clock_gettime_without_mock(clock_id, unit) unless Timecop.mock_process_clock? && mock_time
+
+      divisor = case unit
+                when :float_second
+                  1_000_000_000.0
+                when :second
+                  1_000_000_000
+                when :float_millisecond
+                  1_000_000.0
+                when :millisecond
+                  1_000_000
+                when :float_microsecond
+                  1000.0
+                when :microsecond
+                  1000
+                when :nanosecond
+                  1
+                end
+
+      (mock_time / divisor)
+    end
 
-      alias_method :clock_gettime, :clock_gettime_mock_time
+    alias_method :clock_gettime, :clock_gettime_mock_time
 
-      private
+    private
 
-      def mock_time_monotonic
-        mocked_time_stack_item = Timecop.top_stack_item
-        mocked_time_stack_item.nil? ? nil : mocked_time_stack_item.monotonic
-      end
+    def mock_time_monotonic
+      mocked_time_stack_item = Timecop.top_stack_item
+      mocked_time_stack_item.nil? ? nil : mocked_time_stack_item.monotonic
+    end
 
-      def mock_time_realtime
-        mocked_time_stack_item = Timecop.top_stack_item
+    def mock_time_realtime
+      mocked_time_stack_item = Timecop.top_stack_item
 
-        return nil if mocked_time_stack_item.nil?
+      return nil if mocked_time_stack_item.nil?
 
-        t = mocked_time_stack_item.time
-        t.to_i * 1_000_000_000 + t.nsec
-      end
+      t = mocked_time_stack_item.time
+      t.to_i * 1_000_000_000 + t.nsec
     end
   end
 end

data/lib/timecop/time_stack_item.rb

@@ -9,7 +9,7 @@ class Timecop
       @travel_offset  = @scaling_factor = nil
       @scaling_factor = args.shift if mock_type == :scale
       @mock_type      = mock_type
-      @monotonic      = parse_monotonic_time(*args) if RUBY_VERSION >= '2.1.0'
+      @monotonic      = parse_monotonic_time(*args)
       @time           = parse_time(*args)
       @time_was       = Time.now_without_mock_time
       @travel_offset  = compute_travel_offset
@@ -55,24 +55,22 @@ class Timecop
       @scaling_factor
     end
 
-    if RUBY_VERSION >= '2.1.0'
-      def monotonic
-        if travel_offset.nil?
-          @monotonic
-        elsif scaling_factor.nil?
-          current_monotonic + travel_offset * (10 ** 9)
-        else
-          (@monotonic + (current_monotonic - @monotonic) * scaling_factor).to_i
-        end
+    def monotonic
+      if travel_offset.nil?
+        @monotonic
+      elsif scaling_factor.nil?
+        current_monotonic + travel_offset * (10 ** 9)
+      else
+        (@monotonic + (current_monotonic - @monotonic) * scaling_factor).to_i
       end
+    end
 
-      def current_monotonic
-        Process.clock_gettime_without_mock(Process::CLOCK_MONOTONIC, :nanosecond)
-      end
+    def current_monotonic
+      Process.clock_gettime_without_mock(Process::CLOCK_MONOTONIC, :nanosecond)
+    end
 
-      def current_monotonic_with_mock
-        Process.clock_gettime_mock_time(Process::CLOCK_MONOTONIC, :nanosecond)
-      end
+    def current_monotonic_with_mock
+      Process.clock_gettime_mock_time(Process::CLOCK_MONOTONIC, :nanosecond)
     end
 
     def time(time_klass = Time) #:nodoc:

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Travis Jeffery
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-14 00:00:00.000000000 Z
+date: 2026-04-12 00:00:00.000000000 Z
 dependencies: []
 description: A gem providing "time travel" and "time freezing" capabilities, making
   it dead simple to test time-dependent code.  It provides a unified method to mock
@@ -42,14 +42,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A gem providing "time travel" and "time freezing" capabilities, making it