top_n_loader 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cefe4d1a0d3a7a285526c35c6ead450994578721eb35bbc350ba3fc1e6154d6
-  data.tar.gz: b143544e5f799dc35d174378512107fdb978cfb73392eca0f921ea304388bb5a
+  metadata.gz: 6eb6d3a03ffce49b32f78bb04809b3ce0b9c0cd114c3e32dae441c815873c8a5
+  data.tar.gz: 1b5426e4d320baed476489d56928480d46604028b798a975faa7d104533d7606
 SHA512:
-  metadata.gz: 00f8b8f8bcf82e7cdc376119a45258280a7c9dbcedf97b84331191ee1fd3a0e745137927eb60b36fff86e790078ac9622219a524e9b1e3deb1a724cd6d030182
-  data.tar.gz: 320a553062bec7fa8d4cd3428806fa30ffefcbc2fb141975076a9cd0895f50020b8c82741936a40d1c389921a67a326579cd7c55c870b25fc29d99e90cafd7b5
+  metadata.gz: 7adc3640113ca456040bfcdc08c1c35d9c9ed18d7ddc54d865785ee8a49a06531b2c0067ae84f90ecb5198c088683226892e6c03e3b38edbdcd48635d669dc7a
+  data.tar.gz: f6c99dac0cbe3cd32fc02393f085baf853d88f8680b848e99efccf42ce9eebfffd7a8605192a04e75a396e45bda642a53a0372aa78241101b12680d6d93e6a8a

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+        gemfiles:
+          - gemfiles/Gemfile-rails-5.2
+          - gemfiles/Gemfile-rails-6.0
+        exclude:
+          - ruby: '2.6'
+            gemfiles: gemfiles/Gemfile-rails-5.2
+          - ruby: '2.7'
+            gemfiles: gemfiles/Gemfile-rails-5.2
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - run: |
+        sudo apt-get update
+        sudo apt-get install -y libsqlite3-dev
+    - run: bundle install --gemfile ${{ matrix.gemfiles }} --jobs 4 --retry 3
+    - run: bundle exec --gemfile ${{ matrix.gemfiles }} rake

data/.rubocop.yml

@@ -0,0 +1,16 @@
+require:
+  - rubocop-rubycw
+
+AllCops:
+  TargetRubyVersion: 2.7
+  DisabledByDefault: true
+
+Rubycw/Rubycw:
+  Enabled: true
+  Exclude:
+    - 'test/**/*_test.rb'
+
+Lint/DuplicateMethods:
+  Enabled: true
+  Include:
+    - 'test/**/*_test.rb'

data/Gemfile.lock

@@ -1,45 +1,61 @@
 PATH
   remote: .
   specs:
-    top_n_loader (1.0.1)
+    top_n_loader (1.0.2)
       activerecord
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activerecord (7.0.1)
+      activemodel (= 7.0.1)
+      activesupport (= 7.0.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.9)
     docile (1.1.5)
-    i18n (1.7.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     json (2.1.0)
     method_source (0.9.0)
     minitest (5.11.3)
+    parallel (1.19.1)
+    parser (2.7.1.2)
+      ast (~> 2.4.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rainbow (3.0.0)
     rake (10.5.0)
+    rexml (3.2.4)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-rubycw (0.1.4)
+      rubocop
+    ruby-progressbar (1.10.1)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -49,9 +65,11 @@ DEPENDENCIES
   minitest
   pry
   rake
+  rubocop
+  rubocop-rubycw
   simplecov
   sqlite3
   top_n_loader!
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/Rakefile

@@ -7,4 +7,9 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+desc "Run rubocop"
+task :rubocop do
+  sh 'bundle exec rubocop'
+end
+
+task default: [:rubocop, :test]

data/gemfiles/Gemfile-rails-5.2

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in top_n_loader.gemspec
+gemspec path: ".."
+
+gem "activerecord", "~> 5.2.0"

data/gemfiles/Gemfile-rails-6.0

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in top_n_loader.gemspec
+gemspec path: ".."
+
+gem "activerecord", "~> 6.0.0"

data/lib/top_n_loader/sql_builder.rb

@@ -28,13 +28,13 @@ module TopNLoader::SQLBuilder
           WHERE #{qt parent_table}.#{q klass.primary_key} = T.#{q klass.primary_key}
           ORDER BY #{qt target_table}.#{q order_key} #{order_mode.upcase}
           LIMIT 1 OFFSET #{limit.to_i - 1}
-        ) AS last_value
+        ) AS last_value_of_key
         FROM #{qt parent_table} as T where T.#{q klass.primary_key} in (?)
       ) T
       ON #{qt parent_table}.#{q klass.primary_key} = T.top_n_group_key
       AND (
-        T.last_value IS NULL
-        OR #{qt target_table}.#{q order_key} #{{ asc: :<=, desc: :>= }[order_mode]} T.last_value
+        T.last_value_of_key IS NULL
+        OR #{qt target_table}.#{q order_key} #{{ asc: :<=, desc: :>= }[order_mode]} T.last_value_of_key
         OR #{qt target_table}.#{q order_key} is NULL
       )
     )
@@ -63,13 +63,13 @@ module TopNLoader::SQLBuilder
           #{"AND #{sql}" if sql}
           ORDER BY #{qt table_name}.#{q order_key} #{order_mode.to_s.upcase}
           LIMIT 1 OFFSET #{limit.to_i - 1}
-        ) AS last_value
+        ) AS last_value_of_key
         FROM #{group_key_table}
       ) T
       ON #{join_cond}
       AND (
-        T.last_value IS NULL
-        OR #{qt table_name}.#{q order_key} #{order_op} T.last_value
+        T.last_value_of_key IS NULL
+        OR #{qt table_name}.#{q order_key} #{order_op} T.last_value_of_key
         OR #{qt table_name}.#{q order_key} is NULL
       )
       #{"WHERE #{sql}" if sql}

data/lib/top_n_loader/version.rb

@@ -1,3 +1,3 @@
 module TopNLoader
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/top_n_loader.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord"
 
-  %w[bundler rake minitest sqlite3 pry simplecov].each do |gem_name|
+  %w[bundler rake minitest sqlite3 pry simplecov rubocop rubocop-rubycw].each do |gem_name|
     spec.add_development_dependency gem_name
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: top_n_loader
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - tompng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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-rubycw
+  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: load top n records for each group
 email:
 - tomoyapenguin@gmail.com
@@ -115,7 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -124,6 +154,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/Gemfile-rails-5.2
+- gemfiles/Gemfile-rails-6.0
 - lib/top_n_loader.rb
 - lib/top_n_loader/sql_builder.rb
 - lib/top_n_loader/version.rb
@@ -132,7 +164,7 @@ homepage: https://github.com/tompng/top_n_loader
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: load top n records for each group
 test_files: []