clearance 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1008b7898db9ab0ed2eb372b1c9ec92c54c98a
-  data.tar.gz: 86b11a51fa7ba23911a500547d8ad065c7d9590a
+  metadata.gz: 4a379553672fd5a49ba2e23f23f3179d0e023b8b
+  data.tar.gz: 51022e7a675360f0c142a9812d753fa2a6cf240b
 SHA512:
-  metadata.gz: c62112e27660a5258ad4a2078c5fe993bbf3171e048437ef56572706443b7f24c5ac14ca39cfa80855fd80ea204b8a973630d2fda1ef4b923160223f60f4ef51
-  data.tar.gz: c5a9870f0523c669d49e350cc980a6e29b0a9b9b9a3e2cd08f4439f7607478743068f875b55d348e32ebd8dca478ebce3003b4d4cc502c16d5705cb39147c5cf
+  metadata.gz: 562072cad198bc2e707fbf163ffc279e7b5f6abdc70fc98b777df0f669b33026e6924954429fdabf888512f58535ebe3a80999edb9f79cf92ea711cbde96a0cf
+  data.tar.gz: a19e25467230e87006d4dd1d08932333df4ef47814d60a51766f0648475e8ca67d4a15b86c87b7baaddb739897aa9f5468be7df77bfcaa53c1e87faf99548117

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
+  - 2.2.0
 
 install:
   - "travis_retry bin/setup"

data/Appraisals

@@ -1,13 +1,16 @@
-appraise 'rails3.2' do
-  gem 'rails', '~> 3.2.21'
+if RUBY_VERSION < "2.2.0"
+  appraise 'rails3.2' do
+    gem 'rails', '~> 3.2.21'
+  end
 end
 
 appraise 'rails4.0' do
-  gem 'rails', '~> 4.0.12'
+  gem 'rails', '~> 4.0.13'
+  gem 'test-unit'
 end
 
 appraise 'rails4.1' do
-  gem 'rails', '~> 4.1.8'
+  gem 'rails', '~> 4.1.9'
 end
 
 appraise 'rails4.2' do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.6.1)
