ancestry 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ddb8d5c0746b6c319e51a71a665257612bd6a1
-  data.tar.gz: 5da3981850ca1133b3c4318ba1934b492011c235
+  metadata.gz: 4a0ecc6b1fa22b8bd28b9c30ea33044711e58502
+  data.tar.gz: 61a4f311e5b2b459d31f3579f3768b3e662e9cd5
 SHA512:
-  metadata.gz: 44241ad80d6e7e8392c53a25f2396c101f9bf99dc22c1fd10b49b672af1e38f199a74afc8a5f638ccdb469ee821ae953b95160ed64caaabeb52dbc735addff81
-  data.tar.gz: e49f276175f2265d9af857eb64c72431d34b78ab49e977d2e0b4985095991b86f8da434926787ceaeccbd2a55719cfc4b2c308770ece7fb9cba47e32f11a66e6
+  metadata.gz: 61f60265258f9c8c2a9637c21239c1b32f3117b98a4f7bcdf7752d11e306f29e5c7ecd6bc4b364c1b39bb8ed44a8e7fa94b3b276bc9fb6bfa9c1152f2a1ba4f2
+  data.tar.gz: 75d97ae0017b5906e44e141f97915de6055a33c0f3862db4f5e7b058cbd8482f4e1b90803658873b1cdbc4cf0aab1c7d8d81ff2111aa56e361a5de5a9d8700fd

data/README.md

@@ -109,6 +109,7 @@ record:
     path             Scopes model on path records of the record
     children         Scopes the model on children of the record
     child_ids        Returns a list of child ids
+    has_parent?     Returns true if the record has a parent, false otherwise
     has_children?    Returns true if the record has any children, false otherwise
     is_childless?    Returns true is the record has no children, false otherwise
     siblings         Scopes the model on siblings of the record, the record itself is included*

data/ancestry.gemspec

@@ -14,7 +14,12 @@ Gem::Specification.new do |s|
   arrangement of (sub)tree into hashes and different strategies for dealing with
   orphaned records.
 EOF
-
+  s.metadata = {
+    "homepage_uri" => "https://github.com/stefankroes/ancestry",
+    "changelog_uri" => "https://github.com/stefankroes/ancestry/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/stefankroes/ancestry/",
+    "bug_tracker_uri" => "https://github.com/stefankroes/ancestry/issues",
+  }
   s.version = Ancestry::VERSION
 
   s.authors  = ['Stefan Kroes', 'Keenan Brock']

data/lib/ancestry/class_methods.rb

@@ -99,9 +99,9 @@ module Ancestry
       parents = {}
       exceptions = [] if options[:report] == :list
 
-      self.ancestry_base_class.unscoped do
+      unscoped_where do |scope|
         # For each node ...
-        self.ancestry_base_class.find_each do |node|
+        scope.find_each do |node|
           begin
             # ... check validity of ancestry column
             if !node.valid? and !node.errors[node.class.ancestry_column].blank?
@@ -137,9 +137,9 @@ module Ancestry
       parents = {}
       # Wrap the whole thing in a transaction ...
       self.ancestry_base_class.transaction do
-        self.ancestry_base_class.unscoped do
+        unscoped_where do |scope|
           # For each node ...
-          self.ancestry_base_class.find_each do |node|
+          scope.find_each do |node|
             # ... set its ancestry to nil if invalid
             if !node.valid? and !node.errors[node.class.ancestry_column].blank?
               node.without_ancestry_callbacks do
@@ -158,7 +158,7 @@ module Ancestry
           end
 
           # For each node ...
-          self.ancestry_base_class.find_each do |node|
+          scope.find_each do |node|
             # ... rebuild ancestry from parents array
             ancestry, parent = nil, parents[node.id]
             until parent.nil?
@@ -174,8 +174,8 @@ module Ancestry
 
     # Build ancestry from parent id's for migration purposes
     def build_ancestry_from_parent_ids! parent_id = nil, ancestry = nil
-      self.ancestry_base_class.unscoped do
-        self.ancestry_base_class.where(:parent_id => parent_id).find_each do |node|
+      unscoped_where do |scope|
+        scope.where(:parent_id => parent_id).find_each do |node|
           node.without_ancestry_callbacks do
             node.update_attribute ancestry_column, ancestry
           end
@@ -189,12 +189,22 @@ module Ancestry
       raise Ancestry::AncestryException.new("Cannot rebuild depth cache for model without depth caching.") unless respond_to? :depth_cache_column
 
       self.ancestry_base_class.transaction do
-        self.ancestry_base_class.unscoped do
-          self.ancestry_base_class.find_each do |node|
+        unscoped_where do |scope|
+          scope.find_each do |node|
             node.update_attribute depth_cache_column, node.depth
           end
         end
       end
     end
+
+    def unscoped_where
+      if ActiveRecord::VERSION::MAJOR < 4
+        self.ancestry_base_class.unscoped do
+          yield self.ancestry_base_class
+        end
+      else
+        yield self.ancestry_base_class.unscope(:where)
+      end
+    end
   end
 end

data/lib/ancestry/has_ancestry.rb

@@ -40,7 +40,6 @@ module Ancestry
       # Named scopes
       scope :roots, lambda { where(root_conditions) }
       scope :ancestors_of, lambda { |object| where(ancestor_conditions(object)) }
-      scope :path_of, lambda { |object| where(path_conditions(object)) }
       scope :children_of, lambda { |object| where(child_conditions(object)) }
       scope :descendants_of, lambda { |object| where(descendant_conditions(object)) }
       scope :subtree_of, lambda { |object| where(subtree_conditions(object)) }

data/lib/ancestry/instance_methods.rb

@@ -87,6 +87,7 @@ module Ancestry
       # ancestor_ids.present?
       read_attribute(self.ancestry_base_class.ancestry_column).present?
     end
+    alias :has_parent? :ancestors?
 
     def ancestry_changed?
       changed.include?(self.ancestry_base_class.ancestry_column.to_s)
@@ -306,19 +307,27 @@ module Ancestry
     end
 
     def unscoped_descendants
-      self.ancestry_base_class.unscoped do
-        self.ancestry_base_class.where descendant_conditions
+      unscoped_where do |scope|
+        scope.where descendant_conditions
       end
     end
 
     def unscoped_current_and_previous_ancestors
-      self.ancestry_base_class.unscoped do
-        self.ancestry_base_class.where id: (ancestor_ids + ancestor_ids_was).uniq
+      unscoped_where do |scope|
+        scope.where id: (ancestor_ids + ancestor_ids_was).uniq
       end
     end
 
     def unscoped_find id
-      self.ancestry_base_class.unscoped { self.ancestry_base_class.find(id) }
+      unscoped_where do |scope|
+        scope.find id
+      end
+    end
+
+    def unscoped_where
+      self.ancestry_base_class.unscoped_where do |scope|
+        yield scope
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,7 +122,11 @@ files:
 homepage: http://github.com/stefankroes/ancestry
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/stefankroes/ancestry
+  changelog_uri: https://github.com/stefankroes/ancestry/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/stefankroes/ancestry/
+  bug_tracker_uri: https://github.com/stefankroes/ancestry/issues
 post_install_message: 
 rdoc_options: []
 require_paths: