drop support for devise 3.x

scambra · Aug 4, 2016 · 501ee32 · 501ee32
1 parent b14f1a4
commit 501ee32
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 605 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     devise_invitable (1.6.1)
-      actionmailer (>= 3.2.6)
-      devise (>= 3.2.0)
+      actionmailer (>= 4.0.0)
+      devise (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -55,7 +55,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    devise (4.1.0)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 5.1)
@@ -81,7 +81,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0221)
     mini_portile2 (2.1.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mongo (2.2.4)
@@ -113,7 +113,7 @@ GEM
       activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     rspec-core (3.1.7)

diff --git a/README.rdoc b/README.rdoc
@@ -1,13 +1,12 @@
 = DeviseInvitable
-{<img src="https://badge.fury.io/rb/devise_invitable.svg"/>}[http://badge.fury.io/rb/devise_invitable] {<img src="https://travis-ci.org/scambra/devise_invitable.png"/>}[https://travis-ci.org/scambra/devise_invitable] {<img src="https://codeclimate.com/github/scambra/devise_invitable/badges/gpa.svg"/}[https://codeclimate.com/github/scambra/devise_invitable] 
+{<img src="https://badge.fury.io/rb/devise_invitable.svg"/>}[http://badge.fury.io/rb/devise_invitable] {<img src="https://travis-ci.org/scambra/devise_invitable.png"/>}[https://travis-ci.org/scambra/devise_invitable] {<img src="https://codeclimate.com/github/scambra/devise_invitable/badges/gpa.svg"/}[https://codeclimate.com/github/scambra/devise_invitable]
 
 It adds support to devise[https://github.com/plataformatec/devise] for sending invitations by email (it requires to be authenticated) and accept the invitation setting the password.
 
-DeviseInvitable currently supports Rails 3 and 4, if you want to use it with Rails 2.3 you must install version {0.2.3}[https://rubygems.org/gems/devise_invitable/versions/0.2.3]
-
-It works with Devise >= 3.2
+It works with Devise >= 4.0
 If you want to use devise 3.0.x, you must use 1.2.1 or lower
 If you want to use devise 3.1.x, you must use 1.3.2 or lower
+If you want to use devise >= 3.2, you must use 1.6.1 or lower
 
 == Installation
 
@@ -17,8 +16,8 @@ Install DeviseInvitable gem, it will also install dependencies (such as devise a
 
 Add DeviseInvitable to your Gemfile (and Devise if you weren't using them):
 
-  gem 'devise',           '~> 3.5.2'
-  gem 'devise_invitable', '~> 1.6.0'
+  gem 'devise',           '~> 4.2'
+  gem 'devise_invitable', '~> 1.7.0'
 
 === Automatic installation
 
@@ -285,7 +284,7 @@ You can also set <tt>invited_by</tt> when using the <tt>invite!</tt> class metho
 
 === Find by invitation token
 
-To find by invitation token use the <tt>find_by_invitation_token</tt> class method. 
+To find by invitation token use the <tt>find_by_invitation_token</tt> class method.
 
   user = User.find_by_invitation_token(params[:invitation_token], true)
 

diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('bundler', '>= 1.1.0')
 
-  s.add_runtime_dependency('actionmailer', '>= 3.2.6')
-  s.add_runtime_dependency('devise', '>= 3.2.0')
+  s.add_runtime_dependency('actionmailer', '>= 4.0.0')
+  s.add_runtime_dependency('devise', '>= 4.0.0')
 end
diff --git a/gemfiles/Gemfile.devise-4.0.lock b/gemfiles/Gemfile.devise-4.0.lock
@@ -2,8 +2,8 @@ PATH
   remote: ..
   specs:
     devise_invitable (1.6.1)
-      actionmailer (>= 3.2.6)
-      devise (>= 3.2.0)
+      actionmailer (>= 4.0.0)
+      devise (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/Gemfile.r42.devise-3.5 → gemfiles/Gemfile.devise-4.1 b/gemfiles/Gemfile.r42.devise-3.5 → gemfiles/Gemfile.devise-4.1
@@ -11,13 +11,16 @@ group :test do
     gem "sqlite3", "~> 1.3.4"
   end
 
-  gem 'devise', '~> 3.5.0'
+  gem 'devise', '~> 4.1.0'
+  gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5
   gem 'activerecord', '~> 4.2.6'
-  gem "mongoid", '~> 4.0'
-  gem "capybara", "~> 1.1.0"
+  gem "mongoid"
+  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
+  gem "capybara"
   #gem "launchy", "~> 2.4.3"
   gem 'shoulda', '~> 2.11.3'
   gem 'mocha'
   gem 'factory_girl_rails'
+  gem 'nokogiri'
   gem 'rspec-rails'
 end
diff --git a/gemfiles/Gemfile.r42.devise-3.5.lock → gemfiles/Gemfile.devise-4.1.lock b/gemfiles/Gemfile.r42.devise-3.5.lock → gemfiles/Gemfile.devise-4.1.lock
@@ -2,8 +2,8 @@ PATH
   remote: ..
   specs:
     devise_invitable (1.6.1)
-      actionmailer (>= 3.2.6)
-      devise (>= 3.2.0)
+      actionmailer (>= 4.0.0)
+      devise (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -43,26 +43,23 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.4.0)
     arel (6.0.3)
     bcrypt (3.1.11)
-    bson (3.2.6)
+    bson (4.1.0)
     builder (3.2.2)
-    capybara (1.1.4)
+    capybara (2.7.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    connection_pool (2.2.0)
-    devise (3.5.7)
+      xpath (~> 2.0)
+    devise (4.1.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -71,7 +68,6 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.9.10)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
@@ -84,24 +80,23 @@ GEM
     mime-types (3.0)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongoid (4.0.2)
+    mongo (2.2.4)
+      bson (~> 4.0)
+    mongoid (5.1.2)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
+      mongo (~> 2.1)
+      origin (~> 2.2)
       tzinfo (>= 0.3.37)
-    moped (2.0.7)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    optionable (0.2.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     origin (2.2.0)
     orm_adapter (0.5.0)
+    pkg-config (1.1.7)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -119,40 +114,35 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.1.2)
-    responders (2.1.2)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubyzip (1.2.0)
-    selenium-webdriver (2.53.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     shoulda (2.11.3)
     sqlite3 (1.3.11)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     warden (1.2.6)
       rack (>= 1.0)
-    websocket (1.2.3)
-    xpath (0.1.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -162,15 +152,17 @@ DEPENDENCIES
   activerecord (~> 4.2.6)
   activerecord-jdbcsqlite3-adapter (>= 1.3.0.beta1)
   bundler (>= 1.1.0)
-  capybara (~> 1.1.0)
-  devise (~> 3.5.0)
+  capybara
+  devise (~> 4.1.0)
   devise_invitable!
   factory_girl_rails
   mocha
-  mongoid (~> 4.0)
+  mongoid
+  nokogiri
   rspec-rails
   shoulda (~> 2.11.3)
   sqlite3 (~> 1.3.4)
+  test_after_commit
 
 BUNDLED WITH
-   1.12.4
+   1.12.5
diff --git a/gemfiles/Gemfile.r32 b/gemfiles/Gemfile.r32