order_query 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b0284712fbd8e451e7bb4f41a81dc410c8141bc6e3d670dae192e02565bfb9f
-  data.tar.gz: 6b76ba2002e94c9f320f124ac4ba12bf786e213f9f7fcbcae20ae47402054dce
+  metadata.gz: 2f9e31c687e96f7014255acbfa4590f9495bca00b942d23c111f38a6c77646eb
+  data.tar.gz: ae44f4ca9d520edd2e2d3dc7eead83e9de2f8e440fa2c4ad1d9ce59f266f2756
 SHA512:
-  metadata.gz: ddae4f82c3df302d84d2a7402aa5cc0aa2e6b4706a6d104b296ab5a33d036a121839fd01f42291364cc83347cc63e4a25e6776cbf776cf7e9c3e307818919f79
-  data.tar.gz: c1887c00922ab788bf659111e8ac55f7843c7a6dadfdf2d7948ca5ca1dd08a272142658e735c276d1b54c02b2fefb1d8fda1ebe49498d54cd76bc35435bda12a
+  metadata.gz: d570f7f7133f1475c109be472d61014b31ed0569eb77474de0658eaf6ca77053d411c9f434971a35250a703c6455041aa7d483ddd68439df727a03026ddfd263
+  data.tar.gz: ba16dd0f9c83246ac4f3e10d8492a30063ca12170b1619f971486ad802f1ec548d368c59c59c06befe344d4b71eb35b6feee64564fcee99e76c6e2f904d5d22f

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.5.2
+
+* Ruby 3.0 now supported.
+* Rails 7.0 now supported.
+
 ## 0.5.1
 
 * Rails 6.1 now supported.
@@ -23,7 +28,7 @@
 
 ## 0.3.4
 
-* The `before` and `after` methods now accept a boolean argument that indicates 
+* The `before` and `after` methods now accept a boolean argument that indicates
   whether the relation should exclude the given point or not.
   By default the given point is excluded, if you want to include it,
   use `before(false)` / `after(false)`.

data/Gemfile

@@ -2,5 +2,5 @@
 
 source 'https://rubygems.org'
 
-eval_gemfile 'spec/gemfiles/rails_6_1.gemfile'
+eval_gemfile 'spec/gemfiles/rails_7_0.gemfile'
 eval_gemfile 'rubocop.gemfile'

data/README.md

@@ -11,7 +11,7 @@ This gem finds the next or previous record(s) relative to the current one effici
 Add to Gemfile:
 
 ```ruby
-gem 'order_query', '~> 0.5.1'
+gem 'order_query', '~> 0.5.2'
 ```
 
 ## Usage

data/lib/order_query/space.rb

@@ -15,7 +15,7 @@ module OrderQuery
     def initialize(base_scope, order_spec)
       @base_scope = base_scope
       @columns = order_spec.map do |cond_spec|
-        Column.new(base_scope, *cond_spec)
+        build_column(base_scope, cond_spec)
       end
       # add primary key if columns are not unique
       unless @columns.last.unique?
@@ -58,5 +58,13 @@ module OrderQuery
       "#<OrderQuery::Space @columns=#{@columns.inspect} "\
       "@base_scope=#{@base_scope.inspect}>"
     end
+
+    private
+
+    def build_column(base_scope, cond_spec)
+      column_spec = cond_spec.last.is_a?(Hash) ? cond_spec : cond_spec.push({})
+      attr_name, *vals_and_or_dir, options = column_spec
+      Column.new(base_scope, attr_name, *vals_and_or_dir, **options)
+    end
   end
 end

data/lib/order_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OrderQuery
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 7.0.0'
+gem 'activesupport', '~> 7.0.0'
+
+platforms :mri, :rbx do
+  # https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+  gem 'sqlite3', '~> 1.4'
+
+  # https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
+  gem 'pg', '>= 0.18', '< 2.0'
+
+  # https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+  gem 'mysql2', '>= 0.4.4'
+end
+
+eval_gemfile '../../shared.gemfile'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: order_query
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Gleb Mazovetskiy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - spec/gemfiles/rails_5_2.gemfile
 - spec/gemfiles/rails_6_0.gemfile
 - spec/gemfiles/rails_6_1.gemfile
+- spec/gemfiles/rails_7_0.gemfile
 - spec/gemfiles/rubocop.gemfile
 - spec/order_query_spec.rb
 - spec/spec_helper.rb
@@ -128,7 +129,7 @@ licenses:
 - MIT
 metadata:
   issue_tracker: https://github.com/glebm/order_query
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,17 +144,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Find next / previous Active Record(s) in one query
 test_files:
-- spec/spec_helper.rb
-- spec/order_query_spec.rb
-- spec/gemfiles/rails_6_1.gemfile
-- spec/gemfiles/rails_5_2.gemfile
-- spec/gemfiles/rails_6_0.gemfile
 - spec/gemfiles/rails_5_0.gemfile
 - spec/gemfiles/rails_5_1.gemfile
+- spec/gemfiles/rails_5_2.gemfile
+- spec/gemfiles/rails_6_0.gemfile
+- spec/gemfiles/rails_6_1.gemfile
+- spec/gemfiles/rails_7_0.gemfile
 - spec/gemfiles/rubocop.gemfile
+- spec/order_query_spec.rb
+- spec/spec_helper.rb
 - spec/support/order_expectation.rb