dkastner-moneta 1.1.0 → 1.1.1

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
 gemspec
+
+gem 'mongo'

data/lib/moneta/adapters/mongodb.rb

@@ -14,22 +14,27 @@ module Moneta
       include Moneta::Defaults
 
       def initialize(options = {})
-        if options[:uri]
-          conn = Mongo::Connection.from_uri options[:uri]
-          db_name = URI.parse(options[:uri]).path.sub('/','')
-          db_name ||= options[:db]
+        collection = options.delete(:collection) || 'cache'
+
+        if uri = options.delete(:uri)
+          db_name = URI.parse(uri).path.sub('/','')
+          db_name ||= options.delete :db
+          conn = Mongo::Connection.from_uri uri, options
         else
           options = {
             :host => ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
             :port => ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::Connection::DEFAULT_PORT,
-            :db => 'cache',
-            :collection => 'cache'
+            :db => 'cache'
           }.update(options)
-          conn = Mongo::Connection.new(options[:host], options[:port])
-          db_name = options[:db]
+
+          host = options.delete :host
+          port = options.delete :port
+          db_name = options.delete :db
+
+          conn = Mongo::Connection.new(host, port, options)
         end
-        db = conn.db(db_name)
-        @cache = db.collection(options[:collection])
+        db = conn.db db_name
+        @cache = db.collection collection
       end
 
       def key?(key, *)

data/lib/moneta/version.rb

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

data/spec/moneta_mongodb_spec.rb

@@ -13,7 +13,7 @@ begin
       it 'should initialize with a URI' do
         mock_mongo = mock(Object, :db => mock(Object, :collection => []))
         Mongo::Connection.should_receive(:from_uri).
-          with('mongodb://a:b@localhost:27059/cache').
+          with('mongodb://a:b@localhost:27059/cache', {}).
           and_return mock_mongo
         m = Moneta::Adapters::MongoDB.new :uri => 'mongodb://a:b@localhost:27059/cache'
       end
@@ -22,6 +22,14 @@ begin
         m['example'] = 3.0
         m['example'].should == 3.0
       end
+      it 'should pass any extra options to Mongo::Connection.new' do
+        mock_mongo = mock(Object, :db => mock(Object, :collection => nil))
+        Mongo::Connection.should_receive(:new).with('localhost', 27059,
+          hash_including(:pool_size => 5, :timeout => 22)).
+          and_return(mock_mongo)
+        m = Moneta::Adapters::MongoDB.new :uri => 'mongodb://a:b@localhost:27059/cache',
+          :pool_size => 5, :timeout => 22
+      end
     end
 
     context 'initialized' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dkastner-moneta
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-02-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154443400 !ruby/object:Gem::Requirement
+  requirement: &2160566480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154443400
+  version_requirements: *2160566480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154442860 !ruby/object:Gem::Requirement
+  requirement: &2160566060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154442860
+  version_requirements: *2160566060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154441780 !ruby/object:Gem::Requirement
+  requirement: &2160565640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154441780
+  version_requirements: *2160565640
 description: A unified interface to key/value stores
 email:
 - wycats@gmail.com
@@ -120,18 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3990472740534807466
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3990472740534807466
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5