mongo 0.1.0 → 0.15

data/lib/mongo/util/byte_buffer.rb

@@ -1,17 +1,17 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # ++
 
 # A byte buffer.
@@ -66,14 +66,10 @@ class ByteBuffer
     @cursor += array.length
   end
 
-  if RUBY_VERSION >= '1.9'
-    def put_int(i, offset=nil)
-      put_array([i].pack(@int_pack_order).split(//).collect{|c| c.bytes.first}, offset)
-    end
-  else
-    def put_int(i, offset=nil)
-      put_array([i].pack(@int_pack_order).split(//).collect{|c| c[0]}, offset)
-    end
+  def put_int(i, offset=nil)
+    a = []
+    [i].pack(@int_pack_order).each_byte { |b| a << b }
+    put_array(a, offset)
   end
 
   def put_long(i, offset=nil)
@@ -87,14 +83,10 @@ class ByteBuffer
     end
   end
 
-  if RUBY_VERSION >= '1.9'
-    def put_double(d, offset=nil)
-      put_array([d].pack(@double_pack_order).split(//).collect{|c| c.bytes.first}, offset)
-    end
-  else
-    def put_double(d, offset=nil)
-      put_array([d].pack(@double_pack_order).split(//).collect{|c| c[0]}, offset)
-    end
+  def put_double(d, offset=nil)
+    a = []
+    [d].pack(@double_pack_order).each_byte { |b| a << b }
+    put_array(a, offset)
   end
 
   # If +size+ == nil, returns one byte. Else returns array of bytes of length
@@ -108,7 +100,11 @@ class ByteBuffer
     if one_byte
       @buf[start]
     else
-      @buf[start, len]
+      if @buf.respond_to? "unpack"
+        @buf[start, len].unpack("C*")
+      else
+        @buf[start, len]
+      end
     end
   end
 
@@ -143,11 +139,19 @@ class ByteBuffer
   end
 
   def to_a
-    @buf
+    if @buf.respond_to? "unpack"
+      @buf.unpack("C*")
+    else
+      @buf
+    end
   end
 
   def to_s
-    @buf.pack("C*")
+    if @buf.respond_to? "pack"
+      @buf.pack("C*")
+    else
+      @buf
+    end
   end
 
   def dump

data/lib/mongo/util/ordered_hash.rb

@@ -1,17 +1,17 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # ++
 
 # A hash in which the order of keys are preserved.
@@ -20,49 +20,95 @@
 # Hash already keeps its keys ordered by order of insertion.
 class OrderedHash < Hash
 
+  def ==(other)
+    begin
+      !other.nil? &&
+        keys == other.keys &&
+        values == other.values
+    rescue
+      false
+    end
+  end
+
   # We only need the body of this class if the RUBY_VERSION is before 1.9
   if RUBY_VERSION < '1.9'
+    attr_accessor :ordered_keys
 
-  attr_accessor :ordered_keys
+    def self.[] *args
+      oh = OrderedHash.new
+      if Hash === args[0]
+        oh.merge! args[0]
+      elsif (args.size % 2) != 0
+        raise ArgumentError, "odd number of elements for Hash"
+      else
+        0.step(args.size - 1, 2) do |key|
+          value = key + 1
+          oh[args[key]] = args[value]
+        end
+      end
+      oh
+    end
 
-  def keys
-    @ordered_keys || []
-  end
+    def initialize(*a, &b)
+      super
+      @ordered_keys = []
+    end
 
-  def []=(key, value)
-    @ordered_keys ||= []
-    @ordered_keys << key unless @ordered_keys.include?(key)
-    super(key, value)
-  end
+    def keys
+      @ordered_keys || []
+    end
 
-  def each
-    @ordered_keys ||= []
-    @ordered_keys.each { |k| yield k, self[k] }
-  end
+    def []=(key, value)
+      @ordered_keys ||= []
+      @ordered_keys << key unless @ordered_keys.include?(key)
+      super(key, value)
+    end
 
-  def values
-    collect { |k, v| v }
-  end
+    def each
+      @ordered_keys ||= []
+      @ordered_keys.each { |k| yield k, self[k] }
+      self
+    end
 
-  def merge(other)
-    oh = self.dup
-    oh.merge!(other)
-    oh
-  end
+    def values
+      collect { |k, v| v }
+    end
 
-  def merge!(other)
-    @ordered_keys ||= []
-    @ordered_keys += other.keys # unordered if not an OrderedHash
-    @ordered_keys.uniq!
-    super(other)
-  end
+    def merge(other)
+      oh = self.dup
+      oh.merge!(other)
+      oh
+    end
 
-  def inspect
-    str = '{'
-    str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
-    str << '}'
-  end
+    def merge!(other)
+      @ordered_keys ||= []
+      @ordered_keys += other.keys # unordered if not an OrderedHash
+      @ordered_keys.uniq!
+      super(other)
+    end
 
-  end                           # Ruby before 1.9
+    def inspect
+      str = '{'
+      str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
+      str << '}'
+    end
 
+    def delete(key, &block)
+      @ordered_keys.delete(key) if @ordered_keys
+      super
+    end
+
+    def delete_if(&block)
+      self.each { |k,v|
+        if yield k, v
+          delete(k)
+        end
+      }
+    end
+
+    def clear
+      super
+      @ordered_keys = []
+    end
+  end
 end

data/lib/mongo/util/xml_to_ruby.rb

@@ -1,17 +1,17 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # ++
 
 require 'rexml/document'
@@ -21,7 +21,7 @@ require 'mongo'
 # an OrderedHash.
 class XMLToRuby
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def xml_to_ruby(io)
     doc = REXML::Document.new(io)
@@ -42,10 +42,15 @@ class XMLToRuby
       e.text.to_i
     when 'number'
       e.text.to_f
-    when 'string', 'code'
+    when 'string'
       e.text.to_s
+    when 'code'
+      Code.new(e.text.to_s)
     when 'binary'
-      Base64.decode64(e.text.to_s).to_mongo_binary
+      bin = Binary.new
+      decoded = Base64.decode64(e.text.to_s)
+      decoded.each_byte { |b| bin.put(b) }
+      bin
     when 'symbol'
       e.text.to_s.intern
     when 'boolean'
@@ -58,8 +63,6 @@ class XMLToRuby
       regex_to_ruby(e.elements)
     when 'null'
       nil
-    when 'undefined'
-      Undefined.new
     when 'doc'
       doc_to_ruby(e)
     else
@@ -96,7 +99,7 @@ class XMLToRuby
   def dbref_to_ruby(elements)
     ns = elements['ns'].text
     oid_str = elements['oid'].text
-    DBRef.new(nil, nil, nil, ns, ObjectID.from_string(oid_str))
+    DBRef.new(ns, ObjectID.from_string(oid_str))
   end
 
 end

data/mongo-ruby-driver.gemspec

@@ -0,0 +1,103 @@
+# We need to list all of the included files because we aren't allowed to use
+# Dir[...] in the github sandbox.
+PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
+                 'bin/bson_benchmark.rb',
+                 'bin/mongo_console',
+                 'bin/run_test_script',
+                 'bin/standard_benchmark',
+                 'examples/admin.rb',
+                 'examples/benchmarks.rb',
+                 'examples/blog.rb',
+                 'examples/capped.rb',
+                 'examples/cursor.rb',
+                 'examples/gridfs.rb',
+                 'examples/index_test.rb',
+                 'examples/info.rb',
+                 'examples/queries.rb',
+                 'examples/simple.rb',
+                 'examples/strict.rb',
+                 'examples/types.rb',
+                 'lib/mongo/admin.rb',
+                 'lib/mongo/collection.rb',
+                 'lib/mongo/connection.rb',
+                 'lib/mongo/cursor.rb',
+                 'lib/mongo/db.rb',
+                 'lib/mongo/gridfs/chunk.rb',
+                 'lib/mongo/gridfs/grid_store.rb',
+                 'lib/mongo/gridfs.rb',
+                 'lib/mongo/errors.rb',
+                 'lib/mongo/message/get_more_message.rb',
+                 'lib/mongo/message/insert_message.rb',
+                 'lib/mongo/message/kill_cursors_message.rb',
+                 'lib/mongo/message/message.rb',
+                 'lib/mongo/message/message_header.rb',
+                 'lib/mongo/message/msg_message.rb',
+                 'lib/mongo/message/opcodes.rb',
+                 'lib/mongo/message/query_message.rb',
+                 'lib/mongo/message/remove_message.rb',
+                 'lib/mongo/message/update_message.rb',
+                 'lib/mongo/message.rb',
+                 'lib/mongo/query.rb',
+                 'lib/mongo/types/binary.rb',
+                 'lib/mongo/types/code.rb',
+                 'lib/mongo/types/dbref.rb',
+                 'lib/mongo/types/objectid.rb',
+                 'lib/mongo/types/regexp_of_holding.rb',
+                 'lib/mongo/util/bson.rb',
+                 'lib/mongo/util/byte_buffer.rb',
+                 'lib/mongo/util/ordered_hash.rb',
+                 'lib/mongo/util/xml_to_ruby.rb',
+                 'lib/mongo.rb']
+TEST_FILES = ['test/mongo-qa/_common.rb',
+              'test/mongo-qa/admin',
+              'test/mongo-qa/capped',
+              'test/mongo-qa/count1',
+              'test/mongo-qa/dbs',
+              'test/mongo-qa/find',
+              'test/mongo-qa/find1',
+              'test/mongo-qa/gridfs_in',
+              'test/mongo-qa/gridfs_out',
+              'test/mongo-qa/indices',
+              'test/mongo-qa/remove',
+              'test/mongo-qa/stress1',
+              'test/mongo-qa/test1',
+              'test/mongo-qa/update',
+              'test/test_admin.rb',
+              'test/test_bson.rb',
+              'test/test_byte_buffer.rb',
+              'test/test_chunk.rb',
+              'test/test_collection.rb',
+              'test/test_connection.rb',
+              'test/test_cursor.rb',
+              'test/test_db.rb',
+              'test/test_db_api.rb',
+              'test/test_db_connection.rb',
+              'test/test_grid_store.rb',
+              'test/test_message.rb',
+              'test/test_objectid.rb',
+              'test/test_ordered_hash.rb',
+              'test/test_threading.rb',
+              'test/test_round_trip.rb']
+
+Gem::Specification.new do |s|
+  s.name = 'mongo'
+
+  # be sure to change this constant in lib/mongo.rb as well
+  s.version = '0.15'
+
+  s.platform = Gem::Platform::RUBY
+  s.summary = 'Ruby driver for the MongoDB'
+  s.description = 'A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.'
+
+  s.require_paths = ['lib']
+  s.files = PACKAGE_FILES
+  s.test_files = TEST_FILES
+
+  s.has_rdoc = true
+  s.rdoc_options = ['--main', 'README.rdoc', '--inline-source']
+  s.extra_rdoc_files = ['README.rdoc']
+
+  s.authors = ['Jim Menard', 'Mike Dirolf']
+  s.email = 'mongodb-dev@googlegroups.com'
+  s.homepage = 'http://www.mongodb.org'
+end

data/test/mongo-qa/_common.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '../..', 'lib')
+require 'mongo'
+
+DEFAULT_HOST = '127.0.0.1'
+DEFAULT_PORT = 27017
+DEFAULT_DB = 'driver_test_framework'
+
+include Mongo

data/test/mongo-qa/admin

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '_common.rb')
+db = Connection.new(DEFAULT_HOST, DEFAULT_PORT).db(DEFAULT_DB)
+
+db.collection('test').insert({'test' => 1})
+admin = db.admin
+
+if $DEBUG
+  db.drop_collection('tester')
+  admin.profiling_level = :slow_only
+end
+
+['test', 'pdlskwmf', '$'].each { |name|
+  begin
+    admin.validate_collection(name)
+    puts 'true'
+  rescue => ex
+    puts 'false'
+  end
+}
+
+level_xlation = {:off => 'off', :all => 'all', :slow_only => 'slowOnly'}
+puts level_xlation[admin.profiling_level]
+admin.profiling_level = :off
+puts level_xlation[admin.profiling_level]