squeel 0.8.8 → 0.8.9

data/lib/squeel/adapters/active_record/relation.rb

@@ -98,7 +98,7 @@ module Squeel
 
           order = @reorder_value ? @reorder_value : @order_values
           order = attribute_viz.accept(order.uniq.reject{|o| o.blank?})
-          order = reverse_sql_order(sqlify_order(order)) if @reverse_order_value
+          order = reverse_sql_order(attrs_to_orderings(order)) if @reverse_order_value
           arel.order(*order) unless order.empty?
 
           build_select(arel, attribute_viz.accept(@select_values.uniq))
@@ -109,11 +109,11 @@ module Squeel
           arel
         end
 
-        # reverse_sql_order doesn't understand ARel ordering nodes, so we
-        # need to convert them to their corresponding SQL (for now)
-        def sqlify_order(order)
+        # reverse_sql_order will reverse the order of strings or Orderings,
+        # but not attributes
+        def attrs_to_orderings(order)
           order.map do |o|
-            o.respond_to?(:to_sql) ? o.to_sql : o
+            Arel::Attribute === o ? o.asc : o
           end
         end
 

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

data/spec/squeel/adapters/active_record/relation_spec.rb

@@ -198,6 +198,12 @@ module Squeel
             end
           end
 
+          it 'reverses order of Arel::Attributes when #last is called' do
+            sorted_people = Person.all.sort {|a, b| a.name.downcase <=> b.name.downcase}
+
+            Person.order{name}.last.should eq sorted_people.last
+          end
+
         end
 
         describe '#to_sql' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70108702043340 !ruby/object:Gem::Requirement
+  requirement: &70295228232080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108702043340
+  version_requirements: *70295228232080
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70108702042780 !ruby/object:Gem::Requirement
+  requirement: &70295228231580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108702042780
+  version_requirements: *70295228231580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70108702042220 !ruby/object:Gem::Requirement
+  requirement: &70295228231120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70108702042220
+  version_requirements: *70295228231120
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70108702041580 !ruby/object:Gem::Requirement
+  requirement: &70295228230660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70108702041580
+  version_requirements: *70295228230660
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70108702040920 !ruby/object:Gem::Requirement
+  requirement: &70295228230200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70108702040920
+  version_requirements: *70295228230200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70108702040300 !ruby/object:Gem::Requirement
+  requirement: &70295228229740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70108702040300
+  version_requirements: *70295228229740
 description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
   with\n      a handy block-based syntax. You can write subqueries, access named\n
   \     functions provided by your RDBMS, and more, all without writing\n      SQL