controller-testing-kwargs 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9f386c0399326befa5c12f08f2749bd6410e87
-  data.tar.gz: a2918efa20ef69bf9df070c0e35f3ee09bca200a
+  metadata.gz: 1f1e9fa13a7f2d234aa3450dc9a87af826b91d62
+  data.tar.gz: 454e3ca38063041226b0162f16525ffacbd3b9ad
 SHA512:
-  metadata.gz: 0755f8476ecbaf759db162fd564f25849ffeb95f00e3b8913e16dd280573538360b9e3f7dd5a000b712b4bbf4fd99c4c1dacf46f014d23ec10f53091089c4308
-  data.tar.gz: 197a1d0519e2512de82a26f0394af4022ff343fe8f25490f0acbfd2a8a962627c5ecf242db8d59d907024cfcac0029c2e2cf0316bea45f91032d5b2c34bc8bdb
+  metadata.gz: 82c241dec360d3b6d2f2b2c7c8065311c234feb9f7c28ebd61225b927b602489f87c154db98c5f97ffd7b8c29ad4e627516c6a9b6d4dc2c3fa0c382f71e1f1af
+  data.tar.gz: b7fffdc81950c4251136e976c83e646d1ecdae19ea487b5ac4c6468f43c8b79c66350710e49afb2874ce3f3e44991e2a6964a196daa21adc84de4be38c1f9480

data/lib/controller/testing/kwargs.rb

@@ -7,28 +7,40 @@ module Controller
       ERROR_MESSAGE = 'Please use Rails 5 syntax. See: https://github.com/appfolio/controller-testing-kwargs'
 
       class <<self
-        @on_old = :deprecate
+        @action = :deprecation_warning
 
-        attr_reader :on_old
+        attr_reader :action
 
         def deprecate
-          @on_old = :warn
+          @action = :deprecation_warning
         end
 
         def deprecated?
-          @on_old == :warn
+          @action == :deprecation_warning
         end
 
         def ignore
-          @on_old = :ignore
+          @action = nil
         end
 
         def raise_exception
-          @on_old = :raise
+          @action = :raise_exceptioon
         end
 
         def raise_exception?
-          @on_old == :raise
+          @action == :raise_exceptioon
+        end
+
+        private
+
+        def with_ignore
+          previous_action = @action
+          @action = nil
+          begin
+            yield
+          ensure
+            @action = previous_action
+          end
         end
       end
 
@@ -60,15 +72,9 @@ module Controller
           raise Exception, ERROR_MESSAGE if Controller::Testing::Kwargs.raise_exception? && old_method
           ActiveSupport::Deprecation.warn(ERROR_MESSAGE) if Controller::Testing::Kwargs.deprecated? && old_method
 
-          if xhr
-            previous_value = Controller::Testing::Kwargs.on_old
-            Controller::Testing::Kwargs.ignore
-            begin
-              return xhr(method, action, request_params, request_headers)
-            ensure
-              Controller::Testing::Kwargs.instance_variable_set(:@on_old, previous_value)
-            end
-          end
+          Controller::Testing::Kwargs.send(:with_ignore) do
+            return xhr(method, action, request_params, request_headers)
+          end if xhr
           super(action, request_params, request_headers)
         end
       end

data/lib/controller/testing/kwargs/version.rb

@@ -1,7 +1,7 @@
 module Controller
   module Testing
     module Kwargs
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controller-testing-kwargs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Chad Shaffer