clearance 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79da2d88bfa6ddc89089705872fbf1ece5c42c2
-  data.tar.gz: f5e422a542e1eaed19c721c15a01ad1920c29938
+  metadata.gz: f85367efa274a98517142e37d7f085d3430ac2bb
+  data.tar.gz: 40dc373ed481f3bceb2aabd704e333bde139be4c
 SHA512:
-  metadata.gz: 6d478f0fc99a8dd5b72243fc0c18ba095fc38ecee3e5fdd58e38e4c7cbe4967a4064475da06c8c53b11ea0e0bd5e3432baf00909a81e4c206d29e89931100bcc
-  data.tar.gz: 486865b87a276387bfa4bdc5d823a14ada721291d4a79433d5a02e355aabb4b414f45583101696152f7964a8e2c0a69561a162fa49fc1b384c6ffd4617b06670
+  metadata.gz: 95e458a45dd3fd6610d951d29ff98e755dc810ed38f680804648852701deaf986639e945a43f5f63d0f080461050063628764ca4c07d65617f539977dcfe1b94
+  data.tar.gz: 29d9b4ac5c96112fa1778f1481ee33faa03b4dde6d5fe92bb81c2e67391c613cbaaf690db55d250b223d989f392cd894e8daa7eaf7d55b3a2835f1142d008e68

data/Gemfile

@@ -6,11 +6,12 @@ gem 'appraisal', '~> 1.0'
 gem 'aruba', '~> 0.5'
 gem 'bourne', '~> 1.4'
 gem 'bundler', '~> 1.3'
-gem 'capybara', '~> 2.0.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', '~> 2.13'
+gem 'rspec-rails'
 gem 'shoulda-matchers', '~> 2.4'
 gem 'sqlite3', '~> 1.3'
 gem 'timecop', '~> 0.6'
+gem 'rspec', '~> 2.14'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.4.3)
+    clearance (1.5.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -9,151 +9,155 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    actionmailer (4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
       mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
+    activerecord (4.1.5)
+      activemodel (= 4.1.5)
+      activesupport (= 4.1.5)
+      arel (~> 5.0.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     appraisal (1.0.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (4.0.1)
-    aruba (0.5.4)
+    arel (5.0.1.20140414130214)
+    aruba (0.6.1)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    atomic (1.1.14)
     bcrypt (3.1.7)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
-    builder (3.1.4)
-    capybara (2.0.3)
+    builder (3.2.2)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.4.0)
+      xpath (~> 2.0)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.10)
+    cucumber (1.3.16)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    cucumber-rails (1.4.0)
-      capybara (>= 1.1.2)
-      cucumber (>= 1.2.0)
-      nokogiri (>= 1.5.0)
-      rails (>= 3.0.0)
-    database_cleaner (1.2.0)
+      multi_test (>= 0.1.1)
+    cucumber-rails (1.4.1)
+      capybara (>= 1.1.2, < 3)
+      cucumber (>= 1.3.8, < 2)
+      mime-types (~> 1.16)
+      nokogiri (~> 1.5)
+      rails (>= 3, < 5)
+    database_cleaner (1.3.0)
     diff-lcs (1.2.5)
     email_validator (1.4.0)
       activemodel
     erubis (2.7.0)
-    factory_girl (4.3.0)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.3.0)
-      factory_girl (~> 4.3.0)
+    factory_girl_rails (4.4.1)
+      factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.2)
+    metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
+    mini_portile (0.6.0)
+    minitest (5.4.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.4)
-    multi_test (0.0.3)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    polyglot (0.3.4)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
+    rails (4.1.5)
+      actionmailer (= 4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      activemodel (= 4.1.5)
+      activerecord (= 4.1.5)
+      activesupport (= 4.1.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+      railties (= 4.1.5)
+      sprockets-rails (~> 2.0)
+    railties (4.1.5)
+      actionpack (= 4.1.5)
+      activesupport (= 4.1.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.2.2)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rake (10.3.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-collection_matchers (1.0.0)
+      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.14.4)
-    rspec-rails (2.14.1)
+    rspec-mocks (2.99.2)
+    rspec-rails (2.99.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rubyzip (1.1.0)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    shoulda-matchers (2.5.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
-    sprockets (2.10.1)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-    websocket (1.0.7)
-    xpath (1.0.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -164,12 +168,13 @@ DEPENDENCIES
   aruba (~> 0.5)
   bourne (~> 1.4)
   bundler (~> 1.3)
-  capybara (~> 2.0.3)
+  capybara (~> 2.2.0)
   clearance!
   cucumber-rails (~> 1.3)
   database_cleaner (~> 1.0)
   factory_girl_rails (~> 4.2)
-  rspec-rails (~> 2.13)
+  rspec (~> 2.14)
+  rspec-rails
   shoulda-matchers (~> 2.4)
   sqlite3 (~> 1.3)
   timecop (~> 0.6)

data/NEWS.md

@@ -1,5 +1,10 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+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
+  routes to your application's routes file for modification.
+
 New for 1.4.3 (October 3, 2014)
 * Routing constraints act appropriately when session data is missing.
 

data/README.md

@@ -1,8 +1,8 @@
 Clearance
 =========
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/clearance.png)](http://travis-ci.org/thoughtbot/clearance?branch=master)
-[![Code Climate](https://codeclimate.com/github/thoughtbot/clearance.png)](https://codeclimate.com/github/thoughtbot/clearance)
+[![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)
 
 Rails authentication with email & password.
 
@@ -60,6 +60,7 @@ Clearance.configure do |config|
   config.cookie_domain = '.example.com'
   config.cookie_expiration = lambda { |cookies| 1.year.from_now.utc }
   config.cookie_path = '/'
+  config.routes = true
   config.httponly = false
   config.mailer_sender = 'reply@example.com'
   config.password_strategy = Clearance::PasswordStrategies::BCrypt
@@ -151,13 +152,17 @@ end
 Overriding routes
 -----------------
 
-See [config/routes.rb](/config/routes.rb) for the default behavior.
+See [config/routes.rb](/config/routes.rb) for the default set of routes.
 
-To override a Clearance route, redefine it:
+Route overrides became more difficult with [changes made in Rails
+4][rails_routes]. For this reason, Clearance 1.5 introduces an option to disable
+all clearance routes, giving the user full control over routing and URL design.
 
-```ruby
-resource :session, controller: 'sessions'
-```
+To disable the routes, set `config.routes = false`. You can optionally run
+`rails generate clearance:routes` to dump a copy of the default routes into your
+application for modification.
+
+[rails_routes]: https://github.com/rails/rails/issues/11895
 
 Overriding controllers
 ----------------------
@@ -173,7 +178,7 @@ class SessionsController < Clearance::SessionsController
 class UsersController < Clearance::UsersController
 ```
 
-Don't forget to override routes to your new controllers!
+Don't forget to [override routes](#overriding-routes) to your new controllers!
 
 Then, override public methods:
 
@@ -232,6 +237,19 @@ Override them like any other translation.
 See [config/locales/clearance.en.yml](/config/locales/clearance.en.yml) for the
 default behavior.
 
+Overriding layouts
+----------------
+
+By default, Clearance uses your application's default layout. If you would like
+to change the layout that Clearance uses when rendering its views, simply specify
+the layout in an initializer.
+
+```ruby
+Clearance::PasswordsController.layout 'my_passwords_layout'
+Clearance::SessionsController.layout 'my_sessions_layout'
+Clearance::UsersController.layout 'my_admin_layout'
+```
+
 Overriding views
 ----------------
 

data/config/routes.rb

@@ -1,24 +1,26 @@
-Rails.application.routes.draw do
-  resources :passwords,
-    controller: 'clearance/passwords',
-    only: [:create, :new]
+if Clearance.configuration.routes_enabled?
+  Rails.application.routes.draw do
+    resources :passwords,
+      controller: 'clearance/passwords',
+      only: [:create, :new]
 
-  resource :session,
-    controller: 'clearance/sessions',
-    only: [:create]
+    resource :session,
+      controller: 'clearance/sessions',
+      only: [:create]
 
-  resources :users,
-    controller: 'clearance/users',
-    only: Clearance.configuration.user_actions do
-      resource :password,
-        controller: 'clearance/passwords',
-        only: [:create, :edit, :update]
-    end
+    resources :users,
+      controller: 'clearance/users',
+      only: Clearance.configuration.user_actions do
+        resource :password,
+          controller: 'clearance/passwords',
+          only: [:create, :edit, :update]
+      end
 
-  get '/sign_in' => 'clearance/sessions#new', as: 'sign_in'
-  delete '/sign_out' => 'clearance/sessions#destroy', as: 'sign_out'
+    get '/sign_in' => 'clearance/sessions#new', as: 'sign_in'
+    delete '/sign_out' => 'clearance/sessions#destroy', as: 'sign_out'
 
-  if Clearance.configuration.allow_sign_up?
-    get '/sign_up' => 'clearance/users#new', as: 'sign_up'
+    if Clearance.configuration.allow_sign_up?
+      get '/sign_up' => 'clearance/users#new', as: 'sign_up'
+    end
   end
 end

data/db/schema.rb

@@ -9,14 +9,14 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20110111224543) do
 
   create_table "users", force: true do |t|
-    t.datetime "created_at",                        null: false
-    t.datetime "updated_at",                        null: false
-    t.string   "email",                             null: false
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
+    t.string   "email",                          null: false
     t.string   "encrypted_password", limit: 128, null: false
     t.string   "confirmation_token", limit: 128
     t.string   "remember_token",     limit: 128, null: false

data/features/copy_routes_to_host_application.feature

@@ -0,0 +1,9 @@
+Feature: copy routes to host application
+
+   Background:
+    Given I have a project with clearance
+
+   Scenario:
+    When I successfully run `bundle exec rails generate clearance:install`
+    And I successfully run `bundle exec rails generate clearance:routes`
+    Then the file "config/routes.rb" should contain "get '/sign_in' => 'clearance/sessions#new', as: 'sign_in'"