sequel-batches 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d8af97c53f8431d8fc6318af40c5f42e00ad83f177dc663fbdd5c0a18f7c90d
-  data.tar.gz: 1f5d637fff098d001694c62a4e397801a5077217ba2174533a8c87975edc8fb7
+  metadata.gz: 04f8ae7798b4499734e05f2c832ab01f31e10e7f4fc5c1f00a28bab74849e87a
+  data.tar.gz: 42a570ce32264ca13b7aff386bc7919a027699abe7e21c35dd62ca86e715ba0e
 SHA512:
-  metadata.gz: f26a92d8573d15f3a264d606cce33eaeab69bdb0a791d9b98b4dc9cb8cfad8c4abddf0b04bd5ff9032fe80042da81cc81d1b8759b662c4459567d6720f2bfb7c
-  data.tar.gz: 237d285d2febaa6f896f4e7d727a0a36884c6889c348ef68815999ee10c766390f490888adf62eda75f2a41789e93bddd0dcb205279003eba46db6dba570ff42
+  metadata.gz: 4acd36d8b43e7963dfef29ac9408a76259276bd45678e7be7cb8e0f12f48e6be7d6274c400f5c110a0f1843efdf9abbdeeace8576dcd01f261ead8a1301bc993
+  data.tar.gz: c05e40d2f038db4a12717480debebfe6f202abc27fdb5bf78a236e33e303a5c90455e54d794fd1d3863bf30c4ca0fec935c70052c236a97ea8433e4e0c054469

data/.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
 
     name: ${{ matrix.ruby }}
 
@@ -41,7 +41,6 @@ jobs:
           bundler-cache: true
 
       - run: psql -c 'CREATE DATABASE batches_test'
-      - run: bundle exec rake bundle:audit
       - run: bundle exec rake lint
       - run: bundle exec rspec
 

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Include:
     - lib/**/*.rb
     - spec/**/*.rb

data/Gemfile

@@ -4,3 +4,12 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in sequel-batches.gemspec
 gemspec
+
+gem "bundler"
+gem "pg"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "rubocop-config-umbrellio"
+gem "simplecov"
+gem "simplecov-lcov"

data/Gemfile.lock

@@ -1,105 +1,129 @@
 PATH
   remote: .
   specs:
-    sequel-batches (2.0.1)
+    sequel-batches (2.0.3)
       sequel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    bundler-audit (0.9.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 1.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    i18n (1.12.0)
+    drb (2.2.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.16.2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    method_source (1.1.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
-    pg (1.4.2)
-    pry (0.14.1)
+      racc
+    pg (1.5.6)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.4)
+    racc (1.8.0)
+    rack (3.1.4)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.5)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-config-umbrellio (1.30.0.65)
-      rubocop (~> 1.30.0)
-      rubocop-performance (~> 1.14.0)
-      rubocop-rails (~> 2.14.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-config-umbrellio (1.63.0.93)
+      rubocop (~> 1.63.0)
+      rubocop-performance (~> 1.21.0)
+      rubocop-rails (~> 2.24.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.11.1)
+      rubocop-rspec (~> 2.29.0)
       rubocop-sequel (~> 0.3.3)
-    rubocop-performance (1.14.3)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.14.2)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.29.2)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
-    sequel (5.59.0)
-    simplecov (0.21.2)
+    ruby-progressbar (1.13.0)
+    sequel (5.81.0)
+      bigdecimal
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    thor (1.2.1)
-    tzinfo (2.0.5)
+    strscan (3.1.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  bundler-audit
   pg
   pry
   rake
@@ -110,4 +134,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.3.19
+   2.5.14

data/README.md

@@ -17,7 +17,7 @@ gem 'sequel-batches'
 In order to use the feature you should enable the extension:
 
 ```ruby
-Sequel::DATABASES.first.extension :batches
+DB.extension(:batches)
 ```
 
 After that the `#in_batches` method becomes available on dataset:
@@ -39,8 +39,8 @@ options = {
   order: :desc,
 }
 
-Event.where(type: "login").in_batches(options) do |ds|
-  ds.delete
+Event.where(type: "login").in_batches(**options) do |dataset|
+  dataset.delete
 end
 ```
 

data/Rakefile

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require "bundler/audit/task"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
 
@@ -13,6 +12,5 @@ RuboCop::RakeTask.new(:lint) do |t|
   t.requires << "rubocop-rspec"
   t.requires << "rubocop-performance"
 end
-Bundler::Audit::Task.new
 
 task default: %i[lint spec]

data/lib/sequel/extensions/batches/yielder.rb

@@ -6,7 +6,7 @@ module Sequel::Extensions::Batches
     attr_writer :pk
 
     def initialize(ds:, **options)
-      self.ds = ds
+      self.ds = ds.unordered
       self.pk = options.delete(:pk)
       self.of = options.delete(:of) || 1000
       self.start = options.delete(:start)
@@ -21,19 +21,19 @@ module Sequel::Extensions::Batches
       base_ds = setup_base_ds or return
       return enum_for(:call) unless block_given?
 
-      current_instance = nil
+      current_pk = nil
 
       loop do
         working_ds =
-          if current_instance
-            base_ds.where(generate_conditions(current_instance.to_h, sign: sign_from_exclusive))
+          if current_pk
+            base_ds.where(generate_conditions(current_pk.to_h, sign: sign_from_exclusive))
           else
             base_ds
           end
 
-        working_ds_pk = working_ds.select(*qualified_pk).order(order_by(qualified: true)).limit(of)
-        current_instance = db.from(working_ds_pk).select(*pk).order(order_by).last or break
-        working_ds = working_ds.where(generate_conditions(current_instance.to_h, sign: sign_to_inclusive))
+        working_ds_pk = working_ds.select(*qualified_pk).order(*order_by(qualified: true)).limit(of)
+        current_pk = db.from(working_ds_pk).select(*pk).order(*order_by).last or break
+        working_ds = working_ds.where(generate_conditions(current_pk.to_h, sign: sign_to_inclusive))
 
         yield working_ds
       end
@@ -70,14 +70,18 @@ module Sequel::Extensions::Batches
     end
 
     def order_by(qualified: false)
-      columns = qualified ? qualified_pk : pk
-      asc_order? ? Sequel.asc(columns) : Sequel.desc(columns)
+      columns = qualified ? qualified_pk : unqualified_pk
+      asc_order? ? columns.map(&:asc) : columns.map(&:desc)
     end
 
     def qualified_pk
       @qualified_pk ||= pk.map { |x| Sequel[ds.first_source][x] }
     end
 
+    def unqualified_pk
+      @unqualified_pk ||= pk.map { |x| x.is_a?(Symbol) ? Sequel[x] : x }
+    end
+
     def check_pk(input_pk)
       raise InvalidPKError if input_pk.keys != pk
       input_pk
@@ -90,18 +94,19 @@ module Sequel::Extensions::Batches
     end
 
     def setup_base_ds
-      base_ds = ds.order(order_by(qualified: true))
+      base_ds = ds
       base_ds = base_ds.where(generate_conditions(check_pk(start), sign: sign_from_inclusive)) if start
       base_ds = base_ds.where(generate_conditions(check_pk(finish), sign: sign_to_inclusive)) if finish
 
-      pk_ds = db.from(base_ds.select(*qualified_pk)).select(*pk).order(order_by)
+      pk_ds = db.from(base_ds.select(*qualified_pk)).select(*pk).order(*order_by)
       actual_start = pk_ds.first
       actual_finish = pk_ds.last
 
       return unless actual_start && actual_finish
 
       base_ds = base_ds.where(generate_conditions(actual_start, sign: sign_from_inclusive))
-      base_ds.where(generate_conditions(actual_finish, sign: sign_to_inclusive))
+      base_ds = base_ds.where(generate_conditions(actual_finish, sign: sign_to_inclusive))
+      base_ds.order(*order_by(qualified: true))
     end
   end
 end

data/lib/sequel/extensions/batches.rb

@@ -14,6 +14,6 @@ module Sequel
   end
 end
 
-::Sequel::Dataset.register_extension(:batches, Sequel::Extensions::Batches)
+Sequel::Dataset.register_extension(:batches, Sequel::Extensions::Batches)
 
 require_relative "batches/yielder"

data/sequel-batches.gemspec

@@ -5,10 +5,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = "sequel-batches"
-  spec.version = "2.0.1"
+  spec.version = "2.0.3"
   spec.authors = %w[fiscal-cliff umbrellio]
   spec.email = ["oss@umbrellio.biz"]
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.summary = "The extension mimics AR5 batches api"
   spec.description = "Allows you to split your dataset in batches"
@@ -19,14 +19,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sequel"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "bundler-audit"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop-config-umbrellio"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-lcov"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-batches
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - fiscal-cliff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -25,132 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  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: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  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: '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: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-config-umbrellio
-  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: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-lcov
-  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: '0'
 description: Allows you to split your dataset in batches
 email:
 - oss@umbrellio.biz
@@ -184,14 +58,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: The extension mimics AR5 batches api