acts-as-tree-with-dotted-ids 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 87759d6b94e64e5e78f4c513083c64fa1cc0e673
+  data.tar.gz: 735fcbcbb7b7d575b9a8a0c5e60a39eac0ed9530
+SHA512:
+  metadata.gz: 209c4fd3d1640701cc988b1ea61ce0c42985f7aea6f551fd6a236d8e784918475e65dd803f4824cdea8760d3b05485017908f2bac89fefad8a8c0c40bdbf2215
+  data.tar.gz: 64dd80ad140616a0fc443ab87b27e19d72e00a8a3265c6c5fb3511873ddb70f2e4762b8092006ff064f2a27b813cca739aa1473ad63d3e0ee0ea55a9a7915ba2

data/lib/active_record/acts/tree_with_dotted_ids.rb

@@ -39,7 +39,7 @@ module ActiveRecord
       # The following class methods are added
       # * <tt>traverse</tt> - depth-first traversal of the tree (warning: it does *not* rely on the dotted_ids as it is used to rebuild the tree)
       # * <tt>rebuild_dotted_ids!</tt> - rebuilt the dotted IDs for the whole tree, use this once to migrate an existing +acts_as_tree+ model to +acts_as_tree_with_dotted_ids+
-      
+
       module ClassMethods
         # Configuration options are:
         #
@@ -51,10 +51,10 @@ module ActiveRecord
           configuration.update(options) if options.is_a?(Hash)
 
           belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache]
-          
 
-          has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], 
-            :order => configuration[:order], :dependent => :destroy, &b
+
+          has_many :children, -> { order(configuration[:order]) }, :class_name => name, :foreign_key => configuration[:foreign_key],
+                   :dependent => :destroy, &b
 
           after_save                 :assign_dotted_ids
           after_validation           :update_dotted_ids, :on => :update
@@ -63,22 +63,22 @@ module ActiveRecord
             include ActiveRecord::Acts::TreeWithDottedIds::InstanceMethods
 
             def self.roots
-              res = find(:all, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
+              res = where("#{configuration[:foreign_key]} IS NULL").order(#{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
 
             end
 
             def self.root
-              find(:first, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
+              where("#{configuration[:foreign_key]} IS NULL").order(#{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}}).first
             end
-            
+
             def parent_foreign_key_changed?
               #{configuration[:foreign_key]}_changed?
             end
-            
+
           EOV
         end
-        
-        # Performs a depth-first traversal of the tree, yielding each node to the given block 
+
+        # Performs a depth-first traversal of the tree, yielding each node to the given block
         def traverse(nodes = nil, &block)
           nodes ||= self.roots
           nodes.each do |node|
@@ -86,7 +86,7 @@ module ActiveRecord
             traverse(node.children, &block)
           end
         end
-        
+
         # Traverse the whole tree from roots to leaves and rebuild the dotted_ids path
         # Call it from your migration to upgrade an existing acts_as_tree model.
         def rebuild_dotted_ids!
@@ -94,7 +94,7 @@ module ActiveRecord
             traverse { |node| node.dotted_ids = nil; node.save! }
           end
         end
-        
+
       end
 
       module InstanceMethods
@@ -105,15 +105,15 @@ module ActiveRecord
         def ancestors
           if self.dotted_ids
             ids = self.dotted_ids.split('.')[0...-1]
-            self.class.find(:all, :conditions => {:id => ids}, :order => 'dotted_ids DESC')
+            self.class.where(:id => ids).order('dotted_ids DESC')
           else
             node, nodes = self, []
             nodes << node = node.parent while node.parent
             nodes
           end
         end
-        
-        # 
+
+        #
         def self_and_ancestors
           [self] + ancestors
         end
@@ -141,35 +141,35 @@ module ActiveRecord
         #   subchild1.self_and_siblings # => [subchild1, subchild2]
         def self_and_siblings
           #parent ? parent.children : self.class.roots
-          self.class.find(:all, :conditions => {:parent_id => self.parent_id})
+          self.class.where(:parent_id => self.parent_id)
         end
-        
+
         #
         # root.ancestor_of?(subchild1) # => true
         # subchild1.ancestor_of?(child1) # => false
         def ancestor_of?(node)
           node.dotted_ids.length > self.dotted_ids.length && node.dotted_ids.starts_with?(self.dotted_ids)
         end
-        
+
         #
         # subchild1.descendant_of?(child1) # => true
         # root.descendant_of?(subchild1) # => false
         def descendant_of?(node)
           self.dotted_ids.length > node.dotted_ids.length && self.dotted_ids.starts_with?(node.dotted_ids)
         end
-        
+
         # Returns all children of the current node
         # root.all_children # => [child1, subchild1, subchild2]
         def all_children
           find_all_children_with_dotted_ids
         end
-        
+
         # Returns all children of the current node
         # root.self_and_all_children # => [root, child1, subchild1, subchild2]
         def self_and_all_children
           [self] + all_children
         end
-        
+
         # Returns the depth of the node, root nodes have a depth of 0
         def depth
           if self.dotted_ids.present?
@@ -178,44 +178,44 @@ module ActiveRecord
             (self.parent.try(:depth) || -1) + 1
           end
         end
-                
+
       protected
-      
+
         # Tranforms a dotted_id string into a pattern usable with a SQL LIKE statement
         def dotted_id_like_pattern(prefix = nil)
           (prefix || self.dotted_ids) + '.%'
         end
-        
+
         # Find all children with the given dotted_id prefix
-        # *options* will be passed to to find(:all)
-        # FIXME: use merge_conditions when it will be part of the public API
-        def find_all_children_with_dotted_ids(prefix = nil, options = {})
-          self.class.find(:all, options.update(:conditions => ['dotted_ids LIKE ?', dotted_id_like_pattern(prefix)]))
+        # *extra_scope* will be combine with dotted_ids LIKE
+        # FIXME: use extra_scope when it will be part of the public API
+        def find_all_children_with_dotted_ids(prefix = nil, extra_scope = self.class.where('1=1'))
+          extra_scope.where('dotted_ids LIKE ?', dotted_id_like_pattern(prefix))
         end
-        
+
         # Generates the dotted_ids for this node
         def build_dotted_ids
           self.parent ? "#{self.parent.dotted_ids}.#{self.id}" : self.id.to_s
         end
-        
+
         # After create, adds the dotted id's
         def assign_dotted_ids
           self.update_attribute(:dotted_ids, build_dotted_ids) if self.dotted_ids.blank?
         end
-        
+
         # After validation on update, rebuild dotted ids if necessary
         def update_dotted_ids
           return unless parent_foreign_key_changed?
           old_dotted_ids = self.dotted_ids
           old_dotted_ids_regex = Regexp.new("^#{Regexp.escape(old_dotted_ids)}(.*)")
           self.dotted_ids = build_dotted_ids
-          replace_pattern = "#{self.dotted_ids}\\1"          
+          replace_pattern = "#{self.dotted_ids}\\1"
           find_all_children_with_dotted_ids(old_dotted_ids).each do |node|
             new_dotted_ids = node.dotted_ids.gsub(old_dotted_ids_regex, replace_pattern)
             node.update_attribute(:dotted_ids, new_dotted_ids)
           end
         end
-        
+
       end
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-tree-with-dotted-ids
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,72 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: ''
 email: tma@freshbit.ch
 executables: []
@@ -83,35 +66,32 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- README.rdoc
 - lib/active_record/acts/tree_with_dotted_ids.rb
 - lib/acts-as-tree-with-dotted-ids.rb
-- README.rdoc
 homepage: http://github.com/tma/acts-as-tree-with-dotted-ids
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1326598496013907944
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A drop in replacement for acts_as_tree with super fast ancestors and subtree
   access
 test_files: []