muack 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44cee556b89d8eb6f0b0cf73e9082a41c24f0c07
-  data.tar.gz: 3843d7a99fd975384d3faccce6b4235ce3d273f3
+  metadata.gz: fa632f54941b0ba538198221b3d03ec320e9df35
+  data.tar.gz: 386833604c697560c445c7df2ec677f5a5159cf2
 SHA512:
-  metadata.gz: 5a50371ce353f2063dcbf323e3089b51a8c3e45bb1dd0b1b14882dd0849b4d499e5c61a6dc64ac7a4db9ecd84a11085db9ad95507633fcdaac029fd9b5551611
-  data.tar.gz: b21dbd44169cea461871d4d67ddc9cdb7fecf0b41378b118046b82093e5690165da8c69f907f20d602da8d935c7e50b06896c92ae4149faeb9f641ba6e4000a5
+  metadata.gz: 3c3ea805f32a36c9ec6bc82af5a705bae2ff4cbb059ab71c3dd2c1ed638784ee84d98ea244de4c95b72558e9da2256944c5d853aa9c9ea72f4c98b47014909bc
+  data.tar.gz: ba26968d9d944c7263160bf6583d8a0cfdd1def6711122b90ef59d5af108c5696869d5f283ab40de9120602ca76b4a8c01408bc4fdcf882049a4cc8b26f8db18

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## Muack 1.3.2 -- 2015-06-11
+
+* Fixed a bug for `where`, `having`, and `allowing` which should distinguish
+  between `nil` and `undefined` (which does not have a key in a hash)
+
 ## Muack 1.3.1 -- 2015-05-27
 
 * Fixed a bug for `where`, `having`, and `allowing` which would raise an

data/lib/muack/satisfying.rb

@@ -116,6 +116,7 @@ module Muack
   end
 
   class Where < Satisfying
+    None = Object.new
     def initialize spec
       super([spec])
     end
@@ -134,7 +135,7 @@ module Muack
     private
     def match_hash actual_arg, spec
       (spec.keys | actual_arg.keys).all? do |key|
-        match_value(actual_arg[key], spec[key])
+        match_value(actual_arg, spec, key)
       end
     end
 
@@ -144,16 +145,24 @@ module Muack
       end
     end
 
-    def match_value av, ev
-      case ev
+    def match_value av, ev, key=None
+      if key == None
+        a, e = av, ev
+      elsif av.key?(key) && ev.key?(key)
+        a, e = av[key], ev[key]
+      else
+        return false
+      end
+
+      case e
       when Satisfying
-        ev.match(av)
+        e.match(a)
       when Hash
-        av.kind_of?(Hash) && match_hash(av, ev)
+        a.kind_of?(Hash) && match_hash(a, e)
       when Array
-        av.kind_of?(Array) && match_array(av, ev)
+        a.kind_of?(Array) && match_array(a, e)
       else
-        ev == av
+        e == a
       end
     end
   end
@@ -166,7 +175,7 @@ module Muack
     private
     def match_hash actual_arg, subset
       subset.each_key.all? do |key|
-        match_value(actual_arg[key], subset[key])
+        match_value(actual_arg, subset, key)
       end
     end
   end
@@ -179,7 +188,7 @@ module Muack
     private
     def match_hash actual_arg, superset
       actual_arg.each_key.all? do |key|
-        match_value(actual_arg[key], superset[key])
+        match_value(actual_arg, superset, key)
       end
     end
   end

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/muack.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: muack 1.3.1 ruby lib
+# stub: muack 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "muack"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2015-05-27"
+  s.date = "2015-06-11"
   s.description = "Muack -- A fast, small, yet powerful mocking library.\n\nInspired by [RR][], and it's 32x times faster (750s vs 23s) than RR\nfor running [Rib][] tests.\n\n[RR]: https://github.com/rr/rr\n[Rib]: https://github.com/godfat/rib"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   "test/test_stub.rb"]
   s.homepage = "https://github.com/godfat/muack"
   s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.4.7"
+  s.rubygems_version = "2.4.8"
   s.summary = "Muack -- A fast, small, yet powerful mocking library."
   s.test_files = [
   "test/test_any_instance_of.rb",

data/test/test_satisfying.rb

@@ -229,6 +229,11 @@ describe Muack::Satisfying do
       e.was     .should.eq 'obj.say({:a=>0})'
       e.message .should.eq "\nExpected: #{e.expected}\n but was: #{e.was}"
     end
+
+    would 'respect all keys', :groups => [:only] do
+      mock(Obj).say(where(:a => 0)){ 'nnf' }
+      should.raise(Muack::Unexpected){Obj.say(:a => 0, :b => nil)}
+    end
   end
 
   describe Muack::Having do
@@ -274,6 +279,11 @@ describe Muack::Satisfying do
       e.was     .should.eq 'obj.say({:b=>1})'
       e.message .should.eq "\nExpected: #{e.expected}\n but was: #{e.was}"
     end
+
+    would 'respect all keys' do
+      mock(Obj).say(having(:a => 0, :b => nil)){ 'nnf' }
+      should.raise(Muack::Unexpected){Obj.say(:a => 0)}
+    end
   end
 
   describe Muack::Allowing do
@@ -319,6 +329,11 @@ describe Muack::Satisfying do
       e.was     .should.eq 'obj.say({:b=>"1", :c=>2})'
       e.message .should.eq "\nExpected: #{e.expected}\n but was: #{e.was}"
     end
+
+    would 'respect all keys' do
+      mock(Obj).say(allowing(:a => 0)){ 'nnf' }
+      should.raise(Muack::Unexpected){Obj.say(:a => 0, :b => nil)}
+    end
   end
 
   describe Muack::Satisfying do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muack
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Muack -- A fast, small, yet powerful mocking library.
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Muack -- A fast, small, yet powerful mocking library.