sorcery 0.5.1 → 0.6.0

data/spec/sinatra/modular.rb

@@ -0,0 +1,157 @@
+require 'sinatra/base'
+#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__)
+
+class Modular < Sinatra::Base
+  set :sessions, true
+
+#  ['/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
+
+  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])
+    redirect_back_or_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 '/login_at_test' do
+    login_at(:twitter)
+  end
+
+  get '/test_login_from' do
+    if @user = login_from(:twitter)
+      erb "Success!"
+    else
+      erb "Failed!"
+    end
+  end
+
+# oauth2
+
+  get '/login_at_test2' do
+    login_at(:facebook)
+  end
+
+  get '/test_login_from2' do
+    if @user = login_from(:facebook)
+      erb "Success!"
+    else
+      erb "Failed!"
+    end
+  end
+
+  get '/test_create_from_provider' do
+    provider = params[:provider]
+    login_from(provider)
+    if @user = create_from(provider)
+      erb "Success!"
+    else
+      erb "Failed!"
+    end
+  end
+
+  #run! if app_file == $2
+end

data/spec/sinatra/spec/controller_oauth2_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth2_shared_examples')
 
 def stub_all_oauth2_requests!
   @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
@@ -58,30 +59,8 @@ describe 'MyApp' do
     end
   end
   
-  describe Sinatra::Application, "'create_from'" do
-    before(:each) do
-      stub_all_oauth2_requests!
-      User.delete_all
-      Authentication.delete_all
-    end
-      
-    it "should create a new user" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name"})
-      lambda do
-        get "/test_create_from_provider", :provider => "facebook"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "Noam Ben Ari"
-    end
-    
-    it "should support nested attributes" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "hometown/name"})
-      lambda do
-        get "/test_create_from_provider", :provider => "facebook"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "Haifa, Israel"
-    end
+  describe Sinatra::Application do
+    it_behaves_like "oauth2_controller"
   end
   
   describe Sinatra::Application, "OAuth with User Activation features" do

data/spec/sinatra/spec/controller_oauth_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth_shared_examples')
 require 'ostruct'
 
 def stub_all_oauth_requests!
@@ -63,30 +64,8 @@ describe Sinatra::Application do
     end
   end
   
-  describe Sinatra::Application, "'create_from'" do
-    before(:each) do
-      stub_all_oauth_requests!
-      User.delete_all
-      Authentication.delete_all
-    end
-      
-    it "should create a new user" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
-      lambda do
-        get :test_create_from_provider, :provider => "twitter"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "nbenari"
-    end
-    
-    it "should support nested attributes" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
-      lambda do
-        get :test_create_from_provider, :provider => "twitter"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
-    end
+  describe Sinatra::Application do
+    it_behaves_like "oauth_controller"
   end
   
   describe Sinatra::Application, "OAuth with User Activation features" do

data/spec/sinatra/spec/controller_spec.rb

@@ -14,8 +14,8 @@ describe Sinatra::Application do
     end
     
     it "should enable configuration option 'user_class'" do
-      sorcery_controller_property_set(:user_class, TestUser)
-      Sorcery::Controller::Config.user_class.should equal(TestUser)
+      sorcery_controller_property_set(:user_class, "TestUser")
+      Sorcery::Controller::Config.user_class.should == "TestUser"
     end
     
     it "should enable configuration option 'not_authenticated_action'" do

data/spec/sinatra_modular/Gemfile

@@ -0,0 +1,15 @@
+source 'http://rubygems.org'
+
+gem 'sinatra', '>= 1.2.0'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'activerecord', '>= 3.0.3'
+gem 'actionmailer', '>= 3.0.3'
+gem "sorcery", '>= 0.1.0', :path => '../../'
+
+group :development, :test do
+  gem "rake"
+  gem "rspec", "~> 2.5.0"
+  gem 'ruby-debug19'
+  gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
+  gem 'timecop'
+end

data/spec/sinatra_modular/Gemfile.lock

@@ -0,0 +1,117 @@
+PATH
+  remote: ../../
+  specs:
+    sorcery (0.5.30)
+      bcrypt-ruby (~> 2.1.4)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.5)
+    addressable (2.2.5)
+    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.6.1)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    i18n (0.5.0)
+    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 (1.0.1)
+    multipart-post (1.1.0)
+    oauth (0.4.4)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.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)
+    sqlite3-ruby (1.3.2)
+    tilt (1.2.2)
+    timecop (0.3.5)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionmailer (>= 3.0.3)
+  activerecord (>= 3.0.3)
+  rake
+  rspec (~> 2.5.0)
+  ruby-debug19
+  simplecov (>= 0.3.8)
+  sinatra (>= 1.2.0)
+  sorcery (>= 0.1.0)!
+  sqlite3-ruby
+  timecop

data/spec/sinatra_modular/Rakefile

@@ -0,0 +1,11 @@
+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_modular/*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec_modular/spec.opts"]
+end

data/spec/sinatra_modular/authentication.rb

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

data/spec/sinatra_modular/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_modular/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_modular/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_modular/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_modular/db/migrate/external/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_modular/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_modular/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_modular/filters.rb

@@ -0,0 +1,27 @@
+# --- before filters
+module Filters
+
+  def self.included(klass)
+    klass.class_eval do
+      ['/test_logout', '/some_action', '/test_should_be_logged_in'].each do |pattern|
+        before pattern 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
+    end
+  end
+end

data/spec/sinatra_modular/modular.rb

@@ -0,0 +1,157 @@
+require 'sinatra/base'
+#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__)
+
+class Modular < Sinatra::Base
+  set :sessions, true
+
+#  ['/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
+
+  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])
+    redirect_back_or_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 '/login_at_test' do
+    login_at(:twitter)
+  end
+
+  get '/test_login_from' do
+    if @user = login_from(:twitter)
+      erb "Success!"
+    else
+      erb "Failed!"
+    end
+  end
+
+# oauth2
+
+  get '/login_at_test2' do
+    login_at(:facebook)
+  end
+
+  get '/test_login_from2' do
+    if @user = login_from(:facebook)
+      erb "Success!"
+    else
+      erb "Failed!"
+    end
+  end
+
+  get '/test_create_from_provider' do
+    provider = params[:provider]
+    login_from(provider)
+    if @user = create_from(provider)
+      erb "Success!"
+    else
+      erb "Failed!"
+    end
+  end
+
+  #run! if app_file == $2
+end