activerecord-hierarchical_query 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e751ad55c26d0da2510def0fd67cfe0d3dd60bf9e9ea15eb7c3a58726df5a922
-  data.tar.gz: f80cb2fea417232d291ae3a87a20ee6a5242dc754bb805dc1f7db8a6ea52fcc4
+  metadata.gz: d3d4238806a983d8ef18d78dc339c337e10240e740a572c42304b9e7b5eb2ef6
+  data.tar.gz: 54613c3c77f471f1fceac0868de99d73e32aa3158a3d1fdd1cbb213b150bea7d
 SHA512:
-  metadata.gz: 950ae38c829408a25d015fffb6f46124ab93c3b82c125d78ee5fe463ceef76006ee7462c7d26f9260c970566d3c0971992796b27405e51991b42a841f76a2e11
-  data.tar.gz: 6b9a29abbf9dc44dde4021b80f3bc240b13f83672d80147a17e59ddb2f44306453577c288f3d7e7b3a93e09873761efef777a0bf704cf6b0f1a7d69dd5857bb0
+  metadata.gz: 0a3321cd636c1360b661ab6a0cfeb1b7288edd414fbef695510d0400aa0dfb288c11e4b23abce8af50c02b33bbb8b8b4a108ac82d55b53ea25f7976a7960dfac
+  data.tar.gz: 54c6b966e88f4d8bbf57a7ebf78f6d28ae1950f3b8ee25d1f74c66c408874707f0f4cdd92f9360d62344c02c5ed87f5fd80346c28278976a21511432c17b1c85

data/README.md

@@ -1,6 +1,5 @@
 # ActiveRecord::HierarchicalQuery
 
-[![Build Status](https://travis-ci.org/take-five/activerecord-hierarchical_query.png?branch=master)](https://travis-ci.org/take-five/activerecord-hierarchical_query)
 [![Code Climate](https://codeclimate.com/github/take-five/activerecord-hierarchical_query.png)](https://codeclimate.com/github/take-five/activerecord-hierarchical_query)
 [![Coverage Status](https://coveralls.io/repos/take-five/activerecord-hierarchical_query/badge.png)](https://coveralls.io/r/take-five/activerecord-hierarchical_query)
 [![Gem Version](https://badge.fury.io/rb/activerecord-hierarchical_query.png)](http://badge.fury.io/rb/activerecord-hierarchical_query)
@@ -15,10 +14,10 @@ in hierarchical order using hierarchical query builder.
 
 - ActiveRecord >= 5.0, < 7.1
 - PostgreSQL >= 8.4
-- Postgres Gem >= 0.21, < 1.4
+- Postgres Gem >= 0.21, < 1.5
 
 Note that though PostgresSQL 8.4 and up should work, this library
-is tested on PostgresSQL 10.5.
+is tested on PostgresSQL 15.1.
 
 ## In a nutshell
 

data/lib/active_record/hierarchical_query/orderings.rb

@@ -27,12 +27,10 @@ module ActiveRecord
         order_values.each do |value|
           Array.wrap(as_orderings(value)).each do |ordering|
             @values << ordering
-
-            yield ordering
           end
         end
 
-        @values
+        @values.each(&block)
       end
 
       # Returns order expression to be inserted into SELECT clauses of both

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '1.4.1'
+    VERSION = '1.4.3'
   end
 end

data/spec/active_record/hierarchical_query_spec.rb

@@ -120,11 +120,6 @@ describe ActiveRecord::HierarchicalQuery do
         assert_ordered_by_name_desc { order_siblings(name: :desc) }
       end
 
-      it 'orders rows by String' do
-        assert_ordered_by_name_desc { order_siblings('name desc') }
-        assert_ordered_by_name_asc { order_siblings('name asc') }
-      end
-
       it 'orders rows by Arel::Nodes::Ordering' do
         assert_ordered_by_name_desc { order_siblings(table[:name].desc) }
       end
@@ -153,6 +148,26 @@ describe ActiveRecord::HierarchicalQuery do
           expect(relation.to_sql).not_to match /row_number/i
         end
       end
+
+      context 'when ordering by String' do
+        it 'orders rows by one column' do
+          assert_ordered_by_name_desc { order_siblings('name desc') }
+          assert_ordered_by_name_asc { order_siblings('name asc') }
+        end
+
+        it 'orders rows by multiple columns' do
+          root.update!(name: "Root", trait_id: "a")
+          child_2.update!(name: 'Same Name', trait_id: 'a')
+          child_3.update!(name: 'Same Name', trait_id: 'b')
+          root2 = klass.create(name: "Root", trait_id: "b")
+
+          expect(
+            klass.join_recursive do |b|
+              b.connect_by(id: :parent_id).start_with(parent_id: nil).order_siblings('name asc, trait_id desc')
+            end
+          ).to eq [root2, root, child_1, child_3, child_2, child_4, child_5]
+        end
+      end
     end
 
     describe 'LIMIT and OFFSET clauses' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Alexei Mikhailov
 - Zach Aysan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -40,7 +40,7 @@ dependencies:
         version: '0.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '0.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-description: 
+description:
 email:
 - amikhailov83@gmail.com
 - zachaysan@gmail.com
@@ -154,7 +154,7 @@ homepage: https://github.com/take-five/activerecord-hierarchical_query
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Recursively traverse trees using a single SQL query
 test_files: