imitate 0.1.3 → 0.1.4

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.8.3"
+  gem 'mocha'
 end

data/Gemfile.lock

@@ -9,6 +9,9 @@ GEM
       rake
       rdoc
     json (1.7.0)
+    metaclass (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -27,5 +30,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.8.3)
+  mocha
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/imitate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "imitate"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petr Janda"]
@@ -44,17 +44,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<mocha>, [">= 0"])
   end
 end
 

data/lib/imitate.rb

@@ -36,7 +36,7 @@ module Imitate
     #
     def unmock(name)
       process_name(name) {|parent, token|
-        self.send(was_mocked?(parent, token) ? :remove_const : :get_const, parent, token)
+        self.send(was_mocked?(parent, token) ? :remove_mock : :get_const, parent, token)
       }
     end
 
@@ -45,7 +45,9 @@ module Imitate
     # way then using Imitate.
     #
     def unmock_all
-      MOCKED.each {|mock| remove_const(mock[:parent], mock[:name])}
+      while mock = MOCKED.shift
+        remove_mock(mock[:parent], mock[:name])
+      end
     end
 
     private 
@@ -63,12 +65,19 @@ module Imitate
       MOCKED.index({:parent => parent, :name => name})
     end
 
+    def remove_mock(parent, name)
+      MOCKED.delete({:parent => parent, :name => name})
+      remove_const(parent, name)
+    end
+
     def remove_const(parent, name)
       parent.instance_eval { remove_const name }
     end
 
     def get_const(parent, name)
-      parent.const_get(name)
+        parent.const_get(name)
+      rescue
+        nil
     end
 
     def create_const(clazz, parent, name, &block)

data/spec/imitate_spec.rb

@@ -18,8 +18,8 @@ describe "Imitate" do
   end
 
   describe '.unmock' do
-    context 'if const exists' do
-      context 'if const was mocked by imitate' do
+    context 'const exists' do
+      context 'const was mocked by imitate' do
         it 'should remove the class' do
           Imitate.mock_class('Foo')
           Imitate.unmock('Foo')
@@ -34,6 +34,15 @@ describe "Imitate" do
           lambda { Foo::Bar }.should raise_error
           lambda { Foo }.should raise_error
         end
+
+        it 'should remove record from MOCKED' do
+          Imitate.mock_class('Foo')
+          Imitate.unmock('Foo')
+
+          Imitate.expects(:remove_const).never
+
+          Imitate.unmock('Foo')
+        end
       end
 
       context 'if const was not mocked' do
@@ -68,6 +77,14 @@ describe "Imitate" do
         end
       end
     end
+
+    context 'class doesnt exist' do
+      it 'should do nothing' do
+        Imitate.unmock('Foo1')
+
+        Imitate.expects(:remove_const).never
+      end
+    end
   end
 
   describe '.mock_class' do

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'imitate'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.mock_with :mocha
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imitate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157547400 !ruby/object:Gem::Requirement
+  requirement: &2160205840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2157547400
+  version_requirements: *2160205840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157546900 !ruby/object:Gem::Requirement
+  requirement: &2160203080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2157546900
+  version_requirements: *2160203080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157546420 !ruby/object:Gem::Requirement
+  requirement: &2160200860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157546420
+  version_requirements: *2160200860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157545920 !ruby/object:Gem::Requirement
+  requirement: &2160198100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2157545920
+  version_requirements: *2160198100
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2160194700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2160194700
 description: Simple class mock
 email: petrjanda@me.com
 executables: []
@@ -90,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3941489243692019198
+      hash: 2598245985460209889
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: