devise_openid_authenticatable 1.1.0 → 1.1.1

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - ree
 gemfile:
+  - Gemfile.devise21
   - Gemfile.devise15
   - Gemfile.devise13
   - Gemfile.devise14

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 1.1.1
+* Add support for Devise >= 2.1.0
+
 == 1.1.0
 * Drop support for Rails 2
 * Fix routing issues on Devise > 1.3.5 (fixes #11)

data/Gemfile.devise13

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise_openid_authenticatable.gemspec
 gemspec
 
+gem "rails", "~> 3.0.0"
 gem "devise", "~> 1.3.0"
 
 group :test do

data/Gemfile.devise14

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise_openid_authenticatable.gemspec
 gemspec
 
+gem "rails", "~> 3.0.0"
 gem "devise", "~> 1.4.0"
 
 group :test do

data/Gemfile.devise15

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise_openid_authenticatable.gemspec
 gemspec
 
+gem "rails", "~> 3.1.0"
 gem "devise", "~> 1.5.0"
 
 group :test do

data/Gemfile.devise21

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in devise_openid_authenticatable.gemspec
+gemspec
+
+gem "devise", "~> 2.1.0"
+gem "rails", "~> 3.2.0"
+
+group :test do
+  gem "rots", :git => "http://github.com/roman/rots.git"
+end

data/README.md

@@ -1,4 +1,4 @@
-devise_openid_authenticatable [![Build Status](https://secure.travis-ci.org/[nbudin]/[devise_openid_authenticatable].png)](http://travis-ci.org/[nbudin]/[devise_openid_authenticatable])
+devise_openid_authenticatable [![Build Status](https://secure.travis-ci.org/nbudin/devise_openid_authenticatable.png)](http://travis-ci.org/nbudin/devise_openid_authenticatable)
 ==========================
 
 Written by Nat Budin
@@ -10,7 +10,7 @@ devise_openid_authenticatable is [OpenID](http://openid.net) authentication supp
 Requirements
 ------------
 
-- Devise 1.3
+- Devise 1.3 or higher
 - rack-openid
 
 Installation

data/devise_openid_authenticatable.gemspec

@@ -16,9 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = DeviseOpenidAuthenticatable::VERSION
   
   gem.add_dependency "rack-openid", ">= 1.2.0"
-  gem.add_dependency "devise", "~> 1.3"
+  gem.add_dependency "devise", ">= 1.3"
 
-  gem.add_development_dependency 'rails', '~> 3.0.0'
   gem.add_development_dependency "rspec", "~> 2.3"
   gem.add_development_dependency "rspec-rails", "~> 2.3"
   gem.add_development_dependency "mocha"

data/lib/devise_openid_authenticatable/schema.rb

@@ -1,9 +1,15 @@
-Devise::Schema.class_eval do
-  def openid_authenticatable
-    if respond_to?(:apply_devise_schema)
-      apply_devise_schema :identity_url, String
-    else
-      apply_schema :identity_url, String
+require 'devise/version'
+
+# Devise 2.1 removes schema stuff
+if Devise::VERSION < "2.1"
+  require 'devise/schema'
+  Devise::Schema.class_eval do
+    def openid_authenticatable
+      if respond_to?(:apply_devise_schema)
+        apply_devise_schema :identity_url, String
+      else
+        apply_schema :identity_url, String
+      end
     end
   end
-end
+end

data/lib/devise_openid_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseOpenidAuthenticatable
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/scenario/db/migrate/20100401102949_create_tables.rb

@@ -1,21 +1,48 @@
+require 'devise/version'
+
 class CreateTables < ActiveRecord::Migration
-  def self.up
-    create_table :users do |t|
+  def self.openid_authenticatable_fields(t)
+    if Devise::VERSION < "2.1"
+      require 'devise/schema'
       t.openid_authenticatable
+    else
+      t.string :identity_url
+    end
+  end
+
+  def self.rememberable_fields(t)
+    if Devise::VERSION < "2.1"
+      require 'devise/schema'
       t.rememberable
+    else
+      t.string :remember_token
+      t.datetime :remember_created_at
+    end
+  end
+
+  def self.up
+    create_table :users do |t|
+      openid_authenticatable_fields t
+      rememberable_fields t
       t.string :email
       t.timestamps
     end
     
     create_table :database_users do |t|
-      t.openid_authenticatable
-      t.database_authenticatable
+      openid_authenticatable_fields t
+      if Devise::VERSION < "2.1"
+        t.database_authenticatable
+      else
+        t.string :email,              :null => false, :default => ""
+        t.string :encrypted_password, :null => false, :default => ""
+      end
+
       t.timestamps
     end
     
     create_table :legacy_users do |t|
-      t.openid_authenticatable
-      t.rememberable
+      openid_authenticatable_fields t
+      rememberable_fields t
       t.string :email
       t.timestamps
     end

metadata

@@ -1,156 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_openid_authenticatable
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nat Budin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-08 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack-openid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: devise
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: webrat
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrat
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OpenID authentication module for Devise using Rack::OpenID
-email: 
+email:
 - natbudin@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.rdoc
@@ -158,12 +153,11 @@ files:
 - Gemfile.devise13
 - Gemfile.devise14
 - Gemfile.devise15
+- Gemfile.devise21
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - devise_openid_authenticatable.gemspec
-- devise_openid_authenticatable.gemspec.bak
 - lib/devise_openid_authenticatable.rb
 - lib/devise_openid_authenticatable/model.rb
 - lib/devise_openid_authenticatable/schema.rb
@@ -195,39 +189,31 @@ files:
 - spec/spec_helper.rb
 - spec/strategy_spec.rb
 - spec/support/migrations.rb
-has_rdoc: true
 homepage: https://github.com/nbudin/devise_openid_authenticatable
 licenses: []
-
 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 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: OpenID authentication for Devise
-test_files: 
+test_files:
 - spec/model_spec.rb
 - spec/scenario/app/controllers/application_controller.rb
 - spec/scenario/app/controllers/home_controller.rb
@@ -253,3 +239,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/strategy_spec.rb
 - spec/support/migrations.rb
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/devise_openid_authenticatable.gemspec.bak

@@ -1,100 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{devise_openid_authenticatable}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nat Budin"]
-  s.date = %q{2011-05-31}
-  s.description = %q{OpenID authentication module for Devise using Rack::OpenID}
-  s.email = %q{natbudin@gmail.com}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "CHANGELOG.rdoc",
-    "Gemfile",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "devise_openid_authenticatable.gemspec",
-    "lib/devise_openid_authenticatable.rb",
-    "lib/devise_openid_authenticatable/model.rb",
-    "lib/devise_openid_authenticatable/routes.rb",
-    "lib/devise_openid_authenticatable/schema.rb",
-    "lib/devise_openid_authenticatable/strategy.rb",
-    "rails/init.rb",
-    "spec/model_spec.rb",
-    "spec/scenario/app/controllers/application_controller.rb",
-    "spec/scenario/app/controllers/home_controller.rb",
-    "spec/scenario/app/controllers/sessions_controller.rb",
-    "spec/scenario/app/models/database_user.rb",
-    "spec/scenario/app/models/legacy_user.rb",
-    "spec/scenario/app/models/user.rb",
-    "spec/scenario/app/views/layouts/application.html.erb",
-    "spec/scenario/app/views/sessions/new.html.erb",
-    "spec/scenario/config.ru",
-    "spec/scenario/config/application.rb",
-    "spec/scenario/config/boot.rb",
-    "spec/scenario/config/database.yml",
-    "spec/scenario/config/environment.rb",
-    "spec/scenario/config/environments/development.rb",
-    "spec/scenario/config/environments/test.rb",
-    "spec/scenario/config/initializers/backtrace_silencers.rb",
-    "spec/scenario/config/initializers/inflections.rb",
-    "spec/scenario/config/initializers/secret_token.rb",
-    "spec/scenario/config/routes.rb",
-    "spec/scenario/db/migrate/20100401102949_create_tables.rb",
-    "spec/scenario/db/schema.rb",
-    "spec/spec_helper.rb",
-    "spec/strategy_spec.rb",
-    "spec/support/migrations.rb"
-  ]
-  s.homepage = %q{http://github.com/nbudin/devise_openid_authenticatable}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
-  s.summary = %q{OpenID authentication module for Devise}
-  s.test_files = [
-    "spec/model_spec.rb",
-    "spec/scenario/app/controllers/application_controller.rb",
-    "spec/scenario/app/controllers/home_controller.rb",
-    "spec/scenario/app/controllers/sessions_controller.rb",
-    "spec/scenario/app/models/database_user.rb",
-    "spec/scenario/app/models/legacy_user.rb",
-    "spec/scenario/app/models/user.rb",
-    "spec/scenario/config/application.rb",
-    "spec/scenario/config/boot.rb",
-    "spec/scenario/config/environment.rb",
-    "spec/scenario/config/environments/development.rb",
-    "spec/scenario/config/environments/test.rb",
-    "spec/scenario/config/initializers/backtrace_silencers.rb",
-    "spec/scenario/config/initializers/inflections.rb",
-    "spec/scenario/config/initializers/secret_token.rb",
-    "spec/scenario/config/routes.rb",
-    "spec/scenario/db/migrate/20100401102949_create_tables.rb",
-    "spec/scenario/db/schema.rb",
-    "spec/spec_helper.rb",
-    "spec/strategy_spec.rb",
-    "spec/support/migrations.rb"
-  ]
-
-  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<rack-openid>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<devise>, [">= 1.0.6"])
-    else
-      s.add_dependency(%q<rack-openid>, [">= 1.2.0"])
-      s.add_dependency(%q<devise>, [">= 1.0.6"])
-    end
-  else
-    s.add_dependency(%q<rack-openid>, [">= 1.2.0"])
-    s.add_dependency(%q<devise>, [">= 1.0.6"])
-  end
-end
-