shoulda-context 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9babaf5d9e91c606e7ea6a929319843ab7b0cae4
-  data.tar.gz: a28a2da8ad2ac965197e64525ce1f99a6cbc3e26
+  metadata.gz: 880fce4e56a3fc781a60b71e5fa369c741d94298
+  data.tar.gz: 4a3d36599636a422e721c193c0b7e8ae664f626f
 SHA512:
-  metadata.gz: cf1d4bb465fef15c839c4e422b82ed53640bc2ac7a50d565731078d43f7f68e93f73e1c7f54ec14e52eb9a2b0a4cf2070f39b477faeb5af7878a0d5bdd235959
-  data.tar.gz: 0669d46b4968e00c933879e91ae90f067569ad38ad210550498ab54a1d82319e9e1b63618b286d2020a6a4fc970c1af908bcbce3ca850cca8d7509daeeb9bc6e
+  metadata.gz: 4cf7bd670f4ecc502e374375ed072780e11b73a6622a4a8d48d288992e009623edf16233a84515062f181a982089a522fb29aee48ef3170682ac55a4fe80bd0e
+  data.tar.gz: ca5a33a636d9be10037ddc7aaafba1c7e639a0d2cb00efc7e8e2dfcae5f4a99706e90f8424f8fc0f818856c09d92dc30c93c199fc5edfc6a02d1e60e11a2c28b

data/lib/shoulda/context/context.rb

@@ -318,7 +318,12 @@ module Shoulda
       end
 
       def merge_block(&blk)
-        blk.bind(self).call
+        if self.respond_to?(:instance_exec)
+          self.instance_exec(&blk)
+        else
+          # deprecated in Rails 4.x
+          blk.bind(self).call
+        end
       end
 
       def context(name, &blk)
@@ -395,9 +400,21 @@ module Shoulda
           @shoulda_context = context
           begin
             context.run_parent_setup_blocks(self)
-            should[:before].bind(self).call if should[:before]
+            if should[:before]
+              if self.respond_to?(:instance_exec)
+                self.instance_exec(&should[:before])
+              else
+                # deprecated in Rails 4.x
+                should[:before].bind(self).call
+              end
+            end
             context.run_current_setup_blocks(self)
-            should[:block].bind(self).call
+            if self.respond_to?(:instance_exec)
+              self.instance_exec(&should[:block])
+            else
+              # deprecated in Rails 4.x
+              should[:block].bind(self).call
+            end
           ensure
             context.run_all_teardown_blocks(self)
           end
@@ -415,13 +432,23 @@ module Shoulda
 
       def run_current_setup_blocks(binding)
         setup_blocks.each do |setup_block|
-          setup_block.bind(binding).call
+          if binding.respond_to?(:instance_exec)
+            binding.instance_exec(&setup_block)
+          else
+            # deprecated in Rails 4.x
+            setup_block.bind(binding).call
+          end
         end
       end
 
       def run_all_teardown_blocks(binding)
         teardown_blocks.reverse.each do |teardown_block|
-          teardown_block.bind(binding).call
+          if binding.respond_to?(:instance_exec)
+            binding.instance_exec(&teardown_block)
+          else
+            # deprecated in Rails 4.x
+            teardown_block.bind(binding).call
+          end
         end
         self.parent.run_all_teardown_blocks(binding) if am_subcontext?
       end

data/lib/shoulda/context/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Context
-    VERSION = '1.1.5'.freeze
+    VERSION = '1.1.6'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-context
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal