jmongo 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jmongo (1.0.3)
+    jmongo (1.1.1)
       require_all (~> 1.2)
 
 GEM

data/README.txt

@@ -6,92 +6,43 @@ lifting. Unfortunately, the performance of the pure ruby path under jruby is les
 stellar. Additionally, the C extension isn't compatible with jruby so we aren't able to take
 advantage of any native code boost.
 
-JMongo solves this problem by putting a thin ruby wrapper around the mongo-java-driver. The
+JMongo solves this problem by putting a thin ruby wrapper around the 10gen mongo-java-driver. The
 goal is to provide a drop-in replacement for the mongo and bson gems along with complete
 API compatibility.
 
-The initial version of this gem only wraps enough functionality to cover my personal use-cases.
-I encourage project forking.
+The repo was was forked from Chuck Remes's (now deleted) repo.
 
-INSTALLATION
-  % gem build jmongo.gemspec
-  % gem install jmongo-0.1.0.gem
+INSTALLATION (from Rubygems.org)
+  % gem install jmongo
 
+USAGE
+  * Use jruby with 1.9 compatibility turned on JRUBY_OPTS='--1.9'
 
 PROGRESS
-The following methods have been ported and have at least basic functionality.
-
-find
-  - limit, skip and sort
-find_one
-last_status
-insert
-
-2010-10-16, Guy Boertje ported the following...
-
-count
-update
-save
-find_and_modify
-create_index
-ensure_index
-drop_index
-drop_indexes
-drop_collection
-drop_database
-database_names
-
-Also the returned objects are BSON::OrderedHash objects to match those of the regular ruby mongo library
-
-rough benchmarks
-
-drop collection 'bm' before and after mongo run
-
-require 'rubygems'
-require 'jmongo'
-#require 'mongo'
-require 'benchmark'
-n = 500
-db = Mongo::Connection.new('127.0.0.1',37037).db('bm')
-coll = db.collection('bm')
-ids = []
-docs = []
-Benchmark.bm do |x|
-  x.report("inserts:") do
-    for i in 1..n
-      d = {'n'=>i}
-      ids << coll.insert(d)
-    end
-  end
-  x.report("updates:") do
-    ids.each do |id|
-      coll.update({'_id'=>id},{'$set'=>{'a'=>'blah'}})
-    end
-  end
-  s = {'n'=>{'$gt'=>0}}
-  coll.find(s).each{|d| }
-  coll.find(s).each{|d| }
-  c = coll.find(s)
-  x.report("after find all, iterate:") do
-    c.each do |d|
-      docs << d
-    end
-  end
-end
-db.drop_collection('bm')
-
-Results
-
-ruby --fast --server mongo_bm.rb
-                              user     system      total        real
-                inserts:  0.879000   0.000000   0.879000 (  0.878000)
-                updates:  0.711000   0.000000   0.711000 (  0.711000)
-after find all, iterate:  0.243000   0.000000   0.243000 (  0.243000)
-
-ruby --fast --server jmongo_bm.rb
-                              user     system      total        real
-                inserts:  0.489000   0.000000   0.489000 (  0.489000)
-                updates:  0.357000   0.000000   0.357000 (  0.357000)
-after find all, iterate:  0.058000   0.000000   0.058000 (  0.058000)
-
-
+Almost all of the Ruby driver API is implemented
+
+The the Ruby driver tests have been brought over and converted to be MiniTest based and
+the collection and cursor test suites pass. NOTE: a few (2/3) tests have been skipped, you should look at
+them to see if they affect you.
+
+The Mongoid rspec functional suite runs 2607 examples with 28 failures when using JMongo
+My Mongoid repo was forked after this commit (so newer funtionality/spec will be missing)
+  commit 6cc97092bc10535b8b65647a3d14b10ca1b94c8c
+  Author: Bernerd Schaefer <bj.schaefer@gmail.com>
+  Date:   Tue Jun 28 12:59:34 2011 +0200
+
+The failures are classed in this way:
+  * Different Exception class being raised for BSON invalid keys
+  * Managing Replica Sets directly
+  * Managing Connection Pools directly
+  * XML serialization
+  * Ruby RegExp to BSON encode and decode
+
+I will fix these problems in due course
+
+Please note that the java driver handles the Replica Sets and connection pools
+If you are using Replica Sets and want to use JMongo you should be OK if you use a URI to connect.
+JMongo lets the Java driver handle reading from slaves and writing to master, although YMMV as I have not
+tested JMongo with Replica Sets yet.
+If you intend to use the fsync=true uri option to imply safe=true on your queries, at the moment you will also
+need to specify the w option in the uri. e.g. mongodb://0.0.0.0:27017/?fsync=true;w=1;

data/jmongo.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = 'jmongo'
-  s.version           = '1.1.0'
-  s.date              = '2011-10-03'
+  s.version           = '1.1.1'
+  s.date              = '2011-10-06'
   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"]
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
     lib/jmongo/version.rb
     spec/jmongo_spec.rb
     spec/spec_helper.rb
-    test-results.txt
     test/auxillary/1.4_features.rb
     test/auxillary/authentication_test.rb
     test/auxillary/autoreconnect_test.rb

data/lib/jmongo/collection.rb

@@ -219,7 +219,7 @@ module Mongo
     #   will be raised on an error. Note that a safe check requires an extra
     #   round-trip to the database.
     def save(doc, options={})
-      save_document(doc, (options[:safe] || false))
+      save_document(doc, options[:safe])
     end
 
     # Insert one or more documents into the collection.
@@ -240,9 +240,8 @@ module Mongo
     def insert(doc_or_docs, options={})
       doc_or_docs = [doc_or_docs] unless doc_or_docs.kind_of?(Array)
       doc_or_docs.collect! { |doc| @pk_factory.create_pk(doc) }
-      safe = (options[:safe] || false)
       continue = (options[:continue_on_error] || false)
-      docs = insert_documents(doc_or_docs, safe, continue)
+      docs = insert_documents(doc_or_docs, options[:safe], continue)
       docs.size == 1 ? docs.first['_id'] : docs.collect{|doc| doc['_id']}
     end
     alias_method :<<, :insert
@@ -269,8 +268,7 @@ module Mongo
     #
     # @core remove remove-instance_method
     def remove(selector={}, options={})
-      safe = (options[:safe] || false)
-      remove_documents(selector,safe)
+      remove_documents(selector,options[:safe])
     end
 
     # Update a single document in this collection.
@@ -295,8 +293,7 @@ module Mongo
     # @core update update-instance_method
     def update(selector, document, options={})
       upsert, multi = !!(options[:upsert]), !!(options[:multi])
-      safe = (options[:safe] || false)
-      update_documents(selector, document, upsert, multi, safe)
+      update_documents(selector, document, upsert, multi, options[:safe])
     end
 
     # Create a new index.

data/lib/jmongo/mongo/collection.rb

@@ -76,7 +76,7 @@ module Mongo
       end
 
       def remove_documents(obj, safe=nil)
-        concern = write_concern(safe)
+        concern = @db.write_concern(safe)
         wr = @j_collection.remove(to_dbobject(obj), concern)
         return from_dbobject(wr.last_error(concern)) if concern.call_get_last_error
         true
@@ -85,7 +85,7 @@ module Mongo
       ## Note: refactor when java driver fully supports continue_on_error
       def insert_documents(obj, safe=nil, continue_on_error=false)
         to_do = [obj].flatten
-        concern = write_concern(safe)
+        concern = @db.write_concern(safe)
         if continue_on_error
           out = []
           to_do.each do |doc|
@@ -145,7 +145,7 @@ module Mongo
 
       def update_documents(selector, document, upsert=false, multi=false, safe=nil)
         begin
-          @j_collection.update(to_dbobject(selector),to_dbobject(document), upsert, multi, write_concern(safe))
+          @j_collection.update(to_dbobject(selector),to_dbobject(document), upsert, multi, @db.write_concern(safe))
         rescue => ex
           if ex.message =~ /E11001/
             msg = "Failed to update document #{document.inspect}, duplicate key"
