simple_nested_set 0.1.7 → 0.1.8

data/lib/simple_nested_set/patches/arel_table_initialization.rb

@@ -1,102 +1,110 @@
 require 'gem_patching'
 
-case Arel::VERSION
-when '1.0.1'
-  Gem.patching('arel', '1.0.1') do
-    # 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
-    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
+# actual patches
+# patch for Arel 1.0.1
+module SimpleNestedSetPatchArel1
+  # 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
+  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[:as]
-            as = options[:as].to_s
-            @table_alias = as unless as == @name
-          end
-        else
-          @engine = options # Table.new('foo', engine)
-          @options = {}
-        end
+    if options.is_a?(Hash)
+      @options = options
+      @engine = options[:engine] || Arel::Table.engine
 
-        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
+      if options[:as]
+        as = options[:as].to_s
+        @table_alias = as unless as == @name
+      end
+    else
+      @engine = options # Table.new('foo', engine)
+      @options = {}
+    end
 
-          @@tables ||= engine.connection.tables
+    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
 
-      def as(table_alias)
-        @options ||= {}
-        Arel::Table.new(name, options.merge(:as => table_alias))
-      end
+      @@tables ||= engine.connection.tables
+    end
+  end
 
-      def table_exists?
-        @table_exists ||= @@tables.include?(name) || engine.connection.table_exists?(name)
-      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
+
+# patch for Arel 2.0.x
+#
+# we need to save the provided options in order to pass them to the new
+# Arel-Table. This way, we should be able to maintain the interface and just
+# add the "as"-funtionality
+module SimpleNestedSetPatchArel2
+  def self.included(base)
+    base.class_eval do
+      attr_reader :provided_options
+      alias_method :initialize_without_saving_options, :initialize
+      alias_method :initialize, :initialize_with_saving_options
     end
   end
-when /^2\.0\.[5-9]$/, /^2\.1\.[01]$/, '2.0.10'
-  Gem.patching('arel', Arel::VERSION) do
-    Arel::Table.class_eval do
-      attr_reader :options # this line is added
 
-      def initialize name, engine = Arel::Table.engine
-        @name    = name.to_s
-        @engine  = engine
-        @columns = nil
-        @aliases = []
-        @table_alias = nil
-        @primary_key = nil
+  def initialize_with_saving_options(*args) # name, engine = Arel::Table.engine
+    engine = args[1]
+    @provided_options = (engine.is_a?(Hash)) ? engine : {}
 
-        if Hash === engine
-          @options = engine # this line has been added
-          @engine  = engine[:engine] || Arel::Table.engine
-          @columns = attributes_for engine[:columns]
+    initialize_without_saving_options *args
+  end
 
-          # Sometime AR sends an :as parameter to table, to let the table know
-          # that it is an Alias.  We may want to override new, and return a
-          # TableAlias node?
-          @table_alias = engine[:as] unless engine[:as].to_s == @name
-        end
-      end
+  def as(table_alias)
+    Arel::Table.new(name, provided_options.merge(:as => table_alias))
+  end
+end
 
-      # this whole method is new
-      def as(table_alias)
-        @options ||= {}
-        Arel::Table.new(name, options.merge(:as => table_alias))
-      end
-    end
+case Arel::VERSION
+when '1.0.1'
+  Gem.patching('arel', '1.0.1') do
+    Arel::Table.send :include, SimpleNestedSetPatchArel1
+  end
+when /^2\.0\.[5-9]$/, /^2\.1\.[01]$/, '2.0.10' # successfully tested, could be '~> 2.0.5'
+  Gem.patching('arel', Arel::VERSION) do
+    Arel::Table.send :include, SimpleNestedSetPatchArel2
+  end
+else
+  # latest tested version to enable Gem-patching-Exceptions
+  # This can be removed once we cover all versions which need this patch
+  Gem.patching('arel', '2.0.10') do
+    Arel::Table.send :include, SimpleNestedSetPatchArel2
   end
 end

data/lib/simple_nested_set/rebuild/from_parents.rb

@@ -10,6 +10,8 @@ module SimpleNestedSet
       end
 
       def run(nested_set, sort_order = :id)
+        nested_set.where(:parent_id => nil).update_all(:parent_id => 0)
+
         order_columns = ([:parent_id] + Array[sort_order]).uniq.compact
 
         db_adapter = nested_set.first.class.connection.instance_variable_get('@config')[:adapter].to_sym
@@ -25,7 +27,11 @@ module SimpleNestedSet
                 end.to_a
 
         renumber(nodes.dup)
-        nodes.each(&:save)
+        result = nodes.each(&:save)
+
+        nested_set.where(:parent_id => 0).update_all(:parent_id => nil)
+
+        result
       end
 
       def renumber(nodes)
@@ -45,7 +51,7 @@ module SimpleNestedSet
       end
 
       def child?(node, child)
-        if child.root?
+        if child.root? || child.parent_id == 0
           false
         elsif direct_child?(node, child)
           true

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord