activesupport 7.1.2 → 7.1.3

data/lib/active_support/syntax_error_proxy.rb

@@ -32,6 +32,8 @@ module ActiveSupport
     end
 
     def backtrace_locations
+      return nil if super.nil?
+
       parse_message_for_trace.map { |trace|
         file, line = trace.match(/^(.+?):(\d+).*$/, &:captures) || trace
         BacktraceLocation.new(file, line.to_i, trace)
@@ -43,7 +45,26 @@ module ActiveSupport
 
     private
       def parse_message_for_trace
-        __getobj__.to_s.split("\n")
+        if source_location_eval?
+          # If the exception is coming from a call to eval, we need to keep
+          # the path of the file in which eval was called to ensure we can
+          # return the right source fragment to show the location of the
+          # error
+          location = __getobj__.backtrace_locations[0]
+          ["#{location.path}:#{location.lineno}: #{__getobj__}"]
+        else
+          __getobj__.to_s.split("\n")
+        end
+      end
+
+      if SyntaxError.method_defined?(:path) # Ruby 3.3+
+        def source_location_eval?
+          __getobj__.path.start_with?("(eval")
+        end
+      else # 3.2 and older versions of Ruby
+        def source_location_eval?
+          __getobj__.to_s.start_with?("(eval")
+        end
       end
   end
 end

data/lib/active_support/testing/assertions.rb

@@ -223,7 +223,7 @@ module ActiveSupport
       #     post :create, params: { status: { ok: true } }
       #   end
       #
-      # Provide the optional keyword argument :from to specify the expected
+      # Provide the optional keyword argument +:from+ to specify the expected
       # initial value.
       #
       #   assert_no_changes -> { Status.all_good? }, from: true do

data/lib/active_support/testing/time_helpers.rb

@@ -169,6 +169,10 @@ module ActiveSupport
           now = date_or_time.to_time.change(usec: 0)
         end
 
+        # +now+ must be in local system timezone, because +Time.at(now)+
+        # and +now.to_date+ (see stubs below) will use +now+'s timezone too!
+        now = now.getlocal
+
         stubs = simple_stubs
         stubbed_time = Time.now if stubs.stubbing(Time, :now)
         stubs.stub_object(Time, :now) { at(now) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -446,10 +446,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.2/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.3/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.3/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.2/activesupport
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.3/activesupport
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: