simple_nested_set 0.0.12 → 0.0.13

data/lib/simple_nested_set.rb

@@ -1,10 +1,12 @@
 require 'active_record'
+require 'simple_nested_set/patches/arel_table_initialization'
 
 module SimpleNestedSet
   ATTRIBUTES = [:parent, :parent_id, :left_id, :right_id, :lft, :rgt, :level, :path]
 
   autoload :ActMacro,        'simple_nested_set/act_macro'
   autoload :ClassMethods,    'simple_nested_set/class_methods'
+  autoload :Inspect,         'simple_nested_set/inspect'
   autoload :InstanceMethods, 'simple_nested_set/instance_methods'
   autoload :NestedSet,       'simple_nested_set/nested_set'
   autoload :SqlAbstraction,  'simple_nested_set/sql_abstraction.rb'

data/lib/simple_nested_set/act_macro.rb

@@ -3,8 +3,11 @@ module SimpleNestedSet
     def acts_as_nested_set(options = {})
       return if acts_as_nested_set?
 
-      include SimpleNestedSet::InstanceMethods
       extend  SimpleNestedSet::ClassMethods
+      extend  SimpleNestedSet::Inspect
+
+      include SimpleNestedSet::InstanceMethods
+      include SimpleNestedSet::Inspect
 
       define_callbacks :move, :terminator => "result == false"
 

data/lib/simple_nested_set/inspect.rb

@@ -0,0 +1,30 @@
+module SimpleNestedSet
+  module Inspect
+    def inspect_tree(attributes = [:id, :lft, :rgt, :parent_id, :slug, :path, :level])
+      if is_a?(Class)
+        nodes = all
+        ".\n" << with_exclusive_scope { Inspect.tree(nodes) }
+      else
+        ".\n" << Inspect.tree([self])
+      end
+    end
+
+    class << self
+      def tree(nodes, indent = '')
+        nodes.inject('') do |out, node|
+          last = node == nodes.last
+          out << line(node, indent, last)
+          out << tree(node.children, next_indent(indent, last))
+        end
+      end
+
+      def line(node, indent, last)
+        "#{indent}#{last ? '└' : '├'}── #{node.class.name} id: #{node.id}\n"
+      end
+
+      def next_indent(indent, last)
+        "#{indent}#{last ? '    ' : '|   '}"
+      end
+    end
+  end
+end

data/lib/simple_nested_set/instance_methods.rb

@@ -153,12 +153,20 @@ module SimpleNestedSet
 
     # Move the node to the left of another node
     def move_to_left_of(node)
-      nested_set.move_to(node, :left)
+      if node
+        nested_set.move_to(node, :left)
+      elsif left_most = siblings.first
+        move_to_right_of(left_most)
+      end
     end
 
     # Move the node to the left of another node
     def move_to_right_of(node)
-      nested_set.move_to(node, :right)
+      if node
+        nested_set.move_to(node, :right)
+      elsif right_most = siblings.last
+        move_to_left_of(right_most)
+      end
     end
 
     # Makes this node to the given path

data/lib/simple_nested_set/move/by_attributes.rb

@@ -16,11 +16,11 @@ module SimpleNestedSet
       def perform
         if path && node.path_changed?
           node.move_to_path(path)
-        elsif left_id && left_id != node.id
+        elsif attributes.key?(:left_id) && left_id != node.id
           node.move_to_right_of(left_id)
-        elsif right_id && right_id != node.id
+        elsif attributes.key?(:right_id) && right_id != node.id
           node.move_to_left_of(right_id)
-        elsif parent_id && parent_id != node.parent_id
+        elsif attributes.key?(:parent_id) && parent_id != node.parent_id
           node.move_to_child_of(parent_id)
         end
       end

data/lib/simple_nested_set/patches/arel_table_initialization.rb

@@ -0,0 +1,68 @@
+require 'gem_patching'
+
+# Arel 1.0.0.rc1 Arel::Table#initialize and #table_exists? does not support
+# instantiating an Arel::Table before the database table has been created.
+#
+# This happens in adva-cms2 during the setup of the cucumber test application
+# where the environment has to be loaded (and thus models will be loaded) and
+# migrations will only be run afterwards.
+#
+# see http://github.com/rails/arel/commit/19c5a95f1093653d2628dfb2f53637b0425dbba4#commitcomment-133903
+#
+# Also, in Arel 1.0.0.rc1 Arel::Table#initialize @options won't be initialized
+# if the second argument is an engine, so #as will crash subsequently.
+#
+# These issues have been fixed in:
+#
+# http://github.com/svenfuchs/arel/commit/4b476404cbbecfedc255039c66c6eececb667d7f
+# http://github.com/svenfuchs/arel/commit/3b1b24551106bc116cba404c992b513c5fbd137b
+
+Gem.patching('arel', '1.0.1') do
+  Arel::Table.class_eval do
+    def initialize(name, options = {})
+      @name = name.to_s
+      @table_exists = nil
+      @table_alias = nil
+      @christener = Arel::Sql::Christener.new
+      @attributes = nil
+      @matching_attributes = nil
+
+      if options.is_a?(Hash)
+        @options = options
+        @engine = options[:engine] || Arel::Table.engine
+
+        if options[:as]
+          as = options[:as].to_s
+          @table_alias = as unless as == @name
+        end
+      else
+        @engine = options # Table.new('foo', engine)
+        @options = {}
+      end
+
+      if @engine.connection
+        begin
+          require "arel/engines/sql/compilers/#{@engine.adapter_name.downcase}_compiler"
+        rescue LoadError
+          begin
+            # try to load an externally defined compiler, in case this adapter has defined the compiler on its own.
+            require "#{@engine.adapter_name.downcase}/arel_compiler"
+          rescue LoadError
+            raise "#{@engine.adapter_name} is not supported by Arel."
+          end
+        end
+
+        @@tables ||= engine.connection.tables
+      end
+    end
+
+    def as(table_alias)
+      @options ||= {}
+      Arel::Table.new(name, options.merge(:as => table_alias))
+    end
+
+    def table_exists?
+      @table_exists ||= @@tables.include?(name) || engine.connection.table_exists?(name)
+    end
+  end
+end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,15 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: gem_patching
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,10 +60,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: test_declarative
+  name: database_cleaner
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,7 +77,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: pathname_local
+  name: test_declarative
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +90,25 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
-description: "[description]"
+- !ruby/object:Gem::Dependency 
+  name: pathname_local
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+description: |
+  SimpleNestedSet is a gem which gives the ability to handle nested sets in ActiveRecord-Objects
+  
+  It is built upon ActiveRecord3 and therefore Rails3-ready
+
 email: svenfuchs@artweb-design.de
 executables: []
 
@@ -103,11 +120,13 @@ files:
 - lib/simple_nested_set.rb
 - lib/simple_nested_set/act_macro.rb
 - lib/simple_nested_set/class_methods.rb
+- lib/simple_nested_set/inspect.rb
 - lib/simple_nested_set/instance_methods.rb
 - lib/simple_nested_set/move/by_attributes.rb
 - lib/simple_nested_set/move/protection.rb
 - lib/simple_nested_set/move/to_target.rb
 - lib/simple_nested_set/nested_set.rb
+- lib/simple_nested_set/patches/arel_table_initialization.rb
 - lib/simple_nested_set/rebuild/from_paths.rb
 - lib/simple_nested_set/sql_abstraction.rb
 - lib/simple_nested_set/version.rb
@@ -144,6 +163,6 @@ rubyforge_project: "[none]"
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "[summary]"
+summary: a simple to use nested set solution for ActiveRecord 3
 test_files: []