better_batch-active_record 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe9b288ca345597bef98eb96b6cc5f502d2e3fc80e5cb93d37ae7fa2e58d0f5
-  data.tar.gz: f2630014996f4a63aa776d3c5874ed0069fbb1a132e3c8c56debabbfc156a4e9
+  metadata.gz: a12d961c7d5053c050e5ddb15db2a538c1ac45d60b95a4e30fcc3cfd4350b0e3
+  data.tar.gz: a3bb810a265d30d681a51bf01b5c774aa66fb805a318f8cbcad57109eb1c1ad9
 SHA512:
-  metadata.gz: a9f48bb98fa537624fdf5184e1ef79ec71bc5eb7c6057c6d1aaa9779a3e394ca4c522859b22cd5c577cc518dcb22b9ee4116ccc8306858341aec503241a8c8a8
-  data.tar.gz: 9ad9b8c1f33a5c224952a1fba2253b0e955fcf9ca05edce4ca42545c5c1113053cd8515166d21f88e8fb713ce9055ccb64ec1b3813e59c290839c6dc09bff3e3
+  metadata.gz: 48766522a43487d0be9514d148ad431408ef219333dd4a3ee69de8f4a902e77989cbe7785152d6ae5ee1a11d94eed1750085e3513baf4a05094a5cd54d4c272b
+  data.tar.gz: ed282d59658f40fb23aa6dfbe0a2212aeb854e8001778879e2b8c4daa5f05cb33582d132532dd659f5b677c4a865544139b3c3a3f4cd3f7828b4ba00e7e830b9

data/lib/better_batch/active_record/interface.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'better_batch/query'
+require 'better_batch/active_record/query'
+require 'better_batch/active_record/transform'
+
+module BetterBatch
+  module ActiveRecord
+    class Interface
+      def initialize(model)
+        @builder = Query.new(model)
+        @model = model
+      end
+
+      def upsert(data, unique_by:, except: nil, returning: nil)
+        upsert_data = Transform.slice_upsert(data, except:)
+        query = builder.build(upsert_data, unique_by:, returning:)
+        result = exec_query(:upsert, query, upsert_data)
+        Transform.build_return(returning, result.rows, query)
+      end
+
+      def with_upserted_pk(data, unique_by:, except: nil, &)
+        upserted = upsert(data, unique_by:, except:, returning: primary_key)
+        if block_given?
+          data.zip(upserted, &)
+        else
+          data.zip(upserted)
+        end
+      end
+
+      def set_upserted_pk(data, unique_by:, except: nil)
+        if block_given?
+          with_upserted_pk(data, unique_by:, except:) do |row, pk|
+            row[primary_key] = pk
+            yield row
+          end
+        else
+          set_upserted_pk_map(data, unique_by:, except:)
+        end
+      end
+
+      def select(data, unique_by:, returning:)
+        Transform.assert_inputs_ok!(data, unique_by:)
+        select_data = data.map { |datum| datum.slice(*unique_by) }
+        query = builder.build(select_data, unique_by:, returning:)
+        result = exec_query(:select, query, select_data)
+        Transform.build_return(returning, result.rows, query)
+      end
+
+      def with_selected_pk(data, unique_by:, &)
+        selected = select(data, unique_by:, returning: primary_key)
+        if block_given?
+          data.zip(selected, &)
+        else
+          data.zip(selected)
+        end
+      end
+
+      def set_selected_pk(data, unique_by:)
+        if block_given?
+          with_selected_pk(data, unique_by:) do |row, pk|
+            row[primary_key] = pk
+            yield row
+          end
+        else
+          set_selected_pk_map(data, unique_by:)
+        end
+      end
+
+      private
+
+      attr_reader :model, :builder
+
+      def set_upserted_pk_map(data, unique_by:, except: nil)
+        with_upserted_pk(data, unique_by:, except:).map do |row, pk|
+          row[primary_key] = pk
+          row
+        end
+      end
+
+      def set_selected_pk_map(data, unique_by:)
+        with_selected_pk(data, unique_by:).map do |row, pk|
+          row[primary_key] = pk
+          row
+        end
+      end
+
+      def exec_query(type, query, data)
+        db_exec(query.public_send(type), JSON.generate(data))
+      end
+
+      def db_exec(sql, json_data)
+        model.connection.exec_query(sql, nil, [json_data])
+      end
+
+      def primary_key
+        model.primary_key.to_sym
+      end
+    end
+  end
+end

data/lib/better_batch/active_record/model.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'better_batch/active_record/query'
+require 'better_batch/active_record/interface'
 
 module BetterBatch
   module ActiveRecord
     module Model
       def better_batch
-        Query.new(self)
+        Interface.new(self)
       end
     end
   end

data/lib/better_batch/active_record/query.rb

@@ -9,90 +9,15 @@ module BetterBatch
         @model = model
       end
 
-      def upsert(data, unique_by:, except: nil, returning: nil)
-        upsert_data = slice_upsert(data, except:)
-        query = build_query(upsert_data, unique_by:, returning:)
-        result = exec_query(:upsert, query, upsert_data)
-        build_return(returning, result.rows, query)
-      end
-
-      def with_upserted_pk(data, unique_by:, except: nil)
-        upserted = upsert(data, unique_by:, except:, returning: primary_key)
-        data.zip(upserted)
-      end
-
-      def set_upserted_pk(data, unique_by:, except: nil)
-        with_upserted_pk(data, unique_by:, except:).each do |row, pk|
-          row[primary_key] = pk
-        end
-        nil
-      end
-
-      def select(data, unique_by:, returning:)
-        assert_inputs_ok!(data, unique_by:)
-        select_data = data.map { |datum| datum.slice(*unique_by) }
-        query = build_query(select_data, unique_by:, returning:)
-        result = exec_query(:select, query, select_data)
-        build_return(returning, result.rows, query)
-      end
-
-      def build_return(returning, rows, query)
-        case returning
-        when Symbol
-          rows.map(&:first)
-        when nil, []
-          nil
-        else
-          hash_rows(query.returning, rows)
-        end
-      end
-
-      def with_selected_pk(data, unique_by:)
-        data.zip(select(data, unique_by:, returning: primary_key))
-      end
-
-      def set_selected_pk(data, unique_by:)
-        with_upserted_pk(data, unique_by:).each do |row, pk|
-          row[primary_key] = pk
-        end
-        nil
-      end
-
-      private
-
-      attr_reader :model
-
-      def slice_upsert(data, except:)
-        case except
-        when nil, []
-          data
-        else
-          data.map { |datum| datum.except(*except) }
-        end
-      end
-
-      def assert_inputs_ok!(data, unique_by:)
-        data_keys = data.first.keys
-        missing = Array(unique_by) - data_keys
-        return if missing.empty?
-
-        msg = "All unique_by columns must be in the given data, but #{missing.inspect} was missing from #{data_keys}."
-        raise Error, msg
-      end
-
-      def build_query(data, unique_by:, returning:)
+      def build(data, unique_by:, returning:)
         BetterBatch::Query.new(table_name:, primary_key:, input_columns: data.first.keys,
                                column_types:, unique_columns: unique_by, now_on_insert:,
                                now_on_update:, returning:)
       end
 
-      def exec_query(type, query, data)
-        db_exec(query.public_send(type), JSON.generate(data))
-      end
+      private
 
-      def db_exec(sql, json_data)
-        model.connection.exec_query(sql, nil, [json_data])
-      end
+      attr_reader :model
 
       def table_name
         @table_name ||= model.table_name
@@ -121,15 +46,6 @@ module BetterBatch
       def updated_at_if_present
         :updated_at if column_types.key?(:updated_at)
       end
-
-      def hash_rows(returning, rows)
-        # avoid building an entire new hash (which would rehash keys) for each row
-        # we only need to sub in the values
-        indexes = returning.each_with_index.to_h.freeze
-        rows.map do |row|
-          indexes.transform_values { |index| row[index] }
-        end
-      end
     end
   end
 end

data/lib/better_batch/active_record/transform.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'better_batch/query'
+require 'better_batch/active_record/query'
+
+module BetterBatch
+  module ActiveRecord
+    module Transform
+      class << self
+        def assert_inputs_ok!(data, unique_by:)
+          data_keys = data.first.keys
+          missing = Array(unique_by) - data_keys
+          return if missing.empty?
+
+          msg = "All unique_by columns must be in the given data, but #{missing.inspect} was missing from #{data_keys}."
+          raise Error, msg
+        end
+
+        def slice_upsert(data, except:)
+          case except
+          when nil, []
+            data
+          else
+            data.map { |datum| datum.except(*except) }
+          end
+        end
+
+        def build_return(returning, rows, query)
+          case returning
+          when Symbol
+            rows.map(&:first)
+          when nil, []
+            nil
+          else
+            hash_rows(query.returning, rows)
+          end
+        end
+
+        def hash_rows(returning, rows)
+          # avoid building an entire new hash (which would rehash keys) for each row
+          # we only need to sub in the values
+          indexes = returning.each_with_index.to_h.freeze
+          rows.map do |row|
+            indexes.transform_values { |index| row[index] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/better_batch/active_record/version.rb

@@ -9,6 +9,6 @@ module BetterBatch
     # because Rails is love, Rails is life, Rails is everything
     module Version; end
 
-    VERSION = '1.0.3'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: better_batch-active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Tyler Hartland
 bindir: exe
 cert_chain: []
-date: 2025-04-17 00:00:00.000000000 Z
+date: 2025-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,8 +53,10 @@ files:
 - lib/better_batch/.DS_Store
 - lib/better_batch/active_record.rb
 - lib/better_batch/active_record/error.rb
+- lib/better_batch/active_record/interface.rb
 - lib/better_batch/active_record/model.rb
 - lib/better_batch/active_record/query.rb
+- lib/better_batch/active_record/transform.rb
 - lib/better_batch/active_record/version.rb
 homepage: https://github.com/th7/better_batch-active_record
 licenses: