jmongo 1.1.4 → 1.1.5

data/jmongo.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = 'jmongo'
-  s.version           = '1.1.4'
-  s.date              = '2011-10-19'
+  s.version           = '1.1.5'
+  s.date              = '2011-10-22'
   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"]
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     History.txt
     LICENSE.txt
     README.txt
@@ -87,6 +86,7 @@ Gem::Specification.new do |s|
     test/replica_sets/replication_ack_test.rb
     test/replica_sets/rs_test_helper.rb
     test/safe_test.rb
+    test/subscribe_test.rb
     test/support/hash_with_indifferent_access.rb
     test/support/keys.rb
     test/support_test.rb

data/lib/jmongo/collection.rb

@@ -48,20 +48,37 @@ module Mongo
       if args.size < 2
         raise ArgumentError.new("Must supply at least name and db parameters")
       end
-      if args.first.respond_to?('collection_names')
-        db, name = args
-      else
+      if args.first.is_a?(String)
         name, db = args
+      else
+        db, name = args
       end
-
       @name = validate_name(name)
       @db, @j_db  = db, db.j_db
       @connection = @db.connection
       @pk_factory = @opts.delete(:pk)|| BSON::ObjectId
       @hint = nil
+
+      @monitor = @opts.delete(:monitor)
+      if @monitor
+        setup_monitor
+      elsif @opts.has_key?(:monitor_source)
+        @monitor_source = @opts.delete(:monitor_source)
+      end
+
       @j_collection = j_collection || @j_db.create_collection(@name, to_dbobject(@opts))
     end
 
+    def setup_monitor
+      mon_opts = @monitor.is_a?(Hash)? @monitor : {}
+      size = mon_opts.fetch(:size, 8000)
+      @monitor_max = mon_opts.fetch(:max, 100)
+      opts = {:capped => true, :max => @monitor_max, :size => size, :monitor_source => self}
+      @mon_collection = @db.create_collection("#{@name}-monitor", opts)
+      @j_mon_collection = @mon_collection.j_collection
+      @monitorable = true
+    end
+
     def safe
       !!@opts.fetch(:safe, false)
     end
@@ -648,5 +665,46 @@ module Mongo
     end
 
     alias :size :count
-  end
-end
+
+    def monitor_collection
+      raise InvalidOperation, "Monitoring has not been setup, add :monitor - true or Hash" unless @monitorable
+      @mon_collection
+    end
+
+    def monitored_collection
+      @monitor_source
+    end
+
+    def monitor_subscribe(opts, &callback_doc)
+      raise MongoArgumentError, "Not a monitorable collection" if @monitor_source.nil?
+      raise MongoArgumentError, "Must supply a block" unless block_given?
+      raise MongoArgumentError, "opts needs to be a Hash" unless opts.is_a?(Hash)
+      callback_exit = opts[:callback_exit]
+      raise MongoArgumentError, "Need a callable for exit callback" unless callback_doc.respond_to?('call')
+      exit_check_timeout = opts[:exit_check_timeout]
+      raise MongoArgumentError, "Need a positive float for timeout" unless exit_check_timeout.to_f > 0.0
+
+      tail = Mongo::Cursor.new(self, :timeout => false, :tailable => true, :await_data => 0.5, :order => [['$natural', 1]])
+      
+      loop_th = Thread.new(tail, callback_doc) do |cur, cb|
+        while !Thread.current[:stop]
+          doc = cur.next
+          cb.call(doc) if doc
+        end
+      end
+      loop_th[:stop] = false
+
+      exit_th = Thread.new(exit_check_timeout.to_f, callback_exit) do |to, cb|
+        while true
+          sleep to
+          must_exit = cb.call
+          break if must_exit
+        end
+        loop_th[:stop] = true
+      end
+      #
+    end
+
+    
+  end #class
+end #module

data/lib/jmongo/cursor.rb

@@ -337,15 +337,6 @@ module Mongo
       self
     end
 
-    def mask_option(bitfield, bit, set = true)
-      if set
-        bitfield |= bit
-      else
-        bitfield &= ~bit
-      end
-      bitfield
-    end
-
     def wrap_invalid_op
       begin
         yield

data/lib/jmongo/mongo/collection.rb

@@ -106,6 +106,10 @@ module Mongo
         else
           begin
             @j_collection.insert( to_dbobject(to_do), concern )
+            if @monitorable
+              mon_do = to_do.map{ |doc| {'_id'=>doc['_id'], 'action'=>1} }
+              @j_mon_collection.insert( to_dbobject(mon_do), concern )
+            end
           rescue => ex
             if ex.message =~ /E11000/
               msg = "Failed to insert document #{obj.inspect}, duplicate key, E11000"
@@ -125,6 +129,10 @@ module Mongo
         begin
           jres = @j_collection.insert( dbo, concern )
           result = from_dbobject(jres.get_last_error(concern))
+          if @monitorable
+            mon_obj = one_obj.map{ |doc| {'_id'=>doc['_id'], 'action'=>1} }
+            @j_mon_collection.( to_dbobject(mon_obj), concern )
+          end
         rescue => ex
           if ex.message =~ /E11000/ #noop duplicate key
             result = {'err'=>ex.message}

data/lib/jmongo/version.rb

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

data/test/subscribe_test.rb

@@ -0,0 +1,84 @@
+require 'minitest/spec'
+require './test/test_helper'
+
+Cfg.connection :op_timeout => 10
+Cfg.db
+
+describe "Monitorable Pair Collection" do
+  before do
+    Cfg.clear_all
+  end
+
+  describe "monitoring a collection with defaults" do
+
+    before do
+      opts = {:monitor => true}
+      @collection = Cfg.db.create_collection('buffer', opts)
+    end
+
+    it "should have a monitor_collection" do
+      assert @collection.monitor_collection
+      assert_equal "buffer-monitor", @collection.monitor_collection.name
+    end
+
+    it "should insert into the monitorable collection as well" do
+      @collection.insert({'field1' => 'some value', 'field2' => 99})
+      assert_equal 1, @collection.size
+      rec = @collection.find().to_a.first
+      assert_equal 1, @collection.monitor_collection.size
+      mon_rec = @collection.monitor_collection.find().to_a.first
+      assert_equal rec['_id'], mon_rec['_id']
+      assert_equal 1, mon_rec['action']
+    end
+
+    it "should raise when the subscribe method is called on a normal collection" do
+      normal = Cfg.db.create_collection('normal')
+      assert normal.respond_to?('monitor_subscribe')
+      assert_raises Mongo::MongoArgumentError do
+        normal.monitor_subscribe(2)
+      end
+    end
+
+    it "should raise for invalid options" do
+      @stop_callback = lambda{ true }
+      @monitored = @collection.monitor_collection
+      assert_raises Mongo::MongoArgumentError do
+        @monitored.monitor_subscribe({}) #no block
+      end
+      assert_raises Mongo::MongoArgumentError do
+        @monitored.monitor_subscribe({:callback_exit => ''}) {|doc| apr(doc,'doc')}  #not callable
+      end
+      assert_raises Mongo::MongoArgumentError do
+        @monitored.monitor_subscribe({ :callback_exit => @stop_callback }) {|doc| apr(doc,'doc')} #no timeout
+      end
+      assert_raises Mongo::MongoArgumentError do
+        @monitored.monitor_subscribe({:callback_exit => @stop_callback, :exit_check_timeout => 0}) {|doc| apr(doc,'doc')} #timeout not positive float
+      end
+    end
+
+    it "the monitored collection should have a subscribe method" do
+      @stop = 0
+      @count = 0
+      @values = []
+      @stop_callback = lambda{ @stop += 1; true }
+      @monitored = @collection.monitor_collection
+      assert_equal @collection, @monitored.monitored_collection
+
+      @monitored.monitor_subscribe({:callback_exit => @stop_callback, :exit_check_timeout => 1.0}) do |doc|
+        if doc
+          id, act = doc.values_at('_id','action')
+          @count += (act || 0)
+          orig = @monitored.monitored_collection.find_one('_id'=>id)
+          @values << orig['field2'] if orig
+        end
+      end
+      @collection.insert({'field1' => 'some value', 'field2' => 99})
+      @collection.insert({'field1' => 'some value', 'field2' => 98})
+
+      sleep 1.2
+      assert_equal 1, @stop
+      assert_equal 2, @count
+      assert_equal [99,98], @values
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jmongo
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000 Z
+date: 2011-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &15446080 !ruby/object:Gem::Requirement
+  requirement: &9275500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *15446080
+  version_requirements: *9275500
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &15445600 !ruby/object:Gem::Requirement
+  requirement: &9275020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *15445600
+  version_requirements: *9275020
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &15444720 !ruby/object:Gem::Requirement
+  requirement: &9274520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *15444720
+  version_requirements: *9274520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15444260 !ruby/object:Gem::Requirement
+  requirement: &9273680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +56,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *15444260
+  version_requirements: *9273680
 description: Thin jruby wrapper around Mongo Java Driver
 email:
 - cremes@mac.com
@@ -68,7 +68,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - History.txt
 - LICENSE.txt
 - README.txt
@@ -143,6 +142,7 @@ files:
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/rs_test_helper.rb
 - test/safe_test.rb
+- test/subscribe_test.rb
 - test/support/hash_with_indifferent_access.rb
 - test/support/keys.rb
 - test/support_test.rb

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jmongo (1.1.1)
-      require_all (~> 1.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    awesome_print (0.4.0)
-    diff-lcs (1.1.3)
-    fuubar (0.0.6)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.1.8)
-      ruby-progressbar (~> 0.0.10)
-    metaclass (0.0.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    rake (0.9.2)
-    require_all (1.2.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.8)
-    rspec-mocks (2.6.0)
-    ruby-progressbar (0.0.10)
-    shoulda (2.11.3)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  awesome_print (~> 0.4)
-  fuubar (~> 0.0)
-  jmongo!
-  mocha
-  rake
-  rspec (~> 2.6)
-  shoulda