order_query 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2139f5b59c57d0163c85a86b23b79a3e6fd00a28
-  data.tar.gz: e879b1b335c61133b122c014e49b01acb83c907d
+  metadata.gz: 5665c0c52a581228b9afdc57825cd1cfbec7dcae
+  data.tar.gz: a125032c1dfef35a5dfb251c0b4fb4d4f326c1d6
 SHA512:
-  metadata.gz: a8c33923361af77ea70eaf89eed9486122ff82e70ebcb8dae13d8ee273155e0075a0207e59a7dc276a9d335548830b6a768db1575cc657e2d64c3ad58cbade63
-  data.tar.gz: a42483806ef779802cf97467ebd53fa95e2e97639ce709e51564320ae184e09274a6aaa001f5c7a4414897e4c6918816d5b680466fd6b784c2384bc288167272
+  metadata.gz: 4a5e1c93db80ef5b81da56f2e551f283ac86c3502df3caf73b0f75f717c4a5cb42e7e31dcc9223eb2b05f565db05f57b613b85c5b6da04629708e1eba657d7b3
+  data.tar.gz: 94809f7775c4634d6f933095cc4671957d0c9fc17b7b7036adbf4c1d6c89b7c4ae9a45dace66c88cc0c42ae0610ff9f335ab7bf7721c4908c34da8aa5a7f8c5c

data/CHANGES.md

@@ -1,3 +1,14 @@
+## 0.3.4
+
+* 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)`.
+
+## 0.3.3
+
+* Now compatible with Rails 5 beta 1.
+
 ## 0.3.2
 
 * Optimization: do not wrap top-level disjunctive in `AND` when the column has an enumerated order. [Read more](https://github.com/glebm/order_query/issues/3#issuecomment-54764638).

data/MIT-LICENSE

@@ -1,4 +1,6 @@
-Copyright 2014 Gleb Mazovetskiy
+Copyright (c) 2014-2017 Gleb Mazovetskiy
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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.3.3'
+gem 'order_query', '~> 0.3.4'
 ```
 
 ## Usage
@@ -66,6 +66,11 @@ p.next     #=> #<Post>
 p.position #=> 5
 ```
 
+The `before` and `after` methods also 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)`.
+
 Looping to the first / last record is enabled for `next` / `previous` by default. Pass `false` to disable:
 
 ```ruby

data/Rakefile

@@ -13,27 +13,28 @@ desc 'Test all Gemfiles from spec/*.gemfile'
 task :test_all_gemfiles do
   require 'pty'
   require 'shellwords'
-  cmd      = 'bundle --quiet && bundle exec rake --trace'
+  cmd      = 'bundle install --quiet && bundle exec rake --trace'
   statuses = Dir.glob('./spec/gemfiles/*{[!.lock]}').map do |gemfile|
-    env = {'BUNDLE_GEMFILE' => gemfile}
-    cmd_with_env = "  (#{env.map { |k, v| "export #{k}=#{Shellwords.escape v}" } * ' '}; #{cmd})"
-    $stderr.puts "Testing\n#{cmd_with_env}"
-    PTY.spawn(env, cmd) do |r, _w, pid|
-      begin
-        r.each_line { |l| puts l }
-      rescue Errno::EIO
-        # Errno:EIO error means that the process has finished giving output.
-      ensure
-        ::Process.wait pid
+    Bundler.with_clean_env do
+      env = {'BUNDLE_GEMFILE' => gemfile}
+      $stderr.puts "Testing #{File.basename(gemfile)}:\n  export #{env.map { |k, v| "#{k}=#{Shellwords.escape v}" } * ' '}; #{cmd}"
+      PTY.spawn(env, cmd) do |r, _w, pid|
+        begin
+          r.each_line { |l| puts l }
+        rescue Errno::EIO
+          # Errno:EIO error means that the process has finished giving output.
+        ensure
+          ::Process.wait pid
+        end
       end
+      [$? && $?.exitstatus == 0, gemfile]
     end
-    [$? && $?.exitstatus == 0, cmd_with_env]
   end
-  failed_cmds = statuses.reject(&:first).map { |(_status, cmd_with_env)| cmd_with_env }
-  if failed_cmds.empty?
-    $stderr.puts '✓ Tests pass with all gemfiles'
+  failed_gemfiles = statuses.reject(&:first).map { |(_status, gemfile)| gemfile }
+  if failed_gemfiles.empty?
+    $stderr.puts "✓ Tests pass with all #{statuses.size} gemfiles"
   else
-    $stderr.puts "❌ FAILING (#{failed_cmds.size} / #{statuses.size})\n#{failed_cmds * "\n"}"
+    $stderr.puts "❌ FAILING (#{failed_gemfiles.size} / #{statuses.size})\n#{failed_gemfiles * "\n"}"
     exit 1
   end
 end

data/lib/order_query/point.rb

@@ -31,20 +31,23 @@ module OrderQuery
       space.count - after.count
     end
 
+    # @param [true, false] strict choose if the given scope should include or not the record, default not to include it (strict true)
     # @return [ActiveRecord::Relation]
-    def after
-      side :after
+    def after(strict = true)
+      side :after, strict
     end
 
+    # @param [true, false] strict choose if the given scope should include or not the record, default not to include it (strict true)
     # @return [ActiveRecord::Relation]
-    def before
-      side :before
+    def before(strict = true)
+      side :before, strict
     end
 
     # @param [:before, :after] side
+    # @param [true, false] strict choose if the given scope should include or not the record, default not to include it (strict true)
     # @return [ActiveRecord::Relation]
-    def side(side)
-      query, query_args = @where_sql.build(side)
+    def side(side, strict = true)
+      query, query_args = @where_sql.build(side, strict)
       scope = if side == :after
                 space.scope
               else

data/lib/order_query/sql/where.rb

@@ -19,10 +19,11 @@ module OrderQuery
       #     invoice < 3 OR
       #     invoices = 3 AND (
       #       ... ))
-      def build(side)
+      def build(side, strict = true)
         # generate pairs of terms such as sales < 5, sales = 5
-        terms = @columns.map { |col|
-          [where_side(col, side, true), where_tie(col)].reject { |x| x == WHERE_IDENTITY }
+        terms = @columns.map.with_index { |col, i|
+          be_strict = (i != @columns.size - 1) ? true : strict
+          [where_side(col, side, be_strict), where_tie(col)].reject { |x| x == WHERE_IDENTITY }
         }
         # group pairwise with OR, and nest with AND
         query = foldr_terms terms.map { |pair| join_terms 'OR'.freeze, *pair }, 'AND'.freeze

data/lib/order_query/version.rb

@@ -1,3 +1,3 @@
 module OrderQuery
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/gemfiles/{rails_4.gemfile → rails_4_2.gemfile}

@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gemspec path: '../../'
 
-gem 'activerecord', '~> 4.0'
-gem 'activesupport', '~> 4.0'
+gem 'activerecord', '~> 4.2.9'
+gem 'activesupport', '~> 4.2.9'
 
 eval_gemfile './shared.gemfile'
 

data/spec/gemfiles/{rails_5.gemfile → rails_5_0.gemfile}

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec path: '../../'
 
-gem 'activerecord', '= 5.0.0.beta1'
-gem 'activesupport', '= 5.0.0.beta1'
+gem 'activerecord', '~> 5.0.5'
+gem 'activesupport', '~> 5.0.5'
 
 eval_gemfile './shared.gemfile'

data/spec/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 5.1.3'
+gem 'activesupport', '~> 5.1.3'
+
+eval_gemfile './shared.gemfile'

data/spec/order_query_spec.rb

@@ -61,7 +61,7 @@ describe 'OrderQuery' do
       wrap_top_level_or wrap_top_level_or
 
       context 'Issue test model' do
-        t        = Time.now
+        t = Time.now
         datasets = [
             [
                 ['high', 5, 0, t, true],
@@ -226,7 +226,7 @@ describe 'OrderQuery' do
           }
 
           it 'Point' do
-            post  = create_post
+            post = create_post
             point = OrderQuery::Point.new(post, space)
             expect(point.inspect).to(
                 eq %Q(#<OrderQuery::Point @record=#<Post id: #{post.id}, pinned: false, published_at: #{post.attribute_for_inspect(:published_at)}> @space=#<OrderQuery::Space @columns=[(pinned [true, false] desc), (id unique asc)] @base_scope=Post(id: integer, pinned: boolean, published_at: datetime)>>)
@@ -275,6 +275,42 @@ describe 'OrderQuery' do
           end
         end
 
+        context 'after/before no strict' do
+          context 'by middle attribute in search order' do
+            let!(:base) { Post.create! pinned: true, published_at: Time.now }
+            let!(:older) { Post.create! pinned: true, published_at: Time.now + 1.hour }
+            let!(:younger) { Post.create! pinned: true, published_at: Time.now - 1.hour }
+
+            it 'includes first element' do
+              point = Post.order_list_at(base)
+
+              expect(point.after.count).to eq 1
+              expect(point.after.to_a).to eq [younger]
+
+              expect(point.after(false).count).to eq 2
+              expect(point.after(false).to_a).to eq [base, younger]
+              expect(point.before(false).to_a).to eq [base, older]
+            end
+          end
+
+          context 'by last attribute in search order' do
+            let!(:base) { Post.create! pinned: true, published_at: Time.new(2016, 5, 1, 5, 4, 3), id: 6 }
+            let!(:previous) { Post.create! pinned: true, published_at: Time.new(2016, 5, 1, 5, 4, 3), id: 4 }
+            let!(:next_one) { Post.create! pinned: true, published_at: Time.new(2016, 5, 1, 5, 4, 3), id: 9 }
+
+            it 'includes first element' do
+              point = Post.order_list_at(base)
+
+              expect(point.after.count).to eq 1
+              expect(point.after.to_a).to eq [previous]
+
+              expect(point.after(false).count).to eq 2
+              expect(point.after(false).to_a).to eq [base, previous]
+              expect(point.before(false).to_a).to eq [base, next_one]
+            end
+          end
+        end
+
         before do
           Post.delete_all
         end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-# -*- encoding : utf-8 -*-
 # Configure Rails Environment
 ENV['RAILS_ENV'] = ENV['RACK_ENV'] = 'test'
-if ENV['TRAVIS'] && !(defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx')
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+if ENV['COVERAGE'] && !%w[rbx jruby].include?(RUBY_ENGINE)
+  require 'simplecov'
+  SimpleCov.command_name 'RSpec'
 end
 require 'order_query'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: order_query
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
+- !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'
 description: Find next / previous Active Record(s) in one efficient query
 email: glex.spb@gmail.com
 executables: []
@@ -98,10 +112,9 @@ files:
 - lib/order_query/sql/order_by.rb
 - lib/order_query/sql/where.rb
 - lib/order_query/version.rb
-- spec/gemfiles/rails_4.gemfile
-- spec/gemfiles/rails_4.gemfile.lock
-- spec/gemfiles/rails_5.gemfile
-- spec/gemfiles/rails_5.gemfile.lock
+- spec/gemfiles/rails_4_2.gemfile
+- spec/gemfiles/rails_5_0.gemfile
+- spec/gemfiles/rails_5_1.gemfile
 - spec/order_query_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/glebm/order_query
@@ -125,14 +138,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Find next / previous Active Record(s) in one query
 test_files:
-- spec/gemfiles/rails_4.gemfile
-- spec/gemfiles/rails_4.gemfile.lock
-- spec/gemfiles/rails_5.gemfile
-- spec/gemfiles/rails_5.gemfile.lock
 - spec/order_query_spec.rb
 - spec/spec_helper.rb
+- spec/gemfiles/rails_5_1.gemfile
+- spec/gemfiles/rails_4_2.gemfile
+- spec/gemfiles/rails_5_0.gemfile

data/spec/gemfiles/rails_4.gemfile.lock

@@ -1,73 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    order_query (0.3.2)
-      activerecord (>= 4.0, < 6.0)
-      activesupport (>= 4.0, < 6.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
-      builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    byebug (8.2.1)
-    codeclimate-test-reporter (0.4.8)
-      simplecov (>= 0.7.1, < 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.3)
-    rake (10.4.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.0)
-  activerecord-jdbcsqlite3-adapter
-  activesupport (~> 4.0)
-  byebug
-  codeclimate-test-reporter
-  order_query!
-  rake (~> 10.2)
-  rspec (~> 3.4)
-  sqlite3 (>= 1.3.11)
-
-BUNDLED WITH
-   1.11.2

data/spec/gemfiles/rails_5.gemfile.lock

@@ -1,76 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    order_query (0.3.2)
-      activerecord (>= 4.0, < 6.0)
-      activesupport (>= 4.0, < 6.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
-      builder (~> 3.1)
-    activerecord (5.0.0.beta1)
-      activemodel (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
-      arel (~> 7.0)
-    activesupport (5.0.0.beta1)
-      concurrent-ruby (~> 1.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      method_source
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.0.0)
-    builder (3.2.2)
-    byebug (8.2.1)
-    codeclimate-test-reporter (0.4.8)
-      simplecov (>= 0.7.1, < 1.0.0)
-    concurrent-ruby (1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.8.3)
-    rake (10.4.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 5.0.0.beta1)
-  activerecord-jdbcsqlite3-adapter
-  activesupport (= 5.0.0.beta1)
-  byebug
-  codeclimate-test-reporter
-  order_query!
-  rake (~> 10.2)
-  rspec (~> 3.4)
-  sqlite3 (>= 1.3.11)
-
-BUNDLED WITH
-   1.11.2