activerecord-hierarchical_query 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69600d117213b4b5a7955315a7c93f6101d64f5e438accf02c239ddae3759389
-  data.tar.gz: 8c076d833d60d83e065bab8f081683765d71e824e45ad79ae8db10a85d55086f
+  metadata.gz: '08114c6cb19f90e4d95e49040d5ebad5392b9a06f364b7a9d623e15cef18379d'
+  data.tar.gz: b6c88c4147010c528a4c8d97109710997b1594931aa6f0d9eda29f0cb851b06b
 SHA512:
-  metadata.gz: e967554f13dff63c9a98400d99364c96b28bbc343368e0a181655b44622da3173a4096bbe5f2de78af05d40056c6ef9135f5d1762374666dfb47d288f369efcd
-  data.tar.gz: 4f08d730fada5e0188ccb502cffa4151dcc351a2aa63061e1d634ea3c469bb876e47b2fdd886587f34e63d51abe70d23338e04dab34477ecb5a9a436479679fb
+  metadata.gz: a19a846408d55495b83515064cb69824c69e18768398349146c7d50a62a5ed958ee21ec099b0d331431d650a9847f0c8156acf53fd9a7e85cdb8f62eb7cf375f
+  data.tar.gz: 75415a7c1fcd97b92c387a06edf9e2e6effc160f82ab6ba017b43128f414a1dc5fd69a583317e6d5ec881b802beb4d2c3588f0f77bef0596efd2a13bffd9672e

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)

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.2'
+    VERSION = '1.4.4'
   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.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Alexei Mikhailov
 - Zach Aysan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-06-09 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.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '0.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !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.4.0.dev
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Recursively traverse trees using a single SQL query
 test_files: