mocha 1.12.0 → 2.1.0

data/lib/mocha/stubbed_method.rb

@@ -1,5 +1,5 @@
+require 'ruby2_keywords'
 require 'mocha/ruby_version'
-require 'mocha/singleton_class'
 
 module Mocha
   class StubbedMethod
@@ -11,7 +11,7 @@ module Mocha
       @stubbee = stubbee
       @original_method = nil
       @original_visibility = nil
-      @method_name = PRE_RUBY_V19 ? method_name.to_s : method_name.to_sym
+      @method_name = method_name.to_sym
     end
 
     def stub
@@ -21,7 +21,6 @@ module Mocha
 
     def unstub
       remove_new_method
-      restore_original_method
       mock.unstub(method_name.to_sym)
       return if mock.any_expectations?
       reset_mocha
@@ -38,28 +37,16 @@ module Mocha
     def hide_original_method
       return unless original_method_owner.__method_exists__?(method_name)
       store_original_method_visibility
-      if use_prepended_module_for_stub_method?
-        use_prepended_module_for_stub_method
-      else
-        begin
-          store_original_method
-        # rubocop:disable Lint/HandleExceptions
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
-        end
-        # rubocop:enable Lint/HandleExceptions
-        if stub_method_overwrites_original_method?
-          remove_original_method_from_stubbee
-        end
-      end
+      use_prepended_module_for_stub_method
     end
 
     def define_new_method
       self_in_scope = self
       method_name_in_scope = method_name
       stub_method_owner.send(:define_method, method_name) do |*args, &block|
-        self_in_scope.mock.method_missing(method_name_in_scope, *args, &block)
+        self_in_scope.mock.handle_method_call(method_name_in_scope, args, block)
       end
+      stub_method_owner.send(:ruby2_keywords, method_name)
       retain_original_visibility(stub_method_owner)
     end
 
@@ -67,18 +54,6 @@ module Mocha
       stub_method_owner.send(:remove_method, method_name)
     end
 
-    def store_original_method
-      @original_method = stubbee_method(method_name)
-    end
-
-    def restore_original_method
-      return if use_prepended_module_for_stub_method?
-      if stub_method_overwrites_original_method?
-        original_method_owner.send(:define_method, method_name, method_body(@original_method))
-      end
-      retain_original_visibility(original_method_owner)
-    end
-
     def matches?(other)
       return false unless other.class == self.class
       (stubbee.object_id == other.stubbee.object_id) && (method_name == other.method_name)
@@ -101,18 +76,6 @@ module Mocha
       @original_visibility = original_method_owner.__method_visibility__(method_name)
     end
 
-    def stub_method_overwrites_original_method?
-      @original_method && @original_method.owner == original_method_owner
-    end
-
-    def remove_original_method_from_stubbee
-      original_method_owner.send(:remove_method, method_name)
-    end
-
-    def use_prepended_module_for_stub_method?
-      RUBY_V2_PLUS
-    end
-
     def use_prepended_module_for_stub_method
       @stub_method_owner = PrependedModule.new
       original_method_owner.__send__ :prepend, @stub_method_owner

data/lib/mocha/test_unit.rb

@@ -1,8 +1,6 @@
+require 'mocha/ruby_version'
 require 'mocha/integration/test_unit'
-require 'mocha/deprecation'
 
 unless Mocha::Integration::TestUnit.activate
-  Mocha::Deprecation.warning(
-    "Test::Unit must be loaded *before* `require 'mocha/test_unit'`."
-  )
+  raise "Test::Unit must be loaded *before* `require 'mocha/test_unit'`."
 end

data/lib/mocha/version.rb

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

data/lib/mocha.rb

@@ -1,9 +1 @@
 require 'mocha/version'
-require 'mocha/ruby_version'
-require 'mocha/deprecation'
-
-if Mocha::PRE_RUBY_V19
-  Mocha::Deprecation.warning(
-    'Versions of Ruby earlier than v1.9 will not be supported in future versions of Mocha.'
-  )
-end

data/mocha.gemspec

@@ -2,11 +2,11 @@ lib = File.expand_path('../lib/', __FILE__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 require 'mocha/version'
 
-Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |s|
   s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 2.0'
 
   s.authors = ['James Mead']
   s.description = 'Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.'
@@ -15,37 +15,12 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(docs|test)/}) }
   end
-  s.files.delete('.travis.yml')
+  s.files.delete('.circleci/config.yml')
   s.files.delete('.gitignore')
 
   s.homepage = 'https://mocha.jamesmead.org'
   s.require_paths = ['lib']
   s.summary = 'Mocking and stubbing library'
 
-  unless s.respond_to?(:add_development_dependency)
-    class << s
-      def add_development_dependency(*args)
-        add_dependency(*args)
-      end
-    end
-  end
-
-  if RUBY_VERSION >= '1.9.3'
-    s.add_development_dependency('rake')
-  else
-    # Rake >= v11 does not support Ruby < v1.9.3 so use
-    s.add_development_dependency('rake', '~> 10.0')
-  end
-  s.add_development_dependency('introspection', '~> 0.0.1')
-  if RUBY_VERSION >= '2.2.0'
-    # No test libraries in standard library
-    s.add_development_dependency('minitest')
-  end
-  if RUBY_VERSION >= '1.9.2'
-    s.add_development_dependency('rubocop', '<= 0.58.2')
-  end
-  if ENV['MOCHA_GENERATE_DOCS']
-    s.add_development_dependency('redcarpet')
-    s.add_development_dependency('yard')
-  end
+  s.add_runtime_dependency 'ruby2_keywords', '>= 0.0.5'
 end

metadata

@@ -1,71 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.1.0
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: introspection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.58.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.0.5
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
@@ -85,23 +43,8 @@ files:
 - README.md
 - RELEASE.md
 - Rakefile
-- bin/build-matrix
-- gemfiles/Gemfile.minitest.1.3.0
-- gemfiles/Gemfile.minitest.1.4.0
-- gemfiles/Gemfile.minitest.1.4.1
-- gemfiles/Gemfile.minitest.1.4.2
-- gemfiles/Gemfile.minitest.2.0.0
-- gemfiles/Gemfile.minitest.2.0.1
-- gemfiles/Gemfile.minitest.2.11.0
-- gemfiles/Gemfile.minitest.2.11.2
-- gemfiles/Gemfile.minitest.2.3.0
-- gemfiles/Gemfile.minitest.5.11.3
 - gemfiles/Gemfile.minitest.latest
-- gemfiles/Gemfile.test-unit.2.0.0
-- gemfiles/Gemfile.test-unit.2.0.1
-- gemfiles/Gemfile.test-unit.2.0.3
 - gemfiles/Gemfile.test-unit.latest
-- init.rb
 - lib/mocha.rb
 - lib/mocha/any_instance_method.rb
 - lib/mocha/api.rb
@@ -127,31 +70,13 @@ files:
 - lib/mocha/in_state_ordering_constraint.rb
 - lib/mocha/inspect.rb
 - lib/mocha/instance_method.rb
-- lib/mocha/integration.rb
 - lib/mocha/integration/assertion_counter.rb
 - lib/mocha/integration/mini_test.rb
 - lib/mocha/integration/mini_test/adapter.rb
 - lib/mocha/integration/mini_test/exception_translation.rb
-- lib/mocha/integration/mini_test/nothing.rb
-- lib/mocha/integration/mini_test/version_13.rb
-- lib/mocha/integration/mini_test/version_140.rb
-- lib/mocha/integration/mini_test/version_141.rb
-- lib/mocha/integration/mini_test/version_142_to_172.rb
-- lib/mocha/integration/mini_test/version_200.rb
-- lib/mocha/integration/mini_test/version_201_to_222.rb
-- lib/mocha/integration/mini_test/version_2110_to_2111.rb
-- lib/mocha/integration/mini_test/version_2112_to_320.rb
-- lib/mocha/integration/mini_test/version_230_to_2101.rb
 - lib/mocha/integration/monkey_patcher.rb
 - lib/mocha/integration/test_unit.rb
 - lib/mocha/integration/test_unit/adapter.rb
