openid_mongodb_store 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/openid_mongodb_store/store.rb

@@ -25,7 +25,8 @@ class OpenidMongodbStore::Store < OpenID::Store::Interface
                         'secret'     => secret,
                         'issued'     => association.issued,
                         'lifetime'   => association.lifetime,
-                        'assoc_type' => association.assoc_type)
+                        'assoc_type' => association.assoc_type,
+                        'expire_at'  => (association.issued + association.lifetime))
   end
 
   def get_association(server_url, handle=nil)
@@ -70,14 +71,13 @@ class OpenidMongodbStore::Store < OpenID::Store::Interface
 
   def cleanup_nonces
     now = Time.now.to_i
-    nonces.remove({'timestamp' => {'$gt'=> (now + OpenID::Nonce.skew),
-                                   '$lt'=> (now - OpenID::Nonce.skew)}})
+    nonces.remove({'timestamp' => {'$gt'=> (now + OpenID::Nonce.skew)}})
+    nonces.remove({'timestamp' => {'$lt'=> (now - OpenID::Nonce.skew)}})
   end
 
   def cleanup_associations
     now = Time.now.to_i
-    # Association.delete_all(:expire_at => {'$gt' => now})
-    associations.remove('expire_at' => {'$gt' => now})
+    associations.remove('expire_at' => {'$lt' => now})
   end
 
 end

data/openid_mongodb_store.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openid_mongodb_store}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2010-07-04}
+  s.date = %q{2010-09-27}
   s.description = %q{Like the ActiveRecord Store, but for Mongo.}
   s.email = %q{samsm@samsm.com}
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -1,9 +1,107 @@
 require 'rubygems'
 require 'test/unit'
+require 'mocha'
+require 'ruby-debug'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'openid_mongodb_store'
 
+def test_database
+  Mongo::Connection.new('localhost').db('openid_store_test')
+end
+
 class Test::Unit::TestCase
+
+  def setup
+    timestamp(true)
+  end
+
+  ##
+  ## Mongo-specific database test configuration here.
+  ##
+
+  def store
+    @store ||= OpenidMongodbStore::Store.new(test_database)
+  end
+
+  def insert_old_association
+    store.associations.insert('server_url' => server_url,
+                              'handle'     => handle,
+                              'secret'     => BSON::Binary.new(secret),
+                              'issued'     => too_old_association_timestamp,
+                              'lifetime'   => lifetime,
+                              'assoc_type' => assoc_type,
+                              'expire_at'  => (too_old_association_timestamp + lifetime))
+    
+  end
+  
+  def find_old_association
+    store.associations.find_one({'issued' => too_old_association_timestamp})
+  end
+  
+  def insert_old_nonce
+    store.nonces.insert({'server_url' => server_url, 'timestamp' => too_old_nonce_timestamp, 'salt' => salt})
+  end
+  
+  def find_old_nonce
+    store.nonces.find_one({'server_url'=> server_url, 'timestamp' => too_old_nonce_timestamp, 'salt' => salt})
+  end
+
+  ##
+  ## End of Mongo-specific test config
+  ##
+
+  def too_old_nonce_timestamp
+    timestamp - (OpenID::Nonce.skew * 1.5).to_i
+  end
+
+  def too_old_association_timestamp
+    timestamp - (60*60*24*365) # year old
+  end
+
+  def store_association(opts = {})
+    association = OpenID::Association.new(handle, secret, timestamp, lifetime, assoc_type)
+    opts.each_pair {|k,v| association.send "#{k}=", v}
+    store.store_association(server_url,association)
+  end
+
+  def get_association(server_url = server_url, handle = handle)
+    store.get_association(server_url,handle)
+  end
+
+  def server_url
+    "http://localhost:98765/"
+  end
+
+  def handle
+    "{HMAC-SHA1}{4ca0a54b}{5Sx5CQ==}"
+  end
+
+  def secret
+    OpenID::Util.from_base64("5EoS1O4V+x7VkBNEekHsavgRjbk=")
+  end
+
+  def timestamp(refresh = false)
+    @timestamp = nil if refresh
+    @timestamp ||= (Time.now - 10).to_i # 10 seconds ago
+  end
+
+  def lifetime
+    1209600 # two weeks in seconds
+  end
+
+  def assoc_type
+    "HMAC-SHA1"
+  end
+
+  def salt
+    "KuIaaq"
+  end
+
+  def teardown
+    test_database.drop_collection 'openid_mongo_store_associations'
+    test_database.drop_collection 'openid_mongo_store_nonces'
+  end
+
 end

data/test/test_openid_mongodb_store.rb

@@ -1,7 +1,64 @@
 require 'helper'
 
 class TestOpenidMongodbStore < Test::Unit::TestCase
-  def test_something_for_real
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  def test_store_and_retrieve_association
+    # Make sure there isn't already an association in the database
+    assert !get_association
+
+    # Save an assocaition
+    assert store_association
+
+    # Retrieve the association
+    assert store.get_association(server_url, handle)
+  end
+
+  def test_remove_association
+    store_association
+
+    # Ensure an assocaition exists
+    assert get_association
+
+    # Remove a specific association
+    assert store.remove_association(server_url,handle)
+    # Confirm that the association is gone.
+    assert !get_association
+  end
+
+  def test_use_nonce
+    # If a timestamp is too old, use_nonce should return false
+    assert !store.use_nonce(server_url, too_old_nonce_timestamp, salt)
+
+    # When no nonces exist, this should return true and create a nonce record
+    assert store.use_nonce(server_url, timestamp, salt)
+
+    # After a nonce is created with a given salt/timestamp, use_nonce should return false
+    assert !store.use_nonce(server_url, timestamp, salt)
+  end
+
+  def test_cleanup_nonces
+    insert_old_nonce
+
+    # Verify nonce is inserted
+    assert find_old_nonce
+
+    # Cleanup nonces
+    assert store.cleanup_nonces
+
+    # Verify nonce was cleaned up
+    assert !find_old_nonce
+  end
+
+  def test_cleanup_associations
+    insert_old_association
+
+    # Ensure association was saved
+    assert find_old_association
+
+    # Cleanup associations
+    assert store.cleanup_associations
+
+    # Ensure association was removed
+    assert !find_old_association
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openid_mongodb_store
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency