mocha 0.13.0 → 0.13.1

data/RELEASE.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.13.1
+* Fix #97 - `Mocha::ParameterMatchers#has_entry` does not work with an Array as the entry's value. Thanks to @ngokli.
+* Allow deprecation `:debug` mode to be switched on from `MOCHA_OPTIONS` environment variable.
+
 ## 0.13.0
 * Major overhaul of MiniTest & Test::Unit integration. Mocha now integrates with later versions of the two test libraries using documented hooks rather than monkey-patching. This should mean that Mocha will integrate with new versions of either library without the need to release a new version of Mocha each time, which was clearly bad and unsustainable. Many thanks to @tenderlove, @zenspider & @kou for their help, suggestions & patience.
 * Temporarily deprecated `require 'mocha'`. Use `require 'mocha/setup'` instead. The plan is that eventually `require 'mocha'` will *not* automatically integrate with either of the two test libraries as it does at the moment, and you'll need to explicitly & separately trigger the integration. I think this will provide a lot more flexibility and will hopefully do away with the need for the `require: false` option in the `Gemfile` which has always confused people.

data/lib/mocha/deprecation.rb

@@ -1,3 +1,5 @@
+require 'mocha/debug'
+
 module Mocha
 
   class Deprecation
@@ -14,7 +16,7 @@ module Mocha
 
     end
 
-    self.mode = :enabled
+    self.mode = Debug::OPTIONS['debug'] ? :debug : :enabled
     self.messages = []
 
   end

data/lib/mocha/parameter_matchers/has_entry.rb

@@ -42,16 +42,25 @@ module Mocha
     #   object.method_1('key_1' => 2, 'key_2' => 1)
     #   # error raised, because method_1 was not called with Hash containing entry: 'key_1' => 1
     def has_entry(*options)
-      key, value = options.shift, options.shift
-      if key.is_a?(Hash)
-        case key.length
-        when 0
-          raise ArgumentError.new("Argument has no entries.")
-        when 1
-          key, value = key.to_a.flatten
+      case options.length
+      when 1
+        case options[0]
+        when Hash
+          case options[0].length
+          when 0
+            raise ArgumentError.new("Argument has no entries.")
+          when 1
+            key, value = options[0].first
+          else
+            raise ArgumentError.new("Argument has multiple entries. Use Mocha::ParameterMatchers#has_entries instead.")
+          end
         else
-          raise ArgumentError.new("Argument has multiple entries. Use Mocha::ParameterMatchers#has_entries instead.")
+          raise ArgumentError.new("Argument is not a Hash.")
         end
+      when 2
+        key, value = options
+      else
+        raise ArgumentError.new("Too many arguments; use either a single argument (must be a Hash) or two arguments (a key and a value).")
       end
       HasEntry.new(key, value)
     end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/test/unit/parameter_matchers/has_entry_test.rb

@@ -79,6 +79,13 @@ class HasEntryTest < Test::Unit::TestCase
     assert !matcher.matches?([object])
   end
 
+  def test_should_raise_argument_error_if_single_argument_is_not_a_hash
+    e = assert_raises(ArgumentError) do
+      has_entry(Array.new)
+    end
+    assert_equal "Argument is not a Hash.", e.message
+  end
+
   def test_should_raise_argument_error_if_no_entries_are_supplied
     e = assert_raises(ArgumentError) do
       has_entry({})
@@ -93,4 +100,30 @@ class HasEntryTest < Test::Unit::TestCase
     assert_equal "Argument has multiple entries. Use Mocha::ParameterMatchers#has_entries instead.", e.message
   end
 
+  def test_should_raise_argument_error_if_more_than_two_arguments_are_supplied
+    e = assert_raises(ArgumentError) do
+      has_entry(1, 2, 3)
+    end
+    assert_equal "Too many arguments; use either a single argument (must be a Hash) or two arguments (a key and a value).", e.message
+  end
+
+  def test_should_match_array_as_key
+    matcher = has_entry([:key_1, :key_2] => 'value_1')
+    assert matcher.matches?([{[:key_1, :key_2] => 'value_1', :key_3 => 'value_2'}])
+  end
+
+  def test_should_match_array_as_value
+    matcher = has_entry(:key_1 => ['value_1', 'value_2'])
+    assert matcher.matches?([{:key_1 => ['value_1', 'value_2']}])
+  end
+
+  def test_should_match_hash_as_value_and_key
+    matcher = has_entry({{:key_1 => 'value_1', :key_2 => 'value_2'} => {:key_3 => 'value_3', :key_4 => 'value_4'}})
+    assert matcher.matches?([{{:key_1 => 'value_1', :key_2 => 'value_2'} => {:key_3 => 'value_3', :key_4 => 'value_4'}, :key_5 => 'value_5'}])
+  end
+
+  def test_should_match_matcher_as_value_and_key
+    matcher = has_entry({has_entry(:key_1 => 'value_1') => has_entry(:key_3 => 'value_3')})
+    assert matcher.matches?([{{:key_1 => 'value_1', :key_2 => 'value_2'} => {:key_3 => 'value_3', :key_4 => 'value_4'}, :key_5 => 'value_5'}])
+  end
 end

metadata

@@ -1,78 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mocha
-version: !ruby/object:Gem::Version
-  version: 0.13.0
+version: !ruby/object:Gem::Version 
+  hash: 41
   prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 1
+  version: 0.13.1
 platform: ruby
-authors:
+authors: 
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: metaclass
-  requirement: &70267336106140 !ruby/object:Gem::Requirement
+
+date: 2012-12-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
+  name: metaclass
   type: :runtime
   prerelease: false
-  version_requirements: *70267336106140
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70267336104820 !ruby/object:Gem::Requirement
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: *70267336104820
-- !ruby/object:Gem::Dependency
-  name: introspection
-  requirement: &70267336104360 !ruby/object:Gem::Requirement
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
+  name: introspection
   type: :development
   prerelease: false
-  version_requirements: *70267336104360
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70267336103960 !ruby/object:Gem::Requirement
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
   type: :development
   prerelease: false
-  version_requirements: *70267336103960
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &70267336103420 !ruby/object:Gem::Requirement
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        version: "1"
+  name: redcarpet
   type: :development
   prerelease: false
-  version_requirements: *70267336103420
-description: Mocking and stubbing library with JMock/SchMock syntax, which allows
-  mocking and stubbing of methods on real (non-mock) classes.
+  requirement: *id005
+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
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gemtest
 - .yardopts
 - COPYING.md
@@ -311,30 +338,37 @@ files:
 - test/unit/yield_parameters_test.rb
 homepage: http://gofreerange.com/mocha/docs
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -4192078905680069090
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: mocha
-rubygems_version: 1.8.11
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library
 test_files: []
+
 has_rdoc: yard