devise_google_authenticator 0.3.1 → 0.3.2

data/README.rdoc

@@ -7,16 +7,33 @@ This is a devise[https://github.com/plataformatec/devise] extension to allow you
 * Version 0.2 - tidied up some of the code - changed the references to AsteriskLabs
 * Version 0.3 - first working version! With working generators, tests, and doesnt require changes to Devise's Sign In view
 * Version 0.3.1 - Slight updated in the dependencies.
+* Version 0.3.2 - Updated to include support for Devise 2.0.0 and above (no longer supports 1.5.3 or lower), you'll need version 0.3.1 to use older Devise
 
 == Installation
 
 Add the gem to your Gemfile (don't forget devise too):
 
-* gem 'devise', '~> 1.5.3'
-* gem 'devise_google_authenticator', '0.3.1'
+* gem 'devise'
+* gem 'devise_google_authenticator', '0.3.2'
 
 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)
+
+Install Devise:
+* rails g devise:install
+
+Setup the User or Admin model
+* rails g devise MODEL
+
+Configure your app for authorisation, edit your Controller and add this before_filter:
+
+* before_filter :authenticate_user!
+
+Make sure your "root" route is configured in config/routes.rb
+
 === Automatic Installation (Lets assume this is a bare bones app)
 
 Run the following generator to add the necessary configuration options to Devise's config file:

data/app/controllers/devise/checkga_controller.rb

@@ -1,13 +1,13 @@
 class Devise::CheckgaController < Devise::SessionsController
   prepend_before_filter :require_no_authentication, :only => [ :show, :update ]
-  include Devise::Controllers::InternalHelpers
+  include Devise::Controllers::Helpers
   
   def show
     @tmpid = params[:id]
     if @tmpid.nil?
       redirect_to :root
     else
-      render_with_scope :show
+      render :show
     end
   end
   

data/app/controllers/devise/displayqr_controller.rb

@@ -1,11 +1,11 @@
-class Devise::DisplayqrController < ApplicationController
+class Devise::DisplayqrController < DeviseController
   prepend_before_filter :authenticate_scope!, :only => [:show,:update]
   
-  include Devise::Controllers::InternalHelpers
+  include Devise::Controllers::Helpers
   
   def show
     if not resource.nil? and not resource.gauth_secret.nil?
-      render_with_scope :show
+      render :show
     else
       sign_in scope, resource, :bypass => true
       redirect_to stored_location_for(scope) || :root
@@ -19,7 +19,7 @@ class Devise::DisplayqrController < ApplicationController
       sign_in scope, resource, :bypass => true
       redirect_to stored_location_for(scope) || :root
     else
-      render_with_scope :show
+      render :show
     end
   end
     

data/lib/devise_google_authenticatable/patches/display_qr.rb

@@ -17,13 +17,13 @@ module DeviseGoogleAuthenticator::Patches
             
             respond_with resource, :location => {:controller => 'displayqr', :action => 'show'}
           else
-            set_flash_message :notice, :inactive_signed_up, :reason => inactive_reason(resource) if is_navigational_format?
+            set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
             expire_session_data_after_sign_in!
             respond_with resource, :location => after_inactive_sign_up_path_for(resource)
           end
         else
-          clean_up_passwords(resource)
-          respond_with_navigational(resource) { render_with_scope :new }
+          clean_up_passwords resource
+          respond_with resource
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_google_authenticator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70204026425020 !ruby/object:Gem::Requirement
+  requirement: &70141007631400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70204026425020
+  version_requirements: *70141007631400
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70204026424120 !ruby/object:Gem::Requirement
+  requirement: &70141007630660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,35 +32,35 @@ dependencies:
         version: 3.0.0
     - - <=
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204026424120
+  version_requirements: *70141007630660
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70204026423260 !ruby/object:Gem::Requirement
+  requirement: &70141007629960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
-    - - <
+        version: 2.0.0
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204026423260
+  version_requirements: *70141007629960
 - !ruby/object:Gem::Dependency
   name: rotp
-  requirement: &70204026422440 !ruby/object:Gem::Requirement
+  requirement: &70141007629200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - <=
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70204026422440
+  version_requirements: *70141007629200
 description: Devise Google Authenticator Extension, for adding Google's OTP to your
   Rails apps!
 email: xntrik@gmail.com