prelude-batch-loader 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cae99a6ad46de71ce518e50d1f2877efaebf2df5d23b4224fb10416417f69cd6
-  data.tar.gz: 3594cbeadbaa4e55fea9138570fc55fd8863c04698999737cb018290af95f310
+  metadata.gz: f86743d57a4562218bfea1d13a8e9e920a0ca5f9a91085607f1d1afe5d335e62
+  data.tar.gz: 2778e3c72e362cea60a81d49a04e86deea59227079d870d4351ec0303e105cd0
 SHA512:
-  metadata.gz: 9519329f8ed99362489e9b434448879b1aae9c286e4b689b8b8376866e5b327fd055fcccd36e3e2edb7a4765ca2a478b26b24084808ca7d81b8e2520d261262a
-  data.tar.gz: c2e34af07621b2b2a06514eee82d010f867b67f4afefa50811a239f2536e0bbda6cc168a25f6c5138b5e922d7a012d4ce4c1e670537d2284da4c9f0a745e2bd7
+  metadata.gz: 41b1b1bae958e1641b8b08c779f7ee56470198f91463a9d2afeeea58de88577b184858fc00802661dce66de1a0814c4ab238fc7dd1e9c6c52bcf6bb17b0801ca
+  data.tar.gz: b99d979848d04d2a390f98cc806221f6124662fb2d13b4eb37cb3625c8422496594a1825e5e813eb7e1b747f8314e0d08ca3a29b99c4aef5a1869d14b2427870

data/lib/prelude.rb

@@ -3,6 +3,17 @@ require_relative 'prelude/preloadable'
 require_relative 'prelude/enumerator'
 require 'active_support'
 
+module Prelude
+  def self.wrap(records)
+    preloader = Preloader.new(records.first.class, records)
+    records.each { |r| r.prelude_preloader = preloader }
+  end
+
+  def self.preload(records, method)
+    wrap(records).each(&method)
+  end
+end
+
 ActiveSupport.on_load :active_record do
   include Prelude::Preloadable
 end

data/lib/prelude/enumerator.rb

@@ -8,8 +8,7 @@ module Prelude
       raise TypeMismatch unless map(&:class).uniq.count == 1
 
       # Share a preloader
-      preloader = Preloader.new(first.class, self)
-      each { |r| r.prelude_preloader = preloader }
+      Prelude.wrap(self)
 
       # Iterate
       each { |o| yield o }

data/lib/prelude/method.rb

@@ -1,9 +1,6 @@
 module Prelude
   class Method
-    attr_reader :batch_size
-
-    def initialize(batch_size:, &blk)
-      @batch_size = batch_size
+    def initialize(&blk)
       @definition = blk
     end
 

data/lib/prelude/preloadable.rb

@@ -7,6 +7,15 @@ module Prelude
 
     attr_writer :prelude_preloader
 
+    def preloaded_values
+      @preloaded_values ||= {}
+    end
+
+    def set_preloaded_value_for(name, args, result)
+      key = [name, args]
+      preloaded_values[key] = result
+    end
+
     class_methods do
       # Mapping of field name to block for resolving a given preloader
       def prelude_methods
@@ -14,15 +23,19 @@ module Prelude
       end
 
       # Define how to preload a given method
-      def define_prelude(name, batch_size: nil, &blk)
-        prelude_methods[name] = Prelude::Method.new(batch_size: batch_size, &blk)
+      def define_prelude(name, &blk)
+        prelude_methods[name] = Prelude::Method.new(&blk)
 
         define_method(name) do |*args|
+          key = [name, args]
+          return preloaded_values[key] if preloaded_values.key?(key)
+
           unless @prelude_preloader
             @prelude_preloader = Preloader.new(self.class, [self])
           end
 
-          @prelude_preloader.fetch(name, self, *args)
+          @prelude_preloader.fetch(name, *args)
+          preloaded_values[key]
         end
       end
     end

data/lib/prelude/preloader.rb

@@ -3,59 +3,25 @@ module Prelude
     def initialize(klass, records)
       @klass = klass
       @records = records
-      @runs = {}
     end
 
-    def fetch(name, object, *args)
+    def fetch(name, *args)
       method = @klass.prelude_methods.fetch(name)
 
-      # If this object has a run, return the value
-      if run = run_for(method, args, object)
-        return run[object]
+      # Load and set the results for each record
+      results = preload(method, args)
+      @records.each do |record|
+        record.set_preloaded_value_for(name, args, results[record])
       end
 
-      # Choose a batch of the correct size that contains the object we're trying to load,
-      # or use all if we're not batching
-      run = if method.batch_size
-        remaining_records = @records.to_a - resolved_objects_for(method, args)
-        slices = remaining_records.each_slice(method.batch_size)
-        slice = slices.detect { |slice| slice.include?(object) }
-        preload(method, slice, args)
-      else
-        preload(method, @records, args)
-      end
-
-      # Return the value for this object
-      run[object]
+      results
     end
 
     private
 
     # Preload the given field with the given args for all records
-    def preload(method, records, args)
-      results = method.call(records, *args)
-
-      # set the run for each of these name/record/args combos
-      records.each do |record|
-        set_run_for(method, args, record, results)
-      end
-
-      # Return the run
-      results
-    end
-
-    def run_for(method, args, object)
-      @runs.dig(method, args, object)
-    end
-
-    def resolved_objects_for(method, args)
-      @runs.dig(method, args)&.keys || []
-    end
-
-    def set_run_for(method, args, object, run)
-      @runs[method] ||= {}
-      @runs[method][args] ||= {}
-      @runs[method][args][object] = run
+    def preload(method, args)
+      method.call(@records, *args)
     end
   end
 end

data/lib/prelude/version.rb

@@ -1,3 +1,3 @@
 module Prelude
-  VERSION = [0, 0, 4].join('.')
+  VERSION = [0, 0, 5].join('.')
 end

data/spec/prelude_spec.rb

@@ -129,39 +129,24 @@ describe Prelude do
     ])
   end
 
-  it 'should be able to set a batch size' do
+  it 'should preload when called explicitly' do
     call_count = 0
+    klass = Class.new do
+      include Prelude::Preloadable
 
-    klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'breweries'
-
-      define_prelude(:number, batch_size: 2) do |records|
+      define_prelude(:foo) do |records|
         call_count += 1
-        Hash[records.map { |r| [r, 42] }]
+        records.index_with("bar")
       end
     end
 
-    values = 4.times.map { klass.new }.map.with_prelude { |r| r.number }
-
-    expect(values.uniq).to eq([42])
-    expect(call_count).to eq(4 / 2) # one per batch
-  end
-
-  it 'should be able to use batch_size with default_proc' do
-    call_count = 0
-
-    klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'breweries'
-
-      define_prelude(:number, batch_size: 2) do |records|
-        call_count += 1
-        Hash.new { |h, k| h[k] = 42 }
-      end
-    end
+    records = 4.times.map { klass.new }
+    expect(call_count).to eq(0)
 
-    values = 4.times.map { klass.new }.map.with_prelude { |r| r.number }
+    Prelude.preload(records, :foo)
+    expect(call_count).to eq(1)
 
-    expect(values.uniq).to eq([42])
-    expect(call_count).to eq(4 / 2) # one per batch
+    expect(records.map(&:foo)).to eq(["bar"]*4)
+    expect(call_count).to eq(1)
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 require 'fileutils'
 require 'active_record'
 require 'pry'
-require_relative '../lib/prelude'
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require 'prelude'
 
 # Remove existing
 FileUtils.rm_rf('db.sqlite3')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prelude-batch-loader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Crepezzi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,19 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 description:
 email: john.crepezzi@gmail.com
 executables: []