clearance 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f85367efa274a98517142e37d7f085d3430ac2bb
-  data.tar.gz: 40dc373ed481f3bceb2aabd704e333bde139be4c
+  metadata.gz: 6e291b837723c76c6e2a1615f30a1e93a3b01c6e
+  data.tar.gz: b2c577781ebc764be239d9a97a2bdda8d4c1ad0c
 SHA512:
-  metadata.gz: 95e458a45dd3fd6610d951d29ff98e755dc810ed38f680804648852701deaf986639e945a43f5f63d0f080461050063628764ca4c07d65617f539977dcfe1b94
-  data.tar.gz: 29d9b4ac5c96112fa1778f1481ee33faa03b4dde6d5fe92bb81c2e67391c613cbaaf690db55d250b223d989f392cd894e8daa7eaf7d55b3a2835f1142d008e68
+  metadata.gz: 11de7a2908a2ebc5e294eaefa8376507f76977e072231b5d16528b0c79df241a30a6694ff3371057ac250875fe771a6ececb3efc9e54a050a5d9ad9d8f9568fe
+  data.tar.gz: 634fd82edae876f4ca39e929dcc0dfb0a58d44ec6c32cd7fbe2dec9ede67d99e623ffc719786f0bf55c600a2beb370053539d254d56cd48caed13a1ded5728db

data/CONTRIBUTING.md

@@ -1,9 +1,8 @@
 We love pull requests. Here's a quick guide:
 
-1. Fork the repo and `bundle install`
+1. Fork the repo.
 
-2. Set up Appraisal, which helps us test against multiple Rails versions:
-   `bundle exec appraisal install`
+2. Run `./bin/setup`.
 
 3. Run the tests. We only take pull requests with passing tests, and it's great
    to know that you have a clean slate: `bundle exec appraisal rake`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.5.0)
+    clearance (1.5.1)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -44,7 +44,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.2.2)
@@ -70,7 +70,7 @@ GEM
       rails (>= 3, < 5)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
-    email_validator (1.4.0)
+    email_validator (1.5.0)
       activemodel
     erubis (2.7.0)
     factory_girl (4.4.0)

data/NEWS.md

@@ -1,5 +1,10 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.5.1 (December 19, 2014)
+* Blowfish password strategy fixed
+* Specs generated with `rails generate clearance:specs` now work properly in
+  RSpec 3 projects.
+
 New for 1.5.0 (October 17, 2014)
 * Disable clearance routes by setting `config.routes = false`.
 * Running `rails generate clearance:routes` will dump the default set of

data/README.md

@@ -223,7 +223,7 @@ To override them all at once, change the global configuration:
 
 ```ruby
 Clearance.configure do |config|
-  config.redirect_url = '/overriden'
+  config.redirect_url = '/overridden'
 end
 ```
 

data/bin/setup

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install required gems, including Appraisal, which helps us test against
+# multiple Rails versions
+bundle install
+bundle exec appraisal clean
+bundle exec appraisal install
+
+# Set up database for the application that Clearance tests against
+RAILS_ENV=test bundle exec rake db:reset

data/lib/clearance/password_strategies/blowfish.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'base64'
 
 module Clearance
   module PasswordStrategies
@@ -25,7 +26,8 @@ module Clearance
       def generate_hash(string)
         cipher = OpenSSL::Cipher::Cipher.new('bf-cbc').encrypt
         cipher.key = Digest::SHA256.digest(salt)
-        cipher.update(string) << cipher.final
+        hash = cipher.update(string) << cipher.final
+        Base64.encode64(hash).encode('utf-8')
       end
 
       def initialize_salt_if_necessary
@@ -35,7 +37,7 @@ module Clearance
       end
 
       def generate_salt
-        SecureRandom.hex(20).encode('UTF-8')
+        Base64.encode64(SecureRandom.hex(20)).encode('utf-8')
       end
     end
   end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.5.0'
+  VERSION = "1.5.1"
 end

data/lib/generators/clearance/specs/specs_generator.rb

@@ -1,4 +1,5 @@
 require 'rails/generators/base'
+require 'rspec/rails/version'
 
 module Clearance
   module Generators
@@ -6,8 +7,19 @@ module Clearance
       source_root File.expand_path('../templates', __FILE__)
 
       def create_specs
+        @helper_file = rspec_helper_file
         directory '.', 'spec'
       end
+
+      private
+
+      def rspec_helper_file
+        if RSpec::Rails::Version::STRING.to_i > 2
+          "rails_helper"
+        else
+          "spec_helper"
+        end
+      end
     end
   end
 end

data/lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb.tt

@@ -0,0 +1,11 @@
+require "<%= @helper_file %>"
+require "support/features/clearance_helpers"
+
+feature "User signs out" do
+  scenario "signs out" do
+    sign_in
+    sign_out
+
+    expect_user_to_be_signed_out
+  end
+end

data/lib/generators/clearance/specs/templates/features/clearance/{visitor_resets_password_spec.rb → visitor_resets_password_spec.rb.tt}

@@ -1,6 +1,9 @@
-require "spec_helper"
+require "<%= @helper_file %>"
+require "support/features/clearance_helpers"
 
 feature "Visitor resets password" do
+  before { ActionMailer::Base.deliveries.clear }
+
   scenario "by navigating to the page" do
     visit sign_in_path
 
@@ -12,29 +15,33 @@ feature "Visitor resets password" do
   scenario "with valid email" do
     user = user_with_reset_password
 
-    page_should_display_change_password_message
-    reset_notification_should_be_sent_to user
+    expect_page_to_display_change_password_message
+    expect_reset_notification_to_be_sent_to user
   end
 
   scenario "with non-user account" do
     reset_password_for "unknown.email@example.com"
 
-    page_should_display_change_password_message
-    mailer_should_have_no_deliveries
+    expect_page_to_display_change_password_message
+    expect_mailer_to_have_no_deliveries
   end
 
   private
 
-  def reset_notification_should_be_sent_to(user)
+  def expect_reset_notification_to_be_sent_to(user)
     expect(user.confirmation_token).not_to be_blank
-    mailer_should_have_delivery user.email, "password", user.confirmation_token
+    expect_mailer_to_have_delivery(
+      user.email,
+      "password",
+      user.confirmation_token
+    )
   end
 
-  def page_should_display_change_password_message
+  def expect_page_to_display_change_password_message
     expect(page).to have_content I18n.t("passwords.create.description")
   end
 
-  def mailer_should_have_delivery(recipient, subject, body)
+  def expect_mailer_to_have_delivery(recipient, subject, body)
     expect(ActionMailer::Base.deliveries).not_to be_empty
 
     message = ActionMailer::Base.deliveries.any? do |email|
@@ -46,7 +53,7 @@ feature "Visitor resets password" do
     expect(message).to be
   end
 
-  def mailer_should_have_no_deliveries
+  def expect_mailer_to_have_no_deliveries
     expect(ActionMailer::Base.deliveries).to be_empty
   end
 end

data/lib/generators/clearance/specs/templates/features/clearance/{visitor_signs_in_spec.rb → visitor_signs_in_spec.rb.tt}

@@ -1,42 +1,43 @@
-require "spec_helper"
+require "<%= @helper_file %>"
+require "support/features/clearance_helpers"
 
 feature "Visitor signs in" do
   scenario "with valid email and password" do
     create_user "user@example.com", "password"
     sign_in_with "user@example.com", "password"
 
-    user_should_be_signed_in
+    expect_user_to_be_signed_in
   end
 
   scenario "with valid mixed-case email and password " do
     create_user "user.name@example.com", "password"
     sign_in_with "User.Name@example.com", "password"
 
-    user_should_be_signed_in
+    expect_user_to_be_signed_in
   end
 
   scenario "tries with invalid password" do
     create_user "user@example.com", "password"
     sign_in_with "user@example.com", "wrong_password"
 
-    page_should_display_sign_in_error
-    user_should_be_signed_out
+    expect_page_to_display_sign_in_error
+    expect_user_to_be_signed_out
   end
 
   scenario "tries with invalid email" do
     sign_in_with "unknown.email@example.com", "password"
 
-    page_should_display_sign_in_error
-    user_should_be_signed_out
+    expect_page_to_display_sign_in_error
+    expect_user_to_be_signed_out
   end
 
   private
 
   def create_user(email, password)
-    create(:user, email: email, password: password)
+    FactoryGirl.create(:user, email: email, password: password)
   end
 
-  def page_should_display_sign_in_error
+  def expect_page_to_display_sign_in_error
     expect(page.body).to include(
       I18n.t("flashes.failure_after_create", sign_up_path: sign_up_path)
     )

data/lib/generators/clearance/specs/templates/features/clearance/{visitor_signs_up_spec.rb → visitor_signs_up_spec.rb.tt}

@@ -1,4 +1,5 @@
-require "spec_helper"
+require "<%= @helper_file %>"
+require "support/features/clearance_helpers"
 
 feature "Visitor signs up" do
   scenario "by navigating to the page" do
@@ -12,18 +13,18 @@ feature "Visitor signs up" do
   scenario "with valid email and password" do
     sign_up_with "valid@example.com", "password"
 
-    user_should_be_signed_in
+    expect_user_to_be_signed_in
   end
 
   scenario "tries with invalid email" do
     sign_up_with "invalid_email", "password"
 
-    user_should_be_signed_out
+    expect_user_to_be_signed_out
   end
 
   scenario "tries with blank password" do
     sign_up_with "valid@example.com", ""
 
-    user_should_be_signed_out
+    expect_user_to_be_signed_out
   end
 end

data/lib/generators/clearance/specs/templates/features/clearance/{visitor_updates_password_spec.rb → visitor_updates_password_spec.rb.tt}

@@ -1,11 +1,12 @@
-require "spec_helper"
+require "<%= @helper_file %>"
+require "support/features/clearance_helpers"
 
 feature "Visitor updates password" do
   scenario "with valid password" do
     user = user_with_reset_password
     update_password user, "newpassword"
 
-    user_should_be_signed_in
+    expect_user_to_be_signed_in
   end
 
   scenario "signs in with new password" do
@@ -14,7 +15,7 @@ feature "Visitor updates password" do
     sign_out
     sign_in_with user.email, "newpassword"
 
-    user_should_be_signed_in
+    expect_user_to_be_signed_in
   end
 
   scenario "tries with a blank password" do
@@ -23,7 +24,7 @@ feature "Visitor updates password" do
     change_password_to ""
 
     expect(page).to have_content I18n.t("flashes.failure_after_update")
-    user_should_be_signed_out
+    expect_user_to_be_signed_out
   end
 
   private

data/lib/generators/clearance/specs/templates/support/features/clearance_helpers.rb

@@ -8,7 +8,7 @@ module Features
 
     def sign_in
       password = "password"
-      user = create(:user, password: password)
+      user = FactoryGirl.create(:user, password: password)
       sign_in_with user.email, password
     end
 
@@ -30,20 +30,23 @@ module Features
       click_button I18n.t("helpers.submit.user.create")
     end
 
-    def user_should_be_signed_in
+    def expect_user_to_be_signed_in
       visit root_path
       expect(page).to have_button I18n.t("layouts.application.sign_out")
     end
 
-    def user_should_be_signed_out
+    def expect_user_to_be_signed_out
       expect(page).to have_content I18n.t("layouts.application.sign_in")
     end
 
     def user_with_reset_password
-      user = create(:user)
+      user = FactoryGirl.create(:user)
       reset_password_for user.email
       user.reload
     end
-
   end
 end
+
+RSpec.configure do |config|
+  config.include Features::ClearanceHelpers, type: :feature
+end

data/spec/models/blowfish_spec.rb

@@ -23,7 +23,8 @@ describe Clearance::PasswordStrategies::Blowfish do
         cipher = OpenSSL::Cipher::Cipher.new('bf-cbc').encrypt
         cipher.key = Digest::SHA256.digest(salt)
         expected = cipher.update("--#{salt}--#{password}--") << cipher.final
-        expect(subject.encrypted_password).to eq expected
+        encrypted_password = Base64.decode64(subject.encrypted_password)
+        expect(encrypted_password).to eq expected
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -78,7 +78,6 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".travis.yml"
 - Appraisals
@@ -103,6 +102,7 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/new.html.erb
+- bin/setup
 - clearance.gemspec
 - config/locales/clearance.en.yml
 - config/routes.rb
@@ -161,15 +161,12 @@ files:
 - lib/generators/clearance/specs/USAGE
 - lib/generators/clearance/specs/specs_generator.rb
 - lib/generators/clearance/specs/templates/factories/clearance.rb
-- lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb
-- lib/generators/clearance/specs/templates/features/clearance/visitor_resets_password_spec.rb
-- lib/generators/clearance/specs/templates/features/clearance/visitor_signs_in_spec.rb
-- lib/generators/clearance/specs/templates/features/clearance/visitor_signs_up_spec.rb
-- lib/generators/clearance/specs/templates/features/clearance/visitor_updates_password_spec.rb
-- lib/generators/clearance/specs/templates/support/action_mailer.rb
+- lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb.tt
+- lib/generators/clearance/specs/templates/features/clearance/visitor_resets_password_spec.rb.tt
+- lib/generators/clearance/specs/templates/features/clearance/visitor_signs_in_spec.rb.tt
+- lib/generators/clearance/specs/templates/features/clearance/visitor_signs_up_spec.rb.tt
+- lib/generators/clearance/specs/templates/features/clearance/visitor_updates_password_spec.rb.tt
 - lib/generators/clearance/specs/templates/support/clearance.rb
-- lib/generators/clearance/specs/templates/support/factory_girl.rb
-- lib/generators/clearance/specs/templates/support/features.rb
 - lib/generators/clearance/specs/templates/support/features/clearance_helpers.rb
 - lib/generators/clearance/views/USAGE
 - lib/generators/clearance/views/views_generator.rb

data/.hound.yml

@@ -1,2 +0,0 @@
-StringLiterals:
-  EnforcedStyle: single_quotes

data/lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb

@@ -1,10 +0,0 @@
-require "spec_helper"
-
-feature "User signs out" do
-  scenario "signs out" do
-    sign_in
-    sign_out
-
-    user_should_be_signed_out
-  end
-end

data/lib/generators/clearance/specs/templates/support/action_mailer.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.before(:each) { ActionMailer::Base.deliveries.clear }
-end

data/lib/generators/clearance/specs/templates/support/factory_girl.rb

@@ -1,5 +0,0 @@
-require "factory_girl_rails"
-
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-end

data/lib/generators/clearance/specs/templates/support/features.rb

@@ -1,5 +0,0 @@
-Dir[Rails.root.join("spec/support/features/*.rb")].each { |f| require f }
-
-RSpec.configure do |config|
-  config.include Features::ClearanceHelpers, type: :feature
-end