batch-loader 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124dbf8b2fa20f0e0fd6bca686449f48c3dd3625
-  data.tar.gz: d10abd20d3f55f64871673b5410c8d92539abaa5
+  metadata.gz: 0cb2bec5ff8fdc6fd2c2ec099c1db9ca07916594
+  data.tar.gz: af763f4dc852c3f2b4ca73a3ce0ff639ea544f0a
 SHA512:
-  metadata.gz: 4e97a8dcbb31e6310dc2b40df35143f6bdac4a1153b1ea9de175f07b36e8df0da7890e1c445f91c782e3ac1804ee0129107329685e0aac50dcafadbe17278c3a
-  data.tar.gz: 93188a2738ac3f57735e0643003818b19eb4875c2b748fbbf0e19751c837a8ba32247b84fa84533bb2bbe84515eb35fc28f31929813871c6eb21b9fc08a1d4b8
+  metadata.gz: 699d6d95a80c2b7b7c366979277bb003c0eada94ea087df1812b2b1754ac70d6a518608bd25c7ae3d6665d6d0629c9836811c2e9d0e07bf3879064bf4f0b11c7
+  data.tar.gz: 614b0b57b84e80a7f1de5af9d961c4ca78252e4c84e3a624fa49a25810acae7c6ec2648c8a573cddc2b9620896645d966d79b8c936c02f09b3cca0eb1a445d18

data/CHANGELOG.md

@@ -8,10 +8,14 @@ one of the following labels: `Added`, `Changed`, `Deprecated`,
 to manage the versions of this gem so
 that you can set version constraints properly.
 
-#### [Unreleased](https://github.com/exAspArk/batch-loader/compare/v1.1.0...HEAD)
+#### [Unreleased](https://github.com/exAspArk/batch-loader/compare/v1.1.1...HEAD)
 
 * WIP
 
+#### [v1.1.1](https://github.com/exAspArk/batch-loader/compare/v1.1.0...v1.1.1)
+
+* `Fixed`: `loader`, made it thread-safe again. [#10](https://github.com/exAspArk/batch-loader/pull/10)
+
 #### [v1.1.0](https://github.com/exAspArk/batch-loader/compare/v1.0.4...v1.1.0)
 
 * `Added`: `default_value` override option. [#8](https://github.com/exAspArk/batch-loader/pull/8)

data/lib/batch_loader.rb

@@ -18,8 +18,9 @@ class BatchLoader
     new(item: item)
   end
 
-  def initialize(item:)
+  def initialize(item:, executor_proxy: nil)
     @item = item
+    @__executor_proxy = executor_proxy
   end
 
   def batch(default_value: nil, cache: true, &batch_block)
@@ -76,23 +77,29 @@ class BatchLoader
     return if __executor_proxy.value_loaded?(item: @item)
 
     items = __executor_proxy.list_items
-    loader =  -> (item, value = (no_value = true; nil), &block) {
+    loader = __loader
+    @batch_block.call(items, loader)
+    items.each do |item|
+      next if __executor_proxy.value_loaded?(item: item)
+      loader.call(item, @default_value)
+    end
+    __executor_proxy.delete(items: items)
+  end
+
+  def __loader
+    mutex = Mutex.new
+    -> (item, value = (no_value = true; nil), &block) do
       if no_value && !block
         raise ArgumentError, "Please pass a value or a block"
       elsif block && !no_value
         raise ArgumentError, "Please pass a value or a block, not both"
       end
 
-      next_value = block ? block.call(__executor_proxy.loaded_value(item: item)) : value
-      __executor_proxy.load(item: item, value: next_value)
-    }
-
-    @batch_block.call(items, loader)
-    items.each do |item|
-      next if __executor_proxy.value_loaded?(item: item)
-      loader.call(item, @default_value)
+      mutex.synchronize do
+        next_value = block ? block.call(__executor_proxy.loaded_value(item: item)) : value
+        __executor_proxy.load(item: item, value: next_value)
+      end
     end
-    __executor_proxy.delete(items: items)
   end
 
   def __singleton_class

data/lib/batch_loader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class BatchLoader
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch-loader
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - exAspArk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler