adapter-mongo 0.5.4 → 0.5.5

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 log/*
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email: false
+bundler_args: --without development

data/Gemfile

@@ -1,12 +1,18 @@
 source "http://rubygems.org"
 gemspec
 
-group(:development) do
-  gem 'rake'
-  gem 'rspec',          '~> 2.3'
-  gem 'log_buddy',      '~> 0.5.0'
-  gem 'timecop',        '~> 0.3.5'
-  gem 'i18n',           '0.5.0'
-  gem 'activesupport',  '~> 3', :require => 'active_support'
-  gem 'bson_ext', :require => false
+gem 'rake', '~> 0.9.0'
+
+gem 'mongo', '~> 1.6'
+gem 'bson_ext', '~> 1.6', :require => false
+
+group(:test) do
+  gem 'rspec', '~> 2.8'
+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'
 end

data/Guardfile

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

data/README.md

@@ -0,0 +1,33 @@
+# adapter-mongo
+
+Mongo adapter for adapter gem.
+
+```ruby
+require 'adapter/mongo'
+
+client  = Mongo::Connection.new.db('adapter')['testing']
+adapter = Adapter[:mongo].new(client)
+adapter.clear
+
+adapter.write('foo', 'bar')
+puts 'Should be bar: ' + adapter.read('foo').inspect
+
+adapter.delete('foo')
+puts 'Should be nil: ' + adapter.read('foo').inspect
+
+adapter.write('foo', 'bar')
+adapter.clear
+puts 'Should be nil: ' + adapter.read('foo').inspect
+
+puts 'Should be bar: ' + adapter.fetch('foo', 'bar')
+```
+
+See examples/ or specs/ for more usage.
+
+## Contributing
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so we don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine, but bump version in a commit by itself so we can ignore when we pull)
+* Send us a pull request. Bonus points for topic branches.

data/lib/adapter/mongo/version.rb

@@ -1,5 +1,5 @@
 module Adapter
   module Mongo
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

data/lib/adapter/mongo_atomic.rb

@@ -0,0 +1,9 @@
+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])
+  end
+end

data/lib/adapter-mongo.rb

@@ -1 +1,2 @@
-require 'adapter/mongo'
+require 'adapter/mongo'
+require 'adapter/mongo_atomic'

data/spec/helper.rb

@@ -3,19 +3,10 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 require 'rubygems'
 require 'bundler'
 
-Bundler.require(:default, :development)
-
-require 'pathname'
-require 'logger'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-log_path  = root_path.join('log')
-log_path.mkpath
+Bundler.require(:default, :test)
 
 require 'adapter/spec/an_adapter'
 require 'adapter/spec/types'
-
 require 'adapter-mongo'
 
 shared_examples_for "a mongo adapter" do
@@ -28,11 +19,45 @@ shared_examples_for "a mongo adapter" do
       adapter[key].should == {'_id' => 'key', 'foo' => :bar}
     end
   end
-end
 
-logger = Logger.new(log_path.join('test.log'))
-LogBuddy.init(:logger => logger)
+  it "allows using object id's as keys in correct type" do
+    id = BSON::ObjectId.new
+    adapter.write(id, 'ham')
+    client.find_one('_id' => id).should_not be_nil
+    adapter.read(id).should == 'ham'
+  end
+
+  it "stores hashes right in document" do
+    adapter.write('foo', 'steak' => 'bacon')
+    client.find_one('_id' => 'foo').should == {'_id' => 'foo', 'steak' => 'bacon'}
+  end
+
+  describe "with safe option" 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
+end
 
-Rspec.configure do |c|
+RSpec.configure do |c|
 
 end

data/spec/mongo_atomic_spec.rb

@@ -0,0 +1,27 @@
+require 'helper'
+
+describe "Mongo atomic adapter" do
+  before do
+    @client = Mongo::Connection.new.db('test')['test']
+    @adapter = Adapter[adapter_name].new(@client)
+    @adapter.clear
+  end
+
+  let(:adapter_name) { :mongo_atomic }
+
+  let(:adapter) { @adapter }
+  let(:client)  { @client }
+
+  it_should_behave_like 'a mongo adapter'
+
+  it "allows updating only part of a document" do
+    oid = BSON::ObjectId.new
+    adapter.write(oid, {'a' => 'c', 'b' => 'd'})
+    adapter.write(oid, {'a' => 'z'})
+    adapter.read(oid).should eq({
+      '_id' => oid,
+      'a' => 'z',
+      'b' => 'd',
+    })
+  end
+end

data/spec/mongo_spec.rb

@@ -3,49 +3,14 @@ require 'helper'
 describe "Mongo adapter" do
   before do
     @client = Mongo::Connection.new.db('test')['test']
-    @adapter = Adapter[:mongo].new(@client)
+    @adapter = Adapter[adapter_name].new(@client)
     @adapter.clear
   end
 
+  let(:adapter_name) { :mongo }
+
   let(:adapter) { @adapter }
   let(:client)  { @client }
 
   it_should_behave_like 'a mongo adapter'
-
-  it "allows using object id's as keys in correct type" do
-    id = BSON::ObjectId.new
-    adapter.write(id, 'ham')
-    client.find_one('_id' => id).should_not be_nil
-    adapter.read(id).should == 'ham'
-  end
-
-  it "stores hashes right in document" do
-    adapter.write('foo', 'steak' => 'bacon')
-    client.find_one('_id' => 'foo').should == {'_id' => 'foo', 'steak' => 'bacon'}
-  end
-
-  describe "with safe option" do
-    before do
-      client.ensure_index([['email', 1]], :unique => true)
-      @adapter = Adapter[:mongo].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
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adapter-mongo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 Z
+date: 2012-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -58,17 +58,20 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
-- Gemfile.lock
+- Guardfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - adapter-mongo.gemspec
 - examples/mongo.rb
 - lib/adapter-mongo.rb
 - lib/adapter/mongo.rb
 - lib/adapter/mongo/version.rb
+- lib/adapter/mongo_atomic.rb
 - spec/helper.rb
+- spec/mongo_atomic_spec.rb
 - spec/mongo_spec.rb
 homepage: ""
 licenses: []
@@ -105,4 +108,5 @@ specification_version: 3
 summary: Adapter for mongo
 test_files: 
 - spec/helper.rb
+- spec/mongo_atomic_spec.rb
 - spec/mongo_spec.rb

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    adapter-mongo (0.5.4)
-      adapter (~> 0.5)
-      mongo (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.3)
-    adapter (0.5.2)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    log_buddy (0.5.0)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    rake (0.9.2.2)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    timecop (0.3.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3)
-  adapter-mongo!
-  bson_ext
-  i18n (= 0.5.0)
-  log_buddy (~> 0.5.0)
-  rake
-  rspec (~> 2.3)
-  timecop (~> 0.3.5)

data/README.rdoc

@@ -1,31 +0,0 @@
-= adapter-mongo
-
-Mongo adapter for adapter gem.
-
-    require 'adapter/mongo'
-
-    client  = Mongo::Connection.new.db('adapter')['testing']
-    adapter = Adapter[:mongo].new(client)
-    adapter.clear
-
-    adapter.write('foo', 'bar')
-    puts 'Should be bar: ' + adapter.read('foo').inspect
-
-    adapter.delete('foo')
-    puts 'Should be nil: ' + adapter.read('foo').inspect
-
-    adapter.write('foo', 'bar')
-    adapter.clear
-    puts 'Should be nil: ' + adapter.read('foo').inspect
-
-    puts 'Should be bar: ' + adapter.fetch('foo', 'bar')
-
-See examples/ or specs/ for more usage.
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so we don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine, but bump version in a commit by itself so we can ignore when we pull)
-* Send us a pull request. Bonus points for topic branches.