mocha 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f349dc7259b6d387aaf194adc6c6f93fe39b9b785ce42489e2abf168c58dc84
-  data.tar.gz: '08a9210b39673183198a69a82d368b14af06722cc136a72635638b69a7a9e1b1'
+  metadata.gz: d4bd89c61177f213648b496bffa016c3546d6461da8552429560ff3f9804df4f
+  data.tar.gz: df6603b30f57ea57f6ba3383fc80df02ce0d94b246c35dd97b3eed80e689e717
 SHA512:
-  metadata.gz: 1d77dedb5f4016ab1f2932a18b9d574a0e1de87ab0bc77cf5757920c8ca231a2c5872688a5c1dc8dbd530e81d9e8f1c6feb218c469126685ca822e953c568263
-  data.tar.gz: 6545a73cfed1eb00f94ca06f1cd12606db4377c6e8a5f228a512464e106e129a584d6cedf195602dad45398a2e8346e2abd98c353209e41a4b13da64a9fbc635
+  metadata.gz: d3cb27ce0f13c163fb82a9ac9d3464ea3e0a2478a091033e1cb518a27db4dc4dad7ef16445a31cb363a31622b445413b132c7ffef29cc4b5c84183a7e951ec4d
+  data.tar.gz: ee6377fe60777af55832a284086920a4e1eff54824440f5ab4e9aa03c89e232034f0b0ec89abf5627de60c97d4f6405093144f37ec96217b31ba41ea125fd79b

data/.rubocop.yml

@@ -11,22 +11,10 @@ Style/Alias:
 Style/Documentation:
   Enabled: false
 
-# Enumerable#each_with_object only available since Ruby v1.9
-Style/EachWithObject:
-  Enabled: false
-
 # Kernel#__dir__ has only been available since Ruby v2.0
 Style/ExpandPathArguments:
   Enabled: false
 
-# Kernel#format has only supported named references since Ruby v1.9
-Style/FormatStringToken:
-  EnforcedStyle: unannotated
-
-# ruby19 style has only been supported since Ruby v1.9
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
 # I'm not keen on this cop, because it's easy to miss the conditional
 # I think the results are particularly unhelpful when Metrics/LineLength is big
 Style/IfUnlessModifier:

data/.yardopts

@@ -1,5 +1,4 @@
 --output-dir docs
---template-path yard-templates
 --no-private
 lib/mocha/api.rb
 lib/mocha/hooks.rb

data/COPYING.md

@@ -1,3 +1,3 @@
-Copyright Revieworld Ltd. 2006
+Copyright James Mead 2006
 
-You may use, copy and redistribute this library under the same terms as [Ruby itself](http://www.ruby-lang.org/en/LICENSE.txt) or under the [MIT license](http://www.opensource.org/licenses/MIT).
+You may use, copy and redistribute this library under the same terms as [Ruby itself](https://www.ruby-lang.org/en/about/license.txt) or under the [MIT license](https://mit-license.org/).

data/MIT-LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Revieworld Ltd.
+Copyright (c) 2006 James Mead
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -1,4 +1,4 @@
-## Mocha [![CircleCI status of freerange/mocha](https://circleci.com/gh/freerange/mocha.svg?style=shield&circle-token=bc1f6576c77da43ec58badde9273fa4eb1d7f53a)](https://app.circleci.com/pipelines/github/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha)
+## Mocha [![CircleCI status of freerange/mocha](https://circleci.com/gh/freerange/mocha.svg?style=shield)](https://app.circleci.com/pipelines/github/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha)
 
 ### Description
 
@@ -331,14 +331,12 @@ See this [list of contributors](https://github.com/freerange/mocha/graphs/contri
 * Commit & push to GitHub
 * Check CircleCI build is passing - https://app.circleci.com/pipelines/github/freerange/mocha
 
-* Sign in to Google Analytics - https://analytics.google.com/analytics/web/
-* Find the web property ID for floehopper (625523) > Mocha Documentation (UA-625523-7)
 * Generate documentation:
 
 ```bash
 $ MOCHA_GENERATE_DOCS=true bundle install
 
-$ MOCHA_GENERATE_DOCS=true GOOGLE_ANALYTICS_WEB_PROPERTY_ID=UA-625523-7 rake generate_docs
+$ MOCHA_GENERATE_DOCS=true rake generate_docs
 ```
 * Commit documentation & push to GitHub
 * Sign in to rubygems.org and find API key - https://rubygems.org/profile/edit
@@ -364,6 +362,6 @@ Mocha was initially harvested from projects at [Reevoo](http://www.reevoo.com/).
 
 ### License
 
-© Copyright Revieworld Ltd. 2006
+© Copyright James Mead 2006
 
-You may use, copy and redistribute this library under the same terms as [Ruby itself](http://www.ruby-lang.org/en/LICENSE.txt) or under the [MIT license](http://www.opensource.org/licenses/MIT).
+You may use, copy and redistribute this library under the same terms as [Ruby itself](https://www.ruby-lang.org/en/about/license.txt) or under the [MIT license](https://mit-license.org/).

data/RELEASE.md

@@ -1,5 +1,47 @@
 # Release Notes
 
+## 2.1.0
+
+### External changes
+
+* Fix compatibility with Minitest (#614) - thanks to @kyrofa & @manewitz for reporting and to @zenspider for his input
+
+### Internal changes
+
+* Update URLs for links to Ruby & MIT licenses (d6470af4)
+
+## 2.0.4
+
+### Internal changes
+
+* Update `README.md` (e8c21e1b)
+
+## 2.0.3
+
+### External changes
+
+* Fix `BacktraceFilter` to handle special characters (e242033f, #592) - thanks to @casperisfine
+
+### Internal changes
+
+* Add Ruby v3.1 to the CircleCI build (3e460489)
+* DRY up `regexp_matches` test (ae9fed4a)
+* Fix regexp_matches tests in Ruby v3.2 (26b106a5, #590)
+* Use Ruby 1.9 hash syntax (8bc0ad2f, #598, #537) - thanks to @herwinw
+* Simplify storage of `MOCHA_OPTIONS` (b70507a1, #600) - thanks to @herwinw
+* Pin JRuby to v9.3.9.0 in CircleCI builds (b8e6d064, #591)
+* Rubocop: enable Style/FormatStringToken cop (089a688e, #603) - thanks to @herwinw
+* Remove Ruby version check from `RespondsLikeTest` (21583129)
+* Add Ruby v3.2 to CircleCI build (f7e17636, #601)
+* Use Ruby v2.6 vs v2.2 to run lint CI job (af40b7db)
+* Pin yard version to v0.9.28 to avoid `ArgumentError` (12f1eef7)
+* Revert "Pin JRuby to v9.3.9.0 in CircleCI builds" (4f5bb2f0, #591)
+* Remove invalid CircleCI token from badge URL (7078e76a)
+* Revert "Pin yard version to v0.9.28 to avoid ArgumentError" (7c6c10c5, #609)
+* Remove Google Analytics tracking code (2279c49d, #612)
+* Update `MIT-LICENSE.md` (48162b4e)
+* Update `COPYING.md` (f3152376)
+
 ## 2.0.2
 
 ### External changes

data/Rakefile

@@ -111,7 +111,7 @@ def benchmark_test_case(klass, iterations)
     unless @silent_option
       begin
         load 'test/unit/ui/console/outputlevel.rb' unless defined?(Test::Unit::UI::Console::OutputLevel::SILENT)
-        @silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
+        @silent_option = { output_level: Test::Unit::UI::Console::OutputLevel::SILENT }
       rescue LoadError
         @silent_option = Test::Unit::UI::SILENT
       end
@@ -129,14 +129,8 @@ if ENV['MOCHA_GENERATE_DOCS']
     `rm -rf ./docs`
   end
 
-  task 'docs_environment' do
-    unless ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
-      puts "\nWarning: GOOGLE_ANALYTICS_WEB_PROPERTY_ID was not defined\n\n"
-    end
-  end
-
   desc 'Generate documentation'
-  YARD::Rake::YardocTask.new('yardoc' => 'docs_environment') do |task|
+  YARD::Rake::YardocTask.new('yardoc') do |task|
     task.options = ['--title', "Mocha #{Mocha::VERSION}", '--fail-on-warning']
   end
 

data/lib/mocha/backtrace_filter.rb

@@ -3,11 +3,11 @@ module Mocha
     LIB_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), '..')) + File::SEPARATOR
 
     def initialize(lib_directory = LIB_DIRECTORY)
-      @path_pattern = Regexp.new(lib_directory)
+      @lib_directory = lib_directory
     end
 
     def filtered(backtrace)
-      backtrace.reject { |location| @path_pattern.match(File.expand_path(location)) }
+      backtrace.reject { |location| File.expand_path(location).start_with?(@lib_directory) }
     end
   end
 end

data/lib/mocha/configuration.rb

@@ -39,13 +39,13 @@ module Mocha
   class Configuration
     # @private
     DEFAULTS = {
-      :stubbing_method_unnecessarily => :allow,
-      :stubbing_method_on_non_mock_object => :allow,
-      :stubbing_non_existent_method => :allow,
-      :stubbing_non_public_method => :allow,
-      :stubbing_method_on_nil => :prevent,
-      :display_matching_invocations_on_failure => false,
-      :strict_keyword_argument_matching => false
+      stubbing_method_unnecessarily: :allow,
+      stubbing_method_on_non_mock_object: :allow,
+      stubbing_non_existent_method: :allow,
+      stubbing_non_public_method: :allow,
+      stubbing_method_on_nil: :prevent,
+      display_matching_invocations_on_failure: false,
+      strict_keyword_argument_matching: false
     }.freeze
 
     attr_reader :options

data/lib/mocha/debug.rb

@@ -1,12 +1,9 @@
 module Mocha
   module Debug
-    OPTIONS = (ENV['MOCHA_OPTIONS'] || '').split(',').inject({}) do |hash, key|
-      hash[key] = true
-      hash
-    end.freeze
+    OPTIONS = (ENV['MOCHA_OPTIONS'] || '').split(',').freeze
 
     def self.puts(message)
-      warn(message) if OPTIONS['debug']
+      warn(message) if OPTIONS.include?('debug')
     end
   end
 end

data/lib/mocha/expectation.rb

@@ -674,7 +674,7 @@ module Mocha
     def inspect
       address = __id__ * 2
       address += 0x100000000 if address < 0
-      "#<Expectation:0x#{format('%x', address)} #{mocha_inspect} >"
+      "#<Expectation:0x#{format('%<address>x', address: address)} #{mocha_inspect} >"
     end
 
     # @private

data/lib/mocha/inspect.rb

@@ -6,7 +6,7 @@ module Mocha
       def mocha_inspect
         address = __id__ * 2
         address += 0x100000000 if address < 0
-        inspect =~ /#</ ? "#<#{self.class}:0x#{Kernel.format('%x', address)}>" : inspect
+        inspect =~ /#</ ? "#<#{self.class}:0x#{Kernel.format('%<address>x', address: address)}>" : inspect
       end
     end
 

data/lib/mocha/integration/mini_test/adapter.rb

@@ -23,7 +23,7 @@ module Mocha
 
         # @private
         def self.included(_mod)
-          Mocha::ExpectationErrorFactory.exception_class = ::MiniTest::Assertion
+          Mocha::ExpectationErrorFactory.exception_class = ::Minitest::Assertion
         end
 
         # @private

data/lib/mocha/integration/test_unit/adapter.rb

@@ -23,16 +23,16 @@ module Mocha
 
         # @private
         def self.included(mod)
-          mod.setup :mocha_setup, :before => :prepend
+          mod.setup :mocha_setup, before: :prepend
 
           mod.exception_handler(:handle_mocha_expectation_error)
 
-          mod.cleanup :after => :append do
+          mod.cleanup after: :append do
             assertion_counter = Integration::AssertionCounter.new(self)
             mocha_verify(assertion_counter)
           end
 
-          mod.teardown :mocha_teardown, :after => :append
+          mod.teardown :mocha_teardown, after: :append
         end
 
         private

data/lib/mocha/names.rb

@@ -37,7 +37,7 @@ module Mocha
     def mocha_inspect
       address = @mock.__id__ * 2
       address += 0x100000000 if address < 0
-      "#<Mock:0x#{format('%x', address)}>"
+      "#<Mock:0x#{format('%<address>x', address: address)}>"
     end
   end
 end

data/lib/mocha/parameter_matchers/equivalent_uri.rb

@@ -50,7 +50,7 @@ module Mocha
       # @private
       def explode(uri)
         query_hash = CGI.parse(uri.query || '')
-        URI::Generic::COMPONENT.inject({}) { |h, k| h.merge(k => uri.__send__(k)) }.merge(:query => query_hash)
+        URI::Generic::COMPONENT.inject({}) { |h, k| h.merge(k => uri.__send__(k)) }.merge(query: query_hash)
       end
     end
   end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -128,8 +128,6 @@ files:
 - lib/mocha/version.rb
 - lib/mocha/yield_parameters.rb
 - mocha.gemspec
-- yard-templates/default/layout/html/google_analytics.erb
-- yard-templates/default/layout/html/setup.rb
 homepage: https://mocha.jamesmead.org
 licenses:
 - MIT
@@ -150,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Mocking and stubbing library

data/yard-templates/default/layout/html/google_analytics.erb

@@ -1,8 +0,0 @@
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', '<%= ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID'] %>');
-</script>

data/yard-templates/default/layout/html/setup.rb

@@ -1,5 +0,0 @@
-def init
-  super
-  return unless ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
-  sections[:layout] << :google_analytics
-end