multi_auth 0.0.7 → 0.1.0

data/README

@@ -69,6 +69,13 @@ Ex.
     s.session_times_out_in = 1.hour
   end
 
+You can use OpenID::CustomFetcher to use OpenID provider which uses SSL.
+
+Ex.
+
+  OpenID.fetcher = OpenID::CustomFetcher.new
+  OpenID.fetcher.ca_path = OpenSSL::X509::DEFAULT_CERT_PATH
+
 Customize
 =========
 

data/app/models/email_credential.rb

@@ -91,4 +91,8 @@ class EmailCredential < ActiveRecord::Base
   def login!
     self.update_attributes!(:loggedin_at => Time.now)
   end
+
+  def to_label
+    email
+  end
 end

data/app/models/open_id_credential.rb

@@ -35,4 +35,8 @@ class OpenIdCredential < ActiveRecord::Base
   def login!
     self.update_attributes!(:loggedin_at => Time.now)
   end
+
+  def to_label
+    identity_url
+  end
 end

data/app/views/credentials/email/edit_password.html.erb

@@ -6,11 +6,11 @@
 <%- form_for(:edit_form, @edit_form, :url => {:action => "update_password"}) { |f| -%>
   <table>
     <tr>
-      <th><%=h f.label(:email) %></th>
+      <th><%= f.label(:email) %></th>
       <td><%=h @email_credential.email %></td>
     </tr>
     <tr>
-      <th><%=h f.label(:password) %></th>
+      <th><%= f.label(:password) %></th>
       <td>
         <div><%= f.password_field(:password, :size => 20) %></div>
         <div><%= f.password_field(:password_confirmation, :size => 20) %></div>

data/config/database.yml

@@ -9,7 +9,7 @@ development:
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test: &TEST
+test:
   adapter: sqlite3
   database: db/test.sqlite3
   pool: 5
@@ -20,6 +20,3 @@ production:
   database: db/production.sqlite3
   pool: 5
   timeout: 5000
-
-cucumber:
-  <<: *TEST

data/db/schema.rb

@@ -9,21 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090420020617) do
-
-  create_table "email_addresses", :force => true do |t|
-    t.datetime "created_at",                      :null => false
-    t.string   "activation_token", :limit => 40,  :null => false
-    t.integer  "user_id",                         :null => false
-    t.string   "email",            :limit => 200, :null => false
-    t.datetime "activated_at"
-  end
-
-  add_index "email_addresses", ["activated_at"], :name => "index_email_addresses_on_activated_at"
-  add_index "email_addresses", ["activation_token"], :name => "index_email_addresses_on_activation_token", :unique => true
-  add_index "email_addresses", ["created_at"], :name => "index_email_addresses_on_created_at"
-  add_index "email_addresses", ["email", "user_id"], :name => "index_email_addresses_on_email_and_user_id", :unique => true
-  add_index "email_addresses", ["user_id"], :name => "index_email_addresses_on_user_id"
+ActiveRecord::Schema.define(:version => 20090415163347) do
 
   create_table "email_credentials", :force => true do |t|
     t.datetime "created_at",                      :null => false

data/lib/open_id/custom_fetcher.rb

@@ -0,0 +1,39 @@
+module OpenID
+  class CustomFetcher < StandardFetcher
+
+    attr_accessor :ca_path
+
+    def make_connection(uri)
+      conn = make_http(uri)
+
+      if !conn.is_a?(Net::HTTP)
+        raise RuntimeError, sprintf("Expected Net::HTTP object from make_http; got %s",
+                                    conn.class)
+      end
+
+      if uri.scheme == 'https'
+        if supports_ssl?(conn)
+
+          conn.use_ssl = true
+
+          case
+          when @ca_path
+            set_verified(conn, true)
+            conn.ca_path = @ca_path
+          when @ca_file
+            set_verified(conn, true)
+            conn.ca_file = @ca_file
+          else
+            Util.log("WARNING: making https request to #{uri} without verifying " +
+                     "server certificate; no CA path was specified.")
+            set_verified(conn, false)
+          end
+        else
+          raise RuntimeError, "SSL support not found; cannot fetch #{uri}"
+        end
+      end
+
+      return conn
+    end
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi_auth
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - okkez
@@ -10,39 +16,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +09:00
+date: 2010-06-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: okkez-open_id_authentication
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: validates_email_format_of
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: nayutaya-active-form
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: ""
 executables: []
@@ -52,143 +70,144 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- app/helpers/application_helper.rb
 - app/controllers/auth_controller.rb
+- app/controllers/credentials_controller.rb
 - app/controllers/application_controller.rb
 - app/controllers/credentials/email_controller.rb
 - app/controllers/credentials/open_id_controller.rb
-- app/controllers/auth/email_controller.rb
-- app/controllers/auth/open_id_controller.rb
-- app/controllers/signup_controller.rb
-- app/controllers/credentials_controller.rb
 - app/controllers/signup/email_controller.rb
 - app/controllers/signup/open_id_controller.rb
-- app/models/dummy_user.rb
+- app/controllers/signup_controller.rb
+- app/controllers/auth/email_controller.rb
+- app/controllers/auth/open_id_controller.rb
+- app/models/email_login_form.rb
 - app/models/email_credential_edit_form.rb
 - app/models/open_id_login_form.rb
-- app/models/activation_mailer.rb
-- app/models/email_credential.rb
 - app/models/session.rb
-- app/models/open_id_credential.rb
-- app/models/email_login_form.rb
+- app/models/email_credential.rb
+- app/models/activation_mailer.rb
 - app/models/email_password_edit_form.rb
-- app/views/credentials/index.html.erb
-- app/views/credentials/open_id/delete.html.erb
-- app/views/credentials/open_id/new.html.erb
-- app/views/credentials/email/edit_password.html.erb
-- app/views/credentials/email/activated.html.erb
-- app/views/credentials/email/delete.html.erb
-- app/views/credentials/email/new.html.erb
-- app/views/credentials/email/created.html.erb
-- app/views/credentials/email/activation.html.erb
-- app/views/auth/logged_out.html.erb
-- app/views/auth/index.html.erb
-- app/views/auth/_header.html.erb
-- app/views/auth/open_id/index.html.erb
-- app/views/auth/email/index.html.erb
-- app/views/auth/logged_in.html.erb
-- app/views/activation_mailer/request_for_credential.erb
+- app/models/dummy_user.rb
+- app/models/open_id_credential.rb
+- app/helpers/application_helper.rb
+- app/views/activation_mailer/complete_for_credential.erb
+- app/views/activation_mailer/request_for_notice.erb
 - app/views/activation_mailer/request_for_signup.erb
 - app/views/activation_mailer/complete_for_notice.erb
-- app/views/activation_mailer/request_for_notice.erb
-- app/views/activation_mailer/complete_for_credential.erb
+- app/views/activation_mailer/request_for_credential.erb
 - app/views/activation_mailer/complete_for_signup.erb
+- app/views/credentials/email/delete.html.erb
+- app/views/credentials/email/activated.html.erb
+- app/views/credentials/email/activation.html.erb
+- app/views/credentials/email/new.html.erb
+- app/views/credentials/email/created.html.erb
+- app/views/credentials/email/edit_password.html.erb
+- app/views/credentials/index.html.erb
+- app/views/credentials/open_id/delete.html.erb
+- app/views/credentials/open_id/new.html.erb
+- app/views/signup/email/activated.html.erb
+- app/views/signup/email/activation.html.erb
+- app/views/signup/email/validated.html.erb
+- app/views/signup/email/index.html.erb
+- app/views/signup/email/created.html.erb
+- app/views/signup/email/_progress.html.erb
 - app/views/signup/index.html.erb
 - app/views/signup/open_id/authenticated.html.erb
 - app/views/signup/open_id/index.html.erb
 - app/views/signup/open_id/created.html.erb
-- app/views/signup/email/_progress.html.erb
-- app/views/signup/email/activated.html.erb
-- app/views/signup/email/index.html.erb
-- app/views/signup/email/created.html.erb
-- app/views/signup/email/validated.html.erb
-- app/views/signup/email/activation.html.erb
-- config/routes.rb
-- config/cucumber.yml
+- app/views/auth/email/index.html.erb
+- app/views/auth/_header.html.erb
+- app/views/auth/logged_out.html.erb
+- app/views/auth/index.html.erb
+- app/views/auth/logged_in.html.erb
+- app/views/auth/open_id/index.html.erb
 - config/database.yml.sqlite3
+- config/cucumber.yml
+- config/smtp.yml.sample
 - config/environment.rb
-- config/boot.rb
 - config/database.yml
-- config/smtp.yml.sample
-- db/schema.rb
-- db/development.sqlite3
+- config/boot.rb
+- config/routes.rb
 - db/test.sqlite3
-- lib/action_mailer_util.rb
-- lib/notice_formatter.rb
-- lib/multi_auth.rb
-- lib/multi_auth_helper.rb
+- db/development.sqlite3
+- db/schema.rb
 - lib/token_util.rb
-- lib/open_id_authentication/result.rb
+- lib/multi_auth.rb
 - lib/multi_auth/active_record.rb
 - lib/multi_auth/action_controller.rb
+- lib/open_id_authentication/result.rb
+- lib/multi_auth_helper.rb
+- lib/notice_formatter.rb
+- lib/action_mailer_util.rb
+- lib/open_id/custom_fetcher.rb
 - rails/init.rb
-- generators/multi_auth_migration/multi_auth_migration_generator.rb
-- generators/multi_auth_migration/USAGE
-- generators/multi_auth_migration/templates/migration.rb
-- generators/multi_auth_public_assets/multi_auth_public_assets_generator.rb
-- generators/multi_auth_public_assets/USAGE
-- generators/multi_auth_public_assets/templates/style.css
-- generators/multi_auth_public_assets/templates/images/favicons/yahoo.png
-- generators/multi_auth_public_assets/templates/images/favicons/livedoor.png
-- generators/multi_auth_public_assets/templates/images/favicons/mixi.png
-- generators/multi_auth_public_assets/templates/images/icons/openid.png
-- generators/multi_auth_public_assets/templates/images/icons/openid-with-desc.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/email-with-desc.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/plugin.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/key.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/feed.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/key-with-desc.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/bin.png
 - generators/multi_auth_public_assets/templates/images/icons/fam/help.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/tick.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/key-with-desc.png
 - generators/multi_auth_public_assets/templates/images/icons/fam/cog.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/lightning.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/user.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/email.png
 - generators/multi_auth_public_assets/templates/images/icons/fam/add.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/stop.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/tick.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/delete.png
 - generators/multi_auth_public_assets/templates/images/icons/fam/vcard.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/delete.png
 - generators/multi_auth_public_assets/templates/images/icons/fam/table_save.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/lightning.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/email.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/bin.png
-- generators/multi_auth_public_assets/templates/images/icons/fam/user.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/email-with-desc.png
 - generators/multi_auth_public_assets/templates/images/icons/fam/bomb.png
-- po/ja/multi_auth.po
+- generators/multi_auth_public_assets/templates/images/icons/fam/plugin.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/key.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/feed.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/stop.png
+- generators/multi_auth_public_assets/templates/images/icons/openid.png
+- generators/multi_auth_public_assets/templates/images/icons/openid-with-desc.png
+- generators/multi_auth_public_assets/templates/images/favicons/yahoo.png
+- generators/multi_auth_public_assets/templates/images/favicons/mixi.png
+- generators/multi_auth_public_assets/templates/images/favicons/livedoor.png
+- generators/multi_auth_public_assets/templates/style.css
+- generators/multi_auth_public_assets/multi_auth_public_assets_generator.rb
+- generators/multi_auth_public_assets/USAGE
+- generators/multi_auth_migration/multi_auth_migration_generator.rb
+- generators/multi_auth_migration/templates/migration.rb
+- generators/multi_auth_migration/USAGE
 - po/multi_auth.pot
+- po/ja/multi_auth.po
 - locale/ja/LC_MESSAGES/multi_auth.mo
-- test/unit/token_util_test.rb
-- test/unit/open_id_login_form_test.rb
-- test/unit/notice_formatter_test.rb
+- test/test_helper.rb
+- test/performance/browsing_test.rb
+- test/functional/auth_controller_test.rb
+- test/functional/credentials/email_controller_test.rb
+- test/functional/credentials/open_id_controller_test.rb
+- test/functional/credentials_controller_test.rb
+- test/functional/signup/email_controller_test.rb
+- test/functional/signup/open_id_controller_test.rb
+- test/functional/auth/email_controller_test.rb
+- test/functional/auth/open_id_controller_test.rb
+- test/functional/signup_controller_test.rb
+- test/unit/email_credential_test.rb
+- test/unit/multi_auth_public_assets_generator_test.rb
+- test/unit/action_mailer_util_test.rb
+- test/unit/session_test.rb
 - test/unit/email_login_form_test.rb
-- test/unit/helpers/open_id_signup_helper_test.rb
+- test/unit/email_credential_edit_form_test.rb
+- test/unit/notice_formatter_test.rb
+- test/unit/open_id_login_form_test.rb
+- test/unit/dummy_user_test.rb
+- test/unit/open_id_credential_test.rb
+- test/unit/activation_mailer_test.rb
+- test/unit/helpers/email_signup_helper_test.rb
+- test/unit/helpers/email_auth_helper_test.rb
 - test/unit/helpers/signup_helper_test.rb
-- test/unit/helpers/password_signup_helper_test.rb
+- test/unit/helpers/open_id_signup_helper_test.rb
+- test/unit/helpers/credentials/open_id_helper_test.rb
+- test/unit/helpers/credentials/email_helper_test.rb
 - test/unit/helpers/open_id_auth_helper_test.rb
+- test/unit/helpers/auth_helper_test.rb
+- test/unit/helpers/password_signup_helper_test.rb
 - test/unit/helpers/password_auth_helper_test.rb
-- test/unit/helpers/email_auth_helper_test.rb
-- test/unit/helpers/credentials/email_helper_test.rb
-- test/unit/helpers/credentials/open_id_helper_test.rb
-- test/unit/helpers/email_signup_helper_test.rb
 - test/unit/helpers/credentials_helper_test.rb
-- test/unit/helpers/auth_helper_test.rb
-- test/unit/multi_auth_public_assets_generator_test.rb
-- test/unit/action_mailer_util_test.rb
-- test/unit/open_id_credential_test.rb
-- test/unit/dummy_user_test.rb
-- test/unit/activation_mailer_test.rb
-- test/unit/session_test.rb
-- test/unit/email_credential_test.rb
+- test/unit/token_util_test.rb
 - test/unit/email_password_edit_form_test.rb
-- test/unit/email_credential_edit_form_test.rb
-- test/functional/signup_controller_test.rb
-- test/functional/auth_controller_test.rb
-- test/functional/credentials_controller_test.rb
-- test/functional/credentials/open_id_controller_test.rb
-- test/functional/credentials/email_controller_test.rb
-- test/functional/auth/open_id_controller_test.rb
-- test/functional/auth/email_controller_test.rb
-- test/functional/signup/open_id_controller_test.rb
-- test/functional/signup/email_controller_test.rb
-- test/test_helper.rb
-- test/performance/browsing_test.rb
 - README
 has_rdoc: true
 homepage: https://github.com/okkez/multi_auth
@@ -200,21 +219,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This Rails plugin provides basic login fanctionality