Merge remote-tracking branch 'origin/master' into pr/15

Gemfile

@@ -1,3 +1,5 @@
-source :rubygems 
+source 'https://rubygems.org' 
 
+
+gem 'rake'
 gemspec

Gemfile.lock

@@ -6,7 +6,7 @@ PATH
       warden (~> 1.2.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     addressable (2.2.8)
     bcrypt-ruby (3.0.1)
@@ -33,7 +33,7 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
+    rake (10.4.2)
     rspec (1.2.9)
     simplecov (0.6.4)
       multi_json (~> 1.0)
@@ -46,7 +46,7 @@ GEM
     tilt (1.3.3)
     warden (1.2.1)
       rack (>= 1.0)
-    yard (0.8.2.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

Rakefile

@@ -1,21 +1,24 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-Bundler.setup :development
+require "bundler/gem_tasks"
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  # require 'rspec/core/rake_task'
+  require 'spec/rake/spectask'
 
-Spec::Rake::SpecTask.new('coverage') do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  ENV['COVERAGE'] = "true"
-end
+  Spec::Rake::SpecTask.new('coverage') do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    ENV['COVERAGE'] = "true"
+  end
 
-task :default => :spec
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
+  task default: :spec
+rescue LoadError
+  # no rspec available
+end
 begin
   require 'yard'
   YARD::Rake::YardocTask.new

lib/sinatra_warden/sinatra.rb

@@ -118,8 +118,7 @@ def self.registered(app)
       app.post '/login/?' do
         authenticate
         env['x-rack.flash'][:success] = settings.auth_success_message if defined?(Rack::Flash)
-        redirect settings.auth_use_referrer && session[:return_to] ? session.delete(:return_to) : 
-          settings.auth_success_path
+        redirect settings.auth_use_referrer && session[:return_to] ? session.delete(:return_to) : settings.auth_success_path
       end
 
       app.get '/logout/?' do

sinatra_warden.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard', '>= 0.5.4'
   s.add_development_dependency 'rack-test', '~> 0.6.2'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rake'
 
   s.add_development_dependency 'do_sqlite3', '~> 0.10.0'
   s.add_development_dependency 'dm-core', '~> 1.0'

spec/spec_helper.rb

@@ -39,11 +39,11 @@ def app_with_referrer
     @app ||= define_app TestingLoginWithReferrer
   end
 
-  private 
+private
 
   # :which should be a sinatra app
   def define_app(which)
-    Rack::Builder.app do
+    Rack::Builder.new do
       use Rack::Session::Cookie
       use Warden::Manager do |manager|
         manager.default_strategies :password