+    clearance (1.7.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -68,7 +68,7 @@ GEM
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    cucumber (1.3.17)
+    cucumber (1.3.18)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
@@ -104,7 +104,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
+    mini_portile (0.6.2)
     minitest (5.5.0)
     multi_json (1.10.1)
     multi_test (0.1.1)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2014 thoughtbot, inc.
+Copyright (c) 2009 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,12 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.7.0 (January, 8, 2015)
+* The `authorize` filter has been deprecated in favor of `require_login`. Update
+  all reference to the filter including any calls to `skip_before_filter` or
+  `skip_before_action`.
+* The `Clearance.root` method has been deprecated.
+* Fix the negation of the `deny_access` matcher in Rails 4.0.x on Ruby 2.2
+
 New for 1.6.1 (January 6, 2015)
 * Secure cookies are no longer overwritten when the user visits a non-HTTPS URL.
 

data/README.md

@@ -100,11 +100,11 @@ Clearance.configure do |config|
 end
 ```
 
-Use `authorize` to control access in controllers:
+Use `require_login` to control access in controllers:
 
 ```ruby
 class ArticlesController < ApplicationController
-  before_filter :authorize
+  before_filter :require_login
 
   def index
     current_user.articles
@@ -460,10 +460,10 @@ Run the specs:
 
     rake
 
-Testing authorized controller actions
--------------------------------------
+Testing controller actions that require login
+---------------------------------------------
 
-To test controller actions that are protected by `before_filter :authorize`,
+To test controller actions that are protected by `before_filter :require_login`,
 require Clearance's test helpers and matchers in your test suite.
 
 For `rspec`, add this line to your `spec/spec_helper.rb`:
@@ -555,7 +555,7 @@ you. Thank you!
 License
 -------
 
-Clearance is copyright © 2009-2014 thoughtbot. It is free software, and may be
+Clearance is copyright © 2009 thoughtbot. It is free software, and may be
 redistributed under the terms specified in the `LICENSE` file.
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/app/controllers/clearance/passwords_controller.rb

@@ -1,7 +1,7 @@
 require 'active_support/deprecation'
 
 class Clearance::PasswordsController < Clearance::BaseController
-  skip_before_filter :authorize, only: [:create, :edit, :new, :update]
+  skip_before_filter :require_login, only: [:create, :edit, :new, :update]
   before_filter :forbid_missing_token, only: [:edit, :update]
   before_filter :forbid_non_existent_user, only: [:edit, :update]
 

data/app/controllers/clearance/sessions_controller.rb

@@ -1,5 +1,5 @@
 class Clearance::SessionsController < Clearance::BaseController
-  skip_before_filter :authorize, only: [:create, :new, :destroy]
+  skip_before_filter :require_login, only: [:create, :new, :destroy]
   protect_from_forgery except: :create
 
   def create

data/app/controllers/clearance/users_controller.rb

@@ -1,5 +1,5 @@
 class Clearance::UsersController < Clearance::BaseController
-  skip_before_filter :authorize, only: [:create, :new]
+  skip_before_filter :require_login, only: [:create, :new]
   before_filter :avoid_sign_in, only: [:create, :new], if: :signed_in?
 
   def new

data/features/integration_with_rspec.feature

@@ -7,6 +7,7 @@ Feature: generate rspec integration tests with application
       | rspec-rails        |
       | factory_girl_rails |
       | database_cleaner   |
+      | test-unit          |
 
   Scenario: generate a Rails app, run the generators, and run the tests
     When I install dependencies

data/gemfiles/rails4.0.gemfile

@@ -15,6 +15,7 @@ gem "shoulda-matchers", "~> 2.4"
 gem "sqlite3", "~> 1.3"
 gem "timecop", "~> 0.6"
 gem "pry", :require => false
-gem "rails", "~> 4.0.12"
+gem "rails", "~> 4.0.13"
+gem "test-unit"
 
 gemspec :path => "../"

data/gemfiles/rails4.1.gemfile

@@ -15,6 +15,6 @@ gem "shoulda-matchers", "~> 2.4"
 gem "sqlite3", "~> 1.3"
 gem "timecop", "~> 0.6"
 gem "pry", :require => false
-gem "rails", "~> 4.1.8"
+gem "rails", "~> 4.1.9"
 
 gemspec :path => "../"

data/lib/clearance.rb

@@ -11,6 +11,9 @@ require 'clearance/constraints'
 
 module Clearance
   def self.root
+    warn "#{Kernel.caller.first}: [DEPRECATION] `Clearance.root` is " +
+      "deprecated and will be removed in the next major release. If you need " +
+      "to find Clearance's root, you can use the `Gem::Specification` API."
     File.expand_path('../..', __FILE__)
   end
 end

data/lib/clearance/authorization.rb

@@ -3,15 +3,23 @@ module Clearance
     extend ActiveSupport::Concern
 
     included do
-      hide_action :authorize, :deny_access
+      hide_action :authorize, :deny_access, :require_login
     end
 
-    def authorize
+    def require_login
       unless signed_in?
         deny_access
       end
     end
 
+    def authorize
+      warn "[DEPRECATION] Clearance's `authorize` before_filter is " +
+        "deprecated. Use `require_login` instead. Be sure to update any " +
+        "instances of `skip_before_filter :authorize` or " +
+        "`skip_before_action :authorize` as well"
+      require_login
+    end
+
     def deny_access(flash_message = nil)
       respond_to do |format|
         format.any(:js, :json, :xml) { head :unauthorized }

data/lib/clearance/testing/deny_access_matcher.rb

@@ -64,7 +64,7 @@ module Clearance
             @failure_message_when_negated <<
               "Didn't expect to redirect to #{@url}."
             true
-          rescue MiniTest::Assertion
+          rescue MiniTest::Assertion, ::Test::Unit::AssertionFailedError
             @failure_message << "Expected to redirect to #{@url} but did not."
             false
           end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

data/lib/generators/clearance/views/views_generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators/base'
 module Clearance
   module Generators
     class ViewsGenerator < Rails::Generators::Base
-      source_root Clearance.root
+      source_root File.expand_path("../../../../..", __FILE__)
 
       def create_views
         views.each do |view|

data/spec/controllers/apis_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 class ApisController < ActionController::Base
   include Clearance::Controller
 
-  before_filter :authorize
+  before_filter :require_login
 
   def show
     render text: 'response'

data/spec/controllers/forgeries_controller_spec.rb

@@ -4,7 +4,7 @@ class ForgeriesController < ActionController::Base
   include Clearance::Controller
 
   protect_from_forgery
-  before_filter :authorize
+  before_filter :require_login
 
   # This is off in test by default, but we need it for this test
   self.allow_forgery_protection = true

data/spec/controllers/permissions_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 class PermissionsController < ActionController::Base
   include Clearance::Controller
 
-  before_filter :authorize, only: :show
+  before_filter :require_login, only: :show
 
   def new
     render text: 'New page'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt