karait 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/karait.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{karait}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bcoe"]

data/lib/message.rb

@@ -15,7 +15,6 @@ module Karait
       @source = raw_message
       @queue_collection = queue_collection
       @variables_to_serialize = {}
-      set_expired
       add_accessors raw_message
     end
     
@@ -50,19 +49,6 @@ module Karait
     
     private
     
-    def set_expired
-      @expired = false
-      
-      current_time = Time.now().to_f
-      meta = @source.fetch('_meta', {})
-      
-      return if meta.fetch('expire', -1.0) == -1.0
-      
-      if current_time - meta.fetch('timestamp', 0.0) > meta.fetch('expire', -1.0)
-        @expired = true
-      end
-    end
-    
     def add_accessors(hash)
       hash.each do |k, v|
         if not Message::BLACKLIST.has_key? k

data/lib/queue.rb

@@ -22,7 +22,9 @@ module Karait
       message_dict[:_meta] = {
         :expire => opts.fetch(:expire, -1.0),
         :timestamp => Time.now().to_f,
-        :expired => false
+        :expired => false,
+        :visibility_timeout => -1.0,
+        :accessed => 0.0
       }
       
       message_dict[:_meta][:routing_key] = opts.fetch(:routing_key) if opts[:routing_key]
@@ -45,13 +47,14 @@ module Karait
         }
       end
       
-      @queue_collection.find(conditions).limit(opts.fetch(:messages_read, Queue::MESSAGES_READ)).each do |raw_message|
+      @database.eval(generate_find_with_timeouts_code({
+            'conditions' => conditions,
+            'limit' => opts.fetch(:messages_read, Queue::MESSAGES_READ),
+            'collection' => @queue,
+            'visibilityTimeout' => opts.fetch(:visibility_timeout, -1.0)
+      })).each do |raw_message|
         message = Karait::Message.new(raw_message=raw_message, queue_collection=@queue_collection)
-        if message.expired?
-          message.delete()
-        else
-          messages << message
-        end
+        messages << message
       end
       
       return messages
@@ -119,5 +122,56 @@ module Karait
       )
     end
     
+    def generate_find_with_timeouts_code(variable_scope)
+      BSON::Code.new("
+            function() {
+                var results = [];
+                var currentTime = parseFloat(new Date().getTime()) / 1000.0;
+                
+                function hiddenByVisibilityTimeout(result) {
+                    if ( (currentTime - result._meta.accessed) < (result._meta.visibility_timeout) ) {
+                        return true;
+                    }
+                    return false;
+                }
+                
+                function expire(result) {
+                    if (result._meta.expire <= 0.0) {
+                        return false;
+                    } else if ( (currentTime - result._meta.timestamp) > result._meta.expire ) {
+                        db[collection].update({_id: result._id}, {$set: {'_meta.expired': true}})
+                        return true;
+                    }
+                }
+                
+                (function fetchResults() {
+                    var cursor = db[collection].find(conditions).limit(limit);
+                    var accessedIds = [];
+                    cursor.forEach(function(result) {
+                        if (!expire(result) && !hiddenByVisibilityTimeout(result)) {
+                            results.push(result);
+                            accessedIds.push(result._id);
+                        }
+                    });
+                    if (visibilityTimeout != -1.0) {
+                        db[collection].update({_id: {$in: accessedIds}},
+                            {
+                                $set: {
+                                    '_meta.accessed': currentTime,
+                                    '_meta.visibility_timeout': visibilityTimeout
+                                }
+                            },
+                            false,
+                            true
+                        );
+                    }
+                })();
+            
+                return results;
+            }
+        ",
+        variable_scope
+      )
+    end
   end
 end

data/test/test_message.rb

@@ -78,38 +78,6 @@ class TestMessage < Test::Unit::TestCase
       message.delete()
       assert_equal 0, collection.find({'_meta.expired' => false}).count
   end
-
-  should "set expired to true if current time minus timestamp is greater than expire" do
-    raw_message = {
-        'routing_key' => 'foobar',
-        'apple' => 3,
-        'banana' => 5,
-        '_meta' => {
-            'timestamp' => 0,
-            'expire' => 10,
-            'expired' => false
-        }
-    }
-
-    message = Karait::Message.new(raw_message=raw_message)
-    assert_equal true, message.expired?
-  end
-  
-  should "not set expired to true if expire is -1.0" do
-    raw_message = {
-        'routing_key' => 'foobar',
-        'apple' => 3,
-        'banana' => 5,
-        '_meta' => {
-            'timestamp' => 0,
-            'expire' => -1.0,
-            'expired' => false
-        }
-    }
-    
-    message = Karait::Message.new(raw_message=raw_message)
-    assert_equal false, message.expired?
-  end
   
   should "allow a get method to be called to retrieve keys that conflict with class variables, e.g., send" do
     message = Karait::Message.new(

data/test/test_queue.rb

@@ -194,6 +194,11 @@ class TestQueue < Test::Unit::TestCase
     sleep(0.2)
     messages = queue.read()
     assert_equal 0, messages.count
+    
+    # Make sure the meta._expired key is actually set.
+    collection = Mongo::Connection.new()['karait_test']['queue_test']
+    raw_message = collection.find_one
+    assert_equal true, raw_message['_meta']['expired']
   end
   
   
@@ -211,4 +216,22 @@ class TestQueue < Test::Unit::TestCase
     messages = queue.read()
     assert_equal 0, messages.count
   end
+  
+  should "not see message in queue again until visibility timeout has passed" do
+    queue = Karait::Queue.new(
+      :database => 'karait_test',
+      :queue => 'queue_test'
+    )
+    
+    queue.write Karait::Message.new({'foo' => 1})
+    queue.write Karait::Message.new({:foo => 2})
+    queue.write Karait::Message.new({'foo' => 3})
+    messages = queue.read(:visibility_timeout => 0.05)
+    assert_equal 3, messages.count
+    messages = queue.read(:visibility_timeout => 0.05)
+    assert_equal 0, messages.count
+    sleep(0.1)
+    messages = queue.read(:visibility_timeout => 0.05)
+    assert_equal 3, messages.count
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: karait
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - bcoe