mock5 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da624cffc46d03de23ffd9e33419c6dbe501d44c
-  data.tar.gz: 5b492f7e62385283c2bd3f81ba215ea648c321f9
+  metadata.gz: 76be219294f80c132aa6185e6968ada828583e65
+  data.tar.gz: 57a45abc38b9aeda5e26ca5dba4b7bd574ce527f
 SHA512:
-  metadata.gz: b901a32c3b8272e1fd29380a7efa3bb24dbebde8370047d7b6434e826db92c8534124e8d06c0cb4a9b16cf4dd3c453d59aa658a838a60ee12b0aa52d1f5d5619
-  data.tar.gz: b04f2a98b53adaf67262eb5e079c5e61fa247376388e29dc16c731770f14d78f2d43664628a76f0f51c204b7a8a6608d0e6afc9d17b71552be04699a670c0406
+  metadata.gz: 9f03b77ad3a4b76c135eaf5a0b138099350861a8340d59b465d84e869bb07f9fd0925955b1aa98a4a76fdba5ee9937641237972980b5fd7f2d121b8257514b43
+  data.tar.gz: 4b2548315b2f6f24e71a15f8c39f0c3052fe4ade33c26d8d92a80a5088c46f33b78b3e28ff99c320b168d5d554fc16e29a4a2a5cf6fcfe0194f17fbcfdf4577d

data/Gemfile

@@ -6,3 +6,5 @@ gemspec
 gem "bundler", "~> 1.5"
 gem "rspec",   "~> 2.14"
 gem "rake",    "~> 10.1"
+
+gem "pry-debugger"

data/lib/mock5.rb

@@ -14,18 +14,16 @@ module Mock5
   end
 
   def mount(*apis)
-    apis.each do |api|
-      if mounted_apis.add?(api)
-        registry.register_request_stub api.request_stub
-      end
+    (apis.to_set - mounted_apis).each do |api|
+      mounted_apis.add api
+      registry.register_request_stub api.request_stub
     end
   end
 
   def unmount(*apis)
-    apis.each do |api|
-      if mounted_apis.delete?(api)
-        registry.remove_request_stub api.request_stub
-      end
+    (mounted_apis & apis).each do |api|
+      mounted_apis.delete api
+      registry.remove_request_stub api.request_stub
     end
   end
 
@@ -34,10 +32,10 @@ module Mock5
   end
 
   def with_mounted(*apis)
-    mount *apis
+    mounted = mount(*apis)
     yield
   ensure
-    unmount *apis
+    unmount *mounted
   end
 
   def unmount_all!

data/lib/mock5/version.rb

@@ -1,3 +1,3 @@
 module Mock5
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

data/spec/mock5_spec.rb

@@ -43,6 +43,11 @@ describe Mock5 do
         expect(mounted_apis).to include(api)
         expect(mounted_apis).to include(another_api)
       end
+
+      it "returns the list of mounted apis" do
+        expect(described_class.mount(api)).to eq([api].to_set)
+        expect(described_class.mount(api, another_api)).to eq([another_api].to_set)
+      end
     end
 
     describe ".unmount" do
@@ -70,6 +75,11 @@ describe Mock5 do
         described_class.unmount api
         expect(mounted_apis).to include(another_api)
       end
+
+      it "returns the list of unmounted apis" do
+        expect(described_class.unmount(another_api)).to be_empty
+        expect(described_class.unmount(api, another_api)).to eq([api].to_set)
+      end
     end
 
     describe ".unmount_all!" do
@@ -119,6 +129,17 @@ describe Mock5 do
         expect(mounted_apis).to be_empty
         expect(&action).not_to change(mounted_apis, :empty?)
       end
+
+      it "doesn't unmount api, that was mounted before" do
+        described_class.mount api
+
+        described_class.with_mounted api, another_api do
+          expect(mounted_apis).to include(another_api)
+        end
+
+        expect(mounted_apis).to include(api)
+        expect(mounted_apis).not_to include(another_api)
+      end
     end
 
     describe "stubbing" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mock5
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock