google-authenticator-rails 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440ad5551c31c754fd9870dfd810d9ea97969627f5a97e058c336cc8148b5e59
-  data.tar.gz: 1324392b3336a8ebe39c5c57c117412472d33b9985be59b6a11e72d62414955c
+  metadata.gz: cbb1026a266573661287bef3b6c6bdc3d378366301eb7d7c5f30ed7ea1f66c12
+  data.tar.gz: 30a37ae8d964980695f17a4aab1c4dfc74e4e6d548180ef06eaa5c1eb7f5bc4f
 SHA512:
-  metadata.gz: 98c1cfa7de93eb922afc7c6d58db9fccb732be27e092846902db62993b75f4d55768c57f3352b56ffd28e3c2350faa17c8b458b61e02bf143b54458ceb856124
-  data.tar.gz: 724c84f98fbe300eb2488dcb2c24649592df811e65d1af5fc8c17aeec14c069102e5a3564592083cc131f2de193e95d82d8d44f4a904874c0e5faf59203573f0
+  metadata.gz: 1340e9ebdcc67cdef420bc9d078f8c6c40a00fa6d276ff2f11b411070fc86bfd7eaf64ea0e7088ac253071fddbdf32c497fe5568e6edfd1a417022f2933bc3a4
+  data.tar.gz: 18058f4a6a6680e6707b7838d2f7d2ea0aa33f99cdc4bf9aafcf5fd0d5674d94729e6b7736208f6f8f826d68ab76db6000e0a227088e68632c1d31dcd1b0e618

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google-authenticator-rails (3.0.0)
+    google-authenticator-rails (3.1.0)
       actionpack
       activerecord
       rails
@@ -92,7 +92,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -100,8 +100,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.0)
     net-imap (0.2.3)
       digest
       net-protocol
@@ -117,10 +116,9 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.10-arm64-darwin)
       racc (~> 1.4)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -141,8 +139,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (7.0.3)
       actionpack (= 7.0.3)
       activesupport (= 7.0.3)
@@ -184,7 +182,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/lib/google-authenticator-rails/action_controller/rails_adapter.rb

@@ -20,7 +20,9 @@ module GoogleAuthenticatorRails
 
     module Integration
       def self.included(klass)
-        raise RailsAdapter::LoadedTooLateError.new if defined?(::ApplicationController)
+        if klass.descendants.map(&:name).include?("ApplicationController")
+          raise RailsAdapter::LoadedTooLateError.new
+        end
 
         method = klass.respond_to?(:prepend_before_action) ? :prepend_before_action : :prepend_before_filter
         klass.send(method, :activate_google_authenticator_rails)

data/lib/google-authenticator-rails/version.rb

@@ -1,3 +1,3 @@
 module GoogleAuthenticatorRails
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/spec/action_controller/integration_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe GoogleAuthenticatorRails::ActionController::Integration do
   describe '::included' do
     context 'ApplicationController already defined' do
-      before  { class ApplicationController < MockController; end }
-      after   { Object.send(:remove_const, :ApplicationController) }
-      subject { lambda { MockController.send(:include, GoogleAuthenticatorRails::ActionController::Integration) } }
+      # Autoload ApplicationController.
+      before  { ApplicationController }
+      subject { lambda { MockControllerWithApplicationController.send(:include, GoogleAuthenticatorRails::ActionController::Integration) } }
 
       it { should raise_error(GoogleAuthenticatorRails::ActionController::RailsAdapter::LoadedTooLateError) }
     end

data/spec/spec_helper.rb

@@ -13,8 +13,18 @@ SimpleCov.start
 
 require 'google-authenticator-rails'
 
-class MockController
-  class << self
+module MockControllerBase
+  def self.included(klass)
+    klass.class_eval do
+      extend ClassMethods
+
+      include GoogleAuthenticatorRails::ActionController::Integration
+
+      attr_accessor :cookies
+    end
+  end
+
+  module ClassMethods
     attr_accessor :callbacks
 
     def prepend_before_filter(filter)
@@ -23,15 +33,22 @@ class MockController
     end
   end
 
-  include GoogleAuthenticatorRails::ActionController::Integration
-
-  attr_accessor :cookies
-
   def initialize
     @cookies = MockCookieJar.new
   end
 end
 
+class MockController
+  include MockControllerBase
+end
+
+class MockControllerWithApplicationController
+  include MockControllerBase
+end
+
+# Simulate Rails' autoloading for ApplicationController.
+autoload :ApplicationController, File.join(File.dirname(__FILE__), 'support/application_controller')
+
 class MockCookieJar < Hash
   def [](key)
     hash = super

data/spec/support/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < MockControllerWithApplicationController
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jared McFarland
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2023-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp
@@ -190,6 +190,7 @@ files:
 - spec/session/activation_spec.rb
 - spec/session/persistance_spec.rb
 - spec/spec_helper.rb
+- spec/support/application_controller.rb
 homepage: http://github.com/jaredonline/google-authenticator
 licenses: []
 metadata: {}
@@ -219,3 +220,4 @@ test_files:
 - spec/session/activation_spec.rb
 - spec/session/persistance_spec.rb
 - spec/spec_helper.rb
+- spec/support/application_controller.rb