authpwn_rails 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79347acf991659271a428bfb677c3cee133139a0
-  data.tar.gz: 589da4ac9e17ef7b4991615066a2c145fcb14a95
+  metadata.gz: b4d2ef2f022f0291e7f6907421c3fa9e97c7927a
+  data.tar.gz: b7e5855908c7f21b066de25fa94c718551d93ec5
 SHA512:
-  metadata.gz: 74e5f7e2bc4418a0da94ead6d3300a7896294f27752f958863611d2412e2770149fb1afa1e9d0578afc6ab0073f2053336e24cd5e7fb5e992de08a27fad9b220
-  data.tar.gz: ea7df2b177956b08482bf5c11ab3e503e88f46777e8412798bef4307d617a6bba83ecc96ada668a4daa4ed9be83de59f60a83753988bf6bf435526b513bfdde9
+  metadata.gz: 8644d47e59cc1741668b00e7fd8481e83746df0f4a3b91d5a334365d4e07cee4c4caa8dfef9fccb730781aa782ab0c549ecfa0ed1f43db3f6fcc50b16c7175fc
+  data.tar.gz: d9336b5c8e5e901d85311a8ac1c79a7e99c363c4dbd3cae4f556425e4cbdb1ee4598ffd39dd902e6b6e11deb23a45395fcd3117f3b224d1cd25e397e92b6f145

data/.travis.yml

@@ -10,9 +10,7 @@ env:
   - DB=pg DB_USER=postgres
   - DB=sqlite
 gemfile:
-  - Gemfile.rails4
-  - Gemfile.rails41
-  - Gemfile.rails42
+  - Gemfile.rails5
 rvm:
-  - 2.1.9
   - 2.2.5
+  - 2.3.1

data/Gemfile

@@ -1,18 +1,18 @@
 source 'https://rubygems.org'
 
 gem 'base32', '>= 0.3.2'
-gem 'rails', ['~> 4.0', '>= 4.0.13']
+gem 'rails', '>= 5.0.0.1'
 
 group :development do
   gem 'bundler', '>= 1.6.6'
   gem 'mocha', '>= 1.1.0'
-  gem 'jeweler', '>= 2.0.1'
+  gem 'jeweler', '>= 2.1.1'
   gem 'simplecov', '>= 0'
-  gem 'mysql2', '>= 0.3.20'
+  gem 'mysql2', '>= 0.4.4'
   gem 'omniauth', '>= 1.3.1'
-  gem 'pg', '>= 0.18.4'
-  gem 'rake', '>= 11.1.1'
-  gem 'sqlite3', '>= 1.3.11'
+  gem 'pg', '>= 0.19.0'
+  gem 'rake', '>= 11.3.0'
+  gem 'sqlite3', '>= 1.3.12'
   gem 'rubysl', platforms: [:rbx]
   gem 'rubysl-bundler', platforms: [:rbx]
   gem 'rubysl-rake', platforms: [:rbx]

data/Gemfile.lock

@@ -1,43 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (6.0.3)
+    arel (7.1.4)
     base32 (0.3.2)
     builder (3.2.2)
     concurrent-ruby (1.0.2)
@@ -57,7 +59,7 @@ GEM
       oauth2 (~> 1.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    hashie (3.4.4)
+    hashie (3.4.6)
     highline (1.7.8)
     i18n (0.7.0)
     jeweler (2.1.1)
@@ -71,26 +73,27 @@ GEM
       rdoc
       semver
     json (1.8.3)
-    jwt (1.5.4)
+    jwt (1.5.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    mocha (1.1.0)
+    minitest (5.9.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.4.4)
-    nokogiri (1.6.8)
+    nio4r (1.2.1)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -100,36 +103,34 @@ GEM
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
-    pg (0.18.4)
-    pkg-config (1.1.7)
-    rack (1.6.4)
+    pg (0.19.0)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rdoc (4.2.2)
       json (~> 1.4)
     rubysl (2.2.0)
@@ -332,7 +333,7 @@ GEM
     rubysl-set (2.0.1)
     rubysl-shellwords (2.0.0)
     rubysl-singleton (2.0.0)
-    rubysl-socket (2.1.2)
+    rubysl-socket (2.2)
       rubysl-fcntl (~> 2.0)
     rubysl-stringio (2.1.0)
     rubysl-strscan (2.0.0)
@@ -369,11 +370,14 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.12)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -381,18 +385,18 @@ PLATFORMS
 DEPENDENCIES
   base32 (>= 0.3.2)
   bundler (>= 1.6.6)
-  jeweler (>= 2.0.1)
+  jeweler (>= 2.1.1)
   mocha (>= 1.1.0)
-  mysql2 (>= 0.3.20)
+  mysql2 (>= 0.4.4)
   omniauth (>= 1.3.1)
-  pg (>= 0.18.4)
-  rails (~> 4.0, >= 4.0.13)
-  rake (>= 11.1.1)
+  pg (>= 0.19.0)
+  rails (>= 5.0.0.1)
+  rake (>= 11.3.0)
   rubysl
   rubysl-bundler
   rubysl-rake
   simplecov
-  sqlite3 (>= 1.3.11)
+  sqlite3 (>= 1.3.12)
 
 BUNDLED WITH
-   1.11.2
+   1.13.5

data/{Gemfile.rails4 → Gemfile.rails5}

@@ -1,17 +1,18 @@
 source 'https://rubygems.org'
 
 gem 'base32', '>= 0.3.2'
-gem 'rails', '~> 4.0.13'
+gem 'rails', '>= 5.0.0.1'
 
 group :development do
   gem 'bundler', '>= 1.6.6'
-  gem 'mocha', '>= 1.1.0'
-  gem 'jeweler', '>= 2.0.1'
+  gem 'mocha', '>= 1.2.1'
+  gem 'jeweler', '>= 2.1.1'
   gem 'simplecov', '>= 0'
-  gem 'mysql2', '~> 0.3.20'
+  gem 'mysql2', '>= 0.4.4'
   gem 'omniauth', '>= 1.3.1'
-  gem 'pg', '>= 0.18.4'
-  gem 'sqlite3', '>= 1.3.11'
+  gem 'pg', '>= 0.19.0'
+  gem 'rake', '>= 11.3.0'
+  gem 'sqlite3', '>= 1.3.12'
   gem 'rubysl', platforms: [:rbx]
   gem 'rubysl-bundler', platforms: [:rbx]
   gem 'rubysl-rake', platforms: [:rbx]

data/{README.rdoc → README.md}

@@ -1,34 +1,42 @@
-= authpwn_rails
+# authpwn_rails
 
-User authentication for a Ruby on Rails 4 application. Works with Facebook.
+User authentication for a Ruby on Rails 5 application.
 
-== Integration
+## Integration
 
 Scaffold user accounts, and session controller views.
-    rails g authpwn:all
 
-Wire authentication into your ApplicationController.
-    authenticates_using_session
+```bash
+rails g authpwn:all
+```
+
+Wire authentication into your `ApplicationController`.
+
+```ruby
+class ApplicationController
+  authenticates_using_session
+end
+```
 
 Note: the code inside the models and controllers is tucked away in the plug-in.
 The scaffold models and controllers are there as extension points. You will be
 able to update the plug-in without regenerating the scaffolds.
 
-== Migrating from authpwn 0.9 or older?
+## Migrating from older versions?
 
-See legacy/migrate_09_to_010.rb for a semi-automated way of migrating your
-database.
+See the legacy/ directory a semi-automated way of migrating your database.
 
-== Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version
   unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+  (if you want to have your own version, that is fine but bump version in a
+  commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2010-2013 Victor Costan, released under the MIT license.
+Copyright 2010-2016 Victor Costan, released under the MIT license.

data/Rakefile

@@ -16,7 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "authpwn_rails"
   gem.homepage = "http://github.com/pwnall/authpwn_rails"
   gem.license = "MIT"
-  gem.summary = %Q{User authentication for Rails 4 applications.}
+  gem.summary = %Q{User authentication for Rails 5 applications.}
   gem.description = %Q{Works with Facebook.}
   gem.email = "victor@costan.us"
   gem.authors = ["Victor Costan"]

data/VERSION

@@ -1 +1 @@
-0.21.1
+0.22.0

data/app/models/tokens/email_verification.rb

@@ -26,7 +26,7 @@ class EmailVerification < Tokens::OneTime
   # Returns the token instance.
   def spend
     self.transaction do
-      if credential = email_credential
+      if credential = self.email_credential
         credential.verified = true
         credential.save!
       end
@@ -40,7 +40,7 @@ class EmailVerification < Tokens::OneTime
   #     take advantage of a race condition and changes her e-mail address
   #     before using the token.
   def email_credential
-    user.credentials.find { |c| c.name == email }
+    user.credentials.where(name: email).first
   end
 end  # class Tokens::EmailVerification
 

data/app/models/tokens/password_reset.rb

@@ -23,7 +23,7 @@ class PasswordReset < Tokens::OneTime
   # This method might return nil if a user initiates password recovery multiple
   # times.
   def password_credential
-    user.credentials.find { |c| c.is_a? Credentials::Password }
+    user.credentials.where(type: 'Credentials::Password').first
   end
 end  # class Tokens::PasswordReset
 

data/authpwn_rails.gemspec

@@ -2,21 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: authpwn_rails 0.21.1 ruby lib
+# stub: authpwn_rails 0.22.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "authpwn_rails"
-  s.version = "0.21.1"
+  s.version = "0.22.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Victor Costan"]
-  s.date = "2016-09-03"
+  s.date = "2016-10-18"
   s.description = "Works with Facebook."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -24,11 +24,9 @@ Gem::Specification.new do |s|
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
-    "Gemfile.rails4",
-    "Gemfile.rails41",
-    "Gemfile.rails42",
+    "Gemfile.rails5",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "app/helpers/session_helper.rb",
@@ -86,6 +84,7 @@ Gem::Specification.new do |s|
     "lib/authpwn_rails/user_extensions/email_field.rb",
     "lib/authpwn_rails/user_extensions/password_field.rb",
     "lib/authpwn_rails/user_model.rb",
+    "test/action_controller_test_extensions_test.rb",
     "test/cookie_controller_test.rb",
     "test/credentials/api_token_test.rb",
     "test/credentials/email_credential_test.rb",
@@ -123,7 +122,6 @@ Gem::Specification.new do |s|
     "test/session_mailer_api_test.rb",
     "test/session_mailer_test.rb",
     "test/session_test.rb",
-    "test/test_extensions_test.rb",
     "test/test_helper.rb",
     "test/user_extensions/api_token_field_test.rb",
     "test/user_extensions/email_field_test.rb",
@@ -133,54 +131,54 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pwnall/authpwn_rails"
   s.licenses = ["MIT"]
   s.rubygems_version = "2.5.1"
-  s.summary = "User authentication for Rails 4 applications."
+  s.summary = "User authentication for Rails 5 applications."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<base32>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<rails>, [">= 4.0.13", "~> 4.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 5.0.0.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.6.6"])
       s.add_development_dependency(%q<mocha>, [">= 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1"])
+      s.add_development_dependency(%q<jeweler>, [">= 2.1.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<mysql2>, [">= 0.3.20"])
+      s.add_development_dependency(%q<mysql2>, [">= 0.4.4"])
       s.add_development_dependency(%q<omniauth>, [">= 1.3.1"])
-      s.add_development_dependency(%q<pg>, [">= 0.18.4"])
-      s.add_development_dependency(%q<rake>, [">= 11.1.1"])
-      s.add_development_dependency(%q<sqlite3>, [">= 1.3.11"])
+      s.add_development_dependency(%q<pg>, [">= 0.19.0"])
+      s.add_development_dependency(%q<rake>, [">= 11.3.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 1.3.12"])
       s.add_development_dependency(%q<rubysl>, [">= 0"])
       s.add_development_dependency(%q<rubysl-bundler>, [">= 0"])
       s.add_development_dependency(%q<rubysl-rake>, [">= 0"])
     else
       s.add_dependency(%q<base32>, [">= 0.3.2"])
-      s.add_dependency(%q<rails>, [">= 4.0.13", "~> 4.0"])
+      s.add_dependency(%q<rails>, [">= 5.0.0.1"])
       s.add_dependency(%q<bundler>, [">= 1.6.6"])
       s.add_dependency(%q<mocha>, [">= 1.1.0"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1"])
+      s.add_dependency(%q<jeweler>, [">= 2.1.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<mysql2>, [">= 0.3.20"])
+      s.add_dependency(%q<mysql2>, [">= 0.4.4"])
       s.add_dependency(%q<omniauth>, [">= 1.3.1"])
-      s.add_dependency(%q<pg>, [">= 0.18.4"])
-      s.add_dependency(%q<rake>, [">= 11.1.1"])
-      s.add_dependency(%q<sqlite3>, [">= 1.3.11"])
+      s.add_dependency(%q<pg>, [">= 0.19.0"])
+      s.add_dependency(%q<rake>, [">= 11.3.0"])
+      s.add_dependency(%q<sqlite3>, [">= 1.3.12"])
       s.add_dependency(%q<rubysl>, [">= 0"])
       s.add_dependency(%q<rubysl-bundler>, [">= 0"])
       s.add_dependency(%q<rubysl-rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<base32>, [">= 0.3.2"])
-    s.add_dependency(%q<rails>, [">= 4.0.13", "~> 4.0"])
+    s.add_dependency(%q<rails>, [">= 5.0.0.1"])
     s.add_dependency(%q<bundler>, [">= 1.6.6"])
     s.add_dependency(%q<mocha>, [">= 1.1.0"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1"])
+    s.add_dependency(%q<jeweler>, [">= 2.1.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<mysql2>, [">= 0.3.20"])
+    s.add_dependency(%q<mysql2>, [">= 0.4.4"])
     s.add_dependency(%q<omniauth>, [">= 1.3.1"])
-    s.add_dependency(%q<pg>, [">= 0.18.4"])
-    s.add_dependency(%q<rake>, [">= 11.1.1"])
-    s.add_dependency(%q<sqlite3>, [">= 1.3.11"])
+    s.add_dependency(%q<pg>, [">= 0.19.0"])
+    s.add_dependency(%q<rake>, [">= 11.3.0"])
+    s.add_dependency(%q<sqlite3>, [">= 1.3.12"])
     s.add_dependency(%q<rubysl>, [">= 0"])
     s.add_dependency(%q<rubysl-bundler>, [">= 0"])
     s.add_dependency(%q<rubysl-rake>, [">= 0"])