mongo_adaptor 0.0.7 → 0.0.8

data/lib/mongo_adaptor.rb

@@ -9,33 +9,37 @@ class MongoAdaptor
     end
   end
 
-  def initialize(name,klass)
+  def initialize name, klass
     @collection = self.class.db.collection name.to_s.downcase
     @klass = klass
   end
 
-  def insert(model)
-    @collection.insert( process(model), { :safe => true } )
+  def insert model
+    @collection.insert process(model), safe_mode
   end
-  def upsert(model, query = { "_id" => model.id })
-    @collection.update( query, { "$set" => process(model) }, { :safe => true, :upsert => true } )
+
+  def upsert model, query = { "_id" => model.id }
+    @collection.update query, set(process(model)), safe_mode.merge(upsert_mode true)
   end
-  def update(model)
-    @collection.update( { "_id" => model.id }, { "$set" => process(model) }, { :safe => true, :upsert => false } )
+
+  def update model, query = { "_id" => model.id }
+    @collection.update query, set(process(model)), safe_mode.merge(upsert_mode false)
   end
 
-  def fetch(*args)
-    @collection.find_one *(args + [{ :transformer => builder }])
+  def fetch selector = {}, opts = {}
+    @collection.find_one selector, opts.merge( :transformer => builder )
   end
-  def remove(*args)
-    @collection.remove *args
+
+  def remove selector = {}, opts = {}
+    @collection.remove selector, opts
   end
 
-  def find(*args)
-    @collection.find *(args + [{ :transformer => builder }])
+  def find selector = {}, opts = {}
+    @collection.find selector, opts.merge( :transformer => builder )
   end
 
   private
+
     def builder
       proc do |result|
         @klass.new.tap do |model|
@@ -46,9 +50,23 @@ class MongoAdaptor
         end
       end
     end
+
     def process(model)
       fields = {}
       model.each_pair { |field,value| fields[field] = value unless field == :id }
       fields
     end
+
+    def safe_mode
+      { :safe => true }
+    end
+
+    def upsert_mode level
+      { :upsert => level }
+    end
+
+    def set query
+      { "$set" => query }
+    end
+
 end

data/lib/mongo_adaptor/version.rb

@@ -1,3 +1,3 @@
 class MongoAdaptor
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/mongo_adaptor_spec.rb

@@ -14,7 +14,7 @@ describe 'adapting structs into mongo' do
     end
   end
 
-  describe 'useing the adaptor' do
+  describe 'using the adaptor' do
     let(:klass)      { Struct.new :name, :other, :members, :id }
     let(:adaptor)    { MongoAdaptor.new 'test_collection', klass }
     let(:collection) { Mongo::Configure.current.load.collection 'test_collection' }
@@ -122,6 +122,9 @@ describe 'adapting structs into mongo' do
       it 'gets them all' do
         subject.map(&:other).should == [0,1,2]
       end
+      it 'will pass along options' do
+        expect { adaptor.find({ :name => 'My Model' },{ fields: { }}) }.to_not raise_error
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_adaptor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-01 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: 2571098276566375901
+      hash: 1562466360637587669
 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: 2571098276566375901
+      hash: 1562466360637587669
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25