clearance 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf88ab9f935fc17b80bd9901390e94c0f7ab684
-  data.tar.gz: a522250322d628529f2056ec9de17ef2eaceb608
+  metadata.gz: 7d1008b7898db9ab0ed2eb372b1c9ec92c54c98a
+  data.tar.gz: 86b11a51fa7ba23911a500547d8ad065c7d9590a
 SHA512:
-  metadata.gz: 71ff65519b2a7ed783aa0341f7a3f8adb657029810748fafd8ddecfc4e14a5517b8bbab31773bd23f13f64d1439bc94bc401f756fc8774d0d98c6d952e376cbe
-  data.tar.gz: 3c25517857b86f5bfe43241d1c6e03abf814849418bc5d25da6ff47e36c3640d911dfcbed9a96be736eb15fe47d5523a56ac58322978d92696d806ca586a6d32
+  metadata.gz: c62112e27660a5258ad4a2078c5fe993bbf3171e048437ef56572706443b7f24c5ac14ca39cfa80855fd80ea204b8a973630d2fda1ef4b923160223f60f4ef51
+  data.tar.gz: c5a9870f0523c669d49e350cc980a6e29b0a9b9b9a3e2cd08f4439f7607478743068f875b55d348e32ebd8dca478ebce3003b4d4cc502c16d5705cb39147c5cf

data/.gitignore

@@ -5,7 +5,7 @@
 *~
 .bundle
 db/*.sqlite3
-gemfiles/
+gemfiles/*.lock
 log/*.log
 pkg
 tmp/

data/.travis.yml

@@ -1,18 +1,15 @@
+cache: bundler
+
 language:
   - ruby
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.5
 
 install:
-  - "travis_retry bundle install"
-  - "bundle exec appraisal generate"
-  - "travis_retry bundle exec appraisal install"
-
-before_script:
-  - "bundle exec rake db:migrate"
+  - "travis_retry bin/setup"
 
 script:
   - "bundle exec appraisal rake"
@@ -20,4 +17,5 @@ script:
 branches:
   only:
     - master
-    - 2.0
+
+sudo: false

data/Gemfile

@@ -3,15 +3,15 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'appraisal', '~> 1.0'
+gem 'ammeter'
 gem 'aruba', '~> 0.5'
 gem 'bundler', '~> 1.3'
 gem 'capybara', '~> 2.2.0'
 gem 'cucumber-rails', '~> 1.3', require: false
 gem 'database_cleaner', '~> 1.0'
 gem 'factory_girl_rails', '~> 4.2'
-gem 'rspec-rails'
+gem 'rspec-rails', '~> 3.1'
 gem 'shoulda-matchers', '~> 2.4'
 gem 'sqlite3', '~> 1.3'
 gem 'timecop', '~> 0.6'
-gem 'rspec', '~> 2.14'
 gem 'pry', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.6.0)
+    clearance (1.6.1)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -44,6 +44,10 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    ammeter (1.1.2)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-rails (>= 2.2)
     appraisal (1.0.2)
       bundler
       rake
@@ -138,25 +142,22 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-collection_matchers (1.1.2)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rspec-rails (2.99.0)
+    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.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.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-matchers (2.7.0)
       activesupport (>= 3.0.0)
     slop (3.6.0)
@@ -183,6 +184,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ammeter
   appraisal (~> 1.0)
   aruba (~> 0.5)
   bundler (~> 1.3)
@@ -192,8 +194,7 @@ DEPENDENCIES
   database_cleaner (~> 1.0)
   factory_girl_rails (~> 4.2)
   pry
-  rspec (~> 2.14)
-  rspec-rails
+  rspec-rails (~> 3.1)
   shoulda-matchers (~> 2.4)
   sqlite3 (~> 1.3)
   timecop (~> 0.6)

data/NEWS.md

@@ -1,5 +1,8 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.6.1 (January 6, 2015)
+* Secure cookies are no longer overwritten when the user visits a non-HTTPS URL.
+
 New for 1.6.0 (December 20, 2014)
 * When using Rails 4.2, password reset emails are sent with the
   ActiveJob-compatible `#deliver_later` method.

data/Rakefile

@@ -1,24 +1,23 @@
 # encoding: utf-8
-require 'rubygems'
-require 'bundler/setup'
-require 'bundler/gem_tasks'
+require "rubygems"
+require "bundler/setup"
+require "bundler/gem_tasks"
 
-require 'rake'
-require 'cucumber/rake/task'
-require 'rspec/core/rake_task'
-require 'clearance/testing/application'
+require "rake"
+require "cucumber/rake/task"
+require "rspec/core/rake_task"
 
-desc 'Default'
-task :default => [:all]
-
-desc 'Run the specs and cucumber featrues'
-task :all => [:spec, :cucumber]
+namespace :dummy do
+  require_relative "spec/dummy/application"
+  Dummy::Application.load_tasks
+end
 
-Clearance::Testing::Application.load_tasks
+desc "Default"
+task default: [:spec, :cucumber]
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = false
-  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
+  t.cucumber_opts = ["--format", (ENV["CUCUMBER_FORMAT"] || "progress")]
 end
 
 RSpec::Core::RakeTask.new(:spec)

data/app/mailers/clearance_mailer.rb

@@ -1,9 +1,14 @@
 class ClearanceMailer < ActionMailer::Base
   def change_password(user)
     @user = user
-    mail from: Clearance.configuration.mailer_sender, to: @user.email,
-      subject: I18n.t(:change_password,
-         scope: [:clearance, :models, :clearance_mailer],
-         default: 'Change your password')
+    mail(
+      from: Clearance.configuration.mailer_sender,
+      to: @user.email,
+      subject: I18n.t(
+        :change_password,
+        scope: [:clearance, :models, :clearance_mailer],
+        default: "Change your password"
+      )
+    )
   end
 end

data/app/views/clearance_mailer/change_password.html.erb

@@ -1,5 +1,5 @@
-<%= t('.opening') %>
+<%= t(".opening") %>
 
-<%= edit_user_password_url(@user, :token => @user.confirmation_token.html_safe) %>
+<%= edit_user_password_url(@user, token: @user.confirmation_token.html_safe) %>
 
-<%= t('.closing') %>
+<%= raw t(".closing") %>

data/app/views/layouts/application.html.erb

@@ -7,7 +7,7 @@
 <body>
   <div id="header">
     <% if signed_in? -%>
-      <%= button_to t('.sign_out'), sign_out_path, :method => :delete %>
+      <%= button_to t('.sign_out'), sign_out_path, method: :delete %>
     <% else -%>
       <%= link_to t('.sign_in'), sign_in_path %>
     <% end -%>

data/app/views/passwords/edit.html.erb

@@ -4,8 +4,8 @@
   <p><%= t '.description' %></p>
 
   <%= form_for :password_reset,
-        :url => user_password_path(@user, :token => @user.confirmation_token),
-        :html => { :method => :put } do |form| %>
+        url: user_password_path(@user, token: @user.confirmation_token),
+        html: { method: :put } do |form| %>
     <div class="password-field">
       <%= form.label :password %>
       <%= form.password_field :password %>

data/app/views/passwords/new.html.erb

@@ -3,10 +3,10 @@
 
   <p><%= t '.description' %></p>
 
-  <%= form_for :password, :url => passwords_path do |form| %>
+  <%= form_for :password, url: passwords_path do |form| %>
     <div class="text-field">
       <%= form.label :email %>
-      <%= form.text_field :email, :type => 'email' %>
+      <%= form.text_field :email, type: 'email' %>
     </div>
 
     <div class="submit-field">

data/app/views/sessions/_form.html.erb

@@ -1,7 +1,7 @@
-<%= form_for :session, :url => session_path do |form| %>
+<%= form_for :session, url: session_path do |form| %>
   <div class="text-field">
     <%= form.label :email %>
-    <%= form.text_field :email, :type => 'email' %>
+    <%= form.text_field :email, type: 'email' %>
   </div>
 
   <div class="password-field">

data/app/views/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <div id="clearance" class="sign-in">
   <h2><%= t '.title' %></h2>
 
-  <%= render :partial => '/sessions/form' %>
+  <%= render partial: '/sessions/form' %>
 
 </div>

data/app/views/users/_form.html.erb

@@ -1,6 +1,6 @@
 <div class="text-field">
   <%= form.label :email %>
-  <%= form.text_field :email, :type => 'email' %>
+  <%= form.text_field :email, type: 'email' %>
 </div>
 
 <div class="password-field">

data/app/views/users/new.html.erb

@@ -2,7 +2,7 @@
   <h2><%= t('.title') %></h2>
 
   <%= form_for @user do |form| %>
-    <%= render :partial => '/users/form', :object => form %>
+    <%= render partial: '/users/form', object: form %>
 
     <div class="submit-field">
       <%= form.submit %>

data/bin/setup

@@ -5,8 +5,7 @@ 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
+RAILS_ENV=test bundle exec rake dummy:db:reset

data/config/locales/clearance.en.yml

@@ -2,10 +2,10 @@
 en:
   clearance_mailer:
     change_password:
-      closing: If you didn't request this, ignore this email. Your password
-        has not been changed.
-      opening: 'Someone, hopefully you, requested we send you a link to change
-        your password:'
+      closing: If you didn't request this, ignore this email. Your password has
+        not been changed.
+      opening: "Someone, hopefully you, requested we send you a link to change
+        your password:"
   flashes:
     failure_after_create: Bad email or password.
     failure_after_update: Password can't be blank.

data/features/step_definitions/configuration_steps.rb

@@ -17,7 +17,7 @@ When "I have a project with clearance" do
 
   step 'I cd to "testapp"'
 
-  unless Clearance::Testing.rails4?
+  unless Dummy.rails4?
     step 'I remove the file "public/index.html"'
   end
 
@@ -145,7 +145,7 @@ When /^I create a migration with clearance fields$/ do
 end
 
 def controller_test_dir
-  if Clearance::Testing.rails4?
+  if Dummy.rails4?
     'controllers'
   else
     'functional'

data/features/support/env.rb

@@ -1,32 +1,24 @@
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
-PROJECT_ROOT = File.expand_path('../../..', __FILE__)
-$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
+require "bundler"
+require "rails/all"
 
-require 'rails/all'
-require 'rails/test_help'
-
-Bundler.require
-
-require 'aruba/cucumber'
-require 'clearance/testing/application'
-require 'cucumber/rails/action_controller'
-require 'cucumber/rails/application'
-require 'cucumber/rails/capybara'
-require 'cucumber/rails/database'
-require 'cucumber/rails/hooks'
-require 'cucumber/rails/world'
+require "clearance"
+require "aruba/cucumber"
+require_relative "../../spec/dummy/application"
+require "cucumber/rails/action_controller"
+require "cucumber/rails/application"
+require "cucumber/rails/capybara"
+require "cucumber/rails/database"
+require "cucumber/rails/hooks"
+require "cucumber/rails/world"
 
 ActionController::Base.allow_rescue = false
 Capybara.default_selector = :css
-Capybara.save_and_open_page_path = 'tmp'
-Clearance::Testing::Application.initialize!
+Capybara.save_and_open_page_path = "tmp"
+Dummy::Application.initialize!
 
-begin
-  DatabaseCleaner.strategy = :transaction
-rescue NameError
-  raise 'You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it.'
-end
+DatabaseCleaner.strategy = :transaction
 
 Around do |scenario, block|
   Bundler.with_clean_env do

data/gemfiles/rails3.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0"
+gem "ammeter"
+gem "aruba", "~> 0.5"
+gem "bundler", "~> 1.3"
+gem "capybara", "~> 2.2.0"
+gem "cucumber-rails", "~> 1.3", :require => false
+gem "database_cleaner", "~> 1.0"
+gem "factory_girl_rails", "~> 4.2"
+gem "rspec-rails", "~> 3.1"
+gem "shoulda-matchers", "~> 2.4"
+gem "sqlite3", "~> 1.3"
+gem "timecop", "~> 0.6"
+gem "pry", :require => false
+gem "rails", "~> 3.2.21"
+
+gemspec :path => "../"

data/gemfiles/rails4.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0"
+gem "ammeter"
+gem "aruba", "~> 0.5"
+gem "bundler", "~> 1.3"
+gem "capybara", "~> 2.2.0"
+gem "cucumber-rails", "~> 1.3", :require => false
+gem "database_cleaner", "~> 1.0"
+gem "factory_girl_rails", "~> 4.2"
+gem "rspec-rails", "~> 3.1"
+gem "shoulda-matchers", "~> 2.4"
+gem "sqlite3", "~> 1.3"
+gem "timecop", "~> 0.6"
+gem "pry", :require => false
+gem "rails", "~> 4.0.12"
+
+gemspec :path => "../"

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0"
+gem "ammeter"
+gem "aruba", "~> 0.5"
+gem "bundler", "~> 1.3"
+gem "capybara", "~> 2.2.0"
+gem "cucumber-rails", "~> 1.3", :require => false
+gem "database_cleaner", "~> 1.0"
+gem "factory_girl_rails", "~> 4.2"
+gem "rspec-rails", "~> 3.1"
+gem "shoulda-matchers", "~> 2.4"
+gem "sqlite3", "~> 1.3"
+gem "timecop", "~> 0.6"
+gem "pry", :require => false
+gem "rails", "~> 4.1.8"
+
+gemspec :path => "../"