rollbar 0.10.1 → 0.10.2

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -18,3 +18,51 @@ matrix:
     - rvm: jruby-head
     - rvm: rbx-18mode
     - rvm: rbx-19mode
+    - gemfile: gemfiles/rails30.gemfile
+    - gemfile: gemfiles/rails40.gemfile
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails30.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails30.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails30.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/rails30.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: rbx-18mode
+      gemfile: gemfiles/rails30.gemfile
+    - rvm: rbx-18mode
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: rbx-18mode
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/rails30.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/rails31.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/rails40.gemfile
+gemfile:
+  - gemfiles/rails30.gemfile
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile

data/Appraisals

@@ -0,0 +1,16 @@
+appraise "rails30" do
+  gem "rails", "3.0.20"
+end
+
+appraise "rails31" do
+  gem "rails", "3.1.12"
+end
+
+appraise "rails32" do
+  gem "rails", "3.2.12"
+end
+
+appraise "rails40" do
+  gem "rails", "4.0.0.rc2"
+  gem "protected_attributes"
+end

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**0.10.2*
+- Require hooks at configuration time instead of gem load time
+
 **0.10.1**
 - Fix regression in 0.10.0 reporting exceptions in development environments and rails < 3.2 apps.
 

data/Gemfile

@@ -6,3 +6,4 @@ gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
 gem 'jruby-openssl',                    :platform => :jruby
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'girl_friday'
+gem 'appraisal'

data/Rakefile

@@ -1,14 +1,19 @@
 #!/usr/bin/env rake
+require 'rubygems'
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'appraisal'
 
 RSpec::Core::RakeTask.new(:spec)
 
-namespace :dummy do
-  load 'spec/dummyapp/Rakefile'
-end
-
 desc 'Run specs'
-task :default => ['dummy:db:setup'] do
+task :default do
+  ENV['LOCAL'] = '1'
+  Rake::Task[:spec].invoke
+  
+  Rake::Task[:spec].reenable
+  
+  ENV['LOCAL'] = '0'
   Rake::Task[:spec].invoke
-end
+end

data/gemfiles/rails30.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "girl_friday"
+gem "appraisal"
+gem "rails", "3.0.20"
+
+gemspec :path=>"../"

data/gemfiles/rails31.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "girl_friday"
+gem "appraisal"
+gem "rails", "3.1.12"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "girl_friday"
+gem "appraisal"
+gem "rails", "3.2.12"
+
+gemspec :path=>"../"

data/gemfiles/rails40.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+gem "girl_friday"
+gem "appraisal"
+gem "rails", "4.0.0.rc2"
+gem "protected_attributes"
+
+gemspec :path=>"../"

data/lib/rollbar.rb

@@ -12,14 +12,6 @@ require 'rollbar/configuration'
 require 'rollbar/request_data_extractor'
 require 'rollbar/exception_reporter'
 
-require 'rollbar/delayed_job' if defined?(Delayed) && defined?(Delayed::Plugins)
-require 'rollbar/sidekiq' if defined?(Sidekiq)
-require 'rollbar/goalie' if defined?(Goalie)
-require 'rollbar/rack' if defined?(Rack)
-require 'rollbar/rake' if defined?(Rake)
-require 'rollbar/railtie' if defined?(Rails)
-require 'rollbar/better_errors' if defined?(BetterErrors)
-
 module Rollbar
   class << self
     attr_writer :configuration
@@ -36,6 +28,8 @@ module Rollbar
     #     config.access_token = 'abcdefg'
     #   end
     def configure
+      require_hooks
+      
       # if configuration.enabled has not been set yet (is still 'nil'), set to true.
       if configuration.enabled.nil?
         configuration.enabled = true
@@ -145,6 +139,16 @@ module Rollbar
     end
 
     private
+    
+    def require_hooks()
+      require 'rollbar/delayed_job' if defined?(Delayed) && defined?(Delayed::Plugins)
+      require 'rollbar/sidekiq' if defined?(Sidekiq)
+      require 'rollbar/goalie' if defined?(Goalie)
+      require 'rollbar/rack' if defined?(Rack)
+      require 'rollbar/rake' if defined?(Rake)
+      require 'rollbar/railtie' if defined?(Rails)
+      require 'rollbar/better_errors' if defined?(BetterErrors)
+    end
 
     def log_instance_link(data)
       logger.info "[Rollbar] Details: #{configuration.web_base}/instance/uuid?uuid=#{data[:uuid]} (only available if report was successful)"

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/rollbar.gemspec

@@ -16,8 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'multi_json', '~> 1.5'
 
-  gem.add_development_dependency 'rails', '~> 3.2.12'
-  gem.add_development_dependency 'devise', '>= 2.1.2'
+  gem.add_development_dependency 'rails', '>= 3.0.0'
   gem.add_development_dependency 'rspec-rails', '~> 2.12.0'
   gem.add_development_dependency 'database_cleaner', '>= 0.9.1'
   gem.add_development_dependency 'girl_friday', '>= 0.11.1'

data/spec/controllers/home_controller_spec.rb

@@ -28,7 +28,7 @@ describe HomeController do
     end
   end
 
-  context "rollbar controller methods" do
+  context "rollbar controller methods with %s requests" % (local? ? 'local' : 'non-local') do
     # TODO run these for a a more-real request
     it "should build valid request data" do
       data = @controller.rollbar_request_data
@@ -170,8 +170,8 @@ describe HomeController do
   end
 
   describe "GET 'index'" do
-    it "should be successful and report a message" do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+    it "should be successful and report two messages" do
+      logger_mock.should_receive(:info).with('[Rollbar] Success').twice
       get 'index'
       response.should be_success
     end
@@ -179,7 +179,7 @@ describe HomeController do
 
   describe "'report_exception'", :type => "request" do
     it "should raise a NameError and report an exception after a GET" do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:info).with('[Rollbar] Success').once
 
       get 'report_exception'
       response.should be_success
@@ -204,6 +204,30 @@ describe HomeController do
       Rollbar.last_report[:request][:params]['jsonparam'].should == 'jsonval'
     end
   end
+  
+  describe "'cause_exception'", :type => "request" do
+    it "should raise an uncaught exception and report a message" do
+      logger_mock.should_receive(:info).with('[Rollbar] Success').once
+      
+      expect { get 'cause_exception' }.to raise_exception
+    end
+    
+    context 'show_exceptions' do
+      before(:each) do
+        Dummy::Application.env_config['action_dispatch.show_exceptions'] = true
+      end
+      
+      after(:each) do
+        Dummy::Application.env_config['action_dispatch.show_exceptions'] = false
+      end
+      
+      it "middleware should catch the exception and only report to rollbar once" do
+        logger_mock.should_receive(:info).with('[Rollbar] Success').once
+        
+        get 'cause_exception'
+      end
+    end
+  end
 
   after(:each) do
     Rollbar.configure do |config|

data/spec/dummyapp/app/models/user.rb

@@ -1,10 +1,4 @@
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable,
-  # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
   # Setup accessible (or protected) attributes for your model
   attr_accessible :name, :email, :password, :password_confirmation, :remember_me
 end

data/spec/dummyapp/config/application.rb

@@ -4,7 +4,6 @@ require "rails/all"
 
 Bundler.require
 require "rollbar"
-require "devise"
 
 module Dummy
   class Application < Rails::Application
@@ -48,13 +47,13 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    #config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
-    config.assets.enabled = true
+    #config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    #config.assets.version = '1.0'
   end
 end
 

data/spec/dummyapp/config/environments/development.rb

@@ -23,15 +23,15 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  #config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
-  config.assets.compress = false
+  #config.assets.compress = false
 
   # Expands the lines which load the assets
-  config.assets.debug = true
+  #config.assets.debug = true
 end

data/spec/dummyapp/config/environments/test.rb

@@ -15,7 +15,7 @@ Dummy::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local       = ENV['LOCAL'] == '1'
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
@@ -30,7 +30,7 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummyapp/config/initializers/wrap_parameters.rb

@@ -5,7 +5,9 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  if defined?(wrap_parameters)
+    wrap_parameters :format => [:json]
+  end
 end
 
 # Disable root element in JSON by default.

data/spec/dummyapp/config/routes.rb

@@ -1,14 +1,10 @@
 Dummy::Application.routes.draw do
-  authenticated :user do
-    root :to => 'home#index'
-  end
   root :to => "home#index"
-  devise_for :users
   resources :users do
     member { post :start_session }
   end
 
-  match "/cause_exception" => "home#cause_exception"
-  match "/report_exception" => "home#report_exception"
-  match "/current_user" => "home#current_user"
+  get "/cause_exception" => "home#cause_exception"
+  match "/report_exception" => "home#report_exception", :via=> [:get, :put, :post]
+  get "/current_user" => "home#current_user"
 end

data/spec/dummyapp/db/seeds.rb

@@ -6,7 +6,7 @@
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 puts 'SETTING UP DEFAULT USER LOGIN'
-user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
+user = User.create! :name => 'First User', :email => 'user@example.com'
 puts 'New user created: ' << user.name
-user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please'
+user2 = User.create! :name => 'Second User', :email => 'user2@example.com'
 puts 'New user created: ' << user2.name

data/spec/rollbar_spec.rb

@@ -207,15 +207,15 @@ describe Rollbar do
 
     it 'should send the payload over the network by default' do
       logger_mock.should_not_receive(:info).with('[Rollbar] Writing payload to file')
-      logger_mock.should_receive(:info).with('[Rollbar] Sending payload')
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:info).with('[Rollbar] Sending payload').once
+      logger_mock.should_receive(:info).with('[Rollbar] Success').once
       Rollbar.report_exception(@exception)
     end
 
     it 'should save the payload to a file if set' do
       logger_mock.should_not_receive(:info).with('[Rollbar] Sending payload')
-      logger_mock.should_receive(:info).with('[Rollbar] Writing payload to file')
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      logger_mock.should_receive(:info).with('[Rollbar] Writing payload to file').once
+      logger_mock.should_receive(:info).with('[Rollbar] Success').once
 
       filepath = ''
 

data/spec/spec_helper.rb

@@ -6,6 +6,12 @@ require 'rspec/rails'
 require 'database_cleaner'
 require 'genspec'
 
+namespace :dummy do
+  load 'spec/dummyapp/Rakefile'
+end
+
+Rake::Task['dummy:db:setup'].invoke
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
@@ -27,10 +33,13 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean
   end
-
 end
 
 def reset_configuration
   Rollbar.reconfigure do |config|
   end
 end
+
+def local?
+  ENV['LOCAL'] == '1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -29,28 +29,12 @@ dependencies:
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.12
-- !ruby/object:Gem::Dependency
-  name: devise
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +116,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -139,6 +124,10 @@ files:
 - Rakefile
 - THANKS.md
 - UPGRADE_FROM_RATCHET.md
+- gemfiles/rails30.gemfile
+- gemfiles/rails31.gemfile
+- gemfiles/rails32.gemfile
+- gemfiles/rails40.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.rb
 - lib/rollbar.rb
@@ -193,7 +182,6 @@ files:
 - spec/dummyapp/config/environments/production.rb
 - spec/dummyapp/config/environments/test.rb
 - spec/dummyapp/config/initializers/backtrace_silencers.rb
-- spec/dummyapp/config/initializers/devise.rb
 - spec/dummyapp/config/initializers/inflections.rb
 - spec/dummyapp/config/initializers/mime_types.rb
 - spec/dummyapp/config/initializers/rollbar.rb
@@ -217,7 +205,6 @@ files:
 - spec/requests/home_spec.rb
 - spec/rollbar_spec.rb
 - spec/spec_helper.rb
-- spec/support/devise.rb
 homepage: https://github.com/rollbar/rollbar-gem
 licenses: []
 post_install_message: 
@@ -275,7 +262,6 @@ test_files:
 - spec/dummyapp/config/environments/production.rb
 - spec/dummyapp/config/environments/test.rb
 - spec/dummyapp/config/initializers/backtrace_silencers.rb
-- spec/dummyapp/config/initializers/devise.rb
 - spec/dummyapp/config/initializers/inflections.rb
 - spec/dummyapp/config/initializers/mime_types.rb
 - spec/dummyapp/config/initializers/rollbar.rb
@@ -299,5 +285,4 @@ test_files:
 - spec/requests/home_spec.rb
 - spec/rollbar_spec.rb
 - spec/spec_helper.rb
-- spec/support/devise.rb
 has_rdoc: 

data/spec/dummyapp/config/initializers/devise.rb

@@ -1,233 +0,0 @@
-require 'devise'
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [ :email ]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email ]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email ]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication.
-  # config.http_authenticatable = false
-
-  # If http headers should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. "Application" by default.
-  # config.http_authentication_realm = "Application"
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
-  config.stretches = Rails.env.test? ? 1 : 10
-
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "59ac5dfd254187301c43390ebd59150ab9e28a26bfe528ac69fcecd7ae176495d2193ff797d41228f3f95dceb439ea5e972ae8e017109f7c8dd9a262787d95ff"
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # If true, requires any email changes to be confirmed (exactly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
-  config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [ :email ]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
-  # config.rememberable_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-  
-  # If true, expires auth token on session timeout.
-  # config.expire_auth_token_on_timeout = false
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [ :email ]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
-  config.reset_password_within = 6.hours
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha512
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Set this configuration to false if you want /users/sign_out to sign out
-  # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = Rails.env.test? ? :get : :delete
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-  #   manager.intercept_401 = false
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
-  # end
-
-  # ==> Mountable engine configurations
-  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
-  # is mountable, there are some extra configurations to be taken into account.
-  # The following options are available, assuming the engine is mounted as:
-  #
-  #     mount MyEngine, at: "/my_engine"
-  #
-  # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
-  #
-  # When using omniauth, Devise cannot automatically set Omniauth path,
-  # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = "/my_engine/users/auth"
-end

data/spec/support/devise.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include Devise::TestHelpers, :type => :controller
-end