acts_as_sane_tree 2.0.5 → 2.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 89a019d5241aef791604209335af604e3b6c926d
+  data.tar.gz: ab0d2f4d92b65230a7eaad525389bc102caa18a7
+SHA512:
+  metadata.gz: 9ddd081548cbe842f2bca5562794753e7e6328ebe4c076c1d2fbb5d3ac8cc40a224a79f35bf9367b91bf8eb60ae4671083ea71d70358c2d305fd6bfcff12aae6
+  data.tar.gz: 72f023ab7fe05705c0dd2bc80d6c5fb4ae52005254aae72667a25048132161b4e75e70041cf62c5400f7f9b38318ace8ae9526ebf9c1822bcdf489d21b932a04

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+=== v2.0.6
+* Add full support for rails 4.0 and 4.1
+
 === v2.0.5
 * Force integer type on depth result or nil if undetermined
 * Fixed query building bug in #nodes_within

data/README.rdoc

@@ -1,6 +1,8 @@
-== acts_as_sane_tree 
+== acts_as_sane_tree
 ==== (Building trees with a dash of sanity)
 
+{<img src="https://secure.travis-ci.org/chrisroberts/acts_as_sane_tree.png" />}[http://travis-ci.org/chrisroberts/acts_as_sane_tree]
+
 This is a drop in replacement for acts_as_tree on systems with Postgresql >= 8.4
 
 == What this provides
@@ -9,7 +11,12 @@ A fast way to build trees.
 
 == What version of Rails
 
-As of version 2, acts_as_sane_tree now proudly offers support on Rails 2 as well as Rails 3
+* Rails ~> 4.1.0
+* Rails ~> 4.0.0
+* Rails ~> 3.2.0
+* Rails ~> 3.1.0
+* Rails ~> 3.0.0
+* Rails ~> 2.3.0
 
 == Requirements
 
@@ -50,7 +57,7 @@ http://chrisroberts.github.com/acts_as_sane_tree
 == License
 
 A (now not so large) majority of this was copied directly from the original acts as tree, with the original license:
-* Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license 
+* Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license
 
 The new additions continue:
 * Copyright (c) 2011 Chris Roberts, released under the MIT license

data/lib/acts_as_sane_tree/acts_as_sane_tree.rb

@@ -3,7 +3,7 @@ require 'acts_as_sane_tree/instance_methods'
 require 'acts_as_sane_tree/singleton_methods.rb'
 
 module ActsAsSaneTree
-  
+
   def self.included(base) # :nodoc:
     base.extend(ClassMethods)
   end
@@ -31,7 +31,7 @@ module ActsAsSaneTree
   #   root.children.first.children.first # => subchild1
   #
   # The following class methods are also added:
-  # 
+  #
   # * <tt>nodes_within?(src, chk)</tt> - Returns true if chk contains any nodes found within src and all ancestors of nodes within src
   # * <tt>nodes_within(src, chk)</tt> - Returns any matching nodes from chk found within src and all ancestors within src
   # * <tt>nodes_and_descendants(*args)</tt> - Returns all nodes and descendants for given IDs or records. Accepts multiple IDs and records. Valid options:
@@ -52,21 +52,29 @@ module ActsAsSaneTree
 
       self.class_eval do
         cattr_accessor :configuration
-        
-        has_many :children, 
-          :class_name => @configuration[:class].name, 
-          :foreign_key => @configuration[:foreign_key], 
-          :order => @configuration[:order], 
-          :dependent => @configuration[:dependent]
-        belongs_to :parent, 
-          :class_name => @configuration[:class].name, 
+
+        if(Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.1.0'))
+          has_many :children,
+            :class_name => @configuration[:class].name,
+            :foreign_key => @configuration[:foreign_key],
+            :order => @configuration[:order],
+            :dependent => @configuration[:dependent]
+        else
+          has_many :children,
+            proc{ order self.configuration[:order] },
+            :class_name => @configuration[:class].name,
+            :foreign_key => @configuration[:foreign_key],
+            :dependent => @configuration[:dependent]
+        end
+        belongs_to :parent,
+          :class_name => @configuration[:class].name,
           :foreign_key => @configuration[:foreign_key]
         if(@configuration[:parent_override])
           def parent
             self.class.where(:id => self.parent_id).first
           end
         end
-        
+
         validates_each @configuration[:foreign_key] do |record, attr, value|
           record.errors.add attr, 'cannot be own parent.' if !record.id.nil? && value.to_i == record.id.to_i
         end

data/lib/acts_as_sane_tree/instance_methods.rb

@@ -1,28 +1,29 @@
 module ActsAsSaneTree
   module InstanceMethods
 
-    # Returns all ancestors of the current node. 
+    # Returns all ancestors of the current node.
     def ancestors
-      query = 
+      query =
         "(WITH RECURSIVE crumbs AS (
           SELECT #{self.class.configuration[:class].table_name}.*,
           1 AS depth
           FROM #{self.class.configuration[:class].table_name}
-          WHERE id = #{id} 
+          WHERE id = #{id}
           UNION ALL
-          SELECT alias1.*, 
-          depth + 1 
+          SELECT alias1.*,
+          depth + 1
           FROM crumbs
           JOIN #{self.class.configuration[:class].table_name} alias1 ON alias1.id = crumbs.parent_id
         ) SELECT * FROM crumbs WHERE crumbs.id != #{id}) as #{self.class.configuration[:class].table_name}"
-      if(self.class.rails_3?)
-        self.class.configuration[:class].send(:with_exclusive_scope) do
+      scope_strip_method = self.class.configuration[:class].methods.map(&:to_sym).include?(:unscoped) ? :unscoped : :with_exclusive_scope
+      if(self.class.rails_arel?)
+        self.class.configuration[:class].send(scope_strip_method) do
           self.class.configuration[:class].from(
             query
           ).order("#{self.class.configuration[:class].table_name}.depth DESC")
         end
       else
-        self.class.configuration[:class].send(:with_exclusive_scope) do
+        self.class.configuration[:class].send(scope_strip_method) do
           self.class.configuration[:class].scoped(
             :from => query,
             :order => "#{self.class.configuration[:class].table_name}.depth DESC"
@@ -49,12 +50,12 @@ module ActsAsSaneTree
     def self_and_siblings
       parent ? parent.children : self.class.configuration[:class].roots
     end
-    
+
     # Returns if the current node is a root
     def root?
       parent_id.nil?
     end
-    
+
     # Returns all descendants of the current node. Each level
     # is within its own hash, so for a structure like:
     #   root
@@ -63,9 +64,9 @@ module ActsAsSaneTree
     #               \_ subsubchild1
     #         \_ subchild2
     # the resulting hash would look like:
-    # 
-    #  {child1 => 
-    #    {subchild1 => 
+    #
+    #  {child1 =>
+    #    {subchild1 =>
     #      {subsubchild1 => {}},
     #     subchild2 => {}}}
     #
@@ -79,16 +80,16 @@ module ActsAsSaneTree
       self.class.configuration[:class].nodes_and_descendants(:no_self, self, *args)
     end
     alias_method :descendents, :descendants
-    
+
     # Returns the depth of the current node. 0 depth represents the root of the tree
     def depth
-      query = 
+      query =
         "WITH RECURSIVE crumbs AS (
           SELECT parent_id, 0 AS level
           FROM #{self.class.configuration[:class].table_name}
-          WHERE id = #{self.id} 
+          WHERE id = #{self.id}
           UNION ALL
-          SELECT alias1.parent_id, level + 1 
+          SELECT alias1.parent_id, level + 1
           FROM crumbs
           JOIN #{self.class.configuration[:class].table_name} alias1 ON alias1.id = crumbs.parent_id
         ) SELECT level FROM crumbs ORDER BY level DESC LIMIT 1"

data/lib/acts_as_sane_tree/singleton_methods.rb

@@ -1,14 +1,14 @@
 module ActsAsSaneTree
   module SingletonMethods
-    
+
     # Check if we are in rails 3
-    def rails_3?
-      @is_3 ||= !defined?(Arel).nil?
+    def rails_arel?
+      @is_arel ||= !defined?(Arel).nil?
     end
 
     # Return all root nodes
     def roots
-      if(rails_3?)
+      if(rails_arel?)
         configuration[:class].where(
           "#{configuration[:foreign_key]} IS NULL"
         ).order(configuration[:order])
@@ -22,12 +22,12 @@ module ActsAsSaneTree
 
     # Return first root node
     def root
-      if(rails_3?)
+      if(rails_arel?)
         configuration[:class].where("#{configuration[:foreign_key]} IS NULL").order(configuration[:order]).first
       else
         configuration[:class].find(
-          :first, 
-          :conditions => "#{configuration[:foreign_key]} IS NULL", 
+          :first,
+          :conditions => "#{configuration[:foreign_key]} IS NULL",
           :order => configuration[:order]
         )
       end
@@ -57,26 +57,26 @@ module ActsAsSaneTree
     # chk:: Array of nodes
     # Return all nodes that are within both chk and src
     def nodes_within(src, chk)
-      s = (src.is_a?(Array) ? src : [src]).map{|x|x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
-      c = (chk.is_a?(Array) ? chk : [chk]).map{|x|x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
+      s = [src].flatten.compact.map{|x|x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
+      c = [chk].flatten.compact.map{|x|x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
       if(s.empty? || c.empty?)
         nil
       else
-        query = 
+        query =
           "(WITH RECURSIVE crumbs AS (
             SELECT #{configuration[:class].table_name}.*, 0 AS depth FROM #{configuration[:class].table_name} WHERE id in (#{s.join(', ')})
             UNION ALL
             SELECT alias1.*, crumbs.depth + 1 FROM crumbs JOIN #{configuration[:class].table_name} alias1 on alias1.parent_id = crumbs.id
             #{configuration[:max_depth] ? "WHERE crumbs.depth + 1 < #{configuration[:max_depth].to_i}" : ''}
           ) SELECT * FROM crumbs WHERE id in (#{c.join(', ')})) as #{configuration[:class].table_name}"
-        if(rails_3?)
+        if(rails_arel?)
           configuration[:class].from(query)
         else
           configuration[:class].scoped(:from => query)
         end
       end
     end
-    
+
     # args:: ActiveRecord models or IDs - Symbols: :raw, :no_self - Hash: {:to_depth => n, :at_depth => n}
     # Returns provided nodes plus all descendants of provided nodes in nested Hash where keys are nodes and values are children
     # :raw:: return value will be flat array
@@ -104,7 +104,7 @@ module ActsAsSaneTree
         depth_clause = "#{configuration[:class].table_name}.depth + 1 < #{depth.to_i + 2}"
       end
       base_ids = args.map{|x| x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
-      query = 
+      query =
         "(WITH RECURSIVE crumbs AS (
           SELECT #{configuration[:class].table_name}.*, #{no_self ? -1 : 0} AS depth FROM #{configuration[:class].table_name} WHERE #{base_ids.empty? ? 'parent_id IS NULL' : "id in (#{base_ids.join(', ')})"}
           UNION ALL
@@ -112,7 +112,7 @@ module ActsAsSaneTree
           #{depth_restriction}
         ) SELECT * FROM crumbs) as #{configuration[:class].table_name}"
       q = nil
-      if(rails_3?)
+      if(rails_arel?)
         q = configuration[:class].from(
           query
         ).where(
@@ -126,7 +126,7 @@ module ActsAsSaneTree
         end
       else
         q = configuration[:class].scoped(
-          :from => query, 
+          :from => query,
           :conditions => "#{configuration[:class].table_name}.depth >= 0"
         )
         if(configuration[:order].present?)
@@ -136,7 +136,7 @@ module ActsAsSaneTree
           q = q.scoped(:conditions => depth_clause)
         end
       end
-      unless(rails_3?)
+      unless(rails_arel?)
         q = q.scoped(scope(:find))
       end
       unless(raw)

data/lib/acts_as_sane_tree/version.rb

@@ -13,6 +13,5 @@ module ActsAsSaneTree
     end
   end
 
-  VERSION = Version.new('2.0.5')
+  VERSION = Version.new('2.0.6')
 end
-

metadata

@@ -1,89 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_sane_tree
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 5
-  version: 2.0.5
+version: !ruby/object:Gem::Version
+  version: 2.0.6
 platform: ruby
-authors: 
+authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-11-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sane ActiveRecord tree builder
 email: chrisroberts.code@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- README.rdoc
+files:
+- CHANGELOG.rdoc
 - README.rdoc
-files: 
 - acts_as_sane_tree.gemspec
 - init.rb
-- README.rdoc
-- CHANGELOG.rdoc
 - lib/acts_as_sane_tree.rb
-- lib/acts_as_sane_tree/version.rb
 - lib/acts_as_sane_tree/acts_as_sane_tree.rb
-- lib/acts_as_sane_tree/singleton_methods.rb
 - lib/acts_as_sane_tree/instance_methods.rb
+- lib/acts_as_sane_tree/singleton_methods.rb
+- lib/acts_as_sane_tree/version.rb
 - rails/init.rb
-has_rdoc: true
 homepage: http://github.com/chrisroberts/acts_as_sane_tree
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sane tree builder for ActiveRecord and Postgresql
 test_files: []
-
+has_rdoc: true