toughguy 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b980a129f46230b7ca6453cb803dfcf48db7af
-  data.tar.gz: f62d6aa6d055683ddcd299649ed49d2537d37d36
+  metadata.gz: 99b4d5504b95020c7d616f966f833a2021736630
+  data.tar.gz: 66e9e4b9c642fa774f9997f52be7cea12167a0e5
 SHA512:
-  metadata.gz: 7843f4fd5e9943e057d98fd39dd57edcd7e69bb8f923f9a05e5b55f505dd9be6a9e6d19f1b65cb24d7db25a82c6c4f3730b8ac57fe1a0d99e2802355b601ae4e
-  data.tar.gz: 0ea7585c3b92096b7b98cfc84f6ae5999e1bc2ca56f1714102f31528ab82174b7f5d6c07d4fb9f4d29581fb5e929ad1eb4f72e1b7051de5d6669127c6e76b06f
+  metadata.gz: 9c250c1d3e79b7652d073217e37d828d999315de4a31fe77f75f565595777720bb6cea411cde2d96ae3ae7f14b4ff733559a8190c95cd6563307da7214b2c2ca
+  data.tar.gz: 798e6dc80ec23e116f56adadc6bad83bf97c8954a6cf82d27fcc04a8a74ee3adb0bf39172a8c2b8d4b0b627bdcaea5416362dd1a25f776a86a303d609448da4e

data/Gemfile.lock

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

data/lib/toughguy/model.rb

@@ -122,11 +122,12 @@ module ToughGuy
     
     class << self
       def bulk(&block)
-        @bulk = collection.initialize_ordered_bulk_op
+        reentered = @bulk
+        @bulk = collection.initialize_ordered_bulk_op unless reentered
         block.call
-        @bulk.execute
+        @bulk.execute unless reentered || @bulk.ops.empty?
       ensure
-        @bulk = nil
+        @bulk = nil unless reentered
       end
       
       def add_index(spec, opts={})

data/lib/toughguy/version.rb

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

data/spec/toughguy_spec.rb

@@ -34,6 +34,30 @@ describe "Model#update" do
   end
 end
 
+describe "Model.bulk" do
+  it "should not freak out on empty bulk ops" do
+    lambda {Mau.bulk {}}.should_not raise_error
+  end
+  
+  it "should be reentrant" 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.bulk do
+        m2.set(b: 7, c: 8)
+      end
+    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
   before do
     Mau.drop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toughguy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Sharon Rosner