mixit 0.1.0 → 0.2.0

data/lib/mixit/version.rb

@@ -1,3 +1,3 @@
 class Mixit 
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/mixit.rb

@@ -28,20 +28,22 @@ class Mixit
     if block.arity == 1
       block.call extend!(receiver, true)
     else
-      ivars = receiver.instance_variables
-      extend!(receiver, false).instance_eval(&block)
-
-      # Remove instance variables added by @modules, or &block from 'receiver'.
-      # We want to restore the calling scope to its previous state.
-      (receiver.instance_variables - ivars).each do |ivar|
-        receiver.send(:remove_instance_variable, ivar)
-      end
+      begin
+        ivars = receiver.instance_variables
+        extend!(receiver, false).instance_eval(&block)
+      ensure
+        # Remove instance variables added by @modules, or &block from 'receiver'.
+        # We want to restore the calling scope to its previous state.
+        (receiver.instance_variables - ivars).each do |ivar|
+          receiver.send(:remove_instance_variable, ivar)
+        end
 
-      # Remove methods added by @modules from 'receiver'.
-      # We want to restore the calling scope to its previous state.
-      @modules.each do |mod|
-        mod.instance_methods(false).each do |meth|
-          mod.send(:remove_method, meth)
+        # Remove methods added by @modules from 'receiver'.
+        # We want to restore the calling scope to its previous state.
+        @modules.each do |mod|
+          mod.instance_methods(false).each do |meth|
+            mod.send(:remove_method, meth)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70294493576860 !ruby/object:Gem::Requirement
+  requirement: &70150457564540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70294493576860
+  version_requirements: *70150457564540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70294493576360 !ruby/object:Gem::Requirement
+  requirement: &70150457564040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70294493576360
+  version_requirements: *70150457564040
 description: Temporarily extend the calling scope of a block with instance methods
   from a module.
 email:
@@ -66,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4457976507324133179
+      hash: -222401743341189092
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4457976507324133179
+      hash: -222401743341189092
 requirements: []
 rubyforge_project: mixit
 rubygems_version: 1.8.11