clearance 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971071b9ce630b8439d1abc19bdf0fea8c3e7ae8
-  data.tar.gz: 34239b2f526a2123cad5e76711b152f04939ffc4
+  metadata.gz: bd3a11e206f30f451d54a86f708384fa70347724
+  data.tar.gz: e5b0a43cb7152178ca45351686e151bc1a01dd69
 SHA512:
-  metadata.gz: 4b0d18f3620ff38e93a0ca32a75e456c2d37cd59bc10f4496bb88647b0f6e6f6ef17231260d272ab79dd1a9101a9d1387aa53a119ddea6ae6abf5ba719ee4ffd
-  data.tar.gz: d61fd1590a4578a5970858e3220dcfbee98a942e603da2f456daaba107cf8ceff01149b31d778681095263b6aeb40c69550713a15c853879a032e4e38e488a62
+  metadata.gz: 72f6f66e1473b220645672aa7fa324544f71217e298f05e85f545e898ba92eb1f7c2e056ed518c136aa5d2dbeda3ad313e72de3bb91f19cc21f929df2487860a
+  data.tar.gz: de1749e0f05fa69744648c32c6358c0adf4a14da4c9c9dabeec723d847c2cd7321c590d8a1c7f1154106e09d7e113d85bbb97acda2e23142ce61ba2a12b49576

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.2.1)
+    clearance (1.3.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)

data/NEWS.md

@@ -1,5 +1,9 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.3.0 (March 14, 2014)
+* Installing Clearance with an existing User model will now create a migration
+  that includes adding remember tokens to all existing user records.
+
 New for 1.2.1 (March 6, 2014):
 * Query string is now included in the redirect URL when Clearance redirects to a
   previously stored URL.
@@ -19,7 +23,7 @@ New for 1.1.0 (November 21, 2013):
 
 * Validate email with `EmailValidator` [strict mode][strict].
 * The `cookie_expiration` configuration lambda can now be called with  a
-  `cookies` parameter. allows the Clearance cookie expiration to be set
+  `cookies` parameter. Allows the Clearance cookie expiration to be set
   according to the value of another cookie (such as `remember_me`).
 * A `cookie_expiration` lambda that does not accept this `cookies`
   parameter has been deprecated.

data/features/add_migrations_to_project.feature

@@ -14,14 +14,15 @@ Feature: add migrations to the project
 
   Scenario: Users table without clearance fields exists in the database
     When I install dependencies
-    And I create a simple migration
-    And I successfully run `bundle exec rake db:migrate`
+    And I create a simple user model
+    And I add an existing user
     And I successfully run `bundle exec rails generate clearance:install`
-    And I successfully run `ls db/migrate`
+    And I successfully run `bundle exec rake db:migrate`
     Then the output should contain:
       """
       add_clearance_to_users.rb
       """
+    And the existing user should have a remember token
 
   Scenario: Users table with clearance fields exists in the database
     When I install dependencies

data/features/step_definitions/configuration_steps.rb

@@ -89,21 +89,26 @@ When /^I configure test-unit$/ do
   }
 end
 
-When /^I create a simple migration$/ do
+When /^I create a simple user model$/ do
   steps %Q{
-    When I write to "db/migrate/001_create_users.rb" with:
-      """
-      class CreateUsers < ActiveRecord::Migration
-        def self.up
-          create_table(:users) do |t|
-            t.string :email
-            t.string :name
-          end
-        end
-        def self.down
-        end
-      end
-      """
+    When I successfully run `rails generate model user email:string name:string`
+    And I successfully run `bundle exec rake db:migrate`
+  }
+end
+
+When /^I add an existing user$/ do
+  command = %q{rails runner "User.create!(email: 'a@b.com', name: 'foo')"}
+
+  steps %Q{
+    When I successfully run `#{command}`
+  }
+end
+
+When /existing user should have a remember token$/ do
+  command = 'rails runner "exit(1) unless User.first.remember_token"'
+
+  steps %Q{
+    When I successfully run `#{command}`
   }
 end
 

data/lib/clearance/token.rb

@@ -0,0 +1,7 @@
+module Clearance
+  class Token
+    def self.new
+      SecureRandom.hex(20).encode('UTF-8')
+    end
+  end
+end

data/lib/clearance/user.rb

@@ -1,5 +1,6 @@
 require 'digest/sha1'
 require 'email_validator'
+require 'clearance/token'
 
 module Clearance
   module User
@@ -102,11 +103,11 @@ module Clearance
     end
 
     def generate_confirmation_token
-      self.confirmation_token = SecureRandom.hex(20).encode('UTF-8')
+      self.confirmation_token = Clearance::Token.new
     end
 
     def generate_remember_token
-      self.remember_token = SecureRandom.hex(20).encode('UTF-8')
+      self.remember_token = Clearance::Token.new
     end
   end
 end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

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

@@ -9,6 +9,16 @@ class AddClearanceToUsers < ActiveRecord::Migration
 <% config[:new_indexes].values.each do |index| -%>
     <%= index %>
 <% end -%>
+
+    users = select_all('SELECT id FROM users WHERE remember_token IS NULL')
+
+    users.each do |user|
+      update <<-SQL
+        UPDATE users
+        SET remember_token = '#{Clearance::Token.new}'
+        WHERE id = '#{user['id']}'
+      SQL
+    end
   end
 
   def self.down

data/spec/clearance/token_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Clearance::Token do
+  it 'is a random hex string' do
+    token = 'my_token'
+    SecureRandom.stubs(:hex).with(20).returns(token)
+
+    expect(Clearance::Token.new).to eq token
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -144,6 +144,7 @@ files:
 - lib/clearance/testing/config/routes.rb
 - lib/clearance/testing/deny_access_matcher.rb
 - lib/clearance/testing/helpers.rb
+- lib/clearance/token.rb
 - lib/clearance/user.rb
 - lib/clearance/version.rb
 - lib/generators/clearance/install/install_generator.rb
@@ -175,6 +176,7 @@ files:
 - spec/clearance/session_spec.rb
 - spec/clearance/sign_in_guard_spec.rb
 - spec/clearance/testing/helpers_spec.rb
+- spec/clearance/token_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
 - spec/controllers/flashes_controller_spec.rb
@@ -238,6 +240,7 @@ test_files:
 - spec/clearance/session_spec.rb
 - spec/clearance/sign_in_guard_spec.rb
 - spec/clearance/testing/helpers_spec.rb
+- spec/clearance/token_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
 - spec/controllers/flashes_controller_spec.rb