simple_nested_set 0.0.20 → 0.0.21

data/lib/simple_nested_set/class_methods.rb

@@ -54,7 +54,8 @@ module SimpleNestedSet
     end
 
     def with_leaves
-      where("#{arel_table[:lft].to_sql} = #{arel_table[:rgt].to_sql} - 1").order(:lft)
+      # where("#{arel_table[:lft].to_sql} = #{arel_table[:rgt].to_sql} - 1").order(:lft)
+      where("#{arel_table.name}.lft = #{arel_table.name}.rgt - 1").order(:lft)
     end
   end
 end

data/lib/simple_nested_set/nested_set.rb

@@ -122,21 +122,43 @@ module SimpleNestedSet
     end
 
     def denormalize_level_query
-      query = arel_table.as(:l)
-      query = query.project('count(id)').
-              where(query[:lft].lt(arel_table[:lft])).
-              where(query[:rgt].gt(arel_table[:rgt])).
-              where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
-      "level = (#{query.to_sql})"
+      # query = arel_table.as(:l)
+      # query = query.project('count(id)').
+      #         where(query[:lft].lt(arel_table[:lft])).
+      #         where(query[:rgt].gt(arel_table[:rgt])).
+      #         where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
+      # "level = (#{query.to_sql})"
+
+      %(
+        level = (
+          SELECT COUNT("l"."id")
+          FROM #{table_name} AS l
+          WHERE
+            l.lft < #{table_name}.lft AND
+            l.rgt > #{table_name}.rgt AND
+            #{where_clauses.map { |clause| clause.gsub(table_name, 'l') }.join(' AND ')}
+        )
+      )
     end
 
     def denormalize_path_query
-      query = arel_table.as(:l)
-      query = query.project(group_concat(db_adapter, :slug)).
-              where(query[:lft].lteq(arel_table[:lft])).
-              where(query[:rgt].gteq(arel_table[:rgt])).
-              where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
-      "path = (#{query.to_sql})"
+      # query = arel_table.as(:l)
+      # query = query.project(group_concat(db_adapter, :slug)).
+      #         where(query[:lft].lteq(arel_table[:lft])).
+      #         where(query[:rgt].gteq(arel_table[:rgt])).
+      #         where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
+      # "path = (#{query.to_sql})"
+
+      %(
+        path = (
+          SELECT #{group_concat(db_adapter, :slug)}
+          FROM #{table_name} AS l
+          WHERE
+            l.lft <= #{table_name}.lft AND
+            l.rgt >= #{table_name}.rgt AND
+            #{where_clauses.map { |clause| clause.gsub(table_name, 'l') }.join(' AND ')}
+        )
+      )
     end
 
     def db_adapter

data/lib/simple_nested_set/patches/arel_table_initialization.rb

@@ -1,68 +1,100 @@
 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
+if Arel::VERSION == '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
 
-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.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
+          if options[:as]
+            as = options[:as].to_s
+            @table_alias = as unless as == @name
+          end
+        else
+          @engine = options # Table.new('foo', engine)
+          @options = {}
         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
+        if @engine.connection
           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"
+            require "arel/engines/sql/compilers/#{@engine.adapter_name.downcase}_compiler"
           rescue LoadError
-            raise "#{@engine.adapter_name} is not supported by Arel."
+            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
 
-        @@tables ||= engine.connection.tables
+      def as(table_alias)
+        @options ||= {}
+        Arel::Table.new(name, options.merge(:as => table_alias))
       end
-    end
 
-    def as(table_alias)
-      @options ||= {}
-      Arel::Table.new(name, options.merge(:as => table_alias))
+      def table_exists?
+        @table_exists ||= @@tables.include?(name) || engine.connection.table_exists?(name)
+      end
     end
+  end
+else
+  Gem.patching('arel', '2.0.4') do
+    Arel::Table.class_eval do
+      attr_reader :options
+
+      def initialize name, engine = Arel::Table.engine
+        @name    = name.to_s
+        @engine  = engine
+        @columns = nil
+        @aliases = []
+        @table_alias = nil
+        @primary_key = nil
 
-    def table_exists?
-      @table_exists ||= @@tables.include?(name) || engine.connection.table_exists?(name)
+        if Hash === engine
+          @options = engine
+          @engine  = engine[:engine] || Arel::Table.engine
+          @columns = attributes_for engine[:columns]
+
+          # 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)
+        @options ||= {}
+        Arel::Table.new(name, options.merge(:as => table_alias))
+      end
     end
   end
 end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-11-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,16 +26,16 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: gem_patching
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: gem_patching
+  name: test_declarative
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,10 +60,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: test_declarative
+  name: sqlite3-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,7 +77,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: database_cleaner
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: ruby-debug
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -104,20 +104,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
 description: simple_nested_set allows to easily handle nested sets in ActiveRecord
 email: svenfuchs@artweb-design.de
 executables: []