parentry 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3feb70016cb4448fb7a633c183e4c28451779e80f4b17d9f41c9b56e8e4e560
-  data.tar.gz: 54c9e48f984205d2ba80c5bd53d745c19c89bd95529c63b7e2f4f2335ce3b89a
+  metadata.gz: 61d7162155374b612b01ec0d2c5519ca49e94e8c793f843b6187148d67dc16d4
+  data.tar.gz: b1aea8a7225ff14ad890367d799171927eaaf99e262d3b9b4fcb52171f09d611
 SHA512:
-  metadata.gz: ad121d565f69446d95ef7db926461dd0c51c28ef981c95b0b02ed8debb6b27f40f7576773f76e31e35336704d9bb3fa5705461e9ef2bc5e02a66e4f542e8a534
-  data.tar.gz: 34ed4870c5f7fed79a0558df2e4db01f932690f8e07b935f56c4dfce6343529b6ba2bf69d97a00c039cadc820cd40ae708494bbdf9f8ed6be10c479958852f59
+  metadata.gz: e96ac1b93d29040797963e598976d3878b7852bbb564e5d0ebd5d1ec15ab4c0c4362a4c887b750a5d8467d8207e8f376facbe23396b24e1e33c209cc58240848
+  data.tar.gz: d6bdd03b87f6e35824e4b0cbb88a68fdaef2b81f9122a69ef211db4b1b064423af8a11017263cf6032c09076e7a5986dc598b6a1cde6d724fe821af86d2637e7

data/gemfiles/activerecord_5.1.5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    parentry (1.5.0)
+    parentry (1.6.0)
       activerecord (>= 5.1, < 7.1)
 
 GEM

data/gemfiles/activerecord_5.2.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    parentry (1.5.0)
+    parentry (1.6.0)
       activerecord (>= 5.1, < 7.1)
 
 GEM

data/gemfiles/activerecord_6.0.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    parentry (1.5.0)
+    parentry (1.6.0)
       activerecord (>= 5.1, < 7.1)
 
 GEM

data/gemfiles/activerecord_6.1.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    parentry (1.5.0)
+    parentry (1.6.0)
       activerecord (>= 5.1, < 7.1)
 
 GEM

data/gemfiles/activerecord_7.0.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    parentry (1.5.0)
+    parentry (1.6.0)
       activerecord (>= 5.1, < 7.1)
 
 GEM

data/lib/parentry/strategy/array/class_methods.rb

@@ -3,7 +3,7 @@ module Parentry
     module Array
       module ClassMethods
         def parentry_depth_function
-          Arel.sql("array_length(#{parentry_column}, 1)")
+          Arel::Nodes::NamedFunction.new('array_length', [arel_table[parentry_column], 1])
         end
       end
     end

data/lib/parentry/strategy/ltree/class_methods.rb

@@ -3,7 +3,7 @@ module Parentry
     module Ltree
       module ClassMethods
         def parentry_depth_function
-          Arel.sql("nlevel(#{parentry_column})")
+          Arel::Nodes::NamedFunction.new('nlevel', [arel_table[parentry_column]])
         end
       end
     end

data/lib/parentry/version.rb

@@ -1,3 +1,3 @@
 module Parentry
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/lib/parentry.rb

@@ -39,13 +39,17 @@ module Parentry
 
     scope :order_by_parentry, -> { order(parentry_depth_function) }
 
-    scope :before_depth, ->(depth) { where("#{parentry_depth_function} - 1 < ?", depth + depth_offset) }
-    scope :to_depth, ->(depth) { where("#{parentry_depth_function} - 1 <= ?", depth + depth_offset) }
-    scope :at_depth, ->(depth) { where("#{parentry_depth_function} - 1 = ?", depth + depth_offset) }
-    scope :from_depth, ->(depth) { where("#{parentry_depth_function} - 1 >= ?", depth + depth_offset) }
-    scope :after_depth, ->(depth) { where("#{parentry_depth_function} - 1 > ?", depth + depth_offset) }
+    {
+      before_depth: Arel::Nodes::LessThan,
+      to_depth: Arel::Nodes::LessThanOrEqual,
+      at_depth: Arel::Nodes::Equality,
+      from_depth: Arel::Nodes::GreaterThanOrEqual,
+      after_depth: Arel::Nodes::GreaterThan
+    }.each do |name, node|
+      scope name, ->(depth) { where(node.new(parentry_depth_function, depth + depth_offset + 1)) }
+    end
 
-    scope :roots, -> { where("#{parentry_depth_function} = 1") }
+    scope :roots, -> { where(Arel::Nodes::Equality.new(parentry_depth_function, 1)) }
     scope :ancestors_of, ->(node) { where(node.ancestor_conditions).where.not(id: node.id) }
     scope :children_of, ->(node) { where(parent_id: node.id) }
     scope :descendants_of, ->(node) { subtree_of(node).where.not(id: node.id) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parentry
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord