authpwn_rails 0.10.0 → 0.10.1

data/README.rdoc

@@ -15,6 +15,11 @@ Note: the code inside the models and controllers is tucked away in the plug-in.
 The scaffold models and controllers are there as extension points. You will be
 able to update the plug-in without regenerating the scaffolds.
 
+== Migrating from authpwn 0.9 or older?
+
+See legacy/migrate_09_to_010.rb for a semi-automated way of migrating your
+database.
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1

data/authpwn_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "authpwn_rails"
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/helpers/session_helper.rb",
     "authpwn_rails.gemspec",
+    "legacy/migrate_09_to_010.rb",
     "lib/authpwn_rails.rb",
     "lib/authpwn_rails/credential_model.rb",
     "lib/authpwn_rails/credentials.rb",
@@ -38,7 +39,7 @@ Gem::Specification.new do |s|
     "lib/authpwn_rails/facebook_session.rb",
     "lib/authpwn_rails/generators/all_generator.rb",
     "lib/authpwn_rails/generators/templates/001_create_users.rb",
-    "lib/authpwn_rails/generators/templates/002_create_credentials.rb",
+    "lib/authpwn_rails/generators/templates/003_create_credentials.rb",
     "lib/authpwn_rails/generators/templates/credential.rb",
     "lib/authpwn_rails/generators/templates/credentials.yml",
     "lib/authpwn_rails/generators/templates/session/forbidden.html.erb",

data/legacy/migrate_09_to_010.rb

@@ -0,0 +1,61 @@
+# This script migrates an authpwn <= 0.9 database to the new 0.10 layout.
+# It should be run in a rails console.
+
+
+# Remove obsolete Facebook token files.
+[
+  'app/models/facebook_token.rb',
+  'db/migrate/20100725000002_create_facebook_tokens.rb',
+  'test/fixtures/facebook_tokens.yml'
+].each do |f| 
+  File.unlink f if File.exist?(f)
+end
+
+# Re-generate scaffolds.
+Kernel.system 'rails g authpwn:all'
+
+# Get the credentials table.
+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']
+
+  pwd = Credentials::Password.new :user => user
+  pwd.password = pwd.password_confirmation = '_'
+  pwd.key = user.password_salt + '|' + user.password_hash
+  pwd.save!
+end
+
+# Update the columns in the User model.
+class UpgradeUserModel < ActiveRecord::Migration
+  def change
+    remove_column :users, :email
+    remove_column :users, :email_hash
+    remove_column :users, :password_salt
+    remove_column :users, :password_hash
+    
+    add_column :users, :exuid, :string, :length => 32, :null => true
+  end
+end
+UpgradeUserModel.migrate :up
+reload!
+
+# Assign unique IDs to all users.
+User.all.each do |user|
+  user.set_default_exuid
+  sleep 0.01
+  user.save!
+end
+
+# Finish the upgrade of the User model.
+class FinishUpgradingUserModel < ActiveRecord::Migration
+  def change
+    change_column :users, :exuid, :string, :length => 32, :null => false
+    add_index :users, :exuid, :unique => true, :null => false
+  end
+end
+FinishUpgradingUserModel.migrate :up
+reload!
+

data/lib/authpwn_rails/credentials/email.rb

@@ -27,4 +27,10 @@ module Authpwn::UserModel::InstanceMethods
   def email_credential
     credentials.find { |c| c.instance_of?(Credentials::Email) }
   end
+  
+  # The e-mail from the user's Email credential, or nil no credential exists.
+  def email
+    credential = self.email_credential
+    credential && credential.email
+  end
 end  # module Authpwn::UserModel::InstanceMethods

data/lib/authpwn_rails/credentials.rb

@@ -5,6 +5,12 @@
 # means that we have to load the classes that inherit from Credential after it's
 # defined, which is long after the authpwn_rails engine is loaded.
 
-require 'authpwn_rails/credentials/email.rb'
-require 'authpwn_rails/credentials/facebook.rb'
-require 'authpwn_rails/credentials/password.rb'
+require 'active_support'
+
+module Credentials
+  extend ActiveSupport::Autoload
+  
+  autoload :Email, 'authpwn_rails/credentials/email.rb'
+  autoload :Facebook, 'authpwn_rails/credentials/facebook.rb'
+  autoload :Password, 'authpwn_rails/credentials/password.rb'
+end

data/lib/authpwn_rails/generators/all_generator.rb

@@ -14,8 +14,8 @@ class AllGenerator < Rails::Generators::Base
   
   def create_credential_model
     copy_file 'credential.rb', File.join('app', 'models', 'credential.rb')
-    copy_file '002_create_credentials.rb',
-        File.join('db', 'migrate', '20100725000002_create_credentials.rb')
+    copy_file '003_create_credentials.rb',
+        File.join('db', 'migrate', '20100725000003_create_credentials.rb')
     copy_file 'credentials.yml',
         File.join('test', 'fixtures', 'credentials.yml')
   end

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

@@ -5,9 +5,6 @@ class Credential < ActiveRecord::Base
   # Add your extensions to the Credential class here.
 end
 
-# Load built-in credential types, such as Email and Password.
-require 'authpwn_rails/credentials.rb'
-
 # namespace for all Credential subclasses
 module Credentials
 

data/lib/authpwn_rails/generators/templates/session/new.html.erb

@@ -11,7 +11,7 @@
 </p>
 <% end %>
 
-<%= form_tag :url => session_path do %>
+<%= form_tag session_path do %>
   <div class="field">
     <%= label_tag :email, 'Email Address' %><br />
     <%= email_field_tag :email, @email %>

data/lib/authpwn_rails.rb

@@ -3,6 +3,7 @@ module Authpwn
 end
 
 require 'authpwn_rails/credential_model.rb'
+require 'authpwn_rails/credentials.rb'
 require 'authpwn_rails/facebook_session.rb'
 require 'authpwn_rails/session.rb'
 require 'authpwn_rails/session_controller.rb'

data/test/email_credential_test.rb

@@ -47,4 +47,10 @@ class EmailCredentialTest < ActiveSupport::TestCase
     assert_equal credentials(:jane_email), users(:jane).email_credential
     assert_nil users(:bill).email_credential
   end
+
+  test 'User#email' do
+    assert_equal credentials(:john_email).email, users(:john).email
+    assert_equal credentials(:jane_email).email, users(:jane).email
+    assert_nil users(:bill).email
+  end
 end

data/test/helpers/db_setup.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.configurations = true
 ActiveRecord::Migration.verbose = false
 require 'authpwn_rails/generators/templates/001_create_users.rb'
 CreateUsers.migrate :up
-require 'authpwn_rails/generators/templates/002_create_credentials.rb'
+require 'authpwn_rails/generators/templates/003_create_credentials.rb'
 CreateCredentials.migrate :up
 
 require 'authpwn_rails/generators/templates/user.rb'

data/test/session_controller_api_test.rb

@@ -59,7 +59,7 @@ class SessionControllerApiTest < ActionController::TestCase
     assert_template :new
     assert_nil assigns(:current_user), 'current_user should not be set'
   
-    assert_select 'form' do
+    assert_select 'form[action="/session"]' do
       assert_select 'input#email'
       assert_select 'input#password'
       assert_select 'input[type=submit]'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpwn_rails
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbgraph_rails
-  requirement: &16565780 !ruby/object:Gem::Requirement
+  requirement: &10153440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *16565780
+  version_requirements: *10153440
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16564740 !ruby/object:Gem::Requirement
+  requirement: &10152600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *16564740
+  version_requirements: *10152600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16563820 !ruby/object:Gem::Requirement
+  requirement: &10151940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16563820
+  version_requirements: *10151940
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &16563000 !ruby/object:Gem::Requirement
+  requirement: &10151200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *16563000
+  version_requirements: *10151200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16561920 !ruby/object:Gem::Requirement
+  requirement: &10150220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *16561920
+  version_requirements: *10150220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16560900 !ruby/object:Gem::Requirement
+  requirement: &10149480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16560900
+  version_requirements: *10149480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16540280 !ruby/object:Gem::Requirement
+  requirement: &10148440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *16540280
+  version_requirements: *10148440
 description: Works with Facebook.
 email: victor@costan.us
 executables: []
@@ -107,6 +107,7 @@ files:
 - VERSION
 - app/helpers/session_helper.rb
 - authpwn_rails.gemspec
+- legacy/migrate_09_to_010.rb
 - lib/authpwn_rails.rb
 - lib/authpwn_rails/credential_model.rb
 - lib/authpwn_rails/credentials.rb
@@ -117,7 +118,7 @@ files:
 - lib/authpwn_rails/facebook_session.rb
 - lib/authpwn_rails/generators/all_generator.rb
 - lib/authpwn_rails/generators/templates/001_create_users.rb
-- lib/authpwn_rails/generators/templates/002_create_credentials.rb
+- lib/authpwn_rails/generators/templates/003_create_credentials.rb
 - lib/authpwn_rails/generators/templates/credential.rb
 - lib/authpwn_rails/generators/templates/credentials.yml
 - lib/authpwn_rails/generators/templates/session/forbidden.html.erb
@@ -160,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1320439618928497186
+      hash: 2383073164549657310
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: