Undo changes to library name and gemspec

.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rake test 

INSTALL

@@ -32,16 +32,16 @@ Or, if you installed via rubygems:
  $> irb
  irb$> require "rubygems"
  => true
- irb$> require_gem "ruby-openid" 
+ irb$> require_gem "ruby-openid"
  => true
 
 == Run the test suite
 
-Go into the test directory and execute the *runtests.rb* script.
+Go into the admin directory and execute the *runtests.rb* script.
 
 == Next steps
 
-* Run consumer.rb in the examples directory. 
+* Run consumer.rb in the examples directory.
 * Get started writing your own consumer using OpenID::Consumer
 * Write your own server with OpenID::Server
 * Use the OpenIDLoginGenerator!  Read example/README for more info.

README → README.md

@@ -1,45 +1,46 @@
-=Ruby OpenID
+# Ruby OpenID
+
+[![Build Status](https://secure.travis-ci.org/joe1chen/ruby-openid.png)](http://travis-ci.org/joe1chen/ruby-openid)
 
 A Ruby library for verifying and serving OpenID identities.
 
-This is a fork by courtenay @ entp (http://entp.com) which merges in many pull requests,
+This is a fork by courtenay @ entp (http://entp.com) and joe1chen which merges in many pull requests,
 fixes some tests and works on ruby 1.8.7 and ruby 1.9.2 (at least). This library seems
 otherwise abandoned by its authors.
 
-==Features
-* Easy to use API for verifying OpenID identites - OpenID::Consumer
-* Support for serving OpenID identites - OpenID::Server
-* Does not depend on underlying web framework
-* Supports multiple storage mechanisms (Filesystem, ActiveRecord, Memory)
-* Example code to help you get started, including:
-  * Ruby on Rails based consumer and server
-  * OpenIDLoginGenerator for quickly getting creating a rails app that uses
-    OpenID for authentication
-  * ActiveRecordOpenIDStore plugin
-* Comprehensive test suite
-* Supports both OpenID 1 and OpenID 2 transparently
-
-==Installing
+## Features
+  * Easy to use API for verifying OpenID identites - OpenID::Consumer
+  * Support for serving OpenID identites - OpenID::Server
+  * Does not depend on underlying web framework
+  * Supports multiple storage mechanisms (Filesystem, ActiveRecord, Memory)
+  * Example code to help you get started, including:
+    * Ruby on Rails based consumer and server
+    * OpenIDLoginGenerator for quickly getting creating a rails app that uses OpenID for authentication
+    * ActiveRecordOpenIDStore plugin
+  * Comprehensive test suite
+  * Supports both OpenID 1 and OpenID 2 transparently
+
+## Installing
 Before running the examples or writing your own code you'll need to install
 the library.  See the INSTALL file or use rubygems:
 
-  gem install ruby-openid
+    gem install ruby-openid
 
 Check the installation:
 
-  $ irb
-  irb> require 'rubygems'
-  irb> require_gem 'ruby-openid'
-  => true
+    $ irb
+    irb> require 'rubygems'
+    irb> require_gem 'ruby-openid'
+    => true
 
 The library is known to work with Ruby 1.8.4 on Unix, Max OSX and
 Win32.  Examples have been tested with Rails 1.1 and 1.2, and 2.0.
 
-==Getting Started
+## Getting Started
 The best way to start is to look at the rails_openid example.
 You can run it with:
- cd examples/rails_openid
- script/server
+    cd examples/rails_openid
+    script/server
 
 If you are writing an OpenID Relying Party, a good place to start is:
 examples/rails_openid/app/controllers/consumer_controller.rb
@@ -51,13 +52,13 @@ The library code is quite well documented, so don't be squeamish, and
 look at the library itself if there's anything you don't understand in
 the examples.
 
-==Homepage
+## Homepage
 http://github.com/openid/ruby-openid
 
 See also:
 http://openid.net/
 
-==Community
+## Community
 Discussion regarding the Ruby OpenID library and other JanRain OpenID
 libraries takes place on the the OpenID mailing list on
 openid.net.
@@ -74,12 +75,12 @@ contribute, see
 
   http://openidenabled.com/contribute/
 
-==Author
+## Author
 Copyright 2006-2008, JanRain, Inc.
 
 Contact openid@janrain.com or visit the OpenID channel on pibb.com:
 
 http://pibb.com/go/openid
 
-==License
+## License
 Apache Software License.  For more information see the LICENSE file.

admin/library-name

@@ -1 +1 @@
-entp-ruby-openid
+ruby-openid

examples/active_record_openid_store/README

@@ -44,9 +44,11 @@ You may garbage collect unused nonces and expired associations using
 the gc instance method of ActiveRecordOpenIDStore.  Hook it up to a
 task in your app's Rakefile like so:
 
-  desc 'GC OpenID store'
+  desc 'GC OpenID store, deleting expired nonces and associations'
   task :gc_openid_store => :environment do
-    ActiveRecordOpenIDStore.new.cleanup
+    require 'openid_ar_store'
+    nonces, associations = ActiveRecordStore.new.cleanup
+    puts "Deleted #{nonces} nonces, #{associations} associations"
   end
 
 Run it by typing:

examples/active_record_openid_store/lib/openid_ar_store.rb

@@ -51,7 +51,7 @@ def cleanup_nonces
 
   def cleanup_associations
     now = Time.now.to_i
-    Association.delete_all(['issued + lifetime > ?',now])
+    Association.delete_all(['issued + lifetime < ?',now])
   end
 
 end

lib/openid.rb

@@ -14,9 +14,5 @@
 
 require "openid/version"
 require 'openid/store'
-require 'openid/yadis'
 require "openid/consumer"
-require 'openid/server'
-
-module OpenID
-end
+require 'openid/server'

lib/openid/consumer/idres.rb

@@ -492,10 +492,10 @@ def verify_discovery_single(endpoint, to_match)
                                 "#{endpoint.claimed_id}")
         end
 
-        if to_match.claimed_id != endpoint.claimed_id
-          raise ProtocolError, ("claimed_id mismatch. Expected "\
-                                "#{to_match.claimed_id}, got "\
-                                "#{endpoint.claimed_id}")
+        if to_match.get_local_id != endpoint.get_local_id
+          raise ProtocolError, ("local_id mismatch. Expected "\
+                                "#{to_match.get_local_id}, got "\
+                                "#{endpoint.get_local_id}")
         end
 
         # If the server URL is nil, this must be an OpenID 1
@@ -512,7 +512,7 @@ def verify_discovery_single(endpoint, to_match)
             "`to_match' endpoint."
           end
         elsif to_match.server_url != endpoint.server_url
-          raise ProtocolError, ("OP Endpoint mismatch. Expected "\
+          raise ProtocolError, ("OP Endpoint mismatch. Expected"\
                                 "#{to_match.server_url}, got "\
                                 "#{endpoint.server_url}")
         end