authpwn_rails 0.10.2 → 0.10.3

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/app/models/credentials/facebook.rb

@@ -36,9 +36,9 @@ class Facebook < ::Credential
       User.transaction do
         user = User.create!
         credential = self.new
+        user.credentials << credential
         credential.facebook_uid = uid
         credential.access_token = access_token
-        credential.user = user
         credential.save!
       end
     end

data/authpwn_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "authpwn_rails"
-  s.version = "0.10.2"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     "lib/authpwn_rails/session_controller.rb",
     "lib/authpwn_rails/test_extensions.rb",
     "lib/authpwn_rails/user_extensions/email_field.rb",
+    "lib/authpwn_rails/user_extensions/facebook_fields.rb",
     "lib/authpwn_rails/user_extensions/password_field.rb",
     "lib/authpwn_rails/user_model.rb",
     "test/cookie_controller_test.rb",
@@ -60,6 +61,7 @@ Gem::Specification.new do |s|
     "test/email_field_test.rb",
     "test/facebook_controller_test.rb",
     "test/facebook_credential_test.rb",
+    "test/facebook_fields_test.rb",
     "test/helpers/application_controller.rb",
     "test/helpers/autoload_path.rb",
     "test/helpers/db_setup.rb",

data/legacy/migrate_09_to_010.rb

@@ -20,12 +20,29 @@ Kernel.system "rake db:migrate:up VERSION=20100725000003 RAILS_ENV=#{Rails.env}"
 # Build up credentials.
 reload!
 User.all.each do |user|
-  Credentials::Email.create! :user => user, :email => user.attributes['email']
+  unless /\@graph\.facebook\.com$/ =~ user.email 
+    eml = Credentials::Email.new :email => user.attributes['email']
+    eml.user = user
+    eml.save!
+  end
 
-  pwd = Credentials::Password.new :user => user
-  pwd.password = pwd.password_confirmation = '_'
-  pwd.key = user.password_salt + '|' + user.password_hash
-  pwd.save!
+  if user.password_hash
+    pwd = Credentials::Password.new
+    pwd.user = user
+    pwd.password = pwd.password_confirmation = '_'
+    pwd.key = user.password_salt + '|' + user.password_hash
+    pwd.save!
+  end
+end
+class FacebookToken < ActiveRecord::Base
+  belongs_to :user
+end
+FacebookToken.all.each do |token|
+  cred = Credentials::Facebook.new
+  cred.user = token.user
+  cred.facebook_uid = token.external_uid
+  cred.key = token.access_token
+  cred.save!
 end
 
 # Update the columns in the User model.
@@ -57,5 +74,9 @@ class FinishUpgradingUserModel < ActiveRecord::Migration
   end
 end
 FinishUpgradingUserModel.migrate :up
+class DropFacebookTokens < ActiveRecord::Migration
+  def change
+    drop_table :facebook_tokens
+  end
+end
 reload!
-

data/lib/authpwn_rails.rb

@@ -11,6 +11,7 @@ module Authpwn
   # Contains extensions to the User model.
   module UserExtensions
     autoload :EmailField, 'authpwn_rails/user_extensions/email_field.rb'
+    autoload :FacebookFields, 'authpwn_rails/user_extensions/facebook_fields.rb'
     autoload :PasswordField, 'authpwn_rails/user_extensions/password_field.rb'
   end
 end

data/lib/authpwn_rails/generators/templates/user.rb

@@ -6,6 +6,9 @@ class User < ActiveRecord::Base
   # include Authpwn::UserExtensions::EmailField
   # Virtual password attribute, with confirmation validation.
   # include Authpwn::UserExtensions::PasswordField
+  # Convenience Facebook accessors.
+  # include Authpwn::UserExtensions::FacebookFields
+
 
   # Add your extensions to the User class here.
 end

data/lib/authpwn_rails/user_extensions/facebook_fields.rb

@@ -0,0 +1,65 @@
+require 'active_model'
+require 'active_support'
+
+# :nodoc: namespace
+module Authpwn
+
+# :nodoc: namespace
+module UserExtensions
+  
+# Augments the User model with Facebook-related virtual attributes.
+module FacebookFields
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+    # The user that owns a given Facebook OAuth2 token.
+    #
+    # A new user will be created if the token doesn't belong to any user. This
+    # is the case for a new visitor.
+    def for_facebook_token(access_token)
+      Credentials::Facebook.for(access_token).user
+    end
+    
+    # The user who has a certain e-mail, or nil if the e-mail is unclaimed.
+    def with_facebook_uid(facebook_uid)
+      credential = Credentials::Facebook.where(:name => facebook_uid).
+                                         includes(:user).first
+      credential && credential.user
+    end
+  end
+  
+  module InstanceMethods
+    # Credentials::Facebook instance associated with this user.
+    def facebook_credential
+      credentials.find { |c| c.instance_of?(Credentials::Facebook) }
+    end
+    
+    # FBGraph client loaded with this access token.
+    #
+    # Returns nil if this user has no Facebook credential.
+    def facebook_client
+      credential = self.facebook_credential
+      credential && credential.facebook_client
+    end
+
+    # The facebook user ID from the user's Facebook credential.
+    #
+    # Returns nil if this user has no Facebook credential.
+    def facebook_uid
+      credential = self.facebook_credential
+      credential && credential.facebook_uid
+    end
+    
+    # The facebook OAuth2 access token from the user's Facebook credential.
+    #
+    # Returns nil if this user has no Facebook credential.
+    def facebook_access_token
+      credential = self.facebook_credential
+      credential && credential.access_token
+    end
+  end
+end  # module Authpwn::UserExtensions::FacebookFields
+  
+end  # module Authpwn::UserExtensions
+  
+end  # module Authpwn

data/lib/authpwn_rails/user_model.rb

@@ -52,26 +52,6 @@ module UserModel
       self.exuid ||= (Time.now.to_f * 1_000_000).to_i
     end
   end  # module Authpwn::UserModel::InstanceMethods
-  
 end  # namespace Authpwn::UserModel
 
 end  # namespace Authpwn
-
-
-# :nodoc: adds Facebook integration methods to the User model.
-module Authpwn::UserModel::ClassMethods
-  # The user that owns a given Facebook OAuth2 token.
-  #
-  # A new user will be created if the token doesn't belong to any user. This
-  # is the case for a new visitor.
-  def for_facebook_token(access_token)
-    Credentials::Facebook.for(access_token).user
-  end
-end  # module Authpwn::UserModel::ClassMethods
-
-# :nodoc: adds Facebook integration methods to the User model.
-module Authpwn::UserModel::InstanceMethods
-  def facebook_credential
-    credentials.find { |c| c.instance_of?(Credentials::Facebook) }
-  end
-end  # module Authpwn::UserModel::InstanceMethods

data/test/email_field_test.rb

@@ -14,7 +14,6 @@ class EmailFieldTest < ActiveSupport::TestCase
   end
   
   test 'setup' do
-    @user.save!
     assert @user.valid?
   end
 

data/test/facebook_controller_test.rb

@@ -15,11 +15,22 @@ class FacebookController < ApplicationController
   end
 end
 
+class UserWithFb2 < User
+  include Authpwn::UserExtensions::FacebookFields
+end
+
 class FacebookControllerTest < ActionController::TestCase
   setup do
+    @old_user_class = ::User
+    ::User = UserWithFb2
+    
     @user = users(:john)
     @new_token = 'facebook:new_token|boom'
   end
+  
+  teardown do
+    ::User = @old_user_class
+  end
 
   test "no facebook token" do
     get :show

data/test/facebook_credential_test.rb

@@ -57,19 +57,8 @@ class FacebookCredentialTest < ActiveSupport::TestCase
     assert_equal '123456789', credential.facebook_uid 
     assert_equal @credential.key, credential.key
     assert !credential.new_record?, 'New credential not saved'
-    assert !credential.user.new_record?, "New credential's user not saved"    
+    assert !credential.user.new_record?, "New credential's user not saved"
+    assert_operator credential.user.credentials, :include?, credential,
+        "New user's credentials does not include Facebook credential"    
   end  
-
-  test 'User#facebook_credential' do
-    user = users(:john)
-    assert_equal credentials(:john_facebook), user.facebook_credential
-  end
-  
-  test 'User#for_facebook_token' do
-    flexmock(Credentials::Facebook).should_receive(:uid_from_token).
-        with(credentials(:john_facebook).key).
-        and_return(credentials(:john_facebook).facebook_uid)
-    assert_equal users(:john),
-        User.for_facebook_token(credentials(:john_facebook).key)
-  end
 end

data/test/facebook_fields_test.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class UserWithFb < User
+  include Authpwn::UserExtensions::FacebookFields
+end
+
+class FacebookFieldsTest < ActiveSupport::TestCase
+  def setup
+    @user = UserWithFb.new
+    
+    @john = UserWithFb.find_by_id(users(:john).id)
+    @jane = UserWithFb.find_by_id(users(:jane).id)
+    @bill = UserWithFb.find_by_id(users(:bill).id)
+  end
+  
+  test 'setup' do
+    assert @user.valid?
+  end
+  
+  test 'facebook_credential' do
+    assert_equal credentials(:john_facebook), @john.facebook_credential
+    assert_equal credentials(:jane_facebook), @jane.facebook_credential
+    assert_nil @bill.facebook_credential
+  end
+
+  test 'facebook_uid' do
+    assert_equal credentials(:john_facebook).facebook_uid, @john.facebook_uid
+    assert_equal credentials(:jane_facebook).facebook_uid, @jane.facebook_uid
+    assert_nil @bill.facebook_uid
+  end
+
+  test 'facebook_access_token' do
+    assert_equal credentials(:john_facebook).access_token,
+                 @john.facebook_access_token
+    assert_equal credentials(:jane_facebook).access_token,
+                 @jane.facebook_access_token
+    assert_nil @bill.facebook_access_token
+  end
+
+  test 'facebook_client' do
+    assert_equal credentials(:john_facebook).access_token,
+                 @john.facebook_client.access_token
+    assert_nil @bill.facebook_client
+  end
+
+  test 'with_facebook_uid' do
+    assert_equal users(:john), UserWithFb.with_facebook_uid(
+        credentials(:john_facebook).facebook_uid)
+    assert_equal users(:jane), UserWithFb.with_facebook_uid(
+        credentials(:jane_facebook).facebook_uid)
+    assert_nil UserWithFb.with_facebook_uid('0000000')
+  end
+
+  test 'for_facebook_token' do
+    flexmock(Credentials::Facebook).should_receive(:uid_from_token).
+        with(credentials(:john_facebook).key).
+        and_return(credentials(:john_facebook).facebook_uid)
+    assert_equal users(:john),
+        UserWithFb.for_facebook_token(credentials(:john_facebook).access_token)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpwn_rails
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbgraph_rails
-  requirement: &17655420 !ruby/object:Gem::Requirement
+  requirement: &24789920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *17655420
+  version_requirements: *24789920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17653940 !ruby/object:Gem::Requirement
+  requirement: &24770680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *17653940
+  version_requirements: *24770680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17652840 !ruby/object:Gem::Requirement
+  requirement: &24769460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17652840
+  version_requirements: *24769460
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &17599820 !ruby/object:Gem::Requirement
+  requirement: &24767220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *17599820
+  version_requirements: *24767220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17598940 !ruby/object:Gem::Requirement
+  requirement: &24766540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *17598940
+  version_requirements: *24766540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &17598120 !ruby/object:Gem::Requirement
+  requirement: &24765740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17598120
+  version_requirements: *24765740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17597180 !ruby/object:Gem::Requirement
+  requirement: &24765080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *17597180
+  version_requirements: *24765080
 description: Works with Facebook.
 email: victor@costan.us
 executables: []
@@ -132,6 +132,7 @@ files:
 - lib/authpwn_rails/session_controller.rb
 - lib/authpwn_rails/test_extensions.rb
 - lib/authpwn_rails/user_extensions/email_field.rb
+- lib/authpwn_rails/user_extensions/facebook_fields.rb
 - lib/authpwn_rails/user_extensions/password_field.rb
 - lib/authpwn_rails/user_model.rb
 - test/cookie_controller_test.rb
@@ -139,6 +140,7 @@ files:
 - test/email_field_test.rb
 - test/facebook_controller_test.rb
 - test/facebook_credential_test.rb
+- test/facebook_fields_test.rb
 - test/helpers/application_controller.rb
 - test/helpers/autoload_path.rb
 - test/helpers/db_setup.rb
@@ -165,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3179900965882251985
+      hash: -300984823103934206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: