adapter-mongo 0.7.0 → 0.8.0

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 1.8.7
   - ree
-  - 1.9.2
   - 1.9.3
 notifications:
   email: false

data/Gemfile

@@ -1,18 +1,15 @@
 source "http://rubygems.org"
 gemspec
 
-gem 'rake', '~> 0.9.0'
-
-gem 'mongo', '~> 1.6'
-gem 'bson_ext', '~> 1.6', :require => false
+gem 'rake'
+gem 'bson_ext', '~> 1.8'
 
 group(:test) do
-  gem 'rspec', '~> 2.8'
+  gem 'rspec'
 end
 
 group(:guard) do
-  gem 'guard',          '~> 1.0.0'
-  gem 'guard-rspec',    '~> 0.6.0'
-  gem 'guard-bundler',  '~> 0.1.0'
-  gem 'growl',          '~> 1.0.0'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
 end

data/Guardfile

@@ -6,6 +6,6 @@ end
 guard 'rspec', :version => 2 do
   watch('spec/support/shared_mongo_adapter.rb') { 'spec' }
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/adapter/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/adapter/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/README.md

@@ -5,21 +5,22 @@ Mongo adapter for adapter gem.
 ```ruby
 require 'adapter/mongo'
 
-client  = Mongo::Connection.new.db('adapter')['testing']
+key     = BSON::ObjectId.new
+client  = Mongo::MongoClient.new.db('adapter')['testing']
 adapter = Adapter[:mongo].new(client)
 adapter.clear
 
-adapter.write('foo', 'bar')
-puts 'Should be bar: ' + adapter.read('foo').inspect
+adapter.write(key, {'some' => 'thing'})
+puts 'Should be {"some" => "thing"}: ' + adapter.read(key).inspect
 
-adapter.delete('foo')
-puts 'Should be nil: ' + adapter.read('foo').inspect
+adapter.delete(key)
+puts 'Should be nil: ' + adapter.read(key).inspect
 
-adapter.write('foo', 'bar')
+adapter.write(key, {'some' => 'thing'})
 adapter.clear
-puts 'Should be nil: ' + adapter.read('foo').inspect
+puts 'Should be nil: ' + adapter.read(key).inspect
 
-puts 'Should be bar: ' + adapter.fetch('foo', 'bar')
+puts 'Should be {"some" => "thing"}: ' + adapter.fetch(key, {'some' => 'thing'}).inspect
 ```
 
 ## Flavors
@@ -32,7 +33,7 @@ require 'adapter/mongo_atomic'
 key            = BSON::ObjectId.new
 full_doc       = {'a' => 'c', 'b' => 'd'}
 partial_doc    = {'a' => 'z'}
-client         = Mongo::Connection.new.db('adapter')['testing']
+client         = Mongo::MongoClient.new.db('adapter')['testing']
 adapter        = Adapter[:mongo].new(client)
 atomic_adapter = Adapter[:mongo_atomic].new(client)
 

data/adapter-mongo.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'adapter', '~> 0.6.1'
-  s.add_dependency 'mongo', '~> 1.5'
+  s.add_dependency 'adapter', '0.7.0'
+  s.add_dependency 'mongo', '~> 1.8'
 end

data/examples/mongo.rb

@@ -7,18 +7,19 @@ $:.unshift(lib_path)
 
 require 'adapter/mongo'
 
-client  = Mongo::Connection.new.db('adapter')['testing']
+key     = BSON::ObjectId.new
+client  = Mongo::MongoClient.new.db('adapter')['testing']
 adapter = Adapter[:mongo].new(client)
 adapter.clear
 
-adapter.write('foo', 'bar')
-puts 'Should be bar: ' + adapter.read('foo').inspect
+adapter.write(key, {'some' => 'thing'})
+puts 'Should be {"some" => "thing"}: ' + adapter.read(key).inspect
 
-adapter.delete('foo')
-puts 'Should be nil: ' + adapter.read('foo').inspect
+adapter.delete(key)
+puts 'Should be nil: ' + adapter.read(key).inspect
 
-adapter.write('foo', 'bar')
+adapter.write(key, {'some' => 'thing'})
 adapter.clear
-puts 'Should be nil: ' + adapter.read('foo').inspect
+puts 'Should be nil: ' + adapter.read(key).inspect
 
-puts 'Should be bar: ' + adapter.fetch('foo', 'bar')
+puts 'Should be {"some" => "thing"}: ' + adapter.fetch(key, {'some' => 'thing'}).inspect

data/examples/mongo_atomic.rb

@@ -10,7 +10,7 @@ require 'adapter/mongo_atomic'
 key            = BSON::ObjectId.new
 full_doc       = {'a' => 'c', 'b' => 'd'}
 partial_doc    = {'a' => 'z'}
-client         = Mongo::Connection.new.db('adapter')['testing']
+client         = Mongo::MongoClient.new.db('adapter')['testing']
 adapter        = Adapter[:mongo].new(client)
 atomic_adapter = Adapter[:mongo_atomic].new(client)
 

data/lib/adapter/mongo.rb

@@ -3,14 +3,17 @@ require 'mongo'
 
 module Adapter
   module Mongo
-    def read(key)
-      if doc = client.find_one('_id' => key_for(key))
-        decode(doc)
+
+    # Public
+    def read(key, options = nil)
+      if doc = client.find_one('_id' => key)
+        clean(doc)
       end
     end
 
-    def read_multiple(*keys)
-      ids = keys.map { |key| key_for(key) }
+    # Public
+    def read_multiple(keys, options = nil)
+      ids = keys.map { |key| key }
       docs = client.find('_id' => {'$in' => ids}).to_a
       keys_and_values = docs.map { |doc| [doc.delete('_id'), doc] }
 
@@ -18,27 +21,52 @@ module Adapter
 
       result = {}
       keys.each do |key|
-        key = key_for(key)
+        key = key
         result[key] = docs_by_id[key]
       end
       result
     end
 
-    def write(key, value)
-      client.save({'_id' => key_for(key)}.merge(encode(value)), {:safe => options[:safe]})
+    # Public
+    def write(key, attributes, options = nil)
+      options = operation_options(options)
+      client.save(attributes.merge('_id' => key), options)
+    end
+
+    # Public
+    def delete(key, options = nil)
+      options = operation_options(options)
+      client.remove({:_id => key}, options)
     end
 
-    def delete(key)
-      read(key).tap { client.remove({'_id' => key_for(key)}, {:safe => options[:safe]}) }
+    # Public
+    def clear(options = nil)
+      options = operation_options(options)
+      client.remove({}, options)
     end
 
-    def clear
-      client.remove
+    # Private
+    def clean(doc)
+      doc.delete('_id')
+      doc
     end
 
-    def decode(value)
-      value.delete('_id')
-      value
+    # Private
+    def operation_options(options)
+      write_concern.merge(options || {})
+    end
+
+    # Private
+    def write_concern
+      if options[:write_concern]
+        options[:write_concern]
+      else
+        if options[:safe]
+          {:w => 1}
+        else
+          {:w => 0}
+        end
+      end
     end
   end
 end

data/lib/adapter/mongo/version.rb

@@ -1,5 +1,5 @@
 module Adapter
   module Mongo
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/adapter/mongo_atomic.rb

@@ -1,9 +1,11 @@
 require 'adapter/mongo'
 
 Adapter.define(:mongo_atomic, Adapter::Mongo) do
-  def write(key, value)
-    criteria = {:_id => key_for(key)}
-    updates  = {'$set' => encode(value)}
-    client.update(criteria, updates, :upsert => true, :safe => options[:safe])
+  # Public
+  def write(key, attributes, options = nil)
+    criteria = {:_id => key}
+    updates = {'$set' => attributes}
+    options = operation_options(options).merge(:upsert => true)
+    client.update(criteria, updates, options)
   end
 end

data/spec/mongo_atomic_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe "Mongo atomic adapter" do
   before do
-    @client = Mongo::Connection.new.db('test')['test']
+    @client = Mongo::MongoClient.new.db('test')['test']
     @adapter = Adapter[adapter_name].new(@client)
     @adapter.clear
   end

data/spec/mongo_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe "Mongo adapter" do
   before do
-    @client = Mongo::Connection.new.db('test')['test']
+    @client = Mongo::MongoClient.new.db('test')['test']
     @adapter = Adapter[adapter_name].new(@client)
     @adapter.clear
   end

data/spec/support/shared_mongo_adapter.rb

@@ -31,9 +31,61 @@ shared_examples_for "a mongo adapter" do
   end
 
   describe "with safe option" do
+    context "set to true" do
+      before do
+        client.ensure_index([['email', 1]], :unique => true)
+        @adapter = Adapter[adapter_name].new(client, :safe => true)
+      end
+
+      after do
+        client.drop_index('email_1')
+      end
+
+      it "does not raise operation failure on write if operation succeeds" do
+        adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
+        lambda {
+          adapter.write(BSON::ObjectId.new, {'email' => 'steve@orderedlist.com'})
+        }.should_not raise_error(Mongo::OperationFailure)
+      end
+
+      it "raises operation failure on write if operation fails" do
+        adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
+        lambda {
+          adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
+        }.should raise_error(Mongo::OperationFailure)
+      end
+    end
+
+    context "set to false" do
+      before do
+        client.ensure_index([['email', 1]], :unique => true)
+        @adapter = Adapter[adapter_name].new(client, :safe => false)
+      end
+
+      after do
+        client.drop_index('email_1')
+      end
+
+      it "does not raise operation failure on write if operation succeeds" do
+        adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
+        lambda {
+          adapter.write(BSON::ObjectId.new, {'email' => 'steve@orderedlist.com'})
+        }.should_not raise_error(Mongo::OperationFailure)
+      end
+
+      it "does not raise operation failure on write if operation fails" do
+        adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
+        lambda {
+          adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
+        }.should_not raise_error(Mongo::OperationFailure)
+      end
+    end
+  end
+
+  describe "with :write_concern" do
     before do
       client.ensure_index([['email', 1]], :unique => true)
-      @adapter = Adapter[adapter_name].new(client, :safe => true)
+      @adapter = Adapter[adapter_name].new(client, :write_concern => {:w => 1})
     end
 
     after do
@@ -53,5 +105,40 @@ shared_examples_for "a mongo adapter" do
         adapter.write(BSON::ObjectId.new, {'email' => 'john@orderedlist.com'})
       }.should raise_error(Mongo::OperationFailure)
     end
+
+    it "allows overriding write concern for write" do
+      id = BSON::ObjectId.new
+      client.should_receive(:update).
+        with(
+          hash_including(:_id),
+          kind_of(Hash),
+          hash_including(:w => 0)
+        )
+      adapter.write(id, {:foo => 'bar'}, :w => 0)
+    end
+
+    it "uses write concern for delete" do
+      id = BSON::ObjectId.new
+      client.should_receive(:remove).with({:_id => id}, :w => 1)
+      adapter.delete(id)
+    end
+
+    it "allows overriding write concern for delete" do
+      id = BSON::ObjectId.new
+      client.should_receive(:remove).with({:_id => id}, :w => 0)
+      adapter.delete(id, :w => 0)
+    end
+
+    it "uses write concern for clear" do
+      id = BSON::ObjectId.new
+      client.should_receive(:remove).with({}, :w => 1)
+      adapter.clear
+    end
+
+    it "allows overriding write concern for clear" do
+      id = BSON::ObjectId.new
+      client.should_receive(:remove).with({}, :w => 0)
+      adapter.clear(:w => 0)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapter-mongo
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
 description: Adapter for mongo
 email:
 - nunemaker@gmail.com
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1570202844735750411
+      hash: -2103584337757372266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1570202844735750411
+      hash: -2103584337757372266
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23