authpwn_rails 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/authpwn_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authpwn_rails}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-09-05}
+  s.date = %q{2010-10-06}
   s.description = %q{Works with Facebook.}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = [
@@ -63,17 +63,17 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{User authentication for Rails 3 applications.}
   s.test_files = [
-    "test/cookie_controller_test.rb",
+    "test/facebook_token_test.rb",
+     "test/session_controller_api_test.rb",
+     "test/user_test.rb",
+     "test/cookie_controller_test.rb",
+     "test/test_helper.rb",
      "test/facebook_controller_test.rb",
-     "test/facebook_token_test.rb",
      "test/helpers/application_controller.rb",
-     "test/helpers/db_setup.rb",
-     "test/helpers/fbgraph.rb",
      "test/helpers/routes.rb",
-     "test/helpers/view_helpers.rb",
-     "test/session_controller_api_test.rb",
-     "test/test_helper.rb",
-     "test/user_test.rb"
+     "test/helpers/fbgraph.rb",
+     "test/helpers/db_setup.rb",
+     "test/helpers/view_helpers.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/authpwn_rails/session.rb

@@ -42,15 +42,15 @@ module ControllerInstanceMethods
   def current_user=(user)
     @current_user = user
     if user
-      session[:current_user_id] = user.to_param
+      session[:current_user_pid] = user.to_param
     else
-      session.delete :current_user_id
+      session.delete :current_user_pid
     end
   end  
 
   def authenticate_using_session
     return true if current_user
-    user_param = session[:current_user_id]
+    user_param = session[:current_user_pid]
     user = user_param && User.find_by_param(user_param)
     self.current_user = user if user
   end
@@ -118,12 +118,12 @@ ActionController::Base.send :include, ControllerMixin
 class ActionController::TestCase
   # Sets the authenticated user in the test session.
   def set_session_current_user(user)
-    request.session[:current_user_id] = user ? user.to_param : nil
+    request.session[:current_user_pid] = user ? user.to_param : nil
   end
   
   # The authenticated user in the test session.
   def session_current_user
-    return nil unless user_param = request.session[:current_user_id]
+    return nil unless user_param = request.session[:current_user_pid]
     User.find_by_param user_param
   end
 end

data/lib/authpwn_rails/user_model.rb

@@ -45,17 +45,19 @@ end  # module AuthpwnRails::UserModel::ModelClassMethods
 
 # Included in the metaclass of models that call pwnauth_user_model.
 module ModelMetaclassMethods
-  # Queries by the values generated by to_param. 
+  # Queries the database using the value returned by User#to_param.
+  #
+  # Returns nil if no matching User exists.
   def find_by_param(param)
-    self.where(:email => param).first
+    where(:email => param).first
   end
   
   # The authenticated user or nil.
   def find_by_email_and_password(email, password)
-    @user = where(:email => email).first
-    (@user && @user.password_matches?(password)) ? @user : nil
+    user = where(:email => email).first
+    (user && user.password_matches?(password)) ? user : nil
   end
-    
+  
   # Computes a password hash from a raw password and a salt.
   def hash_password(password, salt)
     Digest::SHA2.hexdigest(password + salt)
@@ -77,7 +79,7 @@ module ModelMetaclassMethods
   # the case for a new visitor.
   def for_facebook_token(access_token)
     FacebookToken.for(access_token).user
-  end  
+  end
 end  # module AuthpwnRails::UserModel::ModelMetaclassMethods
 
 

data/test/cookie_controller_test.rb

@@ -33,8 +33,8 @@ class CookieControllerTest < ActionController::TestCase
     assert_equal "User: #{Fixtures.identify(:john)}", response.body
   end
   
-  test "invalid user_id in session" do
-    get :show, {}, :current_user_id => 999
+  test "invalid user_pid in session" do
+    get :show, {}, :current_user_pid => 'random@user.com'
     assert_response :success
     assert_nil assigns(:current_user)
   end

data/test/user_test.rb

@@ -64,7 +64,7 @@ class UserTest < ActiveSupport::TestCase
   end
   
   test 'to_param' do
-    assert_equal @user.email, @user.to_param
+    assert_equal 'dvdjohn@mit.edu', @user.to_param
   end
   
   test 'password_matches?' do
@@ -73,7 +73,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal false, @user.password_matches?('password'),
                  "Another user's password" 
   end
-  
+    
   test 'find_by_param' do
     assert_equal users(:john), User.find_by_param(users(:john).to_param)
     assert_equal users(:jane), User.find_by_param(users(:jane).to_param)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authpwn_rails
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 -07:00
+date: 2010-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 1
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -125,6 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -133,6 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -144,14 +150,14 @@ signing_key:
 specification_version: 3
 summary: User authentication for Rails 3 applications.
 test_files: 
+- test/facebook_token_test.rb
+- test/session_controller_api_test.rb
+- test/user_test.rb
 - test/cookie_controller_test.rb
+- test/test_helper.rb
 - test/facebook_controller_test.rb
-- test/facebook_token_test.rb
 - test/helpers/application_controller.rb
-- test/helpers/db_setup.rb
-- test/helpers/fbgraph.rb
 - test/helpers/routes.rb
+- test/helpers/fbgraph.rb
+- test/helpers/db_setup.rb
 - test/helpers/view_helpers.rb
-- test/session_controller_api_test.rb
-- test/test_helper.rb
-- test/user_test.rb