jmongo 1.1.3 → 1.1.4

data/jmongo.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = 'jmongo'
-  s.version           = '1.1.3'
-  s.date              = '2011-10-18'
+  s.version           = '1.1.4'
+  s.date              = '2011-10-19'
   s.platform          = Gem::Platform::RUBY
   s.authors           = ["Chuck Remes","Guy Boertje", "Lee Henson"]
   s.email             = ["cremes@mac.com", "guyboertje@gmail.com", "lee.m.henson@gmail.com"]

data/lib/jmongo/cursor.rb

@@ -38,30 +38,31 @@ module Mongo
       _limit options[:limit]
       _sort options[:order]
       _batch_size options[:batch_size]
-      @hint       = options[:hint]
+      _hint options[:hint]
       @snapshot   = options[:snapshot]
       @explain    = options[:explain]
       @socket     = options[:socket]
       @timeout    = options.fetch(:timeout, true)
       @transformer = options[:transformer]
       @tailable   = options.fetch(:tailable, false)
-      @await_data  = @tailable ? options[:await_data] : nil
-      @next_timeout = NEXT_DOCUMENT_TIMEOUT
-      @is_poison_function = nil
-      case @await_data
-      when Hash
-        @poison_doc = @await_data.fetch(:poison_doc, default_poison_doc)
-        @is_poison_function = @await_data[:is_poison_function]
-        @next_timeout = @await_data.fetch(:next_timeout, NEXT_DOCUMENT_TIMEOUT).to_f
-      when Numeric
-        @poison_doc = default_poison_doc
-        @next_timeout = @await_data.to_f
-      when TrueClass
+      @do_tailable_timeout = false
+
+      if @tailable
+        @await_data  = options.fetch(:await_data, true)
+        @next_timeout = NEXT_DOCUMENT_TIMEOUT
+        @is_poison_function = nil
         @poison_doc = default_poison_doc
-      else
-        @poison_doc = nil
+        @do_tailable_timeout = true
+        case @await_data
+        when Hash
+          @poison_doc = @await_data.fetch(:poison_doc, default_poison_doc)
+          @is_poison_function = @await_data[:is_poison_function]
+          @next_timeout = @await_data.fetch(:next_timeout, NEXT_DOCUMENT_TIMEOUT).to_f
+        when Numeric
+          @next_timeout = @await_data.to_f
+        end
+        @timeout_thread = TimeoutThread.new(@collection, @poison_doc, @next_timeout)
       end
-      @timeout_thread = TimeoutThread.new(@collection, @poison_doc, @next_timeout) if @tailable && @poison_doc
 
       @full_collection_name = "#{@collection.db.name}.#{@collection.name}"
 
@@ -155,6 +156,11 @@ module Mongo
       end
     end
 
+    def _hint(hint = nil)
+      return if hint.nil?
+      @hint = to_dbobject(hint)
+    end
+
     def _batch_size(size=nil)
       return if size.nil?
       raise ArgumentError, "batch_size requires an integer" unless size.is_a? Integer
@@ -271,9 +277,9 @@ module Mongo
     end
 
     def __next
-      @timeout_thread.trigger if @tailable
-      doc = from_dbobject(@j_cursor.next)
-      if @tailable
+      if @do_tailable_timeout
+        @timeout_thread.trigger
+        doc = from_dbobject(@j_cursor.next)
         if poisoned?(doc)
           nil
         else
@@ -281,7 +287,7 @@ module Mongo
           doc
         end
       else
-        doc
+        from_dbobject(@j_cursor.next)
       end
     end
 
@@ -324,11 +330,8 @@ module Mongo
         @j_cursor = @j_cursor.hint(@hint) if @hint
         @j_cursor = @j_cursor.snapshot if @snapshot
         @j_cursor = @j_cursor.batchSize(@batch_size) if @batch_size && @batch_size > 0
-        opts_bf = @j_cursor.options
-        opts_bf = mask_option(opts_bf, JMongo::Bytes::QUERYOPTION_NOTIMEOUT, !@timeout)
-        opts_bf = mask_option(opts_bf, JMongo::Bytes::QUERYOPTION_TAILABLE, !!@tailable)
-        opts_bf = mask_option(opts_bf, JMongo::Bytes::QUERYOPTION_AWAITDATA, !!@await_data)
-        @j_cursor.options = opts_bf
+        @j_cursor = @j_cursor.addOption JMongo::Bytes::QUERYOPTION_NOTIMEOUT unless @timeout
+        @j_cursor = @j_cursor.addOption JMongo::Bytes::QUERYOPTION_TAILABLE if @tailable
       end
 
       self

data/lib/jmongo/version.rb

@@ -1,3 +1,3 @@
 module Mongo
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/test/collection_test.rb

@@ -904,8 +904,17 @@ describe "Collection" do
         tail.next_document
       end
     end
-
+    
     it "should find using a tailable cursor" do
+      tail = Mongo::Cursor.new(@capped, :timeout => false, :tailable => true, :order => [['$natural', 1]])
+      1000.times do
+        assert tail.next_document
+      end
+      assert true, tail.has_next?
+      assert_nil tail.next_document
+    end
+
+    it "should find using a tailable cursor with await_data" do
       tail = Mongo::Cursor.new(@capped, :timeout => false, :tailable => true, :await_data => true, :order => [['$natural', 1]])
       1000.times do
         assert tail.next_document

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jmongo
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2011-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &10865120 !ruby/object:Gem::Requirement
+  requirement: &15446080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *10865120
+  version_requirements: *15446080
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &10864640 !ruby/object:Gem::Requirement
+  requirement: &15445600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *10864640
+  version_requirements: *15445600
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &10864180 !ruby/object:Gem::Requirement
+  requirement: &15444720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *10864180
+  version_requirements: *15444720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10863300 !ruby/object:Gem::Requirement
+  requirement: &15444260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +56,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *10863300
+  version_requirements: *15444260
 description: Thin jruby wrapper around Mongo Java Driver
 email:
 - cremes@mac.com