mongo_doc 0.6.22 → 0.6.23

data/Gemfile.lock

@@ -2,68 +2,71 @@ PATH
   remote: .
   specs:
     mongo_doc (0.6.22)
-      activemodel (>= 3.0.0.beta.4)
-      activesupport (>= 3.0.0.beta.4)
-      bson (>= 1.0.0)
-      bson_ext (>= 1.0.0)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      bson (= 1.0.4)
+      bson_ext (= 1.0.4)
       mongo (>= 1.0.0)
       tzinfo (>= 0.3.22)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activesupport (3.0.0.beta4)
+    activesupport (3.0.0)
     bson (1.0.4)
     bson_ext (1.0.4)
     builder (2.1.2)
-    cucumber (0.8.5)
+    cucumber (0.9.2)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
+      gherkin (~> 2.2.5)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
     gemcutter (0.6.1)
-    gherkin (2.1.5)
-      trollop (~> 1.16.2)
+    gherkin (2.2.8)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     git (1.2.5)
     i18n (0.4.1)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
-    json_pure (1.4.3)
-    mongo (1.0.5)
+    json (1.4.6)
+    json_pure (1.4.6)
+    mongo (1.0.7)
       bson (>= 1.0.4)
-    rspec (2.0.0.beta.18)
-      rspec-core (= 2.0.0.beta.18)
-      rspec-expectations (= 2.0.0.beta.18)
-      rspec-mocks (= 2.0.0.beta.18)
-    rspec-core (2.0.0.beta.18)
-    rspec-expectations (2.0.0.beta.18)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.18)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     term-ansicolor (1.0.5)
-    trollop (1.16.2)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (>= 3.0.0.beta.4)
-  activesupport (>= 3.0.0.beta.4)
-  bson (>= 1.0.0)
-  bson_ext (>= 1.0.0)
+  activemodel (>= 3.0.0)
+  activesupport (>= 3.0.0)
+  bson (= 1.0.4)
+  bson_ext (= 1.0.4)
   cucumber (>= 0.8.5)
   jeweler (>= 1.4.0)
   mongo (>= 1.0.0)
   mongo_doc!
-  rspec (>= 2.0.0.beta.18)
+  rspec (>= 2.0.0)
   tzinfo (>= 0.3.22)

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: 0.6.22 2010/09/08
+Version: 0.6.23 2010/10/13
 
 h2. Notes
 
@@ -156,6 +156,10 @@ Finally, if you do not want to use the database configuration file, you can also
 
 bc. MongoDoc::Connection.name = 'stats'
 
+And if that is not enough control,  perhaps you are using authentication, just set the connection directly:
+
+bc. MongoDoc::Connection.connection = Mongo::Connection.from_uri("mongodb://user:password@localhost/db")
+
 h2. Cleaning the database during testing
 
 When testing you may need to clean up and return the database to an empty state. @MongoDoc::DatabaseCleaner.clean_database@ is a helper that can be used to do this, for example with @RSpec@ (note the @require@):

data/Rakefile

@@ -4,21 +4,21 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "mongo_doc"
-    gem.summary = %Q{ODM for MongoDB}
-    gem.description = %Q{ODM for MongoDB}
+    gem.summary = "ODM for MongoDB"
+    gem.description = "ODM for MongoDB"
     gem.email = "leshill@gmail.com"
     gem.homepage = "http://github.com/leshill/mongodoc"
     gem.authors = ["Les Hill"]
     gem.files.include('lib/**/*.task')
-    gem.add_dependency "activesupport", ">= 3.0.0.beta.4"
-    gem.add_dependency "activemodel", ">=3.0.0.beta.4"
-    gem.add_dependency "bson", ">= 1.0.0"
-    gem.add_dependency "bson_ext", ">= 1.0.0"
+    gem.add_dependency "activesupport", ">= 3.0.0"
+    gem.add_dependency "activemodel", ">=3.0.0"
+    gem.add_dependency "bson", "= 1.0.4"
+    gem.add_dependency "bson_ext", "= 1.0.4"
     gem.add_dependency "mongo", ">= 1.0.0"
     gem.add_dependency "tzinfo", ">= 0.3.22"
     gem.add_development_dependency "cucumber", ">= 0.8.5"
     gem.add_development_dependency "jeweler", ">= 1.4.0"
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.18"
+    gem.add_development_dependency "rspec", ">= 2.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.6.22
+0.6.23

data/features/connection.feature

@@ -0,0 +1,13 @@
+Feature: Setting a Connection Manually
+
+  Scenario: Setting the connection manually
+    Given a new connection to the database "with_auth" with user "test" and password "test"
+    And a new collection named 'test'
+    And an object 'movie'
+    When I save the object 'movie'
+    And I query the collection 'test' with the criteria where(:title => 'Gone with the Wind')
+    Then the query result has 1 documents
+
+  Scenario: Failing auth with manual connection
+    When a new connection to the database "with_auth" with user "test" and password "bad"
+    Then a "Mongo::AuthenticationError" exception is thrown

data/features/step_definitions/connection_steps.rb

@@ -0,0 +1,13 @@
+Given /^a new connection to the database "([^"]*)" with user "([^"]*)" and password "([^"]*)"$/ do |db, user, password|
+  begin
+    MongoDoc::Connection.connection = Mongo::Connection.from_uri("mongodb://#{user}:#{password}@localhost/#{db}")
+    MongoDoc::Connection.send(:verify_server_version)
+  rescue StandardError => e
+    @exception = e
+  end
+end
+
+Then /^a "([^"]*)" exception is thrown$/ do |exception|
+  @exception.class.name.should == exception
+end
+

data/lib/mongo_doc/connection.rb

@@ -6,7 +6,7 @@ module MongoDoc
 
     extend self
 
-    attr_writer :config_path, :default_name, :env, :host, :name, :options, :port, :strict
+    attr_writer :config_path, :connection, :default_name, :env, :host, :name, :options, :port, :strict
 
     def config_path
       @config_path || './mongodb.yml'
@@ -55,13 +55,12 @@ module MongoDoc
     private
 
     def connect
-      connection = Mongo::Connection.new(host, port, options)
-      raise NoConnectionError unless connection
-      verify_server_version(connection)
+      self.connection = Mongo::Connection.new(host, port, options) || (raise NoConnectionError.new)
+      verify_server_version
       connection
     end
 
-    def verify_server_version(connection)
+    def verify_server_version
       raise UnsupportedServerVersionError.new('MongoDoc requires at least mongoDB version 1.4.0') unless connection.server_version >= "1.4.0"
     end
   end

data/lib/mongo_doc/ext/code.rb

@@ -0,0 +1,7 @@
+module BSON
+  class Code
+    def to_bson(*args)
+      self
+    end
+  end
+end

data/lib/mongo_doc/ext.rb

@@ -1,6 +1,7 @@
 require 'mongo_doc/ext/array'
 require 'mongo_doc/ext/binary'
 require 'mongo_doc/ext/boolean_class'
+require 'mongo_doc/ext/code'
 require 'mongo_doc/ext/date'
 require 'mongo_doc/ext/date_time'
 require 'mongo_doc/ext/dbref'

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.22'
+  VERSION = '0.6.23'
 end
 
 require 'mongo_doc/connection'

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.22"
+  s.version = "0.6.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-10-14}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "examples/simple_document.rb",
      "examples/simple_object.rb",
      "features/collections.feature",
+     "features/connection.feature",
      "features/db_references.feature",
      "features/embed_hash.feature",
      "features/finders.feature",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
      "features/saving_an_object.feature",
      "features/scopes.feature",
      "features/step_definitions/collection_steps.rb",
+     "features/step_definitions/connection_steps.rb",
      "features/step_definitions/document_steps.rb",
      "features/step_definitions/documents.rb",
      "features/step_definitions/embed_hash_steps.rb",
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/ext/array.rb",
      "lib/mongo_doc/ext/binary.rb",
      "lib/mongo_doc/ext/boolean_class.rb",
+     "lib/mongo_doc/ext/code.rb",
      "lib/mongo_doc/ext/date.rb",
      "lib/mongo_doc/ext/date_time.rb",
      "lib/mongo_doc/ext/dbref.rb",
@@ -234,36 +237,36 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta.4"])
-      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta.4"])
-      s.add_runtime_dependency(%q<bson>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<bson>, ["= 1.0.4"])
+      s.add_runtime_dependency(%q<bson_ext>, ["= 1.0.4"])
       s.add_runtime_dependency(%q<mongo>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.22"])
       s.add_development_dependency(%q<cucumber>, [">= 0.8.5"])
       s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.18"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta.4"])
-      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta.4"])
-      s.add_dependency(%q<bson>, [">= 1.0.0"])
-      s.add_dependency(%q<bson_ext>, [">= 1.0.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
+      s.add_dependency(%q<bson>, ["= 1.0.4"])
+      s.add_dependency(%q<bson_ext>, ["= 1.0.4"])
       s.add_dependency(%q<mongo>, [">= 1.0.0"])
       s.add_dependency(%q<tzinfo>, [">= 0.3.22"])
       s.add_dependency(%q<cucumber>, [">= 0.8.5"])
       s.add_dependency(%q<jeweler>, [">= 1.4.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.18"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta.4"])
-    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta.4"])
-    s.add_dependency(%q<bson>, [">= 1.0.0"])
-    s.add_dependency(%q<bson_ext>, [">= 1.0.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
+    s.add_dependency(%q<bson>, ["= 1.0.4"])
+    s.add_dependency(%q<bson_ext>, ["= 1.0.4"])
     s.add_dependency(%q<mongo>, [">= 1.0.0"])
     s.add_dependency(%q<tzinfo>, [">= 0.3.22"])
     s.add_dependency(%q<cucumber>, [">= 0.8.5"])
     s.add_dependency(%q<jeweler>, [">= 1.4.0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.18"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
   end
 end
 

data/spec/connection_spec.rb

@@ -21,6 +21,19 @@ end
 
 describe "MongoDoc::Connection.Connections" do
 
+  before do
+    MongoDoc::Connection.reset
+  end
+
+  describe "#connection" do
+    let(:conn) { mock }
+
+    it "allows the connection to be set" do
+      MongoDoc::Connection.connection = conn
+      MongoDoc::Connection.connection.should == conn
+    end
+  end
+
   context "Non-rails environment" do
 
     it "does not see Rails" do
@@ -35,7 +48,6 @@ describe "MongoDoc::Connection.Connections" do
       let(:connection) { stub('connection') }
 
       before do
-        MongoDoc::Connection.reset
         MongoDoc::Connection.stub(:connect).and_return(connection)
       end
 
@@ -92,7 +104,6 @@ describe "MongoDoc::Connection.Connections" do
       let(:connection) { stub('connection') }
 
       before do
-        MongoDoc::Connection.reset
         MongoDoc::Connection.stub(:connect).and_return(connection)
       end
 
@@ -111,14 +122,18 @@ describe "MongoDoc::Connection.Connections" do
   context ".verify_server_version" do
     let(:connection) { stub('connection') }
 
+    before do
+      MongoDoc::Connection.connection = connection
+    end
+
     it "raises when the server version is unsupported" do
       connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.4'))
-      lambda { MongoDoc::Connection.send(:verify_server_version, connection) }.should raise_error(MongoDoc::UnsupportedServerVersionError)
+      lambda { MongoDoc::Connection.send(:verify_server_version) }.should raise_error(MongoDoc::UnsupportedServerVersionError)
     end
 
     it "returns when the server version is supported" do
       connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.4.0'))
-      lambda { MongoDoc::Connection.send(:verify_server_version, connection) }.should_not raise_error(MongoDoc::UnsupportedServerVersionError)
+      lambda { MongoDoc::Connection.send(:verify_server_version) }.should_not raise_error(MongoDoc::UnsupportedServerVersionError)
     end
   end
 
@@ -133,9 +148,9 @@ describe "MongoDoc::Connection.Connections" do
       host = 'host'
       port = 'port'
       options = 'options'
-      MongoDoc::Connection.stub(:host).and_return(host)
-      MongoDoc::Connection.stub(:port).and_return(port)
-      MongoDoc::Connection.stub(:options).and_return(options)
+      MongoDoc::Connection.host = host
+      MongoDoc::Connection.port = port
+      MongoDoc::Connection.options = options
       Mongo::Connection.should_receive(:new).with(host, port, options).and_return(connection)
       MongoDoc::Connection.send(:connect)
     end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 43
   prerelease: false
   segments: 
   - 0
   - 6
-  - 22
-  version: 0.6.22
+  - 23
+  version: 0.6.23
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196427
         segments: 
         - 3
         - 0
         - 0
-        - beta
-        - 4
-        version: 3.0.0.beta.4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,14 +40,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196427
         segments: 
         - 3
         - 0
         - 0
-        - beta
-        - 4
-        version: 3.0.0.beta.4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,14 +53,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,14 +68,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -94,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -110,7 +100,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 3
@@ -126,7 +115,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
         - 8
@@ -142,7 +130,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -158,14 +145,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196423
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 18
-        version: 2.0.0.beta.18
+        version: 2.0.0
   type: :development
   version_requirements: *id009
 description: ODM for MongoDB
@@ -193,6 +177,7 @@ files:
 - examples/simple_document.rb
 - examples/simple_object.rb
 - features/collections.feature
+- features/connection.feature
 - features/db_references.feature
 - features/embed_hash.feature
 - features/finders.feature
@@ -207,6 +192,7 @@ files:
 - features/saving_an_object.feature
 - features/scopes.feature
 - features/step_definitions/collection_steps.rb
+- features/step_definitions/connection_steps.rb
 - features/step_definitions/document_steps.rb
 - features/step_definitions/documents.rb
 - features/step_definitions/embed_hash_steps.rb
@@ -247,6 +233,7 @@ files:
 - lib/mongo_doc/ext/array.rb
 - lib/mongo_doc/ext/binary.rb
 - lib/mongo_doc/ext/boolean_class.rb
+- lib/mongo_doc/ext/code.rb
 - lib/mongo_doc/ext/date.rb
 - lib/mongo_doc/ext/date_time.rb
 - lib/mongo_doc/ext/dbref.rb
@@ -355,7 +342,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -364,7 +350,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"