-- lib/mocha/integration/test_unit/gem_version_200.rb
-- lib/mocha/integration/test_unit/gem_version_201_to_202.rb
-- lib/mocha/integration/test_unit/gem_version_203_to_220.rb
-- lib/mocha/integration/test_unit/gem_version_230_to_250.rb
-- lib/mocha/integration/test_unit/nothing.rb
-- lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
-- lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/invocation.rb
 - lib/mocha/is_a.rb
 - lib/mocha/logger.rb
@@ -174,6 +99,7 @@ files:
 - lib/mocha/parameter_matchers/has_entries.rb
 - lib/mocha/parameter_matchers/has_entry.rb
 - lib/mocha/parameter_matchers/has_key.rb
+- lib/mocha/parameter_matchers/has_keys.rb
 - lib/mocha/parameter_matchers/has_value.rb
 - lib/mocha/parameter_matchers/includes.rb
 - lib/mocha/parameter_matchers/instance_methods.rb
@@ -182,6 +108,7 @@ files:
 - lib/mocha/parameter_matchers/kind_of.rb
 - lib/mocha/parameter_matchers/not.rb
 - lib/mocha/parameter_matchers/optionally.rb
+- lib/mocha/parameter_matchers/positional_or_keyword_hash.rb
 - lib/mocha/parameter_matchers/regexp_matches.rb
 - lib/mocha/parameter_matchers/responds_with.rb
 - lib/mocha/parameter_matchers/yaml_equivalent.rb
@@ -191,9 +118,7 @@ files:
 - lib/mocha/return_values.rb
 - lib/mocha/ruby_version.rb
 - lib/mocha/sequence.rb
-- lib/mocha/setup.rb
 - lib/mocha/single_return_value.rb
-- lib/mocha/singleton_class.rb
 - lib/mocha/state_machine.rb
 - lib/mocha/stubbed_method.rb
 - lib/mocha/stubbing_error.rb
@@ -203,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
@@ -218,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Mocking and stubbing library

data/bin/build-matrix

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'yaml'
-require 'set'
-require 'English'
-
-def execute(*commands)
-  commands.each do |command|
-    system(command)
-    next if $CHILD_STATUS.success?
-    message = [
-      'Executing shell command failed.',
-      "  Command: #{command}",
-      "  Status:  #{$CHILD_STATUS.exitstatus}"
-    ].join("\n")
-    raise message
-  end
-end
-
-def reset_bundle
-  execute(
-    'rm -rf .bundle/gems',
-    'rm -rf gemfiles/.bundle/gems',
-    'rm -f *.lock',
-    'rm -f gemfiles/*.lock'
-  )
-end
-
-def with_rbenv(command)
-  %{export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; #{command}}
-end
-
-def run(ruby_version, gemfile, task = 'test')
-  ENV['RBENV_VERSION'] = ruby_version
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  ENV['MOCHA_OPTIONS'] = 'debug'
-  reset_bundle
-  execute(
-    with_rbenv("bundle install --gemfile=#{gemfile}"),
-    with_rbenv("bundle exec rake #{task}")
-  )
-end
-
-AVAILABLE_RUBY_VERSIONS = `rbenv versions --bare`.split("\n")
-
-travis_config = YAML.safe_load(File.read('.travis.yml'))
-build_configs = travis_config['matrix']['include']
-travis_config['rvm'].each do |ruby_version|
-  travis_config['gemfile'].each do |gemfile|
-    travis_config['env'].each do |env|
-      build_configs << { 'rvm' => ruby_version, 'gemfile' => gemfile, 'env' => env }
-    end
-  end
-end
-
-missing_ruby_versions = Set.new
-
-build_configs.each do |config|
-  ruby_version = config['rvm']
-  gemfile = config['gemfile']
-  environment_variables = Hash[*config['env'].split.flat_map { |e| e.split('=') }]
-  original_environment_variables = {}
-  begin
-    environment_variables.each do |k, v|
-      original_environment_variables[k] = ENV[k]
-      ENV[k] = v
-    end
-    if AVAILABLE_RUBY_VERSIONS.include?(ruby_version)
-      puts
-      puts "Ruby v#{ruby_version}; Gemfile path: #{gemfile}; Environment: #{environment_variables}"
-      run(ruby_version, gemfile)
-    else
-      missing_ruby_versions << ruby_version
-    end
-  ensure
-    original_environment_variables.each do |k, v|
-      ENV[k] = v
-    end
-  end
-end
-
-puts "Missing Ruby versions: #{missing_ruby_versions.to_a.join(', ')}"

data/gemfiles/Gemfile.minitest.1.3.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.3.0"
-end

data/gemfiles/Gemfile.minitest.1.4.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.4.0"
-end

data/gemfiles/Gemfile.minitest.1.4.1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.4.1"
-end

data/gemfiles/Gemfile.minitest.1.4.2

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.4.2"
-end

data/gemfiles/Gemfile.minitest.2.0.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.0.0"
-end

data/gemfiles/Gemfile.minitest.2.0.1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.0.1"
-end

data/gemfiles/Gemfile.minitest.2.11.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.11.0"
-end

data/gemfiles/Gemfile.minitest.2.11.2

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.11.2"
-end

data/gemfiles/Gemfile.minitest.2.3.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.3.0"
-end

data/gemfiles/Gemfile.minitest.5.11.3

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "5.11.3"
-end

data/gemfiles/Gemfile.test-unit.2.0.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "test-unit", "2.0.0"
-end

data/gemfiles/Gemfile.test-unit.2.0.1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "test-unit", "2.0.1"
-end

data/gemfiles/Gemfile.test-unit.2.0.3

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "test-unit", "2.0.3"
-end

data/init.rb

@@ -1 +0,0 @@
-warn 'Mocha deprecation warning: The old-style Rails plugin will not be supported in future versions of Mocha.'

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

@@ -1,19 +0,0 @@
-module Mocha
-  module Integration
-    module MiniTest
-      module Nothing
-        def self.applicable_to?(_test_unit_version, _ruby_version = nil)
-          true
-        end
-
-        def self.description
-          'nothing (no MiniTest integration available)'
-        end
-
-        def self.included(_mod)
-          raise 'No MiniTest integration available'
-        end
-      end
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-require 'mocha/integration/assertion_counter'
-require 'mocha/integration/monkey_patcher'
-require 'mocha/integration/mini_test/exception_translation'
-
-module Mocha
-  module Integration
-    module MiniTest
-      module Version13
-        def self.applicable_to?(mini_test_version)
-          Gem::Requirement.new('>= 1.3.0', '<= 1.3.1').satisfied_by?(mini_test_version)
-        end
-
-        def self.description
-          'monkey patch for MiniTest gem v1.3'
-        end
-
-        def self.included(mod)
-          MonkeyPatcher.apply(mod, RunMethodPatch)
-        end
-
-        module RunMethodPatch
-          # rubocop:disable all
-          def run runner
-            assertion_counter = AssertionCounter.new(self)
-            result = '.'
-            begin
-              begin
-                @passed = nil
-                mocha_setup
-                self.setup
-                self.__send__ self.name
-                mocha_verify(assertion_counter)
-                @passed = true
-              rescue Exception => e
-                @passed = false
-                result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
-              ensure
-                begin
-                  self.teardown
-                rescue Exception => e
-                  result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
-                end
-              end
-            ensure
-              mocha_teardown
-            end
-            result
-          end
-          # rubocop:enable all
-        end
-      end
-    end
-  end
-end