sequel-batches 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d672ec841f323173981c39aae77162e2fc1c8df8
-  data.tar.gz: d5efb671fcf8e70b52f71e332fa1db8fdaf1137b
+  metadata.gz: 59714df347d4f6cb7e6e697051a8a049fda88dc1
+  data.tar.gz: 011f44112aee94dda9e0e47e10999e13fe4972fd
 SHA512:
-  metadata.gz: 3d9875b3215e0362cfed0c0dcd243c81a5bedca354c98d03c235c28a6586a3cecf395293443a4d68d40320728617181d2bb2b9e49cea776d76cd8fb946497f21
-  data.tar.gz: 27a68707ccbb69b13e23fa9f6e076e116e77ec04afeb1315e42d8b8e142c383185a9a09991376f2cc6887b8818304ce94e6967e59c84214924e744cbc0ff8f57
+  metadata.gz: eb8daebb6ba2b19abcb3ee3ce6070042b28b36e9d63d01bb9a35f367faacc228e8a1908a22631d08291d70f54d49e8b1f6d10bdb5403b9825b7bc6b8610cb7b2
+  data.tar.gz: 9b9b8ab0afcb1670d6aa517d29299ab1e5887ed322e3f848db85d10b240a5c5ef8529dc93e55ea3406a7b5a1521ef2b14d68f250c52e988fe86a675e98aa7b57

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 *.gem
+.coveralls.yml

data/.ruby-version

@@ -0,0 +1 @@
+jruby-9.1.15.0

data/.travis.yml

@@ -1,8 +1,16 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.3.3
+  - 2.4.2
+  - 2.5.0
+  - jruby
 before_install: gem install bundler -v 1.14.6
+env:
+  - SEQUEL_VERSION='~> 4.0'
+  - SEQUEL_VERSION='~> 5.0'
+gemfile:
+  - gemfiles/ci.gemfile
 addons:
   postgresql: "9.6"
 services:

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    sequel-batches (0.1.1)
-      pg (~> 0.20.0)
-      sequel (~> 4.0)
+    sequel-batches (0.1.2)
+      sequel (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -17,12 +16,17 @@ GEM
       tins (~> 1.6)
     diff-lcs (1.3)
     docile (1.1.5)
+    ffi (1.9.23-java)
     json (2.1.0)
+    json (2.1.0-java)
     method_source (0.9.0)
-    pg (0.20.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    pry (0.11.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+      spoon (~> 0.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -37,18 +41,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    sequel (4.49.0)
+    sequel (5.6.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    spoon (0.0.6)
+      ffi
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     thor (0.19.4)
     tins (1.16.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -1,11 +1,11 @@
-# Sequel::Batches [![Build Status](https://travis-ci.org/umbrellio/sequel-batches.svg?branch=master)](https://travis-ci.org/umbrellio/sequel-batches)
+# Sequel::Batches [![Build Status](https://travis-ci.org/umbrellio/sequel-batches.svg?branch=master)](https://travis-ci.org/umbrellio/sequel-batches) [![Coverage Status](https://coveralls.io/repos/github/umbrellio/sequel-batches/badge.svg?branch=master)](https://coveralls.io/github/umbrellio/sequel-batches?branch=master)
 
 This dataset extension provides the method #in_batches. The method splits dataset in parts and yields it.
 
 You can set following options:
   - pk Overrides primary key of your dataset
   - of sets chunk size (1000 by default)
-  - start as a hash { <column>: <start_value> } represents frame start for batch processing
+  - start as a hash { [column]: <start_value> } represents frame start for batch processing
   - finish as a hash represents frame end
 
 ## Installation

data/gemfiles/ci.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+# MRI/Rubinius Adapter Dependencies
+platforms :ruby do
+  gem "pg", "~>0.20.0"
+end
+
+# JRuby Adapter Dependencies
+platforms :jruby do
+  gem 'jdbc-postgres', '~> 9.4'
+end
+
+gem sequel, "#{ENV['SEQUEL_VERSION']}"

data/gemfiles/ci.gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: ..
+  specs:
+    sequel-batches (0.1.2)
+      sequel (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.2)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    ffi (1.9.23-java)
+    jdbc-postgres (9.4.1212)
+    json (2.1.0)
+    json (2.1.0-java)
+    method_source (0.9.0)
+    pg (0.20.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry (0.11.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+      spoon (~> 0.0)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    sequel (5.6.0)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    spoon (0.0.6)
+      ffi
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    tins (1.16.3)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  coveralls
+  jdbc-postgres (~> 9.4)
+  pg (~> 0.20.0)
+  pry (~> 0.10)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sequel-batches!
+
+BUNDLED WITH
+   1.16.1

data/lib/sequel/extensions/batches.rb

@@ -46,7 +46,16 @@ module Sequel
             Sequel.&(*pk.map { |col| range_expr.call(col, entire_min_max[col]) })
           )
           if min_max.present?
-            ds=ds.where(Sequel.function(:concat, qualified_pk.map{|col| Sequel.cast(col, :text)}) > Sequel.function(:concat, min_max.values.map(&:last)))
+            pk_combinations = pk.each_with_index.map { |x, i| pk[0..-i] }
+            ds = ds.where(Sequel.|(*pk_combinations.each_with_index.map do |pks, i|
+              Sequel.&(*pks.each_with_index.map do |col, j|
+                if j == i
+                  Sequel[first_source][col] > min_max[col].last
+                else
+                  Sequel[first_source][col] >= min_max[col].last
+                end
+              end)
+            end))
           end
 
           min_max = self.db.from(ds).select(*pk_expr.call(pk: pk)).first

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

@@ -1,7 +1,7 @@
 module Sequel
   module Extensions
     module Batches
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

data/sequel-batches.gemspec

@@ -30,12 +30,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sequel", "~> 4.0"
-  spec.add_dependency "pg", "~> 0.20.0"
-
+  spec.add_development_dependency "sequel", "~> 5.0"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "coveralls" 
+  spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,108 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: sequel-batches
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - fiscal-cliff
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.20.0
-  type: :runtime
+        version: '5.0'
+  name: sequel
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: coveralls
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -126,6 +113,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/ci.gemfile
+- gemfiles/ci.gemfile.lock
 - lib/sequel.rb
 - lib/sequel/extensions/batches.rb
 - lib/sequel/extensions/batches/version.rb
@@ -135,7 +124,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,10 +139,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14
+signing_key:
 specification_version: 4
 summary: The extension mimics AR5 batches api
 test_files: []
-has_rdoc: