scoped_from 0.3 → 0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scoped_from (0.2)
+    scoped_from (0.4)
       activerecord (~> 3.1.0)
       activesupport (~> 3.1.0)
 
@@ -32,12 +32,12 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.1)
     builder (3.0.0)
-    columnize (0.3.5)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.2)
+    json (1.6.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     multi_json (1.0.4)
@@ -59,7 +59,7 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2.2)
     rbx-require-relative (0.0.5)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -83,7 +83,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)

data/VERSION

@@ -1 +1 @@
-0.3
+0.4

data/lib/scoped_from/query.rb

@@ -54,20 +54,6 @@ module ScopedFrom
       "#{order[:column]} #{order[:direction].upcase}" if order.present?
     end
     
-    def scoped(scope, name, value)
-      if name.to_s == 'order'
-        scope.order(order_to_sql(value))
-      elsif scope.scope_with_one_argument?(name)
-        scope.send(name, value)
-      elsif scope.scope_without_argument?(name)
-        scope.send(name)
-      elsif scope.column_names.include?(name.to_s)
-        scope.scoped(:conditions => { name => value })
-      else
-        scope
-      end
-    end
-    
     def params=(params)
       params = params.params if params.is_a?(self.class)
       params = CGI.parse(params.to_s) unless params.is_a?(Hash)
@@ -76,8 +62,8 @@ module ScopedFrom
         values = [value].flatten
         next if values.empty?
         if name.to_s == 'order'
-          order = parse_order(values.last)
-          @params[name] = "#{order[:column]}.#{order[:direction]}" if order.present?
+          orders = parse_orders(values).map { |order| "#{order[:column]}.#{order[:direction]}" }
+          @params[name] = (orders.many? ? orders : orders.first) if orders.any?
         elsif @scope.scope_without_argument?(name)
           @params[name] = true if values.all? { |value| true?(value) }
         elsif @scope.scope_with_one_argument?(name)
@@ -104,6 +90,29 @@ module ScopedFrom
       @scope.column_names.include?(column) ? { :column => column, :direction => direction } : {}
     end
     
+    def parse_orders(values)
+      [].tap do |orders|
+        values.each do |value|
+          order = parse_order(value)
+          orders << order if order.present? && !orders.any? { |o| o[:column] == order[:column] }
+        end
+      end
+    end
+    
+    def scoped(scope, name, value)
+      if name.to_s == 'order'
+        scope.order(order_to_sql(value))
+      elsif scope.scope_with_one_argument?(name)
+        scope.send(name, value)
+      elsif scope.scope_without_argument?(name)
+        scope.send(name)
+      elsif scope.column_names.include?(name.to_s)
+        scope.scoped(:conditions => { name => value })
+      else
+        scope
+      end
+    end
+    
     def true?(value)
       TRUE_VALUES.include?(value.to_s.strip.downcase)
     end

data/spec/scoped_from/query_spec.rb

@@ -287,9 +287,11 @@ describe ScopedFrom::Query do
       query(User, { 'Order' => 'firstname.desc' }).params.should == {}
     end
     
-    it 'use last "order" if many are specified' do
-      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC'] }).params.should == { 'order' => 'lastname.desc' }
-      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => 'firstname.desc' }
+    it 'many order can be specified' do
+      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC'] }).params.should == { 'order' => ['firstname.asc', 'lastname.desc'] }
+      query(User, { 'order' => ['firstname.Asc', 'firstname.desc'] }).params.should == { 'order' => 'firstname.asc' }
+      query(User, { 'order' => ['firstname.Asc', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => ['firstname.asc', 'lastname.desc'] }
+      query(User, { 'order' => ['firstname.Asc', 'foo', 'lastname.DESC', 'firstname.desc'] }).params.should == { 'order' => ['firstname.asc', 'lastname.desc'] }
     end
     
     it 'order can be delimited by a space' do
@@ -357,7 +359,7 @@ describe ScopedFrom::Query do
     it 'invokes last order if an array is given' do
       query(User, :order => ['lastname', 'firstname']).scope.should == [users(:jane), users(:john)]
       query(User, :order => ['lastname', 'firstname.desc']).scope.should == [users(:john), users(:jane)]
-      query(User, :order => ['firstname.desc', 'lastname']).scope.order_values.should == ['lastname ASC']
+      query(User, :order => ['firstname.desc', 'lastname']).scope.order_values.should == ['firstname DESC', 'lastname ASC']
     end
     
     it 'defines #query method on returned scoped' do

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: scoped_from
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Alexis Toulotte
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord