jmongo 1.1.1 → 1.1.2

data/test/test_helper.rb

@@ -51,20 +51,26 @@ unless defined? TEST_HOST
   TEST_HOST = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
 end
 
-class MiniTest::Unit::TestCase
-  include Mongo
-  include BSON
+unless defined? TEST_URI
+  TEST_URI = "mongodb://localhost"
+end
+
+module Cfg
+  def self.connection(options={})
+    #@con ||= Mongo::Connection.from_uri(TEST_URI)
+    @con ||= Mongo::Connection.new(TEST_HOST, TEST_PORT)
+  end
 
-  def self.standard_connection(options={})
-    Connection.new(TEST_HOST, TEST_PORT, options)
+  def self.conn
+    connection
   end
 
-  def standard_connection(options={})
-    self.class.standard_connection(options)
+  def self.new_connection(options={})
+    Mongo::Connection.from_uri(TEST_URI, options)
   end
 
   def self.host_port
-    "#{mongo_host}:#{mongo_port}"
+    "#{TEST_HOST}:#{TEST_PORT}"
   end
 
   def self.mongo_host
@@ -75,18 +81,37 @@ class MiniTest::Unit::TestCase
     TEST_PORT
   end
 
-  def host_port
-    self.class.host_port
+  def self.db
+    @db ||= @con.db(MONGO_TEST_DB)
+  end
+
+  def self.version
+    @con.server_version
+  end
+
+  def self.clear_all
+    @db.collection_names.each do |n|
+      @db.drop_collection(n) unless n =~ /system/
+    end
   end
 
-  def mongo_host
-    self.class.mongo_host
+  def self.test
+    @db.collection("test")
   end
 
-  def mongo_port
-    self.class.mongo_port
+  def self.coll
+    test
   end
 
+  def self.coll_full_name
+    "#{MONGO_TEST_DB}.test"
+  end
+end
+
+class MiniTest::Unit::TestCase
+  include Mongo
+  include BSON 
+
   def new_mock_socket(host='localhost', port=27017)
     socket = Object.new
     socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
@@ -98,6 +123,10 @@ class MiniTest::Unit::TestCase
     db = Object.new
   end
 
+  def assert_not_nil arg, msg = ""
+    refute_nil arg, msg
+  end
+
   def assert_raise_error(klass, message)
     begin
       yield

metadata

@@ -1,63 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: jmongo
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.1.1
+  version: 1.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Chuck Remes
 - Guy Boertje
 - Lee Henson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000 +01:00
-default_executable:
+date: 2011-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  version_requirements: &2202 !ruby/object:Gem::Requirement
+  requirement: &10546520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    none: false
-  requirement: *2202
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *10546520
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  version_requirements: &2220 !ruby/object:Gem::Requirement
+  requirement: &10546040 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-    none: false
-  requirement: *2220
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *10546040
 - !ruby/object:Gem::Dependency
   name: fuubar
-  version_requirements: &2238 !ruby/object:Gem::Requirement
+  requirement: &10545480 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-    none: false
-  requirement: *2238
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *10545480
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2254 !ruby/object:Gem::Requirement
+  requirement: &10544920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-    none: false
-  requirement: *2254
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *10544920
 description: Thin jruby wrapper around Mongo Java Driver
 email:
 - cremes@mac.com
@@ -164,30 +163,28 @@ 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'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.5.1
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.6
+signing_key: 
 specification_version: 3
 summary: Thin ruby wrapper around Mongo Java Driver; for JRuby only
 test_files: []
-...