ancestry 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e9d786304fcb6d41f135572b0475167d378bafd24f1e084bab1aa87b759dc5
-  data.tar.gz: 34d82c19057c6036e0e05080fa84569cf4343b8a2ebb19f718ea5093e398e4bf
+  metadata.gz: 1628363389f64272d25675e727b155ba36c221404a95fc7d7d41de12b2185614
+  data.tar.gz: 2a76d777929b18efa86bde34b969f11ab58c3f44424e82c97e69ef8f348d1c96
 SHA512:
-  metadata.gz: e954ca39aabe660070650e2917f5efdd115a10da25c8d7874b565278d2ba6b69b2c17b3bc6138452fec2823675f6ff7c767b10d33c999ac568133736c08fbccf
-  data.tar.gz: 4b3561088670192638cfd7016936d80cb547cf6b1f8f642af62800876fe49de22373ff6f2802442d5f5330668bca487b0b232491eb28d24090fcc6a531f6e45a
+  metadata.gz: 5ece87f9d1577748ffbaaf8617afdc4bf4094f653300b4a2df043a5f16822b267da877f0689b7d792f5f2174f1b4e1b41333e89c0e9dc23c388af30712267953
+  data.tar.gz: a12ce97c69b384100eecf3a347dcd3fea0abb60193c71b0e6a83d667c8f6a4cfdeba7e401e743bf95cf59f4d87ddc550d63b258ac294dd057ca7c518f1c8540f

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 Doing our best at supporting [SemVer](http://semver.org/) with
 a nice looking [Changelog](http://keepachangelog.com).
 
+## Version [4.3.1] <sub><sup>2023-03-19</sub></sup>
+* Fix: added back fields that were removed in #589 [#637](https://github.com/stefankroes/ancestry/pull/637) (thx @znz)
+  - ancestor_ids_in_database
+  - parent_id_in_database
+
 ## Version [4.3.0] <sub><sup>2023-03-09</sub></sup>
 
 * Fix: materialized_path2 strategy [#597](https://github.com/stefankroes/ancestry/pull/597) (thx @kshnurov)

data/lib/ancestry/has_ancestry.rb

@@ -83,12 +83,7 @@ module Ancestry
       # Create counter cache column accessor and set to option or default
       if options[:counter_cache]
         cattr_accessor :counter_cache_column
-
-        if options[:counter_cache] == true
-          self.counter_cache_column = :children_count
-        else
-          self.counter_cache_column = options[:counter_cache]
-        end
+        self.counter_cache_column = options[:counter_cache] == true ? 'children_count' : options[:counter_cache].to_s
 
         after_create :increase_parent_counter_cache, if: :has_parent?
         after_destroy :decrease_parent_counter_cache, if: :has_parent?

data/lib/ancestry/instance_methods.rb

@@ -62,7 +62,7 @@ module Ancestry
 
     # Counter Cache
     def increase_parent_counter_cache
-      self.ancestry_base_class.increment_counter _counter_cache_column, parent_id
+      self.ancestry_base_class.increment_counter counter_cache_column, parent_id
     end
 
     def decrease_parent_counter_cache
@@ -74,7 +74,7 @@ module Ancestry
       return if defined?(@_trigger_destroy_callback) && !@_trigger_destroy_callback
       return if ancestry_callbacks_disabled?
 
-      self.ancestry_base_class.decrement_counter _counter_cache_column, parent_id
+      self.ancestry_base_class.decrement_counter counter_cache_column, parent_id
     end
 
     def update_parent_counter_cache
@@ -83,14 +83,10 @@ module Ancestry
       return unless changed
 
       if parent_id_was = parent_id_before_last_save
-        self.ancestry_base_class.decrement_counter _counter_cache_column, parent_id_was
+        self.ancestry_base_class.decrement_counter counter_cache_column, parent_id_was
       end
 
-      parent_id && self.ancestry_base_class.increment_counter(_counter_cache_column, parent_id)
-    end
-
-    def _counter_cache_column
-      self.ancestry_base_class.counter_cache_column.to_s
+      parent_id && increase_parent_counter_cache
     end
 
     # Ancestors

data/lib/ancestry/materialized_path.rb

@@ -124,10 +124,18 @@ module Ancestry
         parse_ancestry_column(read_attribute(self.ancestry_base_class.ancestry_column))
       end
 
+      def ancestor_ids_in_database
+        parse_ancestry_column(attribute_in_database(self.class.ancestry_column))
+      end
+
       def ancestor_ids_before_last_save
         parse_ancestry_column(attribute_before_last_save(self.ancestry_base_class.ancestry_column))
       end
 
+      def parent_id_in_database
+        parse_ancestry_column(attribute_in_database(self.class.ancestry_column)).last
+      end
+
       def parent_id_before_last_save
         parse_ancestry_column(attribute_before_last_save(self.ancestry_base_class.ancestry_column)).last
       end

data/lib/ancestry/version.rb

@@ -1,3 +1,3 @@
 module Ancestry
-  VERSION = '4.3.0'
+  VERSION = '4.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,7 +112,6 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/ancestry.rb
-- lib/ancestry/array_pattern_validator.rb
 - lib/ancestry/class_methods.rb
 - lib/ancestry/exceptions.rb
 - lib/ancestry/has_ancestry.rb
@@ -121,8 +120,6 @@ files:
 - lib/ancestry/materialized_path.rb
 - lib/ancestry/materialized_path2.rb
 - lib/ancestry/materialized_path_pg.rb
-- lib/ancestry/materialized_path_string.rb
-- lib/ancestry/materialized_path_string2.rb
 - lib/ancestry/version.rb
 homepage: https://github.com/stefankroes/ancestry
 licenses:
@@ -148,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Organize ActiveRecord model into a tree structure

data/lib/ancestry/array_pattern_validator.rb

@@ -1,27 +0,0 @@
-module Ancestry
-  class ArrayPatternValidator < ActiveModel::EachValidator
-    def initialize(options)
-      raise ArgumentError, "Pattern unspecified, Specify using :pattern" unless options[:pattern]
-
-      options[:pattern] = /\A#{options[:pattern].to_s}\Z/ unless options[:pattern].to_s.include?('\A')
-      options[:id] = true unless options.key?(:id)
-      options[:integer] = true unless options.key?(:integer)
-
-      super
-    end
-
-    def validate_each(record, attribute, value)
-      if options[:id] && value.include?(record.id)
-        record.errors.add(attribute, I18n.t("ancestry.exclude_self", {:class_name => self.class.name.humanize}))
-      end
-
-      if value.any? { |v| v.to_s !~ options[:pattern] }
-        record.errors.add(attribute, "illegal characters")
-      end
-
-      if options[:integer] && value.any? { |v| v < 1 }
-        record.errors.add(attribute, "non positive ancestor id")
-      end
-    end
-  end
-end

data/lib/ancestry/materialized_path_string.rb

@@ -1,46 +0,0 @@
-module Ancestry
-  class MaterializedPathString < ActiveRecord::Type::Value
-    def initialize(casting: :to_i, delimiter: '/')
-      @casting = casting&.to_proc
-      @delimiter = delimiter
-    end
-
-    def type
-      :materialized_path_string
-    end
-
-    # convert to database type
-    def serialize(value)
-      if value.kind_of?(Array)
-        value.map(&:to_s).join(@delimiter).presence
-      elsif value.kind_of?(Integer)
-        value.to_s
-      elsif value.nil? || value.kind_of?(String)
-        value
-      else
-        byebug
-        puts "curious type: #{value.class}"
-      end
-    end
-
-    def cast(value)
-      cast_value(value) #unless value.nil? (want to get rid of this - fix default value)
-    end
-
-    # called by cast (form or setter) or deserialize (database)
-    def cast_value(value)
-      if value.kind_of?(Array)
-        super
-      elsif value.nil?
-        # would prefer to use default here
-        # but with default, it kept thinking the field had changed when it hadn't
-        # (that may be a rails bug though)
-        super([])
-      else
-        #TODO: test ancestry=1
-        super(value.to_s.split(@delimiter).map(&@casting))
-      end
-    end
-  end
-end
-ActiveRecord::Type.register(:materialized_path_string, Ancestry::MaterializedPathString)

data/lib/ancestry/materialized_path_string2.rb

@@ -1,46 +0,0 @@
-  # used for materialized path
-  class MaterializedPathString2 < ActiveRecord::Type::Value
-    def initialize(casting: :to_i, delimiter: '/')
-      @casting = casting&.to_proc
-      @delimiter = delimiter
-    end
-
-    def type
-      :materialized_path_string2
-    end
-
-    # convert to database type
-    def serialize(value)
-      if value.kind_of?(Array)
-        # TODO: check all values to ensure no extra slashes
-        value.empty? ? @delimiter : "#{@delimiter}#{value.map(&:to_s).join(@delimiter)}#{@delimiter}"
-      elsif value.kind_of?(Integer)
-        value.to_s
-      elsif value.nil? || value.kind_of?(String)
-        value
-      else
-        byebug
-        puts "curious type: #{value.class}"
-      end
-    end
-
-    def cast(value)
-      cast_value(value) #unless value.nil? (want to get rid of this - fix default value)
-    end
-
-    # called by cast (form or setter) or deserialize (database)
-    def cast_value(value)
-      if value.kind_of?(Array)
-        super
-      elsif value.nil?
-        # would prefer to use default here
-        # but with default, it kept thinking the field had changed when it hadn't
-        super([])
-      else
-        #TODO: test ancestry=1
-        super(value.to_s.split(@delimiter).map(&@casting))
-      end
-    end
-  end
-end
-ActiveRecord::Type.register(:materialized_path_string2, Ancestry::MaterializedPathString)