pg_ltree 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 986a93b7129f617950f44c6d325b4f38ab5757a5
-  data.tar.gz: 45642210715e826c762f982cb1855e4b512b4da8
+SHA256:
+  metadata.gz: af73780dad2653e9068d80d56ad53a1cac86f88968cbe9f697bc832e42aedcf6
+  data.tar.gz: a4bea89ea088fe18ce1a5d5ce9606bceecb1833a36b9ec4ce7b252bcde5e7f83
 SHA512:
-  metadata.gz: cf09fa17e06130bee8bcf299eb2c1ed515d09dc9b97a91fe70fb9e8c39256af092a6c1cc16da48e5ca25aed3f4b7e5c4a67d7b3f0206cef74e6e7821c6577041
-  data.tar.gz: 2537834b75a706e1b540e7bbe11925935cc60b83b6e535f040949e7c2658055940ce90194e360c1c9598b8b84c3deabbd7985a03a7e930ae05990e816912b0a7
+  metadata.gz: '086bcf6439fdfd185d738ab1c120c41192567f8d3e9c1ee456c0ef82bf28d0e6c921d9c9a397ff5cacd7735dfc21605c078ade8927266e6685ef7fefbc1d0b58'
+  data.tar.gz: 9317b961bd9ae4f6ff781c3aa72bf2b5ee0c5136bb6b2a28482853a8c0262278f5a00daf6d8b4dfd71302d4e2b52975abc8e4f2b0629fffdb03037d95ca51ced

data/Rakefile

@@ -30,6 +30,8 @@ namespace :test do
     activerecord_42_pg_017 activerecord_42_pg_018
     activerecord_50_pg_018 activerecord_51_pg_020
     activerecord_51_pg_021 activerecord_52_pg_100
+    activerecord_60_pg_021 activerecord_60_pg_100
+    activerecord_60_pg_110
   ).freeze
 
   AVAILABLE_CASES.each do |version|

data/lib/pg_ltree.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'pg_ltree/ltree'
 require 'pg_ltree/scoped_for'
 require 'pg_ltree/version'
@@ -9,7 +10,8 @@ if defined?(ActiveRecord)
 
   # The behavior of _was changes in Rails 5.1
   # http://blog.toshima.ru/2017/04/06/saved-change-to-attribute.html
-  if ActiveRecord::VERSION::MAJOR > 5 || (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1)
-    ActiveRecord::Base.extend(PgLtree::Versions::Rails51)
+  # This is for backward compability
+  if ActiveRecord::VERSION::MAJOR < 5 || (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR < 1)
+    ActiveRecord::Base.extend(PgLtree::Versions::RailsOlderThan51)
   end
 end

data/lib/pg_ltree/ltree.rb

@@ -44,12 +44,12 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation] relations of node's leaves
       def leaves
-        subquery =
-          unscoped.select("COUNT(subquery.#{ltree_path_column}) = 1")
-                  .from("#{table_name} AS subquery")
-                  .where("subquery.#{ltree_path_column} <@ #{table_name}.#{ltree_path_column}")
-        subquery = subquery.where(subquery: current_scope.where_values_hash) if current_scope
-        where subquery.to_sql
+        subquery = unscoped.select("#{table_name}.#{ltree_path_column}")
+                           .from("#{table_name} AS subquery")
+                           .where("#{table_name}.#{ltree_path_column} <> subquery.#{ltree_path_column}")
+                           .where("#{table_name}.#{ltree_path_column} @> subquery.#{ltree_path_column}")
+
+        where.not ltree_path_column => subquery
       end
 
       # Get all with nodes when path liked the lquery
@@ -92,11 +92,22 @@ module PgLtree
         public_send ltree_path_column
       end
 
-      # Get lTree previous value
+      # Get ltree original value before the save just occurred
+      # https://api.rubyonrails.org/classes/ActiveRecord/AttributeMethods/Dirty.html#method-i-attribute_before_last_save
       #
       # @return [String] ltree previous value
-      def ltree_path_was
-        public_send :"#{ltree_path_column}_was"
+      def ltree_path_before_last_save
+        public_send :attribute_before_last_save, ltree_path_column
+      end
+
+      # Get lTree previous value
+      # originally +attribute_was+ used in before create/update, destroy won't call +save+ so this work
+      # https://api.rubyonrails.org/classes/ActiveRecord/AttributeMethods/Dirty.html#method-i-attribute_in_database
+      #
+      # @return [String] ltree value in database
+
+      def ltree_path_in_database
+        public_send :attribute_in_database, ltree_path_column
       end
 
       # Check what current node is root
@@ -226,15 +237,15 @@ module PgLtree
       #
       # @return [ActiveRecord::Relation]
       def cascade_update
-        ltree_scope.where(["#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path_was]).where(["#{ltree_scope.table_name}.#{ltree_path_column} != ?", ltree_path])
-                   .update_all ["#{ltree_path_column} = ? || subpath(#{ltree_path_column}, nlevel(?))", ltree_path, ltree_path_was]
+        ltree_scope.where(["#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path_before_last_save]).where(["#{ltree_scope.table_name}.#{ltree_path_column} != ?", ltree_path])
+                   .update_all ["#{ltree_path_column} = ? || subpath(#{ltree_path_column}, nlevel(?))", ltree_path, ltree_path_before_last_save]
       end
 
       # Delete all children for current path
       #
       # @return [ActiveRecord::Relation]
       def cascade_destroy
-        ltree_scope.where("#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path_was).delete_all
+        ltree_scope.where("#{ltree_scope.table_name}.#{ltree_path_column} <@ ?", ltree_path_in_database).delete_all
       end
     end
   end

data/lib/pg_ltree/version.rb

@@ -3,5 +3,5 @@
 # @author a.ponomarenko
 module PgLtree
   # Gem Version
-  VERSION = '1.1.7'.freeze
+  VERSION = '1.1.8'.freeze
 end

data/lib/pg_ltree/versions/rails_older_than_51.rb

@@ -0,0 +1,28 @@
+module PgLtree
+  module Versions
+    module RailsOlderThan51
+      def ltree(column = :path, options: { cascade: true })
+        super
+        include InstanceMethods
+      end
+
+      module InstanceMethods
+        # Get lTree previous value
+        #
+        # Related changes in > Rails 5.1.0
+        # https://github.com/rails/rails/pull/25337
+        #
+        # @return [String] Rails 5.1 replace attribute_was method with two methods, this is a wrapper for older rails
+        def ltree_path_before_last_save
+          public_send :attribute_was, ltree_path_column
+        end
+
+        #
+        # @return [String] Rails 5.1 replace attribute_was method with two methods, this is a wrapper for older rails
+        def ltree_path_in_database
+          public_send :attribute_was, ltree_path_column
+        end
+      end
+    end
+  end
+end

data/test/pg_ltree/ltree_test.rb

@@ -53,6 +53,16 @@ class PgLtree::LtreeTest < BaseTest
     )
   end
 
+  test '#leaves with a relation' do
+    assert_equal TreeNode.where("path <> 'Top.Collections.Pictures.Astronomy.Stars'").leaves.pluck(:path), %w(
+      Top.Science.Astronomy.Astrophysics
+      Top.Science.Astronomy.Cosmology
+      Top.Hobbies.Amateurs_Astronomy
+      Top.Collections.Pictures.Astronomy.Galaxies
+      Top.Collections.Pictures.Astronomy.Astronauts
+    )
+  end
+
   test '#where_path_liked' do
     assert_equal TreeNode.where_path_liked('*{2}.Astronomy|Pictures').pluck(:path), %w(
       Top.Science.Astronomy

data/test/test_helper.rb

@@ -31,6 +31,13 @@ class BaseTest < ActiveSupport::TestCase
       exit 0
     end
 
+    begin
+      PG.connect(host: db_connection["host"], user: db_connection["username"], password: db_connection["password"])
+        .exec("CREATE DATABASE #{db_connection['database']}")
+    rescue
+      # Ignore errors on DB:CEATE
+    end
+
     ActiveRecord::Base.establish_connection db_connection
     ActiveRecord::Schema.verbose = false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_ltree
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Andrei Panamarenka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 7.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 7.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ files:
 - lib/pg_ltree/ltree.rb
 - lib/pg_ltree/scoped_for.rb
 - lib/pg_ltree/version.rb
-- lib/pg_ltree/versions/rails_5_1.rb
+- lib/pg_ltree/versions/rails_older_than_51.rb
 - test/database.yml
 - test/database.yml.sample
 - test/pg_ltree/ltree_test.rb
@@ -159,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.0.pre2
 signing_key: 
 specification_version: 4
 summary: Organise ActiveRecord model into a tree structure with PostgreSQL LTree

data/lib/pg_ltree/versions/rails_5_1.rb

@@ -1,32 +0,0 @@
-module PgLtree
-  module Versions
-    module Rails51
-      def ltree(column = :path, options: { cascade: true })
-        super
-
-        before_destroy :delete_ltree_column_value if options[:cascade]
-        include InstanceMethods
-      end
-
-      module InstanceMethods
-        # Get lTree previous value
-        #
-        # Related changes in > Rails 5.1.0
-        # https://github.com/rails/rails/pull/25337
-        #
-        # @return [String] ltree previous value
-        def ltree_path_was
-          public_send :"#{ltree_path_column}_before_last_save"
-        end
-
-        #
-        # In order for for cascade_destroy to work with the current callbacks, let's first delete the column :/.
-        # @author HoyaBoya [https://github.com/HoyaBoya]
-        #
-        def delete_ltree_column_value
-          update!(ltree_path_column => nil)
-        end
-      end
-    end
-  end
-end