clearance 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f19deed642e596906454bdc24af4a8a130f0da6
-  data.tar.gz: f0424abac9bb5dfd7a5fca4bca85896ab639931c
+  metadata.gz: 625a226d7fafddee52dd57e85023dd92035f7093
+  data.tar.gz: e28717fbeb6a97e8d6dde485ca67fb4d2f0aeabd
 SHA512:
-  metadata.gz: 3fc54c3cc46fbecb48a627487c34047c3212e85f3831f4db9589c5d1c6da793d217b9cbda2f4fae71a0db37baf3bc5cd7203b11b7b34c9d69cfb1eb4fbac6bda
-  data.tar.gz: 887f7bf44074ef55c242c90c537c0855e5ef5790c88fece43c2067cd89007f76ab3dbf1c56b108961086605823b0c2345079158f131f66027f144cbee614ca47
+  metadata.gz: 2984d34843ad635be7463a123448bf002d46a40b34ac0a60c83d5e04da9b068be57aa3ddb4552bf468204fdf0390a23c2896995135efa2bbf692a95b7745917d
+  data.tar.gz: 59b82d503fbe6b139b22992751a14ac2c62d5817df8ddddb319499ebd912a7dec7072ef818c675bf0b8a21c40250192774068f8429f37092109af1f6ec4d93b5

data/.travis.yml

@@ -6,14 +6,34 @@ language:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.7
-  - 2.2.3
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 
-install:
-  - "travis_retry bin/setup"
+gemfile:
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
+  - gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails50.gemfile
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.2.4
+      gemfile: gemfiles/rails32.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails32.gemfile
 
-script:
-  - "bundle exec appraisal rake"
+install:
+  - "bin/setup"
 
 branches:
   only:

data/Appraisals

@@ -1,18 +1,30 @@
 if RUBY_VERSION < "2.2.0"
-  appraise 'rails3.2' do
+  appraise 'rails32' do
     gem 'rails', '~> 3.2.21'
   end
 end
 
-appraise 'rails4.0' do
+appraise 'rails40' do
   gem 'rails', '~> 4.0.13'
   gem 'test-unit'
 end
 
-appraise 'rails4.1' do
+appraise 'rails41' do
   gem 'rails', '~> 4.1.9'
 end
 
-appraise 'rails4.2' do
+appraise 'rails42' do
   gem 'rails', '~> 4.2.0'
 end
+
+if RUBY_VERSION >= "2.2.0"
+  appraise "rails50" do
+    gem "rails", "~> 5.0.0.beta1"
+    gem "rspec-rails", github: "rspec/rspec-rails"
+    gem "rspec-support", github: "rspec/rspec-support"
+    gem "rspec-core", github: "rspec/rspec-core"
+    gem "rspec-mocks", github: "rspec/rspec-mocks"
+    gem "rspec-expectations", github: "rspec/rspec-expectations"
+    gem "rspec", github: "rspec/rspec"
+  end
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.12.0)
+    clearance (1.12.1)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -62,6 +62,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     coderay (1.1.0)
+    concurrent-ruby (1.0.0)
     database_cleaner (1.5.1)
     diff-lcs (1.2.5)
     email_validator (1.6.0)
@@ -81,11 +82,11 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
     minitest (5.8.3)
-    nokogiri (1.6.6.3)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -118,7 +119,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec-core (3.4.0)
+    rspec-core (3.4.1)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -134,16 +135,17 @@ GEM
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
-    rspec-support (3.4.0)
+    rspec-support (3.4.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     slop (3.6.0)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)

data/NEWS.md

@@ -3,6 +3,12 @@
 The noteworthy changes for each Clearance version are included here. For a
 complete changelog, see the git history for each version via the version links.
 
+## [1.12.1] - January 7, 2016
+
+### Fixed
+- Fixed the `create_users` migration generated by `rails generate
+  clearance:install` under Rails 3.x.
+
 ## [1.12.0] - November 17, 2015
 
 ### Added
@@ -242,7 +248,6 @@ complete changelog, see the git history for each version via the version links.
 
 [1.1.0]: https://github.com/thoughtbot/clearance/compare/v1.0.1...v1.1.0
 
-
 ## [1.0.1] - August 9, 2013
 
 ### Fixed

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/thoughtbot/clearance.svg)](http://travis-ci.org/thoughtbot/clearance?branch=master)
 [![Code Climate](https://codeclimate.com/github/thoughtbot/clearance.svg)](https://codeclimate.com/github/thoughtbot/clearance)
+[![Documentation Quality](https://inch-ci.org/github/thoughtbot/clearance.svg?branch=master)](https://inch-ci.org/github/thoughtbot/clearance)
 
 Rails authentication with email & password.
 
@@ -228,7 +229,6 @@ translation.
 See [config/locales/clearance.en.yml](/config/locales/clearance.en.yml) for the
 default behavior.
 
-
 ### User Model
 
 See [lib/clearance/user.rb](/lib/clearance/user.rb) for the default behavior.

data/app/mailers/clearance_mailer.rb

@@ -6,9 +6,8 @@ class ClearanceMailer < ActionMailer::Base
       to: @user.email,
       subject: I18n.t(
         :change_password,
-        scope: [:clearance, :models, :clearance_mailer],
-        default: "Change your password"
-      )
+        scope: [:clearance, :models, :clearance_mailer]
+      ),
     )
   end
 end

data/bin/setup

@@ -4,8 +4,12 @@ set -e
 
 # Install required gems, including Appraisal, which helps us test against
 # multiple Rails versions
-bundle install
-bundle exec appraisal install
+gem install bundler --conservative
+bundle check || bundle install
+
+if [ -z "$CI" ]; then
+  bundle exec appraisal install
+fi
 
 # Set up database for the application that Clearance tests against
 RAILS_ENV=test bundle exec rake dummy:db:reset

data/config/locales/clearance.en.yml

@@ -1,5 +1,9 @@
 ---
 en:
+  clearance:
+    models:
+      clearance_mailer:
+        change_password: Change your password
   clearance_mailer:
     change_password:
       closing: If you didn't request this, ignore this email. Your password has

data/gemfiles/rails50.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0"
+gem "ammeter"
+gem "bundler", "~> 1.3"
+gem "capybara", ">= 2.3"
+gem "database_cleaner", "~> 1.0"
+gem "factory_girl_rails", "~> 4.2"
+gem "rspec-rails", :github => "rspec/rspec-rails"
+gem "shoulda-matchers", "~> 2.8"
+gem "sqlite3", "~> 1.3"
+gem "timecop", "~> 0.6"
+gem "pry", :require => false
+gem "rails", "~> 5.0.0.beta1"
+gem "rspec-support", :github => "rspec/rspec-support"
+gem "rspec-core", :github => "rspec/rspec-core"
+gem "rspec-mocks", :github => "rspec/rspec-mocks"
+gem "rspec-expectations", :github => "rspec/rspec-expectations"
+gem "rspec", :github => "rspec/rspec"
+
+gemspec :path => "../"

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.12.0"
+  VERSION = "1.12.1"
 end

data/lib/generators/clearance/install/templates/db/migrate/add_clearance_to_users.rb

@@ -24,7 +24,7 @@ class AddClearanceToUsers < ActiveRecord::Migration
   def self.down
     change_table :users do |t|
 <% if config[:new_columns].any? -%>
-      t.remove <%= new_columns.keys.map { |column| ":#{column}" }.join(",") %>
+      t.remove <%= new_columns.keys.map { |column| ":#{column}" }.join(", ") %>
 <% end -%>
     end
   end

data/lib/generators/clearance/install/templates/db/migrate/create_users.rb

@@ -6,8 +6,9 @@ class CreateUsers < ActiveRecord::Migration
       t.string :encrypted_password, limit: 128, null: false
       t.string :confirmation_token, limit: 128
       t.string :remember_token, limit: 128, null: false
-      t.index :email
-      t.index :remember_token
     end
+
+    add_index :users, :email
+    add_index :users, :remember_token
   end
 end

data/spec/acceptance/clearance_installation_spec.rb

@@ -10,6 +10,7 @@ describe "Clearance Installation" do
 
   it "can successfully run specs" do
     app_name = "testapp"
+
     generate_test_app(app_name)
 
     Dir.chdir(app_name) do
@@ -70,9 +71,7 @@ describe "Clearance Installation" do
       silencer = ""
     end
 
-    return_value = Bundler.with_clean_env do
-      system("#{command} #{silencer}")
-    end
+    return_value = system("#{command} #{silencer}")
 
     expect(return_value).to eq true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -112,10 +112,11 @@ files:
 - config/routes.rb
 - db/migrate/20110111224543_create_clearance_users.rb
 - db/schema.rb
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.2.gemfile
+- gemfiles/rails32.gemfile
+- gemfiles/rails40.gemfile
+- gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/authorization.rb