mongo 0.18.3 → 0.19

data/bin/objectid_benchmark.rb

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'mongo'
-require 'benchmark'
-
-TRIALS = 500000
-
-include Mongo
-
-Benchmark.bm do |x|
-
-  x.report('original') do
-    TRIALS.times do
-      ObjectID.new(nil, true)
-    end
-  end
-
-  x.report('new') do
-    TRIALS.times do
-      ObjectID.new(nil, false)
-    end
-  end
-
-end

data/bin/perf.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'mongo'
-require 'benchmark'
-require 'socket'
-require 'digest/md5'
-require 'thread'
-
-include Mongo
-
-c  = Mongo::Connection.new('localhost', 27017, :pool_size => 10)
-coll = c['perf']['docs']
-coll.remove
-
-doc = {'name' => 'kyle', 
-       'languages' => ['ruby', 'javascript', 'c'],
-       'date'      => Time.now}
-
-TRIES = 5000
-@threads = []
-100.times do |n|
-  @threads << Thread.new do
-    50.times do |n|
-    doc['n'] = n*n
-    coll.insert(doc)
-    doc.delete(:_id)
-    end
-  end
-end
-@threads.join

data/lib/mongo/admin.rb

@@ -1,95 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-# ++
-
-module Mongo
-
-  # @deprecated this class is deprecated. Methods defined here will 
-  #   henceforth be available in Mongo::DB.
-  class Admin
-
-    def initialize(db)
-      warn "The Admin class has been DEPRECATED. All admin methods now exist in DB."
-      @db = db
-    end
-
-    # Return the current database profiling level.
-    #
-    # @return [Symbol] :off, :slow_only, or :all
-    #
-    # @deprecated please use DB#profiling_level instead.
-    def profiling_level
-      warn "Admin#profiling_level has been DEPRECATED. Please use DB#profiling_level instead."
-      oh = OrderedHash.new
-      oh[:profile] = -1
-      doc = @db.command(oh)
-      raise "Error with profile command: #{doc.inspect}" unless @db.ok?(doc) && doc['was'].kind_of?(Numeric)
-      case doc['was'].to_i
-      when 0
-        :off
-      when 1
-        :slow_only
-      when 2
-        :all
-      else
-        raise "Error: illegal profiling level value #{doc['was']}"
-      end
-    end
-
-    # Set database profiling level to :off, :slow_only, or :all.
-    #
-    # @deprecated please use DB#profiling_level= instead.
-    def profiling_level=(level)
-      warn "Admin#profiling_level= has been DEPRECATED. Please use DB#profiling_level= instead."
-      oh = OrderedHash.new
-      oh[:profile] = case level
-                     when :off
-                       0
-                     when :slow_only
-                       1
-                     when :all
-                       2
-                     else
-                       raise "Error: illegal profiling level value #{level}"
-                     end
-      doc = @db.command(oh)
-      raise "Error with profile command: #{doc.inspect}" unless @db.ok?(doc)
-    end
-
-    # Returns an array containing current profiling information.
-    #
-    # @deprecated please use DB#profiling_info instead.
-    def profiling_info
-      warn "Admin#profiling_info has been DEPRECATED. Please use DB#profiling_info instead."
-      Cursor.new(Collection.new(@db, DB::SYSTEM_PROFILE_COLLECTION), :selector => {}).to_a
-    end
-
-    # Validate a named collection by raising an exception if there is a
-    # problem or returning an interesting hash (see especially the
-    # 'result' string value) if all is well.
-    #
-    # @deprecated please use DB#validate_collection instead.
-    def validate_collection(name)
-      warn "Admin#validate_collection has been DEPRECATED. Please use DB#validate_collection instead."
-      doc = @db.command(:validate => name)
-      raise "Error with validate command: #{doc.inspect}" unless @db.ok?(doc)
-      result = doc['result']
-      raise "Error with validation data: #{doc.inspect}" unless result.kind_of?(String)
-      raise "Error: invalid collection #{name}: #{doc.inspect}" if result =~ /\b(exception|corrupt)\b/i
-      doc
-    end
-
-  end
-end

data/lib/mongo/util/xml_to_ruby.rb

@@ -1,112 +0,0 @@
-# --
-# Copyright (C) 2008-2009 10gen Inc.
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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'
-require 'mongo'
-
-# @deprecated
-# Converts a .xson file (an XML file that describes a Mongo-type document) to
-# an OrderedHash.
-class XMLToRuby
-
-  include Mongo
-
-  def xml_to_ruby(io)
-    warn "XMLToRuby is deprecated. The .xson format is not longer in use."
-    doc = REXML::Document.new(io)
-    doc_to_ruby(doc.root.elements['doc'])
-  end
-
-  protected
-
-  def element_to_ruby(e)
-    warn "XMLToRuby is deprecated. The .xson format is not longer in use."
-    type = e.name
-    child = e.elements[1]
-    case type
-    when 'oid'
-      ObjectID.from_string(e.text)
-    when 'ref'
-      dbref_to_ruby(e.elements)
-    when 'int'
-      e.text.to_i
-    when 'number'
-      e.text.to_f
-    when 'string'
-      e.text.to_s
-    when 'code'
-      Code.new(e.text.to_s)
-    when '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'
-      e.text.to_s == 'true'
-    when 'array'
-      array_to_ruby(e.elements)
-    when 'date'
-      Time.at(e.text.to_f / 1000.0)
-    when 'regex'
-      regex_to_ruby(e.elements)
-    when 'null'
-      nil
-    when 'doc'
-      doc_to_ruby(e)
-    else
-      raise "Unknown type #{type} in element with name #{e.attributes['name']}"
-    end
-  end
-
-  def doc_to_ruby(element)
-    warn "XMLToRuby is deprecated. The .xson format is not longer in use."
-    oh = OrderedHash.new
-    element.elements.each { |e| oh[e.attributes['name']] = element_to_ruby(e) }
-    oh
-  end
-
-  def array_to_ruby(elements)
-    warn "XMLToRuby is deprecated. The .xson format is not longer in use."
-    a = []
-    elements.each { |e|
-      index_str = e.attributes['name']
-      a[index_str.to_i] = element_to_ruby(e)
-    }
-    a
-  end
-
-  def regex_to_ruby(elements)
-    warn "XMLToRuby is deprecated. The .xson format is not longer in use."
-    pattern = elements['pattern'].text
-    options_str = elements['options'].text || ''
-
-    options = 0
-    options |= Regexp::IGNORECASE if options_str.include?('i')
-    options |= Regexp::MULTILINE if options_str.include?('m')
-    options |= Regexp::EXTENDED if options_str.include?('x')
-    Regexp.new(pattern, options)
-  end
-
-  def dbref_to_ruby(elements)
-    warn "XMLToRuby is deprecated. The .xson format is not longer in use."
-    ns = elements['ns'].text
-    oid_str = elements['oid'].text
-    DBRef.new(ns, ObjectID.from_string(oid_str))
-  end
-
-end

data/test/test_admin.rb

@@ -1,67 +0,0 @@
-require 'test/test_helper'
-
-# NOTE: assumes Mongo is running
-class AdminTest < Test::Unit::TestCase
-
-  include Mongo
-
-  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
-  @@coll = @@db.collection('test')
-
-  def setup
-    # Insert some data to make sure the database itself exists.
-    @@coll.remove
-    @r1 = @@coll.insert('a' => 1) # collection not created until it's used
-    @@coll_full_name = 'ruby-mongo-test.test'
-    @admin = @@db.admin
-  end
-
-  def teardown
-    @admin.profiling_level = :off
-    @@coll.remove if @@coll
-    @@db.error
-  end
-
-  def test_default_profiling_level
-    assert_equal :off, @admin.profiling_level
-  end
-
-  def test_change_profiling_level
-    @admin.profiling_level = :slow_only
-    assert_equal :slow_only, @admin.profiling_level
-    @admin.profiling_level = :off
-    assert_equal :off, @admin.profiling_level
-    @admin.profiling_level = :all
-    assert_equal :all, @admin.profiling_level
-    begin
-      @admin.profiling_level = :medium
-      fail "shouldn't be able to do this"
-    rescue
-    end
-  end
-
-  def test_profiling_info
-    # Perform at least one query while profiling so we have something to see.
-    @admin.profiling_level = :all
-    @@coll.find()
-    @admin.profiling_level = :off
-
-    info = @admin.profiling_info
-    assert_kind_of Array, info
-    assert info.length >= 1
-    first = info.first
-    assert_kind_of String, first['info']
-    assert_kind_of Time, first['ts']
-    assert_kind_of Numeric, first['millis']
-  end
-
-  def test_validate_collection
-    doc = @admin.validate_collection(@@coll.name)
-    assert_not_nil doc
-    result = doc['result']
-    assert_not_nil result
-    assert_match /firstExtent/, result
-  end
-
-end

data/test/test_round_trip.rb

@@ -1,114 +0,0 @@
-HERE = File.dirname(__FILE__)
-$LOAD_PATH[0,0] = File.join(HERE, '..', 'lib')
-require 'test/test_helper'
-require 'mongo/util/xml_to_ruby'
-
-# For each xml/bson file in the data subdirectory, we turn the XML into an
-# OrderedHash and then test both Ruby-to-BSON and BSON-to-Ruby translations.
-#
-# There is a whole other project that includes similar tests
-# (http://github.com/mongodb/mongo-qa). If the directory ../../mongo-qa
-# exists, (that is, the top-level dir of mongo-qa is next to the top-level dir
-# of this project), then we find the BSON test files there and use those, too.
-class RoundTripTest < Test::Unit::TestCase
-
-  include Mongo
-
-  @@ruby = nil
-
-  def setup
-    unless @@ruby
-      names = Dir[File.join(HERE, 'data', '*.xml')].collect {|f| File.basename(f).sub(/\.xml$/, '') }
-      @@ruby = {}
-      names.each { |name|
-        File.open(File.join(HERE, 'data', "#{name}.xml")) { |f|
-          @@ruby[name] = XMLToRuby.new.xml_to_ruby(f)
-        }
-      }
-    end
-  end
-
-  def test_dummy
-    assert true
-  end
-
-  def self.create_test_for_round_trip_files_in_dir(dir)
-    names = Dir[File.join(dir, '*.xson')].collect {|f| File.basename(f).sub(/\.xson$/, '') }
-    names.each { |name|
-      eval <<EOS
-def test_#{name}_#{dir.gsub(/[^a-zA-Z0-9_]/, '_')}
-  one_round_trip("#{dir}", "#{name}")
-end
-EOS
-    }
-  end
-
-  # Dynamically generate one test for each test file. This way, if one test
-  # fails the others will still run.
-  create_test_for_round_trip_files_in_dir(File.join(HERE, 'data'))
-  mongo_qa_dir = File.join(HERE, '../..', 'mongo-qa/modules/bson_tests/tests')
-  if File.exist?(mongo_qa_dir)
-    %w(basic_types complex single_types).each { |subdir_name|
-      create_test_for_round_trip_files_in_dir(File.join(mongo_qa_dir, subdir_name))
-    }
-  end
-
-  # Round-trip comparisons of Ruby-to-BSON and back.
-  # * Take the objects that were read from XML
-  # * Turn them into BSON bytes
-  # * Compare that with the BSON files we have
-  # * Turn those BSON bytes back in to Ruby objects
-  # * Turn them back into BSON bytes
-  # * Compare that with the BSON files we have (or the bytes that were already
-  #   generated)
-  def one_round_trip(dir, name)
-    obj = File.open(File.join(dir, "#{name}.xson")) { |f|
-      begin
-        XMLToRuby.new.xml_to_ruby(f)
-      rescue => ex # unsupported type
-        return
-      end
-    }
-
-    File.open(File.join(dir, "#{name}.bson"), 'rb') { |f|
-      # Read the BSON from the file
-      bson = f.read
-
-      # Turn the Ruby object into BSON bytes and compare with the BSON bytes
-      # from the file.
-      bson_from_ruby = BSON.serialize(obj)
-
-      begin
-        assert_equal bson.length, bson_from_ruby.to_s.length
-        assert_equal bson, bson_from_ruby.to_s
-      rescue => ex
-#         File.open(File.join(dir, "#{name}_out_a.bson"), 'wb') { |f| # DEBUG
-#           bson_from_ruby.each { |b| f.putc(b) }
-#         }
-        raise ex
-      end
-
-      # Turn those BSON bytes back into a Ruby object.
-      #
-      # We're passing a nil db to the contructor here, but that's OK because
-      # the BSON DBRef bytes don't contain the db object in any case, and we
-      # don't care what the database is.
-      obj_from_bson = BSON.deserialize(bson_from_ruby)
-      assert_kind_of OrderedHash, obj_from_bson
-
-      # Turn that Ruby object into BSON and compare it to the original BSON
-      # bytes.
-      bson_from_ruby = BSON.serialize(obj_from_bson)
-      begin
-        assert_equal bson.length, bson_from_ruby.to_s.length
-        assert_equal bson, bson_from_ruby.to_s
-      rescue => ex
-#         File.open(File.join(dir, "#{name}_out_b.bson"), 'wb') { |f| # DEBUG
-#           bson_from_ruby.each { |b| f.putc(b) }
-#         }
-        raise ex
-      end
-    }
-  end
-
-end