authlogic_rpx 1.1.1 → 1.2.0

data/Rakefile

@@ -1,48 +1,55 @@
-ENV['RDOCOPT'] = "-S -f html -T hanna"
-
-require "rubygems"
-require "echoe"
-require File.dirname(__FILE__) << "/lib/authlogic_rpx/version"
-
-Echoe.new("authlogic_rpx") do |p|
-  p.version = AuthlogicRpx::Version::STRING
-  p.url = "http://github.com/tardate/authlogic_rpx"
-  p.summary = "Authlogic plug-in for RPX support"
-  p.description = "Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support"
-
-  p.runtime_dependencies = ["authlogic >=2.1.3", "rpx_now >=0.6.12" ]
-  p.development_dependencies = []
-
-  p.author = "Paul Gallagher / tardate"
-  p.email  = "gallagher.paul@gmail.com"
-
-  p.install_message = ""
-end
-
-
-Rake::Task[:test].clear
-
-Rake::TestTask.new(:unit) do |t|
-  t.libs << "test/libs"
-  t.pattern = 'test/unit/*test.rb'
-  t.verbose = true
-end
-
-Rake::TestTask.new(:no_mapping) do |t|
-  t.libs << "test/libs"
-  t.test_files = FileList.new('test/unit/*test.rb', 'test/integration/no_mapping/*test.rb')
-  t.verbose = true
-end
-
-Rake::TestTask.new(:internal_mapping) do |t|
-  t.libs << "test/libs"
-  t.test_files = FileList.new('test/integration/internal_mapping/*test.rb')
-  t.verbose = true
-end
-
-task :test do
-  Rake::Task[:no_mapping].invoke
-  Rake::Task[:internal_mapping].invoke
-end
-
+ENV['RDOCOPT'] = "-S -f html -T hanna"
+
+require "rubygems"
+require 'rake'
+
+require File.dirname(__FILE__) << "/lib/authlogic_rpx/version"
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "authlogic_rpx"
+    gem.version = AuthlogicRpx::Version::STRING
+    gem.summary = %Q{Authlogic plug-in for RPX support}
+    gem.description = %Q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
+    gem.email = "gallagher.paul@gmail.com"
+    gem.homepage = "http://github.com/tardate/authlogic_rpx"
+    gem.authors = [ "Paul Gallagher / tardate <gallagher.paul@gmail.com>" ]
+    gem.add_dependency "authlogic", "= 2.1.6"
+    gem.add_dependency "rpx_now", "= 0.6.23"
+    gem.add_development_dependency "test-unit", ">= 2.1.1"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+
+namespace :test do
+  Rake::TestTask.new(:units) do |t|
+    t.libs << "test/libs"
+    t.pattern = 'test/unit/*test.rb'
+    t.verbose = true
+  end
+
+  Rake::TestTask.new(:no_mapping) do |t|
+    t.libs << "test/libs"
+    t.test_files = FileList.new('test/unit/*test.rb', 'test/integration/no_mapping/*test.rb')
+    t.verbose = true
+  end
+
+  Rake::TestTask.new(:internal_mapping) do |t|
+    t.libs << "test/libs"
+    t.test_files = FileList.new('test/integration/internal_mapping/*test.rb')
+    t.verbose = true
+  end
+end
+
+task :test do
+  Rake::Task['test:no_mapping'].invoke
+  Rake::Task['test:internal_mapping'].invoke
+end
+
 task :default => :test

data/authlogic_rpx.gemspec