@@ -160,7 +160,7 @@ module Mongo
       def save_document(obj, safe=nil)
         @pk_factory.create_pk(obj)
         db_obj = to_dbobject(obj)
-        concern = write_concern(safe)
+        concern = @db.write_concern(safe)
         begin
           @j_collection.save( db_obj, concern )
         rescue => ex

data/lib/jmongo/mongo/db.rb

@@ -6,6 +6,24 @@ module Mongo
       SYSTEM_NAMESPACE_COLLECTION = "system.namespaces"
       SYSTEM_PROFILE_COLLECTION = "system.profile"
 
+      #@collection.save({:doc => 'foo'}, :safe => nil)       ---> NONE = new WriteConcern(-1)
+      #@collection.save({:doc => 'foo'}, :safe => true)        ---> NORMAL = new WriteConcern(0)
+      #@collection.save({:doc => 'foo'}, :safe => {:w => 2})   ---> new WriteConcern( 2 , 0 , false)
+      #@collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200})                 ---> new WriteConcern( 2 , 200 , false)
+      #@collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200, :fsync => true}) ---> new WriteConcern( 2 , 0 , true)
+      #@collection.save({:doc => 'foo'}, :safe => {:fsync => true}) ---> FSYNC_SAFE = new WriteConcern( 1 , 0 , true)
+
+      def write_concern(safe)
+        return @j_db.write_concern if safe.nil?
+        return JMongo::WriteConcern.new(0) if safe.is_a?(FalseClass)
+        return JMongo::WriteConcern.new(1) if safe.is_a?(TrueClass)
+        return JMongo::WriteConcern.new(0) unless safe.is_a?(Hash)
+        w = safe[:w] || 1
+        t = safe[:wtimeout] || 0
+        f = !!(safe[:fsync] || false)
+        JMongo::WriteConcern.new(w, t, f) #dont laugh!
+      end
+
       private
 
       def exec_command(cmd)
@@ -25,7 +43,6 @@ module Mongo
       def get_last_error
         from_dbobject @j_db.get_last_error
       end
-
     end
   end
 end

data/lib/jmongo/mongo/utils.rb

@@ -62,7 +62,7 @@ module Mongo
 
       def from_dbobject obj
         # for better upstream compatibility make the objects into ruby hash or array
-        
+
         case obj
         when Java::ComMongodb::BasicDBObject, Java::ComMongodb::CommandResult
           h = obj.hashify
@@ -113,24 +113,6 @@ module Mongo
         end
         list
       end
-
-      #@collection.save({:doc => 'foo'}, :safe => nil)       ---> NONE = new WriteConcern(-1)
-      #@collection.save({:doc => 'foo'}, :safe => true)        ---> NORMAL = new WriteConcern(0)
-      #@collection.save({:doc => 'foo'}, :safe => {:w => 2})   ---> new WriteConcern( 2 , 0 , false)
-      #@collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200})                 ---> new WriteConcern( 2 , 200 , false)
-      #@collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200, :fsync => true}) ---> new WriteConcern( 2 , 0 , true)
-      #@collection.save({:doc => 'foo'}, :safe => {:fsync => true}) ---> FSYNC_SAFE = new WriteConcern( 1 , 0 , true)
-
-      def write_concern(safe)
-        return JMongo::WriteConcern.new(-1) if safe.nil?
-        return JMongo::WriteConcern.new(0) if safe.is_a?(FalseClass)
-        return JMongo::WriteConcern.new(1) if safe.is_a?(TrueClass)
-        return JMongo::WriteConcern.new(0) unless safe.is_a?(Hash)
-        w = safe[:w] || 1
-        t = safe[:wtimeout] || 0
-        f = !!(safe[:fsync] || false)
-        JMongo::WriteConcern.new(w, t, f) #dont laugh!
-      end
     end
   end
 end

data/lib/jmongo/version.rb

@@ -1,3 +1,3 @@
 module Mongo
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,62 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: jmongo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  prerelease:
+  version: 1.1.1
 platform: ruby
 authors:
 - Chuck Remes
 - Guy Boertje
 - Lee Henson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000 Z
+date: 2011-10-06 00:00:00.000000000 +01:00
+default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &21113940 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2202 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-  type: :runtime
+    none: false
+  requirement: *2202
   prerelease: false
-  version_requirements: *21113940
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &21113180 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2220 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-  type: :development
+    none: false
+  requirement: *2220
   prerelease: false
-  version_requirements: *21113180
+  type: :development
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &21112600 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2238 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-  type: :development
+    none: false
+  requirement: *2238
   prerelease: false
-  version_requirements: *21112600
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21112020 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2254 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-  type: :development
+    none: false
+  requirement: *2254
   prerelease: false
-  version_requirements: *21112020
+  type: :development
 description: Thin jruby wrapper around Mongo Java Driver
 email:
 - cremes@mac.com
@@ -93,7 +94,6 @@ files:
 - lib/jmongo/version.rb
 - spec/jmongo_spec.rb
 - spec/spec_helper.rb
-- test-results.txt
 - test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
@@ -164,28 +164,30 @@ files:
 - test/unit/read_test.rb
 - test/unit/safe_test.rb
 - test/uri_test.rb
+has_rdoc: true
 homepage: http://github.com/guyboertje/jmongo
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.5.1
+signing_key:
 specification_version: 3
 summary: Thin ruby wrapper around Mongo Java Driver; for JRuby only
 test_files: []
+...

data/test-results.txt

@@ -1,98 +0,0 @@
-Loaded suite ./test/collection_test
-Started
-"test_map_reduce_with_raw_response"
-"function() { emit(this.user_id, 1); }"
-"function(k,vals) { return 1; }"
-{
-        "result" => "foo",
-    "timeMillis" => 18,
-        "timing" => {
-         "mapTime" => 0,
-        "emitLoop" => 17,
-           "total" => 18
-    },
-        "counts" => {
-         "input" => 3,
-          "emit" => 3,
-        "output" => 3
-    },
-            "ok" => 1.0
-}
-........."test_map_reduce_with_output_collection"
-"function() { emit(this.user_id, 1); }"
-"function(k,vals) { return 1; }"
-{
-        "result" => "test-map-coll",
-    "timeMillis" => 1,
-        "timing" => {
-         "mapTime" => 0,
-        "emitLoop" => 0,
-           "total" => 1
-    },
-        "counts" => {
-         "input" => 3,
-          "emit" => 3,
-        "output" => 3
-    },
-            "ok" => 1.0
-}
-....."test_map_reduce_with_code_objects"
-"function() { emit(this.user_id, 1); }"
-"function(k,vals) { return 1; }"
-{
-        "result" => "foo",
-    "timeMillis" => 1,
-        "timing" => {
-         "mapTime" => 0,
-        "emitLoop" => 0,
-           "total" => 1
-    },
-        "counts" => {
-         "input" => 2,
-          "emit" => 2,
-        "output" => 2
-    },
-            "ok" => 1.0
-}
-..."test_map_reduce_with_options"
-"function() { emit(this.user_id, 1); }"
-"function(k,vals) { return 1; }"
-{
-        "result" => "foo",
-    "timeMillis" => 1,
-        "timing" => {
-         "mapTime" => 0,
-        "emitLoop" => 0,
-           "total" => 1
-    },
-        "counts" => {
-         "input" => 2,
-          "emit" => 2,
-        "output" => 2
-    },
-            "ok" => 1.0
-}
-.."test_map_reduce"
-"function() { emit(this.user_id, 1); }"
-"function(k,vals) { return 1; }"
-{
-        "result" => "foo",
-    "timeMillis" => 1,
-        "timing" => {
-         "mapTime" => 0,
-        "emitLoop" => 0,
-           "total" => 1
-    },
-        "counts" => {
-         "input" => 2,
-          "emit" => 2,
-        "output" => 2
-    },
-            "ok" => 1.0
-}
-..............
-Finished in 0.304000 seconds.
-
-33 tests, 94 assertions, 0 failures, 0 errors, 0 skips
-
-Test run options: --seed 45344