muack 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b8d14895660519e1ff47c5675958879c675f9f
-  data.tar.gz: 79f2de6572ae6502f1f8feebb28813df73914b68
+  metadata.gz: f7434ef1baf3aaeb9f7772ce6a8eedeb431132ba
+  data.tar.gz: e55ae09a1166fcd29e2cf50379af01a2d1e508fc
 SHA512:
-  metadata.gz: 49698fea906242ae5cc4acf155fbc824c3951db2a4410ce307c209616eacf982951248c4eaf2bdef77b98071fc8975ee18d15d063cc63128e2ae10e96cd59171
-  data.tar.gz: 0253b5b1fb8bc58b02f782a4fe261e557e9a891b0e7e766474f007016fa2fdbd8887435a0bc3533a3125dae480a44e1cf1bd46fde5574a5badf3b69420d7c5ac
+  metadata.gz: fc8ef5fffdfba3f044999cb2afb9e6ac612f2b0fa04db224590e9bbf6d720d4e73f418b509510e61d89a80819dfbfc8d56cef3ed40e1bb1009e48e2b83509ec9
+  data.tar.gz: 3b1181888ebc6130e215caa86c66e11c083b8dbbb7f6198c64b53fa93efc4a866fbcd7c3ebac8261bc86359eb15a37f9d7da1fd4b309b68b2b6818685a0780dc

data/.travis.yml

@@ -4,6 +4,6 @@ script: 'ruby -r bundler/setup -S rake test'
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - ruby
   - rbx
   - jruby

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## Muack 1.0.3 -- 2014-03-11
+
+* From now on, `Muack::API.hash_including` could accept `Muack::Satisfy` as
+  values. That means we could now use `hash_including(:key => is_a(String))`
+  or `hash_including(:url => match(/^https/))` and so on so forth.
+
 ## Muack 1.0.2 -- 2014-01-17
 
 * Fixed a bug where spies do not really verify against actual arguments,

data/lib/muack/satisfy.rb

@@ -66,7 +66,14 @@ module Muack
   class HashIncluding < Satisfy
     def initialize hash
       super lambda{ |actual_arg|
-        actual_arg.values_at(*hash.keys) == hash.values }, [hash]
+        actual_arg.values_at(*hash.keys).zip(hash.values).all? do |(av, ev)|
+          if ev.kind_of?(Satisfy)
+            ev.match(av)
+          else
+            ev == av
+          end
+        end
+      }, [hash]
     end
   end
 

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/muack.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: muack 1.0.2 ruby lib
+# stub: muack 1.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "muack"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   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 = "2014-01-17"
+  s.date = "2014-03-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 = [
@@ -46,7 +46,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.2.1"
+  s.rubygems_version = "2.2.2"
   s.summary = "Muack -- A fast, small, yet powerful mocking library."
   s.test_files = [
   "test/test_any_instance_of.rb",

data/test/test_from_readme.rb

@@ -9,13 +9,12 @@ describe 'from README.md' do
   after{ Muack.reset }
 
   Context = Module.new{
-    def p res
-      (@results ||= []) << res
-    end
+    def results; @results ||= []; end
+    def p res  ; results << res ; end
 
     def verify expects
-      return unless @results
-      @results.zip(expects).each do |(res, exp)|
+      return if results.empty?
+      results.zip(expects).each do |(res, exp)|
         next if exp == 'ok'
         if exp.start_with?('raise')
           res.should.kind_of eval(exp.sub('raise', ''))

data/test/test_satisfy.rb

@@ -115,6 +115,13 @@ describe Muack::Satisfy do
       Muack::EnsureReset.call
     end
 
+    should 'satisfy with satisfy' do
+      mock(Str).say(hash_including(:b => is_a(Fixnum))){ |arg| arg[:b] }
+      Str.say(:a => 1, :b => 2).should.eq 2
+      Muack.verify.should.eq true
+      Muack::EnsureReset.call
+    end
+
     should 'raise Unexpected error if passing unexpected argument' do
       mock(Obj).say(hash_including(:b => 2)){ 'boo' }
       begin
@@ -129,6 +136,22 @@ describe Muack::Satisfy do
         Muack::EnsureReset.call
       end
     end
+
+    should 'raise Unexpected error if passing unsatisfied argument' do
+      mock(Obj).say(hash_including(:b => is_a(String))){ 'boo' }
+      begin
+        Obj.say(:b => 1)
+        'never'.should.eq 'reach'
+      rescue Muack::Unexpected => e
+        e.expected.should.eq \
+          'obj.say(Muack::API.hash_including({:b=>Muack::API.is_a(String)}))'
+        e.was     .should.eq 'obj.say({:b=>1})'
+        e.message .should.eq "\nExpected: #{e.expected}\n but was: #{e.was}"
+      ensure
+        Muack.reset
+        Muack::EnsureReset.call
+      end
+    end
   end
 
   describe Muack::Including do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muack
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Muack -- A fast, small, yet powerful mocking library.
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Muack -- A fast, small, yet powerful mocking library.