sorcery 0.7.5 → 0.7.6

data/spec/Gemfile

@@ -4,7 +4,7 @@ gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
 gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.4.1"
+gem 'oauth2', "~> 0.5.1"
 group :development do
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'

data/spec/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.7.4)
+    sorcery (0.7.5)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -43,13 +43,13 @@ GEM
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
     builder (2.1.2)
-    columnize (0.3.4)
+    columnize (0.3.5)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
     i18n (0.6.0)
     linecache19 (0.5.12)
@@ -61,11 +61,11 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)
@@ -120,7 +120,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby
   oauth (~> 0.4.4)
-  oauth2 (~> 0.4.1)
+  oauth2 (~> 0.5.1)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   ruby-debug19

data/spec/rails3/Gemfile

@@ -9,6 +9,6 @@ group :development, :test do
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
   gem 'timecop'
-  # gem 'capybara', '~> 1.1.1'
+  gem 'capybara', '~> 1.1.1'
   gem 'launchy', '~> 2.0.5'
 end

data/spec/rails3/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.4)
+    sorcery (0.7.5)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -43,14 +43,24 @@ GEM
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
     builder (2.1.2)
-    columnize (0.3.4)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.2.3)
+      ffi (~> 1.0.6)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
+    ffi (1.0.11)
     i18n (0.6.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
@@ -62,12 +72,13 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
+    nokogiri (1.5.0)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)
@@ -111,11 +122,17 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.15.0)
+      childprocess (>= 0.2.1)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
@@ -124,11 +141,14 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara (~> 1.1.1)
   launchy (~> 2.0.5)
   rails (= 3.0.3)
   rspec-rails (~> 2.7.0)

data/spec/rails3/app/controllers/application_controller.rb

@@ -14,6 +14,11 @@ class ApplicationController < ActionController::Base
     render :nothing => true
   end
 
+  def some_action_making_a_non_persisted_change_to_the_user
+    current_user.username = "to_be_ignored"
+    render :nothing => true
+  end
+  
   def test_login
     @user = login(params[:username], params[:password])
     render :text => ""

data/spec/rails3/config/environments/in_memory.rb

@@ -0,0 +1,35 @@
+AppRoot::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection = true
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/rails3/spec/controller_activity_logging_spec.rb

@@ -54,6 +54,13 @@ describe ApplicationController do
       User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
     end
 
+    it "should update nothing but activity fields" do
+      original_user_name = User.first.username
+      login_user
+      get :some_action_making_a_non_persisted_change_to_the_user
+      User.first.username.should == original_user_name
+    end
+    
     it "'current_users' should hold the user object when 1 user is logged in" do
       login_user
       get :some_action

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -2,7 +2,7 @@ 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!
-  web_server      = OAuth2::Strategy::WebServer.any_instance
+  auth_code       = OAuth2::Strategy::AuthCode.any_instance
   access_token    = mock(OAuth2::AccessToken)
   access_token.stub(:token_param=)
   access_token.stub(:get).and_return({
@@ -21,7 +21,7 @@ def stub_all_oauth2_requests!
     "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}],
     "verified"=>true,
     "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
-  web_server.stub(:get_access_token).and_return(access_token)
+  auth_code.stub(:get_access_token).and_return(access_token)
 end
 
 describe ApplicationController do
@@ -62,7 +62,7 @@ describe ApplicationController do
       create_new_user
       get :login_at_test2
       response.should be_a_redirect
-      response.should redirect_to("https://graph.facebook.com/oauth/authorize?client_id=#{::Sorcery::Controller::Config.facebook.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&response_type=code")
+      response.should redirect_to("https://graph.facebook.com/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.facebook.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&display=page")
     end
 
     it "'login_from' logins if user exists" do
@@ -84,7 +84,7 @@ describe ApplicationController do
       create_new_user
       get :login_at_test3
       response.should be_a_redirect
-      response.should redirect_to("https://github.com/login/oauth/authorize?client_id=#{::Sorcery::Controller::Config.github.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=&response_type=code")
+      response.should redirect_to("https://github.com/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.github.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=&display=")
     end
 
     it "'login_from' logins if user exists (github)" do
@@ -106,7 +106,7 @@ describe ApplicationController do
       create_new_user
       get :login_at_test4
       response.should be_a_redirect
-      response.should redirect_to("https://accounts.google.com/o/oauth2/auth?client_id=#{::Sorcery::Controller::Config.google.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile&response_type=code")
+      response.should redirect_to("https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=#{::Sorcery::Controller::Config.google.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile&display=")
     end
 
     it "'login_from' logins if user exists (google)" do
@@ -128,7 +128,7 @@ describe ApplicationController do
       create_new_user
       get :login_at_test5
       response.should be_a_redirect
-      response.should redirect_to("https://oauth.live.com/authorize?client_id=#{::Sorcery::Controller::Config.liveid.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=wl.basic%20wl.emails%20wl.offline_access&response_type=code")
+      response.should redirect_to("https://oauth.live.com/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.liveid.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=wl.basic%20wl.emails%20wl.offline_access&display=")
     end
 
     it "'login_from' logins if user exists (liveid)" do

data/spec/rails3/spec/integration_spec.rb

@@ -1,21 +1,21 @@
-# require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-# 
-# describe "the login process", :type => :request do
-#   before(:all) do
-#     sorcery_reload!
-#     create_new_user
-#   end
-#   
-#   after(:all) do
-#   end
-# 
-#   it "handles unverified request" do
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "the login process", :type => :request do
+  before(:all) do
+    sorcery_reload!
+    create_new_user
+  end
+  
+  after(:all) do
+  end
+end
+#   it "handles unverified request", :js => true do
 #     visit root_path
-#     # save_and_open_page
-#     fill_in 'Username', :with => 'gizmo'
+#     #save_and_open_page
+#     fill_in 'Username', :with => 'gizmo1'
 #     fill_in 'Password', :with => 'secret'
 #     # <input name="authenticity_token" type="hidden" value="+8M9lXnjnhAW/mAuzwI9Mmy6hM+00qZJa8VMQUg+NmM=">
-#     #page.execute_script("$$('hidden').value='mezuza'")
+#     page.execute_script("$$('hidden').value='mezuza'")
 #     #save_and_open_page
 #     click_button 'Login'
 #     save_and_open_page

data/spec/rails3/spec/spec_helper.rb

@@ -5,7 +5,7 @@ $: << File.join(File.dirname(__FILE__), '..', '..', 'lib' )
 ENV["RAILS_ENV"] ||= 'in_memory'  
 require File.expand_path("../../config/environment", __FILE__)  
 require 'rspec/rails'  
-#require 'capybara/rspec'
+require 'capybara/rspec'
 require 'timecop'
 # require 'simplecov'
 # SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.4)
+    sorcery (0.7.5)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -42,17 +42,17 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
     coderay (0.9.8)
-    columnize (0.3.4)
+    columnize (0.3.5)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
     i18n (0.6.0)
     linecache19 (0.5.12)
@@ -65,18 +65,18 @@ GEM
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
     mime-types (1.17.2)
-    mongo (1.4.1)
-      bson (= 1.4.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongo_mapper (0.10.1)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
       plucky (~> 0.4.0)
     multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     plucky (0.4.3)
       mongo (~> 1.3)
     polyglot (0.3.3)
@@ -129,7 +129,7 @@ GEM
       archive-tar-minitar (>= 0.5.2)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
+    sexp_processor (3.0.8)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.4)
+    sorcery (0.7.5)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -42,16 +42,16 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
-    columnize (0.3.4)
+    columnize (0.3.5)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
     i18n (0.6.0)
     linecache19 (0.5.12)
@@ -62,18 +62,18 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    mongo (1.4.1)
-      bson (= 1.4.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongoid (2.2.4)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)