rspectacular 0.44.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16290f005d85c1b14f8b364276c5eff983449a49
-  data.tar.gz: 3d8faceafa6d96441ce907d2669fd294122afa8d
+  metadata.gz: b46bb75a27b3e57faa420401cfe19266d008341c
+  data.tar.gz: 5a183e749aefb7beda610d16f700749c520ac94d
 SHA512:
-  metadata.gz: f3c57d8ce4854d0a9d92b11d248a11c1d95be407cb16260f8d13b9e74ad3b71baaa23c835191d0a5ea97b165d90a36e11bf85f74d8a43fd25788adb65a718188
-  data.tar.gz: eb06ec87a8b7cb1ca3940ea1e64b6fec354e9e3708d7c3e1038cf2e7cfbcfa1a02d8310460ab9b1438937c07da6743e80b850646b8d5db53e9e0de7251e10f46
+  metadata.gz: 83c157792a0da5a854e637a2541002ddd7881c2b4f12160d7f50e7c993b3d4c4effbad4174c589e71fc5e359045eccc695f1a9cdc7e622d958bb98a663b8ceab
+  data.tar.gz: 3c9d62b91f2177644602fa48ac6b761812baeb8d5ccea6fbb612d99a7813c3c4c8cc2563e2fd547b642cfe22867da3446dbf7fdd06b3f403023a438a0f81dd92

data/lib/rspectacular/plugins/authentication.rb

@@ -1,73 +1,69 @@
 RSpec.configure do |config|
   config.around(:each, mock_auth: lambda { |v| !!v }) do |example|
-    options                   = example.metadata[:mock_auth]
+    options                               = example.metadata[:mock_auth]
 
-    klass                     = case options
-                                when TrueClass
-                                  User
-                                when Hash
-                                  options[:class] || User
-                                else
-                                  options
-                                end
+    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
+    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
+    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
+    instance                              = if options.is_a?(Hash) && options[:strategy] == :instance
+                                              klass.new
+                                            else
+                                              FactoryGirl.create(underscored_class_name.to_sym)
+                                            end
 
-    inferred_auth_method      = if options.is_a?(Hash) && options[:authentication_method]
-                                  options[:authentication_method]
-                                else
-                                  :"authenticate_#{underscored_class_name}!"
-                                end
+    inferred_auth_method                  = if options.is_a?(Hash) && options[:authentication_method]
+                                              options[:authentication_method]
+                                            else
+                                              :"authenticate_#{underscored_class_name}!"
+                                            end
 
-    described_class_instance  = described_class.new
+    authentication_controller_class       = if example.metadata[:type] == :controller
+                                              described_class
+                                            else
+                                              ApplicationController
+                                            end
 
-    authentication_method     = if described_class_instance.respond_to?(inferred_auth_method, true)
-                                  inferred_auth_method
-                                elsif described_class_instance.respond_to?(:authenticate, true)
-                                  :authenticate
-                                end
+    authentication_controller_instance    = authentication_controller_class.new
 
-    if options[:status] == :unauthorized
-      described_class.send(:define_method, authentication_method) { false }
-    else
-      described_class.send(:define_method, authentication_method) { true }
-    end
+    authentication_method                 = if authentication_controller_instance.respond_to?(inferred_auth_method, true)
+                                              inferred_auth_method
+                                            elsif authentication_controller_instance.respond_to?(:authenticate, true)
+                                              :authenticate
+                                            end
 
-    example.example_group_instance.class.let(current_class_method) do
-      if options[:status] == :unauthorized
-        nil
-      else
-        instance
-      end
-    end
+    authentication_successful             = if options.is_a?(Hash) && options.has_key?(:status)
+                                              options[:status] == :authorized
+                                            else
+                                              true
+                                            end
 
-    described_class.send(:define_method, current_class_method) do
-      if options[:status] == :unauthorized
-        nil
-      else
-        instance
-      end
-    end
+    authentication_result                 = authentication_successful ? instance : nil
+
+    authentication_controller_class.send(:define_method, authentication_method) { authentication_successful }
+    authentication_controller_class.send(:define_method, current_class_method)  { authentication_result }
+    authentication_controller_class.send(:helper_method, current_class_method)
+    example.example_group_instance.class.let(current_class_method)              { authentication_result }
 
     example.run
 
-    described_class.send(:remove_method, current_class_method)
-    described_class.send(:remove_method, authentication_method)
+    authentication_controller_class.send(:remove_method, current_class_method)
 
     unless options.is_a?(Hash) && options[:strategy] == :instance
       instance.delete

data/lib/rspectacular/version.rb

@@ -1,3 +1,3 @@
 module RSpectacular
-  VERSION = '0.44.0'
+  VERSION = '0.45.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspectacular
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec