google_authentication 0.1.2 → 0.2.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@google_authentication --create
+rvm use 1.9.3@google_authentication --create

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 0.2.0, released 2012-06-06
+
+* Updated gem to work with new versions of Devise and Omniauth, currently 2.1.0 for Devise and 1.1.0 for Omniauth
+
 ## 0.1.2, released 2011-07-07
 
 * Added presence and uniqueness validators to `:email` and `:omniauth_uid` fields in `acts_as_google_user` models

data/Gemfile

@@ -1,22 +1,23 @@
 source "http://rubygems.org"
 
-gem 'rails', '>= 3.0.0'
-gem 'omniauth' # This MUST be before devise
-gem 'devise', '>= 1.2.0'
+gem 'rails', '>= 3.1.0'
+gem 'omniauth', '>= 1.0'
+gem 'omniauth-google-apps'
+gem 'devise', '>= 2.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "sqlite3"
-  gem "rspec-rails"
+  gem "sqlite3", '~> 1.3.5'
+  gem "rspec-rails", '>= 2.9.0'
   gem "shoulda-matchers"
-  gem "generator_spec"
+  gem "generator_spec", '>= 0.8.5'
   gem "guard-rspec"
   gem "capybara", ">= 0.4.0"
   gem "yard"
   gem "cucumber", "~> 0.10"
   gem "aruba"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.2"
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/config/routes.rb

@@ -2,7 +2,9 @@ Rails.application.routes.draw do
 
   if GoogleAuthentication.define_routes?
     # Devise + omniauth routes only if the given class exist
-    devise_for GoogleAuthentication.devise_table, :controllers => {:omniauth_callbacks => "google_authentication/omniauth_callbacks"} do
+    devise_for GoogleAuthentication.devise_table, :controllers => {:omniauth_callbacks => "google_authentication/omniauth_callbacks"}
+
+    devise_scope GoogleAuthentication.model_name do
       get 'sign_in', :to => 'google_authentication/sessions#new', :as => :new_user_session
       get 'sign_out', :to => 'google_authentication/sessions#destroy', :as => :destroy_user_session
     end

data/google_authentication.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{google_authentication}
-  s.version = "0.1.2"
+  s.name = "google_authentication"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabio Napoleoni"]
-  s.date = %q{2011-07-07}
-  s.description = %q{Authenticate users through Google in your app using devise and omniauth}
-  s.email = %q{f.napoleoni@gmail.com}
+  s.date = "2012-06-06"
+  s.description = "Authenticate users through Google in your app using devise and omniauth"
+  s.email = "f.napoleoni@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -96,60 +96,63 @@ Gem::Specification.new do |s|
     "spec/models/acts_as_google_user_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/fabn/google_authentication}
+  s.homepage = "http://github.com/fabn/google_authentication"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Authenticate users through Google in your app}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Authenticate users through Google in your app"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<omniauth>, [">= 0"])
-      s.add_runtime_dependency(%q<devise>, [">= 1.2.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<omniauth>, [">= 1.0"])
+      s.add_runtime_dependency(%q<omniauth-google-apps>, [">= 0"])
+      s.add_runtime_dependency(%q<devise>, [">= 2.0"])
+      s.add_development_dependency(%q<sqlite3>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 2.9.0"])
       s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
-      s.add_development_dependency(%q<generator_spec>, [">= 0"])
+      s.add_development_dependency(%q<generator_spec>, [">= 0.8.5"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.10"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<omniauth>, [">= 0"])
-      s.add_dependency(%q<devise>, [">= 1.2.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<omniauth>, [">= 1.0"])
+      s.add_dependency(%q<omniauth-google-apps>, [">= 0"])
+      s.add_dependency(%q<devise>, [">= 2.0"])
+      s.add_dependency(%q<sqlite3>, ["~> 1.3.5"])
+      s.add_dependency(%q<rspec-rails>, [">= 2.9.0"])
       s.add_dependency(%q<shoulda-matchers>, [">= 0"])
-      s.add_dependency(%q<generator_spec>, [">= 0"])
+      s.add_dependency(%q<generator_spec>, [">= 0.8.5"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<cucumber>, ["~> 0.10"])
       s.add_dependency(%q<aruba>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<omniauth>, [">= 0"])
-    s.add_dependency(%q<devise>, [">= 1.2.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<omniauth>, [">= 1.0"])
+    s.add_dependency(%q<omniauth-google-apps>, [">= 0"])
+    s.add_dependency(%q<devise>, [">= 2.0"])
+    s.add_dependency(%q<sqlite3>, ["~> 1.3.5"])
+    s.add_dependency(%q<rspec-rails>, [">= 2.9.0"])
     s.add_dependency(%q<shoulda-matchers>, [">= 0"])
-    s.add_dependency(%q<generator_spec>, [">= 0"])
+    s.add_dependency(%q<generator_spec>, [">= 0.8.5"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<cucumber>, ["~> 0.10"])
     s.add_dependency(%q<aruba>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
   end
 end

data/lib/google_authentication/acts_as_google_user.rb

@@ -65,7 +65,7 @@ module GoogleAuthentication
         # @return [ActiveRecord::Base] an instance of the base class
         def find_or_create_by_omniauth_default_impl omniauth_data
           find_or_initialize_by_omniauth_uid(omniauth_data['uid']).tap do |user|
-            omniauth_data['user_info'].each do |k, v|
+            omniauth_data['info'].each do |k, v|
               user.send "#{k}=", v if user.respond_to? "#{k}="
             end
             user.save!

data/lib/google_authentication/engine.rb

@@ -4,6 +4,7 @@ require 'rails'
 require 'action_controller'
 
 require 'omniauth'
+require 'omniauth-google-apps'
 require 'devise'
 
 module GoogleAuthentication
@@ -13,7 +14,7 @@ module GoogleAuthentication
     # Initialize devise configuration for omniauth
     initializer "google_authentication.domain", :before => "devise.omniauth" do
       require 'openid/store/filesystem'
-      Devise.omniauth :google_apps, OpenID::Store::Filesystem.new('/tmp'), :domain => GoogleAuthentication.domain
+      Devise.omniauth :google_apps, :store => OpenID::Store::Filesystem.new('/tmp'), :domain => GoogleAuthentication.domain
     end
   end
 end

data/spec/dummy/config/initializers/devise.rb

@@ -88,10 +88,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/spec/models/acts_as_google_user_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe GoogleAuthentication::ActsAsGoogleUser do
 
   class DefaultUser < ActiveRecord::Base
-    set_table_name :users
+    self.table_name =  :users
     acts_as_google_user
   end
 
   class RememberableUser < ActiveRecord::Base
-    set_table_name :users
+    self.table_name =  :users
     acts_as_google_user :rememberable
   end
 
   class ForbiddenUser < ActiveRecord::Base
-    set_table_name :users
+    self.table_name =  :users
     acts_as_google_user :database_authenticable, :recoverable
   end
 

metadata

@@ -1,182 +1,264 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google_authentication
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Fabio Napoleoni
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-07 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-google-apps
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: devise
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.10"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *id014
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 description: Authenticate users through Google in your app using devise and omniauth
 email: f.napoleoni@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
+files:
 - .document
 - .rspec
 - .rvmrc
@@ -255,36 +337,32 @@ files:
 - spec/integration/navigation_spec.rb
 - spec/models/acts_as_google_user_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/fabn/google_authentication
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2937787373273199637
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1565083947915961248
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Authenticate users through Google in your app
 test_files: []
-