devise_instant2fa 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b1be53c25de64e34b74a41cdd2e37a6b8cdfd9
-  data.tar.gz: 9314e6632e80fa4e8428a1ced354df19e461d967
+  metadata.gz: 5b1449ef40141b27a50dd0a46074bcda15bd6423
+  data.tar.gz: e325998b8f174692e00708b3fb29941f25c15ce1
 SHA512:
-  metadata.gz: bd69fe2574166de4a5925bfe95210c2968c71eb0d7affffbb80e65e2263ce47548f654069fdb708ac8a014c319b013b805fd899550d86af7c4b46e448e127613
-  data.tar.gz: 55950735513bcf851f970886c1bff733aafa074e2e80434003136d87706e79eeab3980c557b62a6146379ab64b4c5d052d24d36cfd3264b8b664c78faf6a164d
+  metadata.gz: 846b20b9d1dccd64c7a43eaabe210e03eac21551c645c3e23bdd4391fd938be1c5dc8b0053b6ffcc6409de446b887ab85b997cfdaf18cb65ebbaa3d428d38a2e
+  data.tar.gz: 83c40520260431adef2ff92b4179ebbf715b3d04d190b557ce205ec9bc6326794a2db48fda7b981c32179b5415de20ceb6fb680abb8ccbcae780135cf506f333

data/app/controllers/devise/instant2fa_controller.rb

@@ -1,7 +1,13 @@
 class Devise::Instant2faController < DeviseController
-  prepend_before_action :find_resource_and_require_password_checked, :only => [
-    :show, :update
-  ]
+  if self.respond_to?(:prepend_before_action)
+    prepend_before_action :find_resource_and_require_password_checked, :only => [
+      :show, :update
+    ]
+  else
+    prepend_before_filter :find_resource_and_require_password_checked, :only => [
+      :show, :update
+    ]
+  end
 
   def show
     @hosted_page_url = session["#{resource_name}_hosted_page_url"]
@@ -26,7 +32,7 @@ class Devise::Instant2faController < DeviseController
     @resource = send("current_#{resource_name}")
 
     if @resource.nil?
-      @resource = resource_class.find_by_id(session["#{resource_name}_id"])
+      @resource = resource_class.find(session["#{resource_name}_id"])
     end
   end
 

data/devise_instant2fa.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'rails', '>= 3.1.1'
   s.add_runtime_dependency 'devise'
-  s.add_runtime_dependency 'instant2fa', '~> 1'
+  s.add_runtime_dependency 'instant2fa', '>= 1.0.2'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/lib/devise_instant2fa/controllers/helpers.rb

@@ -3,8 +3,12 @@ module DeviseInstant2fa
     module Helpers
       extend ActiveSupport::Concern
 
-      included do
-        before_action :handle_two_factor_authentication, :if => :is_signing_in?
+      def self.included(source)
+          if source.respond_to?(:before_action) # Rails 4+
+            source.send(:before_action, :handle_two_factor_authentication, :if => :is_signing_in?)
+          elsif source.respond_to?(:before_filter) # Rails 3
+            source.send(:before_filter, :handle_two_factor_authentication, :if => :is_signing_in?)
+          end
       end
 
       def is_devise_sessions_controller?

data/lib/devise_instant2fa/version.rb

@@ -1,3 +1,3 @@
 module DeviseInstant2fa
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: devise_instant2fa
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jesse Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: instant2fa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
@@ -112,28 +112,28 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -171,17 +171,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: devise_instant2fa
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Instant 2FA plugin for devise