ruby-openid 1.0 → 1.0.1

data/examples/consumer.rb

@@ -6,9 +6,13 @@ require "pathname"
 require "webrick"
 include WEBrick
 
-require "openid/consumer"
-require "openid/filestore"
-require "openid/util"
+# load the openid library, first trying rubygems
+begin
+  require "rubygems"
+  require_gem "ruby-openid", ">= 1.0"
+rescue LoadError
+  require "openid"
+end
 
 ################ start config ##########################
 # use your desired store implementation here

data/examples/openid-store/associations/http-www.myopenid.com_2Fserver-ZFp96P4qV1FjqgGt2rtZBvRJWic

@@ -0,0 +1,6 @@
+version: 2
+handle: {HMAC-SHA1}{44637c57}{YcwFSQ==}
+secret: N2o4OrdrEhtke+lcpAOwOQaffGU=
+issued: 1147370327
+lifetime: 1209599
+assoc_type: HMAC-SHA1

data/examples/rails_active_record_store/README

@@ -4,7 +4,7 @@ A store is required by an OpenID server and optionally by the consumer to
 store associations, nonces, and auth key information across requests and
 threads. This directory contains code useful in implementing an
 ActiveRecord based store as an alternative to using the standard
-OpenID::FilesystemOpenIDStore in Ruby on Rails applications.
+OpenID::FilesystemStore in Ruby on Rails applications.
 
 ==Setting up your database
 
@@ -36,7 +36,7 @@ openid_setting.rb into the app/models dir of your rails app.
 You'll probably have controller for handling openid operations in your
 application (see the other examples).  The control flow of the store
 is handled in a helper.  Look at OpenidHelper in openid_helper.rb,
-which implements the OpenID::OpenIDStore interface.
+which implements the OpenID::Store interface.
 
 Copy the openid_helper.rb into your app/helpers and then include the
 OpenidHelper module in your openid controller.  When instantiating

data/examples/rails_active_record_store/models/openid_association.rb

@@ -1,4 +1,9 @@
-require 'openid/association'
+begin
+  require "rubygems"
+  require_gem "ruby-openid", ">= 1.0"
+rescue LoadError
+  require "openid"
+end
 
 class OpenidAssociation < ActiveRecord::Base
 

data/examples/rails_active_record_store/openid_helper.rb

@@ -1,4 +1,10 @@
-require 'openid/association'
+# load the openid library
+begin
+  require "rubygems"
+  require_gem "ruby-openid", ">= 1.0"
+rescue LoadError
+  require "openid"
+end
 
 module OpenidHelper
 

data/examples/rails_openid_login_generator/templates/controller.rb

@@ -1,8 +1,13 @@
 require "pathname"
 require "cgi"
 
-require "openid/filestore"
-require "openid/consumer"
+# load the openid library
+begin
+  require "rubygems"
+  require_gem "ruby-openid", ">= 1.0"
+rescue LoadError
+  require "openid"
+end
 
 class <%= class_name %>Controller < ApplicationController
   layout  'scaffold'
@@ -15,19 +20,13 @@ class <%= class_name %>Controller < ApplicationController
     if @request.post?
       request = consumer.begin(openid_url)
 
-      p 'XXX', request
-
       case request.status
       when OpenID::SUCCESS
         return_to = url_for(:action=> 'complete')
         trust_root = url_for(:controller=>'')
 
         url = request.redirect_url(trust_root, return_to)
-        p 'REDIRECTURL', url
-
         redirect_to(url)
-
-        p 'REDIRECT SENT', @session
         return
 
       when OpenID::FAILURE
@@ -40,8 +39,6 @@ class <%= class_name %>Controller < ApplicationController
       end      
     end    
 
-    p 'Done'
-
   end
 
   # handle the openid server response

data/examples/rails_server/app/controllers/server_controller.rb

@@ -1,7 +1,12 @@
 require 'pathname'
 
-require 'openid/filestore'
-require 'openid/server'
+# load the openid library, first trying rubygems
+begin
+  require "rubygems"
+  require_gem "ruby-openid", ">= 1.0"
+rescue LoadError
+  require "openid"
+end
 
 class ServerController < ApplicationController
 

data/examples/rails_server/log/development.log

@@ -6057,3 +6057,28 @@ Processing ServerController#index (for 127.0.0.1 at 2006-05-09 14:00:54) [GET]
   Parameters: {"openid.return_to"=>"http://localhost:2000/complete?&nonce=vh0B1ozF", "openid.mode"=>"checkid_setup", "action"=>"index", "controller"=>"server", "openid.identity"=>"http://localhost:3000/user/x", "openid.trust_root"=>"http://localhost:2000/", "openid.assoc_handle"=>"{HMAC-SHA1}{44610305}{DjH4ig==}"}
 Redirected to http://localhost:2000/complete?&nonce=vh0B1ozF&openid.sig=QbSO14Ca39098XwN38yXb%2BNgiDc%3D&openid.mode=id_res&openid.return_to=http%3A%2F%2Flocalhost%3A2000%2Fcomplete%3F%26nonce%3Dvh0B1ozF&openid.identity=http%3A%2F%2Flocalhost%3A3000%2Fuser%2Fx&openid.signed=identity%2Creturn_to%2Cmode&openid.assoc_handle=%7BHMAC-SHA1%7D%7B44610305%7D%7BDjH4ig%3D%3D%7D
 Completed in 0.00412 (242 reqs/sec) | 302 Found [http://localhost/server?openid.mode=checkid_setup&openid.return_to=http%3A%2F%2Flocalhost%3A2000%2Fcomplete%3F%26nonce%3Dvh0B1ozF&openid.trust_root=http%3A%2F%2Flocalhost%3A2000%2F&openid.identity=http%3A%2F%2Flocalhost%3A3000%2Fuser%2Fx&openid.assoc_handle=%7BHMAC-SHA1%7D%7B44610305%7D%7BDjH4ig%3D%3D%7D]
+
+
+Processing LoginController#index (for 127.0.0.1 at 2006-05-11 11:01:05) [GET]
+  Parameters: {"action"=>"index", "controller"=>"login"}
+Rendering  within layouts/server
+Rendering login/index
+Completed in 0.00734 (136 reqs/sec) | Rendering: 0.00612 (83%) | 200 OK [http://localhost/]
+
+
+Processing LoginController#submit (for 127.0.0.1 at 2006-05-11 11:01:08) [GET]
+  Parameters: {"username"=>"b", "action"=>"submit", "controller"=>"login"}
+Redirected to http://localhost:3000/
+Completed in 0.00144 (692 reqs/sec) | 302 Found [http://localhost/login/submit?username=b]
+
+
+Processing LoginController#index (for 127.0.0.1 at 2006-05-11 11:01:09) [GET]
+  Parameters: {"action"=>"index", "controller"=>"login"}
+Rendering  within layouts/server
+Rendering login/index
+Completed in 0.00211 (474 reqs/sec) | Rendering: 0.00098 (46%) | 200 OK [http://localhost/]
+
+
+Processing ServerController#index (for 127.0.0.1 at 2006-05-11 11:01:18) [GET]
+  Parameters: {"action"=>"index", "controller"=>"server"}
+Completed in 0.00290 (344 reqs/sec) | 200 OK [http://localhost/server]

data/lib/openid.rb

@@ -0,0 +1,5 @@
+require "openid/util"
+require "openid/consumer"
+require "openid/server"
+require "openid/stores"
+require "openid/filestore"

data/lib/openid/discovery.rb

@@ -5,7 +5,7 @@ require "openid/parse"
 # try and use the yadis gem, falling back to system yadis
 begin
   require 'rubygems'
-  require_gem 'ruby-yadis', ">=0.2.3"  
+  require_gem 'ruby-yadis', ">=0.3"  
 rescue LoadError
   require "yadis"
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-openid
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2006-05-10 00:00:00 -07:00
+  version: 1.0.1
+date: 2006-05-11 00:00:00 -07:00
 summary: A library for consuming and serving OpenID identities.
 require_paths: 
 - lib
@@ -12,7 +12,7 @@ email: brian@janrian.com
 homepage: http://www.openidenabled.com/openid/libraries/ruby
 rubyforge_project: 
 description: 
-autorequire: 
+autorequire: openid
 default_executable: 
 bindir: bin
 has_rdoc: true
@@ -156,12 +156,14 @@ files:
 - examples/openid-store/temp
 - examples/openid-store/auth_key
 - examples/openid-store/associations/http-localhost_3A3000_2Fserver-EMQbAy3NnHVzA.s0u5KAcplKGzo
+- examples/openid-store/associations/http-www.myopenid.com_2Fserver-ZFp96P4qV1FjqgGt2rtZBvRJWic
 - lib/openid
 - lib/hmac-sha2.rb
 - lib/hmac.rb
 - lib/hmac-sha1.rb
 - lib/hmac-rmd160.rb
 - lib/hmac-md5.rb
+- lib/openid.rb
 - lib/openid/consumer.rb
 - lib/openid/dh.rb
 - lib/openid/fetchers.rb