toughguy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8b128c7302c3b25ec0274ce6fea18599e8acd2
-  data.tar.gz: bb2a8e05fee133b6dd322c5fd9cdc3140857a7ed
+  metadata.gz: 281b8113071be47cb1c600fcca69c0ea22e76227
+  data.tar.gz: d893f5a805c2f702526e7b98eae2df9c9598d97a
 SHA512:
-  metadata.gz: a578bbc736a87c373b440fd32750d03791e5fcad33b69f6331602d3a4cb1ac9c31473bea8f2d22dfdf7812a71dd4a29b7a280a531e52c138684ef4d9f8a6bf2d
-  data.tar.gz: cb5f2f74d06f4c4a157cee9aba307b2f6516855611f4541e0e95a1836bb210486bc73e4e7504cb9f0977497900781deb3d91cf391be2206d34e42347a08b77d8
+  metadata.gz: 426b3c2c00bb3bf7207e80fe99a75c72c6327da3ac26abe1c417b030caea719f736eb71933be35dfe27656031bfa74838550fdcee9f74370feba7fa755cc1aba
+  data.tar.gz: 99014ea40caec7e4bbf74f4d74e77d637409556e469a80c10a835709e62fe07f040ddb2d227e16fb7471ebf299f6f67ee4ffee52981ee773aa608e389d429452

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toughguy (0.1.0)
+    toughguy (0.2.0)
       assistance (= 0.1.5)
       bson_ext (= 1.11.1)
       mongo (= 1.11.1)

data/lib/toughguy/mapped_model.rb

@@ -8,7 +8,7 @@ module ToughGuy
     end
   
     def set(hash)
-      collection.update({_id: id}, '$set' => hash)
+      model.update({_id: id}, '$set' => hash)
       @values.merge!(hash)
     end
   

data/lib/toughguy/model.rb

@@ -31,6 +31,10 @@ module ToughGuy
     def model
       self.class
     end
+    
+    def bulk(&block)
+      model.bulk(&block)
+    end
 
     def [](k)
       @values[k]
@@ -60,16 +64,16 @@ module ToughGuy
         values[:_id] = collection.insert(values)
         after_create
       else
-        collection.update({_id: id}, values.exclude(:_id))
+        self.class.update({_id: id}, values.exclude(:_id))
       end
     end
-
+    
     def update(hash)
-      collection.update({_id: id}, hash)
+      model.update({_id: id}, hash)
     end
 
     def set(hash)
-      update('$set' => hash)
+      model.update({_id: id}, '$set' => hash)
       @values.merge!(hash.symbolize_keys)
     end
 
@@ -115,8 +119,16 @@ module ToughGuy
     def exists?
       model.find(id) != nil
     end
-
+    
     class << self
+      def bulk(&block)
+        @bulk = collection.initialize_ordered_bulk_op
+        block.call
+        @bulk.execute
+      ensure
+        @bulk = nil
+      end
+      
       def add_index(spec, opts={})
         @indexes ||= []
         @indexes << [spec, opts]
@@ -242,9 +254,14 @@ module ToughGuy
       end
   
       def update(*args)
-        collection.update(*args)
+        if @bulk
+          @bulk.find(args[0]).update(args[1])
+        else
+          collection.update(*args)
+        end
+        # (@bulk || collection).update(*args)
       end
-  
+      
       def stats
         collection.stats
       end

data/lib/toughguy/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module ToughGuy
-  Version = '0.1.0'
+  Version = '0.2.0'
 end

data/spec/toughguy_spec.rb

@@ -16,6 +16,22 @@ describe "Model#update" do
     m.refresh
     m.values.should == {c: 3, d: 4, _id: id}
   end
+  
+  it "should work when doing bulk updates" do
+    m1 = Mau.create(a: 1, b: 2)
+    m2 = Mau.create(a: 3, b: 4)
+    
+    m1.bulk do
+      m1.set(a: 5, c: 6)
+      m2.set(b: 7, c: 8)
+    end
+    
+    m1.refresh
+    m2.refresh
+    
+    m1.values.should == {a: 5, b: 2, c: 6, _id: m1.id}
+    m2.values.should == {a: 3, b: 7, c: 8, _id: m2.id}
+  end
 end
 
 describe "Model#set" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toughguy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo