Merge pull request #278 from paulsponagl/order_by

with_scope order_by: "fieldname [asc|desc]"

app/models/content_type.rb

@@ -83,28 +83,39 @@ class ContentType
     list = (if conditions.nil? || conditions.empty?
       self.contents
     else
+      # check for order_by: "field [asc|desc]" condition
+      if order_by = ( conditions.delete('order_by') || conditions.delete(:order_by) )
+        column, sort_order = order_by.split
+        column = column.to_sym
+      else
+        sort_order = nil
+      end
+
       conditions_with_names = {}
 
       conditions.each do |key, value|
         # convert alias (key) to name
-        field = self.content_custom_fields.detect { |f| f._alias == key }
+        if field = self.content_custom_fields.detect { |f| f._alias == key }
 
-        case field.kind.to_sym
+          case field.kind.to_sym
-        when :category
+          when :category
-          if (category_item = field.category_items.where(:name => value).first).present?
+            if (category_item = field.category_items.where(:name => value).first).present?
-            conditions_with_names[field._name.to_sym] = category_item._id
+              conditions_with_names[field._name.to_sym] = category_item._id
+            end
+          else
+            conditions_with_names[field._name.to_sym] = value
           end
-        else
-          conditions_with_names[field._name.to_sym] = value
         end
       end
 
-      self.contents.where(conditions_with_names)
+      conditions_with_names.blank? ? self.contents : self.contents.where(conditions_with_names)
     end).sort { |a, b| (a.send(column) && b.send(column)) ? (a.send(column) || 0) <=> (b.send(column) || 0) : 0 }
 
-    return list if self.order_manually?
+    if sort_order.nil?
-
+      (self.order_manually? || self.asc_order?) ? list : list.reverse
-    self.asc_order? ? list : list.reverse
+    else
+      sort_order == 'asc' ? list : list.reverse
+    end
   end
 
   def sort_contents!(ids)

spec/models/content_type_spec.rb

@@ -89,6 +89,13 @@ describe ContentType do
       @content_type.order_direction = 'desc'
       @content_type.ordered_contents.collect(&:name).should == %w(Sacha Did)
     end
+
+    it 'returns a list of contents ordered through condition {order_by: "name asc"}' do
+      @content_type.order_by = 'name'
+      @content_type.order_direction = 'desc'
+      @content_type.ordered_contents(:order_by => 'name asc').collect(&:name).should == %w(Did Sacha)
+    end
+    
     
     it 'returns a list of contents ordered by a Date column when first instance is missing the value' do
       @content_type = FactoryGirl.build(:content_type, :order_by => 'created_at')