devise_google_authenticator 0.3.9 → 0.3.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhiNGE3NDNkMWZlZTMzY2RiMTJlNDYwMGIwNjg0NTE0YjBkMWYxMg==
+    MmFhOTViZTIzZjljNDZkZTBhZTE3YTUyYWZiYWI2MzFiZWE3N2ZiZA==
   data.tar.gz: !binary |-
-    YTIyN2E0YTVjNjI2NWE0NzRmOGJkMTBlNjYzM2YzMTk2NWJiNjI1OQ==
+    MDNkY2FmYTk5NjVkZmM0MDYyYzFkYTY0ZjRjZWVhYzY1NWRjMjVhMg==
 SHA512:
   metadata.gz: !binary |-
-    NjBkY2YxNTJjOWVmNTFhMmVmNmNmYTc1N2QxNDZmNTQ4Nzk5MDc0NTZkYmM2
-    N2ZiNjZmMDc4MzEzZjExZjkyODg5Njk2ZTNiNThiMDU1YWViNjlmNTg1MGZh
-    NmYyMDIwNWFlNWU3Y2NkOTYxYTdmZjk5OTBhYjVmOTAwMjRjMWU=
+    ZmJkNDRlNmNiNmNiYmJhOGUwMTMyZWU1NDI1YTUwNzhjMzg0YjA1ODQwOTI1
+    ZGYyNDhkYzQyOGZkYzk4NDUwOTE3MGFmODk4NDc0NTE1Yjg2MGMwMTgxZjBj
+    MTJkZjE0MjcyYjFmOTFkMGVkNzlkODAxNDk5MWVlYjIyMjdiZTU=
   data.tar.gz: !binary |-
-    OWFiZDhhZDNjNTUzZDNkNzVmODAwYmI3ZjIyZmM2ZDkyNGZjM2Y2ZDcxMGMx
-    NWM1OTE0MjY4MjRjZWUzOWIzYzAzODk3MTRlZGQ0MjA5ZGVlNzJjZjU5ODY0
-    ZDEwYWNhNTUwMmFlZGEyMGE3N2NhOTA2Zjg2YjFiN2I3OTY2NDk=
+    NDdiZjQwMGIyYWE3M2YzNGU5ZDJlNDc2MGE2NzI1Y2ZmNzllYTNmNDgxMWE0
+    N2QxYWU5NWRjYWE4MjVlM2RmMDNlYjRjNDRlNDBlYmYwYTZkN2MxNDVkYmIw
+    YTJkMmVhNmM2ODkxMzgyMmE5ZTE4NWI5MjYxNDU1NTE3MTc4MTc=

data/README.rdoc

@@ -15,19 +15,20 @@ This is a devise[https://github.com/plataformatec/devise] extension to allow you
 * 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
+* Version 0.3.10 - Added support for Mongoid ORM in addition to ActiveRecord. (Still no appropriate testing for, but I've run this on vanilla Rails 4.0.4 and Devise 3.2.3 apps)
 
 == Installation
 
 Add the gem to your Gemfile (don't forget devise too):
 
 * gem 'devise'
-* gem 'devise_google_authenticator', '0.3.9'
+* gem 'devise_google_authenticator', '0.3.10'
 
 Don't forget to "bundle install"
 
 === Devise Installation (In case you haven't done it)
 
-To setup Devise, you need to do the following (but refer to https://github.com/plataformatec/devise for more information)
+Before you can setup Devise Google Authenticator you need to setup Devise first, you need to do the following (but refer to https://github.com/plataformatec/devise for more information)
 
 Install Devise:
 * rails g devise:install
@@ -51,7 +52,7 @@ After you've created your Devise user models (which is usually done with a "rail
 
 * rails g devise_google_authenticator MODEL
 
-Don't forget to migrate:
+Don't forget to migrate if you're NOT using Mongoid as your database ORM, Mongoid installations will have appropriate fields added to the model after the command above:
 
 * rake db:migrate
 

data/lib/devise_google_authenticatable/models/google_authenticatable.rb

@@ -49,6 +49,20 @@ module Devise # :nodoc:
           end
         end
 
+        def gauth_enabled?
+          # Active_record seems to handle determining the status better this way
+          if self.gauth_enabled.respond_to?("to_i")
+            if self.gauth_enabled.to_i != 0
+              return true
+            else
+              return false
+            end
+          # Mongoid does NOT have a .to_i for the Boolean return value, hence, we can just return it
+          else
+            return self.gauth_enabled
+          end
+        end
+
         def require_token?(cookie)
           if self.class.ga_remembertime.nil? || cookie.blank?
             return true

data/lib/devise_google_authenticatable/patches/check_ga.rb

@@ -11,7 +11,7 @@ module DeviseGoogleAuthenticator::Patches
 
         resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
 
-        if resource.respond_to?(:get_qr) and resource.gauth_enabled.to_i != 0 and resource.require_token?(cookies.signed[:gauth]) #Therefore we can quiz for a QR
+        if resource.respond_to?(:get_qr) and resource.gauth_enabled? and resource.require_token?(cookies.signed[:gauth]) #Therefore we can quiz for a QR
           tmpid = resource.assign_tmp #assign a temporary key and fetch it
           warden.logout #log the user out
 

data/lib/generators/mongoid/devise_google_authenticator_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators/named_base'
+require 'generators/devise/orm_helpers'
+
+module Mongoid
+  module Generators
+    class DeviseGoogleAuthenticatorGenerator < Rails::Generators::NamedBase
+      include Devise::Generators::OrmHelpers
+
+      def inject_field_types
+        inject_into_file model_path, migration_data, :after => "include Mongoid::Document\n" if model_exists?
+      end
+
+      def migration_data
+<<RUBY
+  # Google Authenticator
+  field :gauth_secret, :type => String
+  field :gauth_enabled, :type => Boolean, :default => 'f'
+  field :gauth_tmp, :type => String
+  field :gauth_tmp_datetime, :type => DateTime
+
+RUBY
+      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.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Christian Frichot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ files:
 - lib/generators/devise_google_authenticator/devise_google_authenticator_generator.rb
 - lib/generators/devise_google_authenticator/install_generator.rb
 - lib/generators/devise_google_authenticator/views_generator.rb
+- lib/generators/mongoid/devise_google_authenticator_generator.rb
 - LICENSE.txt
 - README.rdoc
 homepage: http://github.com/AsteriskLabs/devise_google_authenticator