devise_google_authenticator 0.3.12 → 0.3.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTE5MmFhODRkZThiZDQwOWNmNzRmNWIyZTM2YTZmY2IxMzNhM2JkOA==
+    ODhhMWQ5M2IxNzA4MGFhYzAzMTE2ZGIyMmZhOTIwOWFkOGQyNjBmNQ==
   data.tar.gz: !binary |-
-    Y2NlZGJjMDg4YTdiN2Q0ZDEyMzMyYTliZDY4ZTcxODZjMzkzNWQwYw==
+    ZDkwNGI3MjgxM2UyZmZlNzAyNGIzNWRiMjhlMmEzMTcyOTRiMjZmOA==
 SHA512:
   metadata.gz: !binary |-
-    NTQ3MmM0YzE2MGU5ZDEzZDBlMGE5OTAxYzg0ZTE2ZGM1Mjc0YTUyZmE3YTUz
-    ZjhkYzQxMzM4NmVjNzlhOTIxNDlmZGI4ZTQyNDUzYjkxOGQzZmY0NmE4Mzk3
-    OGFkMWRiYzcyNDE1MjlkM2I2ZTYyMTNkZWFmNWMyNzliNzMzNjc=
+    M2E1YjM1ZmMwNmNiZjI4NGUwNjI1MGIxOTNlZmE0NzExMjAyNWRjNTIxNzIy
+    NTk3ZTAyMGFjYmY4Y2UyYWQyYmQxNzcyM2NlMWZjYmIwNTY1NzRkMDliNjBl
+    Yzc4OWYyZDZlOTE3ZjUwMjJjNmY5NjFlOGY3ZTliOTk0MmRiMDI=
   data.tar.gz: !binary |-
-    ZmZlZDgwYmM4NTRhNjQ1ZGFkZmRiMjY1MGJmNDA5YzM0YjFiOTQ0ZTU1MGM4
-    NDI1NDQ3MzQwMjRlZmIzZTIwMDA3MzNlNmQ5MTQ0MGNkZTFjY2FkNmQ2ZmI2
-    OTM5NGY2ZTJhZTM0NzhjMWYzMzZhYWJiZThmYThmNDkxZDMwZWQ=
+    MTNlNjRiZGUzNTg3YTRiNDZiMDQzZDAyYWE2NDEyMjY0ZmVhZTI0NDhhY2U2
+    OTdiZjk1OGUyYWM2OTRjMmFmY2I1NTFjZmVmZWUwNDVjMTEyOGFlOGU0OTkx
+    YTYxNTdkNmNmZDJjZTg5Y2Y0NDdiZDBkYzM1MWQ1MmZkZDM4MjU=

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.12'
+* gem 'devise_google_authenticator', '0.3.13'
 
 Don't forget to "bundle install"
 
@@ -79,6 +79,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.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.
 * Version 0.3.12 - Re-introduced Warden's after_authentication callback. Thanks Sunny Ng for the pull.
 * Version 0.3.11 - Fixed a bug where if the Devise module was included within something else, such as Active Admin, rewriting back to the CheckGA functionality was broken. This update addresses https://github.com/AsteriskLabs/devise_google_authenticator/issues/7
 * 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)
@@ -105,6 +106,7 @@ This extension would not exist without the following other projects and associat
 * 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-
+* Michael Guymon https://github.com/mguymon
 
 
 == Contributing to devise_google_authenticator

data/lib/devise_google_authenticatable/controllers/helpers.rb

@@ -1,17 +1,23 @@
 module DeviseGoogleAuthenticator
   module Controllers # :nodoc:
     module Helpers # :nodoc:
-      def google_authenticator_qrcode(user)
-        data = "otpauth://totp/#{username_from_email(user.email)}@#{Rails.application.class.parent_name}?secret=#{user.gauth_secret}"
+      def google_authenticator_qrcode(user,qualifier=nil)
+        username = username_from_email(user.email)
+        app = Rails.application.class.parent_name
+        data = "otpauth://totp/#{otpauth_user(username, app, qualifier)}?secret=#{user.gauth_secret}"
         data = Rack::Utils.escape(data)
         url = "https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl=#{data}"
         return image_tag(url, :alt => 'Google Authenticator QRCode')
       end
       
+      def otpauth_user(username, app, qualifier=nil)
+        "#{username}@#{app}#{qualifier}"
+      end 
+
       def username_from_email(email)
         (/^(.*)@/).match(email)[1]
       end
       
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_google_authenticator
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Christian Frichot
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement