ancestry 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec53fbb23531d1bf8431468c6a8b60746487f22fa16701d07b7874451ed0b7f
-  data.tar.gz: 8ce0b89ebb790f0e54ea4edaa9dec4581d4aefbdc211243b1e123132e62a4a4f
+  metadata.gz: 5962b504410b75525481574c43d8122fc4f4607e1c56f8827bbc565a7704adb6
+  data.tar.gz: 51c13aec4d355421c4e095804890c58eba3a8a774ce9286e3eaf28351ac22a11
 SHA512:
-  metadata.gz: 40a01583120fc47577cf59064d7d4dce4a2788607d09f3205908a2875252e58874aa1c82d1fae7bbefd86548bfd9cc0bfd029aac51d358cdfaceb9b2f8f1ba74
-  data.tar.gz: f921a574313fe737d13630e50afb2cea865834b59e72ca32c256a58289b371bb5cffadf887177a595a0a69f0721bd7984e9347ac5081069f8f6586433fff94aa
+  metadata.gz: b6dc1d80c7a77fc1f97232634d11e188863d25e7e9da3f74654ada7f4d3fc2951c6962b4f2b516476772eecce98f66db7c4625298465d2f9de4a7d2f17ff2553
+  data.tar.gz: 7199de05c78a159e1e1924de1331617a9cc06d4f1403bd82f88a8da5e7f0c127343c1b905bfb714ba2e0e88c285fb9694f467eda9c56af4089db2077fe5c1da2

data/README.md

@@ -14,7 +14,8 @@ records.
 
 NOTE:
 
-- Ancestry 3.x supports Rails 5.0 and earlier.
+- Ancestry 2.x supports Rails 4.1, and earlier
+- Ancestry 3.x supports Rails 5.0, and 4.2
 - Ancestry 4.0 only supports rails 5.0 and higher
 
 # Installation

data/lib/ancestry/has_ancestry.rb

@@ -4,12 +4,11 @@ module Ancestry
       # Check options
       raise Ancestry::AncestryException.new("Options for has_ancestry must be in a hash.") unless options.is_a? Hash
       options.each do |key, value|
-        unless [:ancestry_column, :orphan_strategy, :cache_depth, :depth_cache_column, :touch].include? key
+        unless [:ancestry_column, :orphan_strategy, :cache_depth, :depth_cache_column, :touch, :counter_cache].include? key
           raise Ancestry::AncestryException.new("Unknown option for has_ancestry: #{key.inspect} => #{value.inspect}.")
         end
       end
 
-
       # Create ancestry column accessor and set to option or default
       cattr_accessor :ancestry_column
       self.ancestry_column = options[:ancestry_column] || :ancestry
@@ -78,6 +77,21 @@ module Ancestry
         validates_numericality_of depth_cache_column, :greater_than_or_equal_to => 0, :only_integer => true, :allow_nil => false
       end
 
+      # 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
+
+        after_create :increase_parent_counter_cache, if: :has_parent?
+        after_destroy :decrease_parent_counter_cache, if: :has_parent?
+        after_update :update_parent_counter_cache
+      end
+
       # Create named scopes for depth
       {:before_depth => '<', :to_depth => '<=', :at_depth => '=', :from_depth => '>=', :after_depth => '>'}.each do |scope_name, operator|
         scope scope_name, lambda { |depth|

data/lib/ancestry/instance_methods.rb

@@ -92,6 +92,44 @@ module Ancestry
       end
     end
 
+    # Counter Cache
+    def increase_parent_counter_cache
+      self.class.increment_counter _counter_cache_column, parent_id
+    end
+
+    def decrease_parent_counter_cache
+      # @_trigger_destroy_callback comes from activerecord, which makes sure only once decrement when concurrent deletion.
+      # but @_trigger_destroy_callback began after rails@5.1.0.alpha.
+      # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/persistence.rb#L340
+      # https://github.com/rails/rails/pull/14735
+      # https://github.com/rails/rails/pull/27248
+      return if defined?(@_trigger_destroy_callback) && !@_trigger_destroy_callback
+      return if ancestry_callbacks_disabled?
+
+      self.class.decrement_counter _counter_cache_column, parent_id
+    end
+
+    def update_parent_counter_cache
+      changed =
+        if ActiveRecord::VERSION::STRING >= '5.1.0'
+          saved_change_to_attribute?(self.ancestry_base_class.ancestry_column)
+        else
+          ancestry_changed?
+        end
+
+      return unless changed
+
+      if parent_id_was = parent_id_before_last_save
+        self.class.decrement_counter _counter_cache_column, parent_id_was
+      end
+
+      parent_id && self.class.increment_counter(_counter_cache_column, parent_id)
+    end
+
+    def _counter_cache_column
+      self.ancestry_base_class.counter_cache_column.to_s
+    end
+
     # Ancestors
 
     def ancestors?
@@ -101,7 +139,14 @@ module Ancestry
     alias :has_parent? :ancestors?
 
     def ancestry_changed?
-      changed.include?(self.ancestry_base_class.ancestry_column.to_s)
+      column = self.ancestry_base_class.ancestry_column.to_s
+      if ActiveRecord::VERSION::STRING >= '5.1.0'
+        # These methods return nil if there are no changes.
+        # This was fixed in a refactoring in rails 6.0: https://github.com/rails/rails/pull/35933
+        !!(will_save_change_to_attribute?(column) || saved_change_to_attribute?(column))
+      else
+        changed.include?(column)
+      end
     end
 
     def ancestor_ids
@@ -113,6 +158,7 @@ module Ancestry
     end
 
     def ancestors depth_options = {}
+      return self.ancestry_base_class.none unless ancestors?
       self.ancestry_base_class.scope_depth(depth_options, depth).ordered_by_ancestry.where ancestor_conditions
     end
 
@@ -130,6 +176,13 @@ module Ancestry
       parse_ancestry_column(send("#{self.ancestry_base_class.ancestry_column}#{BEFORE_LAST_SAVE_SUFFIX}"))
     end
 
+    def parent_id_before_last_save
+      ancestry_was = send("#{self.ancestry_base_class.ancestry_column}#{BEFORE_LAST_SAVE_SUFFIX}")
+      return unless ancestry_was.present?
+
+      ancestry_was.split(ANCESTRY_DELIMITER).last.to_i
+    end
+
     def path_ids
       ancestor_ids + [id]
     end

data/lib/ancestry/version.rb

@@ -1,3 +1,3 @@
 module Ancestry
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -157,7 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Organize ActiveRecord model into a tree structure