lib/neo4j/paginated.rb in neo4j-3.0.2 vs lib/neo4j/paginated.rb in neo4j-3.0.3

@@ -5,13 +5,19 @@
 
     def initialize(items, total, current_page)
       @items, @total, @current_page = items, total, current_page
     end
 
-    def self.create_from(source, page, per_page)
+    def self.create_from(source, page, per_page, order = nil)
       #partial = source.drop((page-1) * per_page).first(per_page)
+      target = source.node_var
       partial = source.skip(page-1).limit(per_page)
-      Paginated.new(partial, source.count, page)
+      ordered_partial, ordered_source = if order
+                                          [partial.order_by(order), source.query.with("#{target} as #{target}").pluck("COUNT(#{target})").first]
+                                        else
+                                          [partial, source.count]
+                                        end
+      Paginated.new(ordered_partial, ordered_source, page)
     end
 
     delegate :each, :to => :items
     delegate :pluck, :to => :items
     delegate :size, :[], :to => :items
\ No newline at end of file