sorcery 0.2.1 → 0.3.0

data/spec/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
-gem "sorcery", '0.2.1', :path => '../../../'
+gem "sorcery", '0.3.0', :path => '../../../'
 gem 'oauth', ">= 0.4.4"
 gem 'oauth2', ">= 0.1.1"
 group :development do

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.2.1)
+    sorcery (0.3.0)
 
 GEM
   remote: http://rubygems.org/
@@ -118,4 +118,4 @@ DEPENDENCIES
   rspec
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.2.1)!
+  sorcery (= 0.3.0)!

data/spec/rails3/app_root/Gemfile

@@ -2,10 +2,8 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.2.1', :path => '../../../'
-gem 'bcrypt-ruby', '~> 2.1.4', :require => 'bcrypt'
-gem 'oauth', ">= 0.4.4"
-gem 'oauth2', ">= 0.1.1"
+gem "sorcery", '0.3.0', :path => '../../../'
+
 group :development, :test do
   gem 'rspec'
   gem 'rspec-rails'

data/spec/rails3/app_root/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.2.1)
+    sorcery (0.3.0)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -126,14 +126,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby (~> 2.1.4)
-  oauth (>= 0.4.4)
-  oauth2 (>= 0.1.1)
   rails (= 3.0.3)
   rspec
   rspec-rails
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.2.1)!
+  sorcery (= 0.3.0)!
   spork (~> 0.9.0.rc)
   sqlite3-ruby

data/spec/rails3/app_root/spec/controller_oauth2_spec.rb

@@ -32,6 +32,7 @@ describe ApplicationController do
       
     after(:each) do
       User.delete_all
+      Authentication.delete_all
     end
     
     it "auth_at_provider redirects correctly" do
@@ -60,6 +61,7 @@ describe ApplicationController do
     before(:each) do
       stub_all_oauth2_requests!
       User.delete_all
+      Authentication.delete_all
     end
       
     it "should create a new user" do

data/spec/rails3/app_root/spec/controller_oauth_spec.rb

@@ -9,7 +9,9 @@ def stub_all_oauth_requests!
   @consumer.stub!(:get_request_token).and_return(@req_token)
   @acc_token = OAuth::AccessToken.new(@consumer)
   @req_token.stub!(:get_access_token).and_return(@acc_token)
-  session[:request_token] = @req_token
+  session[:request_token] = @req_token.token
+  session[:request_token_secret] = @req_token.secret
+  OAuth::RequestToken.stub!(:new).and_return(@req_token)
   response = OpenStruct.new()
   response.body = {"following"=>false, "listed_count"=>0, "profile_link_color"=>"0084B4", "profile_image_url"=>"http://a1.twimg.com/profile_images/536178575/noamb_normal.jpg", "description"=>"Programmer/Heavy Metal Fan/New Father", "status"=>{"text"=>"coming soon to sorcery gem: twitter and facebook authentication support.", "truncated"=>false, "favorited"=>false, "source"=>"web", "geo"=>nil, "in_reply_to_screen_name"=>nil, "in_reply_to_user_id"=>nil, "in_reply_to_status_id_str"=>nil, "created_at"=>"Sun Mar 06 23:01:12 +0000 2011", "contributors"=>nil, "place"=>nil, "retweeted"=>false, "in_reply_to_status_id"=>nil, "in_reply_to_user_id_str"=>nil, "coordinates"=>nil, "retweet_count"=>0, "id"=>44533012284706816, "id_str"=>"44533012284706816"}, "show_all_inline_media"=>false, "geo_enabled"=>true, "profile_sidebar_border_color"=>"a8c7f7", "url"=>nil, "followers_count"=>10, "screen_name"=>"nbenari", "profile_use_background_image"=>true, "location"=>"Israel", "statuses_count"=>25, "profile_background_color"=>"022330", "lang"=>"en", "verified"=>false, "notifications"=>false, "profile_background_image_url"=>"http://a3.twimg.com/profile_background_images/104087198/04042010339.jpg", "favourites_count"=>5, "created_at"=>"Fri Nov 20 21:58:19 +0000 2009", "is_translator"=>false, "contributors_enabled"=>false, "protected"=>false, "follow_request_sent"=>false, "time_zone"=>"Greenland", "profile_text_color"=>"333333", "name"=>"Noam Ben Ari", "friends_count"=>10, "profile_sidebar_fill_color"=>"C0DFEC", "id"=>123, "id_str"=>"91434812", "profile_background_tile"=>false, "utc_offset"=>-10800}.to_json
   @acc_token.stub!(:get).and_return(response)
@@ -37,6 +39,7 @@ describe ApplicationController do
       
     after(:each) do
       User.delete_all
+      Authentication.delete_all
     end
     
     it "auth_at_provider redirects correctly" do
@@ -65,6 +68,7 @@ describe ApplicationController do
     before(:each) do
       stub_all_oauth_requests!
       User.delete_all
+      Authentication.delete_all
     end
       
     it "should create a new user" do
@@ -98,6 +102,7 @@ describe ApplicationController do
     
     after(:each) do
       User.delete_all
+      Authentication.delete_all
     end
     
     it "should not send activation email to external users" do

data/spec/rails3/app_root/spec/controller_session_timeout_spec.rb

@@ -27,7 +27,7 @@ describe ApplicationController do
     
     it "with 'session_timeout_from_last_action' should not logout if there was activity" do
       sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      login_user
+      get :test_login, :username => 'gizmo', :password => 'secret'
       sleep 0.3
       get :test_should_be_logged_in
       session[:user_id].should_not be_nil
@@ -39,7 +39,7 @@ describe ApplicationController do
     
     it "with 'session_timeout_from_last_action' should logout if there was no activity" do
       sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      login_user
+      get :test_login, :username => 'gizmo', :password => 'secret'
       sleep 0.6
       get :test_should_be_logged_in
       session[:user_id].should be_nil

data/spec/rails3/app_root/spec/spec_helper.rb

@@ -53,6 +53,7 @@ Spork.prefork do
   end
   
   include ::Sorcery::TestHelpers
+  include ::Sorcery::TestHelpers::Rails
   
 end
 

data/spec/sinatra/Gemfile

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gem 'sinatra', '>= 1.2.0'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+gem "sorcery", '0.3.0', :path => '../../'
+
+group :development, :test do
+  gem 'rspec'
+  gem 'ruby-debug19'
+  gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
+  gem 'spork', '~> 0.9.0.rc'
+end

data/spec/sinatra/Gemfile.lock

@@ -0,0 +1,134 @@
+PATH
+  remote: ../../
+  specs:
+    sorcery (0.3.0)
+      bcrypt-ruby (~> 2.1.4)
+      json (>= 1.5.1)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
+      rails (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    addressable (2.2.4)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.7)
+    bcrypt-ruby (2.1.4)
+    builder (2.1.2)
+    columnize (0.3.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    faraday (0.5.5)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    i18n (0.5.0)
+    json (1.5.1)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    oauth (0.4.4)
+    oauth2 (0.1.1)
+      faraday (~> 0.5.0)
+      multi_json (~> 0.0.4)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    simplecov (0.3.9)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
+    sinatra (1.2.0)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    spork (0.9.0.rc3)
+    sqlite3-ruby (1.3.2)
+    thor (0.14.6)
+    tilt (1.2.2)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec
+  ruby-debug19
+  simplecov (>= 0.3.8)
+  sinatra (>= 1.2.0)
+  sorcery (= 0.3.0)!
+  spork (~> 0.9.0.rc)
+  sqlite3-ruby

data/spec/sinatra/Rakefile

@@ -0,0 +1,10 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+desc 'Default: Run all specs.'
+task :default => :spec
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = '**/*_spec.rb'
+end

data/spec/sinatra/authentication.rb

@@ -0,0 +1,3 @@
+class Authentication < ActiveRecord::Base
+  belongs_to :user
+end

data/spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb

@@ -0,0 +1,17 @@
+class AddActivationToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :activation_state, :string, :default => nil
+    add_column :users, :activation_token, :string, :default => nil
+    add_column :users, :activation_token_expires_at, :datetime, :default => nil
+    
+    add_index :users, :activation_token
+  end
+
+  def self.down
+    remove_index :users, :activation_token
+    
+    remove_column :users, :activation_token_expires_at
+    remove_column :users, :activation_token
+    remove_column :users, :activation_state
+  end
+end

data/spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb

@@ -0,0 +1,17 @@
+class AddActivityLoggingToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :last_login_at,     :datetime, :default => nil
+    add_column :users, :last_logout_at,    :datetime, :default => nil
+    add_column :users, :last_activity_at,  :datetime, :default => nil
+    
+    add_index :users, [:last_logout_at, :last_activity_at]
+  end
+
+  def self.down
+    remove_index :users, [:last_logout_at, :last_activity_at]
+    
+    remove_column :users, :last_activity_at
+    remove_column :users, :last_logout_at
+    remove_column :users, :last_login_at
+  end
+end

data/spec/sinatra/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb

@@ -0,0 +1,11 @@
+class AddBruteForceProtectionToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :failed_logins_count, :integer, :default => 0
+    add_column :users, :lock_expires_at, :datetime, :default => nil
+  end
+
+  def self.down
+    remove_column :users, :lock_expires_at
+    remove_column :users, :failed_logins_count
+  end
+end

data/spec/sinatra/db/migrate/core/20101224223620_create_users.rb

@@ -0,0 +1,16 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :username,         :null => false
+      t.string :email,            :default => nil
+      t.string :crypted_password, :default => nil
+      t.string :salt,             :default => nil
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/spec/sinatra/db/migrate/oauth/20101224223628_create_authentications.rb

@@ -0,0 +1,14 @@
+class CreateAuthentications < ActiveRecord::Migration
+  def self.up
+    create_table :authentications do |t|
+      t.integer :user_id, :null => false
+      t.string :provider, :uid, :null => false
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :authentications
+  end
+end

data/spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb

@@ -0,0 +1,15 @@
+class AddRememberMeTokenToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :remember_me_token, :string, :default => nil
+    add_column :users, :remember_me_token_expires_at, :datetime, :default => nil
+    
+    add_index :users, :remember_me_token
+  end
+
+  def self.down
+    remove_index :users, :remember_me_token
+    
+    remove_column :users, :remember_me_token_expires_at
+    remove_column :users, :remember_me_token
+  end
+end

data/spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb

@@ -0,0 +1,13 @@
+class AddResetPasswordToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :reset_password_token, :string, :default => nil
+    add_column :users, :reset_password_token_expires_at, :datetime, :default => nil
+    add_column :users, :reset_password_email_sent_at, :datetime, :default => nil
+  end
+
+  def self.down
+    remove_column :users, :reset_password_email_sent_at
+    remove_column :users, :reset_password_token_expires_at
+    remove_column :users, :reset_password_token
+  end
+end

data/spec/sinatra/filters.rb

@@ -0,0 +1,21 @@
+# --- before filters
+
+['/test_logout','/some_action','/test_should_be_logged_in'].each do |patt|
+  before patt do
+    require_login
+  end
+end
+
+before '/test_http_basic_auth' do
+  require_login_from_http_basic
+end
+
+# ----- test filters
+
+before do
+  self.class.sorcery_vars = {}
+end
+
+after do
+  save_instance_vars
+end

data/spec/sinatra/myapp.rb

@@ -0,0 +1,133 @@
+require 'sinatra'
+enable :sessions
+
+require 'sqlite3'
+require 'active_record'
+
+# establish connection
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sqlite3",
+  :database => ":memory:",
+  :verbosity => "quiet"
+)
+
+require 'action_mailer'
+ActionMailer::Base.delivery_method = :test
+require File.join(File.dirname(__FILE__),'sorcery_mailer')
+
+# models
+require File.join(File.dirname(__FILE__),'user')
+require 'sorcery'
+
+APP_ROOT = File.dirname(__FILE__)
+
+require File.join(File.dirname(__FILE__),'filters')
+
+get '/' do
+
+end
+
+get '/test_login' do
+  @user = login(params[:username],params[:password])
+  @current_user = current_user
+  @logged_in = logged_in?
+  erb :test_login
+end
+
+get '/test_logout' do
+  session[:user_id] = User.first.id
+  logout
+  @current_user = current_user
+  @logged_in = logged_in?
+end
+
+get '/test_current_user' do
+  session[:user_id] = params[:id]
+  current_user
+end
+
+get '/some_action' do
+  erb ''
+end
+
+post '/test_return_to' do
+  session[:return_to_url] = params[:return_to_url] if params[:return_to_url]
+  @user = login(params[:username], params[:password])
+  return_or_redirect_to(:some_action)
+end
+
+get '/test_should_be_logged_in' do
+  erb ''
+end
+
+def test_not_authenticated_action
+  halt "test_not_authenticated_action"
+end
+
+def not_authenticated2
+  @session = session
+  save_instance_vars
+  redirect '/'
+end
+
+# remember me
+
+post '/test_login_with_remember' do
+  @user = login(params[:username], params[:password])
+  remember_me!
+  erb ''
+end
+
+post '/test_login_with_remember_in_login' do
+  @user = login(params[:username], params[:password], params[:remember])
+  erb ''
+end
+
+get '/test_login_from_cookie' do
+  @user = current_user
+  erb ''
+end
+
+# http_basic
+
+get '/test_http_basic_auth' do
+  erb "HTTP Basic Auth"
+end
+
+# oauth
+
+get '/auth_at_provider_test' do
+  auth_at_provider(:twitter)
+end
+
+get '/test_login_from_access_token' do
+  if @user = login_from_access_token(:twitter)
+    erb "Success!"
+  else
+    erb "Failed!"
+  end
+end
+
+# oauth2
+
+get '/auth_at_provider_test2' do
+  auth_at_provider(:facebook)
+end
+
+get '/test_login_from_access_token2' do
+  if @user = login_from_access_token(:facebook)
+    erb "Success!"
+  else
+    erb "Failed!"
+  end
+end
+
+get '/test_create_from_provider' do
+  provider = params[:provider]
+  login_from_access_token(provider)
+  if @user = create_from_provider!(provider)
+    erb "Success!"
+  else
+    erb "Failed!"
+  end
+end