simple_nested_set 0.0.27 → 0.0.28

data/lib/simple_nested_set/rebuild/from_parents.rb

@@ -1,19 +1,27 @@
 module SimpleNestedSet
   module Rebuild
     class FromParents
-      attr_writer :num
+      include SqlAbstraction
 
-      def num
-        @num ||= 0
+      attr_accessor :num
+
+      def initialize
+        @num = 0
       end
 
       def run(nested_set, sort_order = nil)
-        order_columns = ([:parent_id] + Array[sort_order]).compact
+        order_columns = ([:parent_id] + Array[sort_order]).uniq.compact
+
+        db_adapter = nested_set.first.class.connection.instance_variable_get('@config')[:adapter].to_sym
+
+        order_clause = order_columns.map do |col|
+          order_by(db_adapter, col)
+        end
 
         nodes = if nested_set.respond_to?(:except)
-                  nested_set.except(:order).order(order_columns)
+                  nested_set.except(:order).order(order_clause)
                 else
-                  nested_set.reorder(order_columns)
+                  nested_set.reorder(order_clause)
                 end.to_a
 
         renumber(nodes.dup)

data/lib/simple_nested_set/sql_abstraction.rb

@@ -1,7 +1,7 @@
 module SimpleNestedSet
+  # database-specific statements, ready to be
+  # inserted into arel.project()
   module SqlAbstraction
-    # return a database-specific 'GROUP_CONCAT'-statement, ready to be
-    # inserted into arel.project()
     def group_concat(database, field, separator = '/')
       case database.to_sym
       when :sqlite, :sqlite3
@@ -14,5 +14,16 @@ module SimpleNestedSet
         raise ArgumentError, "#{database} is not supported by SimpleNestedSet::SqlAbstraction#group_concat"
       end
     end
+
+    def order_by(database, order)
+      case database.to_sym
+      when :sqlite, :sqlite3
+        order.to_s
+      when :mysql, :mysql2
+        "`#{order }`"
+      when :postgresql
+        "\"#{order}\" NULLS FIRST"
+      end
+    end
   end
 end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 0
-  - 27
-  version: 0.0.27
+  - 28
+  version: 0.0.28
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency