devise_google_authenticator 0.3.8 → 0.3.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBmNWJmYjg3Yzk3NWE4ZmU1Njg1OTYyOTEwODE0MzUxMDU0ODBjMg==
+    NzhiNGE3NDNkMWZlZTMzY2RiMTJlNDYwMGIwNjg0NTE0YjBkMWYxMg==
   data.tar.gz: !binary |-
-    ZDNmNDMwNmQ2ZjgzOTYyNmRlMjY0Y2ZjZGFlNWRiM2QzNmRiOGJhNg==
+    YTIyN2E0YTVjNjI2NWE0NzRmOGJkMTBlNjYzM2YzMTk2NWJiNjI1OQ==
 SHA512:
   metadata.gz: !binary |-
-    NTdhZGZmZmFhYjEyMzk3NDEwYmU0ODlhNWViMzQ2MTI4YzA4ZjllNmMxYzhk
-    Y2VlMDNmOTM0NTQ5ZmQ5M2Y5OWMyYjFmNzg0MTVjZWM3MTVlOTMyNWVjMDI0
-    NTI0NzUyN2RmYmViMWNlZDQ0OWIzYzNiY2NjNTBjOTdkYjc1NTI=
+    NjBkY2YxNTJjOWVmNTFhMmVmNmNmYTc1N2QxNDZmNTQ4Nzk5MDc0NTZkYmM2
+    N2ZiNjZmMDc4MzEzZjExZjkyODg5Njk2ZTNiNThiMDU1YWViNjlmNTg1MGZh
+    NmYyMDIwNWFlNWU3Y2NkOTYxYTdmZjk5OTBhYjVmOTAwMjRjMWU=
   data.tar.gz: !binary |-
-    ZTk2MTk2ODA1YzJkM2E0ZDY5ZmM1YTNhOGJlZTM0ZDZjYjYzNWY1YzUzNzg4
-    OWI3Y2U4MDMxN2MwNDg3MTJmM2JkNjI4MzdkOTdhMDcxY2I5ZDNmZTVhYjE3
-    MDE4NmNkODBkNTg4MmMyMDkyZjhkNGRmNjQxMzY5OTQxYTlkMWE=
+    OWFiZDhhZDNjNTUzZDNkNzVmODAwYmI3ZjIyZmM2ZDkyNGZjM2Y2ZDcxMGMx
+    NWM1OTE0MjY4MjRjZWUzOWIzYzAzODk3MTRlZGQ0MjA5ZGVlNzJjZjU5ODY0
+    ZDEwYWNhNTUwMmFlZGEyMGE3N2NhOTA2Zjg2YjFiN2I3OTY2NDk=

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Christian Frichot
+Copyright (c) 2014 Christian Frichot
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -14,13 +14,14 @@ This is a devise[https://github.com/plataformatec/devise] extension to allow you
 * Version 0.3.6 - Slight updates - increased key size, more open gemspec, updated en.yml. (Thanks Michael Guymon)
 * Version 0.3.7 - Support for current Devise (3.2.0) and Rails4 (Thanks https://github.com/ronald05arias) - integration test still broke - need to address this
 * Version 0.3.8 - Support for remembering the token authentication. (i.e. don't request the token for a configurable amount of time Thanks https://github.com/blahblahblah-) - and seriously, I'm going to try and refactor all the integration tests with Rspec.
+* Version 0.3.9 - Merging fix from zhenyuchen (deprecated ActiveRecord query grammar) - also, re-tested against Rails 4.0.4 and Devise 3.2.3
 
 == Installation
 
 Add the gem to your Gemfile (don't forget devise too):
 
 * gem 'devise'
-* gem 'devise_google_authenticator', '0.3.8'
+* gem 'devise_google_authenticator', '0.3.9'
 
 Don't forget to "bundle install"
 
@@ -70,6 +71,7 @@ The install generator adds some options to the end of your Devise config file (c
 
 * config.ga_timeout - how long should the user be able to authenticate with their Google Authenticator token
 * config.ga_timedrift - a multiplier which provides for drift between a user's clock (and therefore their OTP) and the system clock. This should be fine at 3.
+* config.ga_remembertime - how long to remember the token for before requiring another. By default this is 1 month. To disable this setting change it to nil.
 
 == Custom Views
 
@@ -84,6 +86,7 @@ With this extension enabled, the following is expected behaviour:
 * When a user registers, they are forwarded onto the Display QR page. This allows them to add their new "token" to their mobile device, and enable, or disable, the functionality.
 * If users can't self-register, they're still able to visit this page by visiting /MODEL/displayqr (eg: /users/displayqr).
 * If the function is enabled (for that user), when they sign in, they'll be prompted for their password (as per normal), but then redirected into the Check QR page. They have to enter their token (from their device) to then successfully authenticate.
+* If configured (by default to 1 month), the user will only be prompted for the token every 1 month.
 
 == I18n
 
@@ -97,6 +100,8 @@ This extension would not exist without the following other projects and associat
 * Devise_invitable (Sergio Cambra) https://github.com/scambra/devise_invitable
 * Devise_openid_authenticatable (Nat Budin) https://github.com/nbudin/devise_openid_authenticatable
 * Devise_security_extension (Team Phatworx, Marco Scholl, Alexander Dreher) https://github.com/phatworx/devise_security_extension
+* Ronald Arias https://github.com/ronald05arias
+* Sunny Ng https://github.com/blahblahblah-
 
 
 == Contributing to devise_google_authenticator
@@ -111,6 +116,6 @@ This extension would not exist without the following other projects and associat
 
 == Copyright
 
-Copyright (c) 2012 Christian Frichot. See LICENSE.txt for
+Copyright (c) 2014 Christian Frichot. See LICENSE.txt for
 further details.
 

data/lib/devise_google_authenticatable/models/google_authenticatable.rb

@@ -72,7 +72,7 @@ module Devise # :nodoc:
 
       module ClassMethods # :nodoc:
         def find_by_gauth_tmp(gauth_tmp)
-          find(:first, :conditions => {:gauth_tmp => gauth_tmp})
+          where(gauth_tmp: gauth_tmp).first
         end
         ::Devise::Models.config(self, :ga_timeout, :ga_timedrift, :ga_remembertime)
       end

data/lib/generators/active_record/devise_google_authenticator_generator.rb

@@ -6,7 +6,7 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_devise_migration
-        migration_template "migration.rb", "db/migrate/devise_google_authenticator_add_to_#{table_name}"
+        migration_template "migration.rb", "db/migrate/devise_google_authenticator_add_to_#{table_name}.rb"
       end
     end
   end

data/lib/generators/devise_google_authenticator/devise_google_authenticator_generator.rb

@@ -1,26 +1,26 @@
 module DeviseGoogleAuthenticator
-	module Generators
-		class DeviseGoogleAuthenticatorGenerator < Rails::Generators::NamedBase
+  module Generators
+    class DeviseGoogleAuthenticatorGenerator < Rails::Generators::NamedBase
 
-			namespace "devise_google_authenticator"
+      namespace "devise_google_authenticator"
 
-			desc "Add :google_authenticatable directive in the given model, plus accessors. Also generate migration for ActiveRecord"
+      desc "Add :google_authenticatable directive in the given model, plus accessors. Also generate migration for ActiveRecord"
 
-			def inject_devise_google_authenticator_content
-				path = File.join("app","models","#{file_path}.rb")
+      def inject_devise_google_authenticator_content
+        path = File.join("app","models","#{file_path}.rb")
 
-				if File.exists?(path)
-				  inject_into_file(path, "google_authenticatable, :", :after => "devise :")
-				  inject_into_file(path, "gauth_enabled, :gauth_tmp, :gauth_tmp_datetime, :", :after => "attr_accessible :") if needs_attr_accessible?
-				  inject_into_class(path, class_name, "\tattr_accessor :gauth_token\n")
-				end
-			end
+        if File.exists?(path)
+          inject_into_file(path, "google_authenticatable, :", :after => "devise :")
+          inject_into_file(path, "gauth_enabled, :gauth_tmp, :gauth_tmp_datetime, :", :after => "attr_accessible :") if needs_attr_accessible?
+          inject_into_class(path, class_name, "\tattr_accessor :gauth_token\n")
+        end
+      end
 
-			hook_for :orm
+      hook_for :orm
 
-			private
+      private
 
-			def needs_attr_accessible?
+      def needs_attr_accessible?
         rails_3? && !strong_parameters_enabled?
       end
 
@@ -32,6 +32,6 @@ module DeviseGoogleAuthenticator
         defined?(ActionController::StrongParameters)
       end
 
-		end
-	end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_google_authenticator
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Christian Frichot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler