mongo_adaptor 0.0.14 → 0.0.15

data/lib/mongo_adaptor.rb

@@ -35,16 +35,16 @@ class MongoAdaptor
     @collection.update query, command, safe_mode.merge(upsert_mode false).merge(options)
   end
 
-  def fetch selector = {}, opts = { :fields => fields }
-    @collection.find_one selector, opts.merge( :transformer => builder )
+  def fetch selector = {}, opts = {}
+    @collection.find_one selector, { :fields => fields, :transformer => builder }.merge(opts)
   end
 
   def remove selector = {}, opts = {}
     @collection.remove selector, opts
   end
 
-  def find selector = {}, opts = { :fields => fields }
-    @collection.find selector, opts.merge( :transformer => builder )
+  def find selector = {}, opts = {}
+    @collection.find selector, { :fields => fields, :transformer => builder }.merge(opts)
   end
 
   private

data/lib/mongo_adaptor/version.rb

@@ -1,3 +1,3 @@
 class MongoAdaptor
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/mongo_adaptor_spec.rb

@@ -1,12 +1,8 @@
 require 'mongo_adaptor'
 
 describe 'adapting structs into mongo' do
-  before do
-    Mongo::Configure.from_database 'mongo_adaptor_test'
-  end
-  after do
-    Mongo::Configure.current.load.collections.select { |c| c.name !~ /^system\./ }.each &:remove
-  end
+  before { Mongo::Configure.from_database 'mongo_adaptor_test' }
+  after  { Mongo::Configure.current.load.collections.select { |c| c.name !~ /^system\./ }.each &:remove }
 
   describe 'db setup' do
     it 'uses the configured database' do
@@ -47,12 +43,14 @@ describe 'adapting structs into mongo' do
         subject { adaptor.insert model }
         it_should_behave_like 'new model'
       end
+
       context 'upserting' do
         subject { adaptor.upsert model, {} }
         it_should_behave_like 'new model'
       end
+
       describe 'upserting with a custom operation' do
-        subject { adaptor.execute({ name: 'value' }, { '$push' => { "key" => "value" } }, { :upsert => true }) }
+        subject { adaptor.execute({ :name => 'value' }, { '$push' => { "key" => "value" } }, { :upsert => true }) }
         it_should_behave_like 'creates a document'
         it 'will execute my command' do
           subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_adaptor
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 309314115556500517
+      hash: 1930400006720958320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 309314115556500517
+      hash: 1930400006720958320
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25