master_loader 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b53788dd7b265f1d35a198b9eeae7130f9901587ae6a4cc407faacfcee0b104
-  data.tar.gz: 26b01fd1504202fa5c7d33c2176e8b6f11d6f88d1ba3563d4f5b5799108a2376
+  metadata.gz: cd83b96c1af9e69faf722df9b11e111d28fcf27e32c6563d01a010eaee9c0b54
+  data.tar.gz: 4637e7af9cab59032ae49f095447c84a8c5802dcd7af316902cc7f1aed552c0b
 SHA512:
-  metadata.gz: dd8b1b14f32d52330b37f283b81229747469e985d1099032d90124d20f4c01622fdeda5a31aeb53a87fa52b1f1e78d6b9c886793588fa24c95bdd9362767d678
-  data.tar.gz: 3c98a152170415b655df19d555534fb87823d7e937686c5267f46b905d26fab9f1f63368b2f77398e3a7ad724faea4d714d9c0173c6aeb592debeec8b3b25446
+  metadata.gz: 1017e771dff8a4f26b97b066e50aa2a0618b5930a142daf7a7890b84e345d6fc28cd1bfbac700bb750bf94aa03acffdf8f028a6f21bc81457ad2a804e2f74b25
+  data.tar.gz: 0f248838aeaf259a7fd599cd91c858dcb7df3725c1ce2c1c6a3f0b45a2ffe555fe33be55503252ed5cbd0c22fe5cef8016bb29e1a0c42d5a8aeb18264d253a31

data/lib/master_loader/version.rb

@@ -1,4 +1,4 @@
 class MasterLoader
   # @!visibility private
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/lib/master_loader.rb

@@ -1,5 +1,3 @@
-require 'concurrent'
-
 class DelayedResult
   def initialize(&resolver)
     @resolver = resolver
@@ -19,7 +17,7 @@ class DelayedResult
   end
 
   def value!
-    @value ||= @resolver.call().yield_self do |val|
+    @value ||= @resolver.call.yield_self do |val|
       if val&.is_a?(DelayedResult)
         val.value!
       else
@@ -34,6 +32,16 @@ class DelayedResult
 end
 
 class MasterLoader
+  class Cache < ::Hash
+    def compute_if_absent(key, &block)
+      if self.has_key?(key)
+        self.fetch(key)
+      else
+        self[key] = block.call(key)
+      end
+    end
+  end
+
   class NoCache
     def compute_if_absent(_key)
       yield
@@ -41,13 +49,11 @@ class MasterLoader
   end
 
   class Batch
-    attr_accessor :name
-    attr_accessor :fulfilled
+    attr_accessor :name, :fulfilled
 
     def initialize(loader_block, name: nil, max_batch_size: Float::INFINITY)
       @name = name
-      @queue = Concurrent::Array.new
-      @lock = Concurrent::ReadWriteLock.new
+      @queue = []
       @loader_block = loader_block
       @max_batch_size = max_batch_size
       @fulfilled = false
@@ -59,23 +65,15 @@ class MasterLoader
 
       DelayedResult.new do
         results = if @fulfilled
-                    @lock.with_read_lock do
-                      @results
-                    end
+                    @results
                   else
-                    @lock.with_write_lock do
-                      if @fulfilled
-                        @results
-                      else
-                        @fulfilled = true
-                        r = @loader_block.call(@queue)
-                        @results = if r.is_a?(DelayedResult)
-                          normalize_results(r.value!)
-                        else
-                          normalize_results(r)
-                        end
-                      end
-                    end
+                    @fulfilled = true
+                    r = @loader_block.call(@queue)
+                    @results = if r.is_a?(DelayedResult)
+                                 normalize_results(r.value!)
+                               else
+                                 normalize_results(r)
+                               end
                   end
 
         unless results.key?(key)
@@ -124,12 +122,12 @@ class MasterLoader
     @cache = if options.has_key?(:cache)
                options.delete(:cache) || NoCache.new
              else
-               Concurrent::Map.new
+               Cache.new
              end
     @max_batch_size = options.fetch(:max_batch_size, Float::INFINITY)
 
-    @interceptor = options.delete(:interceptor) || -> (n) {
-      -> (ids) {
+    @interceptor = options.delete(:interceptor) || lambda { |n|
+      lambda { |ids|
         n.call(ids)
       }
     }
@@ -138,9 +136,7 @@ class MasterLoader
   end
 
   def load(key)
-    if key.nil?
-      raise TypeError, "#load must be called with a key, but got: nil"
-    end
+    raise TypeError, "#load must be called with a key, but got: nil" if key.nil?
 
     result = retrieve_from_cache(key) do
       batch.queue(key)
@@ -154,9 +150,7 @@ class MasterLoader
   end
 
   def load_many(keys)
-    unless keys.is_a?(Array)
-      raise TypeError, "#load_many must be called with an Array, but got: #{keys.class.name}"
-    end
+    raise TypeError, "#load_many must be called with an Array, but got: #{keys.class.name}" unless keys.is_a?(Array)
 
     delayed_results = keys.map(&method(:load))
     DelayedResult.new do
@@ -172,9 +166,7 @@ class MasterLoader
     end
   end
 
-  def retrieve_from_cache(key)
-    @cache.compute_if_absent(key) do
-      yield
-    end
+  def retrieve_from_cache(key, &block)
+    @cache.compute_if_absent(key, &block)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_loader
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Caleb Land
@@ -9,21 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2021-09-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+dependencies: []
 description: A data loading utility to batch loading of promises. It can be used with
   graphql gem.
 email: