rspectacular 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4514a7c374f578a05e5068349aed748650e092e
-  data.tar.gz: 1b7d278797738f516ecd769a6004943d968426ff
+  metadata.gz: 086646cb2d6416003e88309aa679fff45dc9005e
+  data.tar.gz: 41754ecd6e2932d789b1e542a081fa01c4d1672a
 SHA512:
-  metadata.gz: 58da3af6fb889c8660d551b2d8e95f01df2d8e3df9e3613b88cb44696fac2fdcc193d331fe7da1efedc628f3efbb3eb1aa559f485d175539488e2dc6b431aea6
-  data.tar.gz: b9278de9218dc98a0092dec84f32511e60979316d34856f54dbf7f3c0c78e935f445651eda5a448935ee117018488bb593d7215e1d66c374a94b028ccb7616fd
+  metadata.gz: 46040d797e8718a246b48ea05be62c108cb5f81443c7e9db0e9787760d36c2035bfd2073535497b20baf7eaba849116d5cd6fa656b185ba8ddca9d41de5fda82
+  data.tar.gz: 13e0b3dbd4c0671dd2e8acade05684a2780cefbfd4fa88ef19dba9bce2812a72751bbd9f2701cf618330e7f5eb758ae72ee08646bbc1ffe49d70040924ff3f35

data/lib/rspectacular/plugins/authentication.rb

@@ -1,42 +1,44 @@
 RSpec.configure do |config|
-  config.before(:each, mock_auth: lambda { |v| !!v }) do |example|
-    options                 = example.metadata[:mock_auth]
-
-    klass                   = case options
-                              when TrueClass
-                                User
-                              when Hash
-                                options[:class] || User
-                              else
-                                options
-                              end
-
-    underscored_class_name  = klass.
-                                 name[/.*::(\w+)\z/, 1].
-                                 gsub(/([a-z])([A-Z])/, '\1_\2').
-                                 downcase
-
-    current_class_method    = if options.is_a?(Hash) && options[:method]
-                                options[:method]
-                              else
-                                :"current_#{underscored_class_name}"
-                              end
-
-    instance                = if options.is_a?(Hash) && options[:strategy] == :instance
-                                klass.new
-                              else
-                                FactoryGirl.create(underscored_class_name.to_sym)
-                              end
-
-    authentication_method   = if options.is_a?(Hash) && options[:authentication_method]
-                                options[:authentication_method]
-                              else
-                                :"authenticate_#{underscored_class_name}!"
-                              end
-
-    if subject.respond_to?(authentication_method, true)
+  config.around(:each, mock_auth: lambda { |v| !!v }) do |example|
+    options                   = example.metadata[:mock_auth]
+
+    klass                     = case options
+                                when TrueClass
+                                  User
+                                when Hash
+                                  options[:class] || User
+                                else
+                                  options
+                                end
+
+    underscored_class_name    = klass.
+                                   name[/.*::(\w+)\z/, 1].
+                                   gsub(/([a-z])([A-Z])/, '\1_\2').
+                                   downcase
+
+    current_class_method      = if options.is_a?(Hash) && options[:method]
+                                  options[:method]
+                                else
+                                  :"current_#{underscored_class_name}"
+                                end
+
+    instance                  = if options.is_a?(Hash) && options[:strategy] == :instance
+                                  klass.new
+                                else
+                                  FactoryGirl.create(underscored_class_name.to_sym)
+                                end
+
+    authentication_method     = if options.is_a?(Hash) && options[:authentication_method]
+                                  options[:authentication_method]
+                                else
+                                  :"authenticate_#{underscored_class_name}!"
+                                end
+
+    described_class_instance  = described_class.new
+
+    if described_class_instance.respond_to?(authentication_method, true)
       described_class.skip_before_action authentication_method
-    elsif subject.respond_to?(:authenticate, true)
+    elsif described_class_instance.respond_to?(:authenticate, true)
       described_class.skip_before_action :authenticate
     end
 
@@ -45,5 +47,9 @@ RSpec.configure do |config|
     described_class.send(:define_method, current_class_method) do
       instance
     end
+
+    example.run
+
+    described_class.send(:remove_method, current_class_method)
   end
 end

data/lib/rspectacular/version.rb

@@ -1,3 +1,3 @@
 module RSpectacular
-  VERSION = '0.40.0'
+  VERSION = '0.41.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspectacular
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - jfelchner