sequel-batches 1.1.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ba86551c2e6fa28e3c012fec381ca293267b3c04629f8295114724a2c7ff99a
-  data.tar.gz: c36a543672f8d6869e4189ad808ac15c275d0342cc41ec3a258a0299e4225829
+  metadata.gz: 3cd6e15b3473080a3ccc2db4959cddb601624fc0bde9bda3bfad153d9e60194b
+  data.tar.gz: 840ea07efcc58c518a2022f21e4423fc1e2887b2a552c05d5905077ae02daa8a
 SHA512:
-  metadata.gz: 655a16e69b97c23fe80c92beef06e5cc80fa242b161955ef3702193385528b67b8575a14c5b75ed0e7cc4af559e1a04e0e0141e8ab4ef60c5cfc350ac5afda9c
-  data.tar.gz: c36d801caaf7cefc37520c4db12ce9d47ff62c20eb2c9c8c2c9813775829bd5acbaa0bc8f1d6953b5fc1c6dfbcea34650eec29ca37f8c15731872bd1915f193a
+  metadata.gz: a1ae993708db8f425d9901047fb868498f0b1e0957e2fc56578ec23f388e095fd2ba509a3a09c7b9d485c9b7f7e1bf390144bc2e74c09bf585c7b4b708376b24
+  data.tar.gz: 5d19d482faf0959d6a873dd17dc62595c7d5c972d1d35d169ece1c53f880d5ba1e116b6db5d27e04e3731c2f74da989ac361df215fe9d2daa061a2c6b9e43f69

data/.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, "3.0", jruby-9.3.1.0, ruby-head, jruby-head]
+        ruby: ["2.7", "3.0", "3.1"]
 
     name: ${{ matrix.ruby }}
 
@@ -44,7 +44,6 @@ jobs:
       - run: bundle exec rake bundle:audit
       - run: bundle exec rake lint
       - run: bundle exec rspec
-        continue-on-error: ${{ matrix.ruby == 'jruby-head' ||  matrix.ruby == 'ruby-head' }}
 
       - uses: coverallsapp/github-action@v1.1.2
         with:

data/.gitignore

@@ -11,7 +11,6 @@
 .rspec_status
 
 *.gem
-*.lock
 *.log
 .coveralls.yml
 .ruby-version

data/.rubocop.yml

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

data/Gemfile

@@ -4,13 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in sequel-batches.gemspec
 gemspec
-
-# MRI/Rubinius Adapter Dependencies
-platforms :ruby do
-  gem "pg"
-end
-
-# JRuby Adapter Dependencies
-platforms :jruby do
-  gem "jdbc-postgres"
-end

data/Gemfile.lock

@@ -0,0 +1,113 @@
+PATH
+  remote: .
+  specs:
+    sequel-batches (2.0.2)
+      sequel
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    bundler-audit (0.9.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.16.2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pg (1.4.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      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)
+      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)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.11.1)
+      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)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.4)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    sequel (5.59.0)
+    simplecov (0.21.2)
+      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)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  bundler-audit
+  pg
+  pry
+  rake
+  rspec
+  rubocop-config-umbrellio
+  sequel-batches!
+  simplecov
+  simplecov-lcov
+
+BUNDLED WITH
+   2.3.19

data/README.md

@@ -12,14 +12,6 @@ Add this line to your application's Gemfile:
 gem 'sequel-batches'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sequel-batches
-
 ## Usage
 
 In order to use the feature you should enable the extension:
@@ -57,21 +49,26 @@ end
 You can set the following options:
 
 ### pk
+
 Overrides primary key of your dataset. This option is required in case your table doesn't have a real PK, otherwise you will get `Sequel::Extensions::Batches::MissingPKError`.
 
 Note that you have to provide columns that don't contain NULL values, otherwise this may not work as intended. You will receive `Sequel::Extensions::Batches::NullPKError` in case batch processing detects a NULL value on it's way, but it's not guaranteed since it doesn't check all the rows for performance reasons.
 
 ### of
+
 Sets chunk size (1000 by default).
 
 ### start
+
 A hash `{ [column]: <start_value> }` that represents frame start for batch processing. Note that you will get `Sequel::Extensions::Batches::InvalidPKError` in case you provide a hash with wrong keys (ordering matters as well).
 
 ### finish
+
 Same as `start` but represents the frame end.
 
 ### order
-Specifies the primary key order (can be :asc or :desc). Defaults to :asc.
+
+Specifies the primary key order (can be `:asc` or `:desc`). Defaults to `:asc`.
 
 ## Contributing
 

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)
@@ -31,8 +31,8 @@ module Sequel::Extensions::Batches
             base_ds
           end
 
-        working_ds_pk = working_ds.select(*qualified_pk).order(order_by).limit(of)
-        current_instance = db.from(working_ds_pk).select(*pk).order(order_by).last or break
+        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))
 
         yield working_ds
@@ -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,11 +94,11 @@ module Sequel::Extensions::Batches
     end
 
     def setup_base_ds
-      base_ds = ds.order(order_by(qualified: true))
+      base_ds = ds.order(*order_by(qualified: true))
       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
 

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 = "1.1.0"
+  spec.version = "2.0.2"
   spec.authors = %w[fiscal-cliff umbrellio]
   spec.email = ["oss@umbrellio.biz"]
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.summary = "The extension mimics AR5 batches api"
   spec.description = "Allows you to split your dataset in batches"
@@ -22,13 +22,11 @@ Gem::Specification.new do |spec|
 
   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 "rubocop-config-umbrellio"
-
   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: 1.1.0
+  version: 2.0.2
 platform: ruby
 authors:
 - fiscal-cliff
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !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
@@ -82,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-config-umbrellio
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-config-umbrellio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +164,7 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -169,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="