devise_google_authenticator 0.3.15 → 0.3.16

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDAxODk5NTQwOGNkZWRlZTk0YzdkOTY3YjFiYzcxNDkyY2RkYTJjZQ==
-  data.tar.gz: !binary |-
-    N2JmNTExODkzYTYxOWZjNjE0OWIwYzI5MDU5Y2M4ZjhmZWIxODNmMA==
+SHA1:
+  metadata.gz: a91d2025549af93ca8c7a5ed21498896285e1018
+  data.tar.gz: 8bae8a5614a383e8cb6e1ca34fa2762234ecbbe1
 SHA512:
-  metadata.gz: !binary |-
-    YzAxZGFmMzBkZTliZGExZDAzMDViMWI1NDQ0MDZkZWI3NDkzYzBiMzU3N2Nl
-    MDFlNjlkNzU0NWQ3ODlmNWUxOTk4Y2M0MGI5ZjdhYWUzMjJmY2U5ZmFmYTQy
-    MmY3YWUzZWMxMTZiYTA1NzI1NjA5ZTdjZjJjYzJjNWE5MGNhODc=
-  data.tar.gz: !binary |-
-    NWUwMDJjN2I2MzkxMTk4NTAwOTgzZGRjYWVhNmRlOTI3OGU3YTA5NjlmNmU3
-    NzI5Yzk5MGEwMWRjZmExZWFkZmE5MDkxMWI1ZDczMmM5NGVkODI0YzdhMWMx
-    M2U1ODY2MjVkZGU2N2Y3ZGNlNjYzYjIxMWVlNTQ2NTc0YjFhYTM=
+  metadata.gz: edf585b0b9ee16248ddca6ce38510d5874814a3d6c7feec67228d2fa9b2400d710652192732d760d1b4dd8b00b18aed5733be5c8d9ef039a083c11742012d8f9
+  data.tar.gz: 231ba879a35e1e23c3072a94fe92021150e2c88e2d126b448d0f7f11fc0e40b4fe074fba27d36fa063589a9bf7ed603852fbe0fb6fb3aa79671ef0e5c69c002f

data/README.rdoc

@@ -7,7 +7,7 @@ This is a devise[https://github.com/plataformatec/devise] extension to allow you
 Add the gem to your Gemfile (don't forget devise too):
 
 * gem 'devise'
-* gem 'devise_google_authenticator', '0.3.15'
+* gem 'devise_google_authenticator', '0.3.16'
 
 Don't forget to "bundle install"
 
@@ -81,6 +81,7 @@ With this extension enabled, the following is expected behaviour:
 The install generator also installs an english copy of a Devise Google Authenticator i18n file. This can be modified (or used to create other language versions) and is located at: config/locales/devise.google_authenticator.en.yml
 
 == Changes
+* Version 0.3.16 - A few bug-fixes. Test-cases are now passing in Ruby 1.9.3 and 2.1.5
 * Version 0.3.15 - Can now configure whether the displayqr page is displayed during sign-up. Can customise the app's name (thanks Felipe Lima). Require the users to enter the token when enabling or disabling the token (thanks again Felipe Lima). Handle namespaced Devise models (thanks Mikkel Garcia). Ability to set an Issuer within the OTP generation (thanks Sylvain UTARD).
 * Version 0.3.14 - Users can now generate a new token if they wish. This is available from the displayqr page.
 * Version 0.3.13 - Merged a feature to allow a qualifier for the Google Authenticator token display. This allows you to specify in your view a qualifier for the name of the OTP when it's enrolled into the Google Authenticator app. Thanks Michael Guymon for the pull.

data/app/controllers/devise/displayqr_controller.rb

@@ -1,12 +1,12 @@
 class Devise::DisplayqrController < DeviseController
-  prepend_before_filter :authenticate_scope!, :only => [:show,:update,:refresh]
+  prepend_before_filter :authenticate_scope!, :only => [:show, :update, :refresh]
 
   include Devise::Controllers::Helpers
 
   # GET /resource/displayqr
   def show
     if resource.nil? || resource.gauth_secret.nil?
-      sign_in scope, resource, :bypass => true
+      sign_in resource_class.new, resource
       redirect_to stored_location_for(scope) || :root
     else
       @tmpid = resource.assign_tmp
@@ -21,7 +21,7 @@ class Devise::DisplayqrController < DeviseController
       return
     end
 
-    if resource.set_gauth_enabled(resource_params)
+    if resource.set_gauth_enabled(params[resource_name]['gauth_enabled'])
       set_flash_message :notice, (resource.gauth_enabled? ? :enabled : :disabled)
       sign_in scope, resource, :bypass => true
       redirect_to stored_location_for(scope) || :root
@@ -52,6 +52,7 @@ class Devise::DisplayqrController < DeviseController
     self.resource = send("current_#{resource_name}")
   end
 
+  # 7/2/15 - Unsure if this is used anymore - @xntrik
   def resource_params
     return params.require(resource_name.to_sym).permit(:gauth_enabled) if strong_parameters_enabled?
     params

data/config/locales/en.yml

@@ -17,3 +17,5 @@ en:
       user:
         status: "User status updated!"
         newtoken: "You have updated to a new token - make sure you update your Google Authenticator application before continuing!!"
+        disabled: "2FA is currently disabled"
+        enabled: "2FA is currently enabled"

data/lib/devise_google_authenticatable/models/google_authenticatable.rb

@@ -19,8 +19,9 @@ module Devise # :nodoc:
           self.gauth_secret
         end
 
-        def set_gauth_enabled(params)
-          self.update_without_password(params)
+        def set_gauth_enabled(param)
+          #self.update_without_password(params[gauth_enabled])
+          self.update_attributes(:gauth_enabled => param)
         end
 
         def assign_tmp

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: devise_google_authenticator
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Christian Frichot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.6'
 description: Devise Google Authenticator Extension, for adding Google's OTP to your
   Rails apps!
 email: xntrik@gmail.com
@@ -75,6 +47,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- LICENSE.txt
+- README.rdoc
 - app/controllers/devise/checkga_controller.rb
 - app/controllers/devise/displayqr_controller.rb
 - app/views/devise/checkga/show.html.erb
@@ -83,9 +57,9 @@ files:
 - lib/devise_google_authenticatable/controllers/helpers.rb
 - lib/devise_google_authenticatable/models/google_authenticatable.rb
 - lib/devise_google_authenticatable/orm/active_record.rb
+- lib/devise_google_authenticatable/patches.rb
 - lib/devise_google_authenticatable/patches/check_ga.rb
 - lib/devise_google_authenticatable/patches/display_qr.rb
-- lib/devise_google_authenticatable/patches.rb
 - lib/devise_google_authenticatable/rails.rb
 - lib/devise_google_authenticatable/routes.rb
 - lib/devise_google_authenticatable/schema.rb
@@ -96,8 +70,6 @@ files:
 - 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
 licenses:
 - MIT
@@ -108,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Devise Google Authenticator Extension