@@ -1,38 +1,101 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{authlogic_rpx}
-  s.version = "1.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Paul Gallagher / tardate"]
-  s.date = %q{2010-01-17}
-  s.description = %q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
-  s.email = %q{gallagher.paul@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/rpx_identifier.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb"]
-  s.files = ["CHANGELOG.rdoc", "MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "authlogic_rpx.gemspec", "generators/add_authlogic_rpx_migration/USAGE", "generators/add_authlogic_rpx_migration/add_authlogic_rpx_migration_generator.rb", "generators/add_authlogic_rpx_migration/templates/migration_internal_mapping.rb", "generators/add_authlogic_rpx_migration/templates/migration_no_mapping.rb", "init.rb", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/rpx_identifier.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb", "rails/init.rb", "test/fixtures/rpxresponses.yml", "test/fixtures/users.yml", "test/integration/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/settings_test.rb", "test/integration/no_mapping/basic_authentication_and_registration_test.rb", "test/integration/no_mapping/settings_test.rb", "test/libs/ext_test_unit.rb", "test/libs/mock_rpx_now.rb", "test/libs/rails_trickery.rb", "test/libs/rpxresponse.rb", "test/libs/user.rb", "test/libs/user_session.rb", "test/test_helper.rb", "test/test_internal_mapping_helper.rb", "test/unit/acts_as_authentic_settings_test.rb", "test/unit/session_settings_test.rb", "test/unit/session_validation_test.rb", "test/unit/verify_rpx_mock_test.rb"]
-  s.homepage = %q{http://github.com/tardate/authlogic_rpx}
-  s.post_install_message = %q{}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Authlogic_rpx", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{authlogic_rpx}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Authlogic plug-in for RPX support}
-  s.test_files = ["test/integration/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/settings_test.rb", "test/integration/no_mapping/basic_authentication_and_registration_test.rb", "test/integration/no_mapping/settings_test.rb", "test/test_helper.rb", "test/test_internal_mapping_helper.rb", "test/unit/acts_as_authentic_settings_test.rb", "test/unit/session_settings_test.rb", "test/unit/session_validation_test.rb", "test/unit/verify_rpx_mock_test.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<authlogic>, [">= 2.1.3"])
-      s.add_runtime_dependency(%q<rpx_now>, [">= 0.6.12"])
-    else
-      s.add_dependency(%q<authlogic>, [">= 2.1.3"])
-      s.add_dependency(%q<rpx_now>, [">= 0.6.12"])
-    end
-  else
-    s.add_dependency(%q<authlogic>, [">= 2.1.3"])
-    s.add_dependency(%q<rpx_now>, [">= 0.6.12"])
-  end
-end
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{authlogic_rpx}
+  s.version = "1.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Paul Gallagher / tardate <gallagher.paul@gmail.com>"]
+  s.date = %q{2010-09-28}
+  s.description = %q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
+  s.email = %q{gallagher.paul@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGELOG.rdoc",
+     "MIT-LICENSE",
+     "Manifest",
+     "README.rdoc",
+     "Rakefile",
+     "authlogic_rpx.gemspec",
+     "generators/add_authlogic_rpx_migration/USAGE",
+     "generators/add_authlogic_rpx_migration/add_authlogic_rpx_migration_generator.rb",
+     "generators/add_authlogic_rpx_migration/templates/migration_internal_mapping.rb",
+     "generators/add_authlogic_rpx_migration/templates/migration_no_mapping.rb",
+     "init.rb",
+     "lib/authlogic_rpx.rb",
+     "lib/authlogic_rpx/acts_as_authentic.rb",
+     "lib/authlogic_rpx/helper.rb",
+     "lib/authlogic_rpx/rpx_identifier.rb",
+     "lib/authlogic_rpx/session.rb",
+     "lib/authlogic_rpx/version.rb",
+     "rails/init.rb",
+     "test/fixtures/rpxresponses.yml",
+     "test/fixtures/users.yml",
+     "test/integration/basic_authentication_and_registration_test.rb",
+     "test/integration/internal_mapping/basic_authentication_and_registration_test.rb",
+     "test/integration/internal_mapping/settings_test.rb",
+     "test/integration/no_mapping/basic_authentication_and_registration_test.rb",
+     "test/integration/no_mapping/settings_test.rb",
+     "test/libs/ext_test_unit.rb",
+     "test/libs/mock_rpx_now.rb",
+     "test/libs/rails_trickery.rb",
+     "test/libs/rpxresponse.rb",
+     "test/libs/user.rb",
+     "test/libs/user_session.rb",
+     "test/test_helper.rb",
+     "test/test_internal_mapping_helper.rb",
+     "test/unit/acts_as_authentic_settings_test.rb",
+     "test/unit/session_settings_test.rb",
+     "test/unit/session_validation_test.rb",
+     "test/unit/verify_rpx_mock_test.rb"
+  ]
+  s.homepage = %q{http://github.com/tardate/authlogic_rpx}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Authlogic plug-in for RPX support}
+  s.test_files = [
+    "test/integration/basic_authentication_and_registration_test.rb",
+     "test/integration/internal_mapping/basic_authentication_and_registration_test.rb",
+     "test/integration/internal_mapping/settings_test.rb",
+     "test/integration/no_mapping/basic_authentication_and_registration_test.rb",
+     "test/integration/no_mapping/settings_test.rb",
+     "test/libs/ext_test_unit.rb",
+     "test/libs/mock_rpx_now.rb",
+     "test/libs/rails_trickery.rb",
+     "test/libs/rpxresponse.rb",
+     "test/libs/user.rb",
+     "test/libs/user_session.rb",
+     "test/test_helper.rb",
+     "test/test_internal_mapping_helper.rb",
+     "test/unit/acts_as_authentic_settings_test.rb",
+     "test/unit/session_settings_test.rb",
+     "test/unit/session_validation_test.rb",
+     "test/unit/verify_rpx_mock_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.6"])
+      s.add_runtime_dependency(%q<rpx_now>, ["= 0.6.23"])
+      s.add_development_dependency(%q<test-unit>, [">= 2.1.1"])
+    else
+      s.add_dependency(%q<authlogic>, ["= 2.1.6"])
+      s.add_dependency(%q<rpx_now>, ["= 0.6.23"])
+      s.add_dependency(%q<test-unit>, [">= 2.1.1"])
+    end
+  else
+    s.add_dependency(%q<authlogic>, ["= 2.1.6"])
+    s.add_dependency(%q<rpx_now>, ["= 0.6.23"])
+    s.add_dependency(%q<test-unit>, [">= 2.1.1"])
+  end
+end
+

data/generators/add_authlogic_rpx_migration/USAGE

@@ -1,18 +1,18 @@
-Description:
-    ruby script/generate add_authlogic_rpx_migration [mapping:mapping_mode] [user_model:model_name] 
-    
-    Creates an add_authlogic_rpx_migration file in db/migrate.
-    
-    The mapping_mode parameter indicates which style of Authlogic_RPX-supported identity 
-    mapping should be used. Allowed values for mapping_mode are:
-       none
-       internal 
-    Default mapping_mode is 'internal'
-    
-    The user_model parameter specifies the name of the user/member model in your application.
-    Default model_name is 'User'
-
-    e.g. to generate the RPX migration where the user model is called 'Member' and you do not
-    want to support identity mapping:
-    
-    ruby script/generate add_authlogic_rpx_migration mapping:none user_model:member
+Description:
+    ruby script/generate add_authlogic_rpx_migration [mapping:mapping_mode] [user_model:model_name] 
+    
+    Creates an add_authlogic_rpx_migration file in db/migrate.
+    
+    The mapping_mode parameter indicates which style of Authlogic_RPX-supported identity 
+    mapping should be used. Allowed values for mapping_mode are:
+       none
+       internal 
+    Default mapping_mode is 'internal'
+    
+    The user_model parameter specifies the name of the user/member model in your application.
+    Default model_name is 'User'
+
+    e.g. to generate the RPX migration where the user model is called 'Member' and you do not
+    want to support identity mapping:
+    
+    ruby script/generate add_authlogic_rpx_migration mapping:none user_model:member

data/generators/add_authlogic_rpx_migration/add_authlogic_rpx_migration_generator.rb

@@ -1,44 +1,44 @@
-class AddAuthlogicRpxMigrationGenerator < Rails::Generator::Base
-  def manifest
-
-    record do |m| 
-      
-      m.migration_template template_name, 'db/migrate', :assigns => {
-        :user_model_base => user_model_base,
-        :user_model => user_model,
-        :user_model_collection => user_model_collection
-      }
-    end
-  end
-  
-  def file_name
-    "add_authlogic_rpx_migration"
-  end
-  
-  protected
-    # Override with your own usage banner.
-    def banner
-      "Usage: #{$0} #{spec.name} [options] [mapping:mapping_mode] [user_model:model_name]"
-    end
-
-    attr_writer :params
-    def params
-      @params ||= {"mapping" => "internal", "user_model" => "User"}.merge( Hash[*(@args.collect { |arg| arg.split(":") }.flatten)] )
-    end
-    
-    def user_model_base
-      params['user_model'].singularize.downcase
-    end
-    def user_model
-      params['user_model'].singularize.capitalize
-    end
-    def user_model_collection
-      params['user_model'].pluralize.downcase
-    end
-    def mapping
-      params['mapping']
-    end
-    def template_name
-      mapping == 'none' ? 'migration_no_mapping.rb' : 'migration_internal_mapping.rb'
-    end
-end
+class AddAuthlogicRpxMigrationGenerator < Rails::Generator::Base
+  def manifest
+
+    record do |m| 
+      
+      m.migration_template template_name, 'db/migrate', :assigns => {
+        :user_model_base => user_model_base,
+        :user_model => user_model,
+        :user_model_collection => user_model_collection
+      }
+    end
+  end
+  
+  def file_name
+    "add_authlogic_rpx_migration"
+  end
+  
+  protected
+    # Override with your own usage banner.
+    def banner
+      "Usage: #{$0} #{spec.name} [options] [mapping:mapping_mode] [user_model:model_name]"
+    end
+
+    attr_writer :params
+    def params
+      @params ||= {"mapping" => "internal", "user_model" => "User"}.merge( Hash[*(@args.collect { |arg| arg.split(":") }.flatten)] )
+    end
+    
+    def user_model_base
+      params['user_model'].singularize.downcase
+    end
+    def user_model
+      params['user_model'].singularize.capitalize
+    end
+    def user_model_collection
+      params['user_model'].pluralize.downcase
+    end
+    def mapping
+      params['mapping']
+    end
+    def template_name
+      mapping == 'none' ? 'migration_no_mapping.rb' : 'migration_internal_mapping.rb'
+    end
+end

data/generators/add_authlogic_rpx_migration/templates/migration_internal_mapping.rb

@@ -1,34 +1,34 @@
-class AddAuthlogicRpxMigration < ActiveRecord::Migration
-  def self.up
-    create_table :rpx_identifiers do |t|
-      t.string  :identifier, :null => false
-      t.string  :provider_name
-      t.integer :<%= user_model_base %>_id, :null => false
-      t.timestamps
-    end
-    add_index :rpx_identifiers, :identifier, :unique => true, :null => false
-    add_index :rpx_identifiers, :<%= user_model_base %>_id, :unique => false, :null => false
-    
-    # == Customisation may be required here ==
-    # You may need to remove database constraints on other fields if they will be unused in the RPX case
-    # (e.g. crypted_password and password_salt to make password authentication optional). 
-    # If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped
-    # e.g.:
-    #change_column :<%= user_model_collection %>, :crypted_password, :string, :default => nil, :null => true
-    #change_column :<%= user_model_collection %>, :password_salt, :string, :default => nil, :null => true
-    
-  end
-  
-  def self.down
-    drop_table :rpx_identifiers
-    
-    # == Customisation may be required here ==
-    # Restore user model database constraints as appropriate
-    # e.g.:
-    #[:crypted_password, :password_salt].each do |field|
-    #  <%= user_model %>.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
-    #  change_column :<%= user_model_collection %>, field, :string, :default => "", :null => false
-    #end
-
-  end
-end
+class AddAuthlogicRpxMigration < ActiveRecord::Migration
+  def self.up
+    create_table :rpx_identifiers do |t|
+      t.string  :identifier, :null => false
+      t.string  :provider_name
+      t.integer :<%= user_model_base %>_id, :null => false
+      t.timestamps
+    end
+    add_index :rpx_identifiers, :identifier, :unique => true, :null => false
+    add_index :rpx_identifiers, :<%= user_model_base %>_id, :unique => false, :null => false
+    
+    # == Customisation may be required here ==
+    # You may need to remove database constraints on other fields if they will be unused in the RPX case
+    # (e.g. crypted_password and password_salt to make password authentication optional). 
+    # If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped
+    # e.g.:
+    #change_column :<%= user_model_collection %>, :crypted_password, :string, :default => nil, :null => true
+    #change_column :<%= user_model_collection %>, :password_salt, :string, :default => nil, :null => true
+    
+  end
+  
+  def self.down
+    drop_table :rpx_identifiers
+    
+    # == Customisation may be required here ==
+    # Restore user model database constraints as appropriate
+    # e.g.:
+    #[:crypted_password, :password_salt].each do |field|
+    #  <%= user_model %>.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
+    #  change_column :<%= user_model_collection %>, field, :string, :default => "", :null => false
+    #end
+
+  end
+end

data/generators/add_authlogic_rpx_migration/templates/migration_no_mapping.rb

@@ -1,29 +1,29 @@
-class AddAuthlogicRpxMigration < ActiveRecord::Migration
-
-  def self.up
-    add_column :<%= user_model_collection %>, :rpx_identifier, :string
-    add_index :<%= user_model_collection %>, :rpx_identifier
-      
-    # == Customisation may be required here ==
-    # You may need to remove database constraints on other fields if they will be unused in the RPX case
-    # (e.g. crypted_password and password_salt to make password authentication optional). 
-    # If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped
-    # e.g.:
-    #change_column :<%= user_model_collection %>, :crypted_password, :string, :default => nil, :null => true
-    #change_column :<%= user_model_collection %>, :password_salt, :string, :default => nil, :null => true
-    
-  end
-
-  def self.down
-    remove_column :<%= user_model_collection %>, :rpx_identifier
-    
-    # == Customisation may be required here ==
-    # Restore user model database constraints as appropriate
-    # e.g.:
-    #[:crypted_password, :password_salt].each do |field|
-    #  <%= user_model %>.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
-    #  change_column :<%= user_model_collection %>, field, :string, :default => "", :null => false
-    #end
-
-  end
-end
+class AddAuthlogicRpxMigration < ActiveRecord::Migration
+
+  def self.up
+    add_column :<%= user_model_collection %>, :rpx_identifier, :string
+    add_index :<%= user_model_collection %>, :rpx_identifier
+      
+    # == Customisation may be required here ==
+    # You may need to remove database constraints on other fields if they will be unused in the RPX case
+    # (e.g. crypted_password and password_salt to make password authentication optional). 
+    # If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped
+    # e.g.:
+    #change_column :<%= user_model_collection %>, :crypted_password, :string, :default => nil, :null => true
+    #change_column :<%= user_model_collection %>, :password_salt, :string, :default => nil, :null => true
+    
+  end
+
+  def self.down
+    remove_column :<%= user_model_collection %>, :rpx_identifier
+    
+    # == Customisation may be required here ==
+    # Restore user model database constraints as appropriate
+    # e.g.:
+    #[:crypted_password, :password_salt].each do |field|
+    #  <%= user_model %>.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
+    #  change_column :<%= user_model_collection %>, field, :string, :default => "", :null => false
+    #end
+
+  end
+end