sorted 0.3.3 → 0.3.4

data/README.rdoc

@@ -45,7 +45,7 @@ You might want to roll your own link_to_sorted method to use jQuery ui css class
 
 This gem works with rails 2.3.x but you will have to roll your own scope and view helper.
 
-Here is the named scope for you model(s):
+Here is the named scope for your model(s):
 
   named_scope :sorted, lambda { |params|
     params.merge(:order => Sorted::Sorter.new(params[:order], {:sort => params.delete(:sort)}).to_sql)

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/sorted.rb

@@ -34,31 +34,44 @@ module Sorted
     end
 
     def parse_sql(sql)
-      if m = sql.match(/(([a-zA-Z._]+)\s([asc|ASC|desc|DESC]+)|[a-zA-Z._]+)/)
+      if m = sql.match(/(([a-zA-Z._:]+)\s([asc|ASC|desc|DESC]+)|[a-zA-Z._:]+)/)
         [(m[2].nil? ? m[1] : m[2]),(m[3].nil? ? "asc" : m[3].downcase)]
       end
     end
-
+    
     def toggle
       @_array = []
-      order_queue.select do |os|
-        sort_queue.flatten.include?(os[0])
-      end.each do |os|
-        if sort_queue[0, order_queue.size].flatten.include?(os[0])
-          @_array << [os[0], (case sort_queue.assoc(os[0])[1]; when "asc"; "desc"; when "desc"; "asc" end)]
+      sorts  = sort_queue.transpose.first
+      orders = order_queue.transpose.first
+      unless sorts.nil?
+        if orders == sorts.take(orders.size)
+          orders.select do |order|
+            sorts.include?(order)
+          end.each do |order|
+            @_array << [order, (case sort_queue.assoc(order).last; when "asc"; "desc"; when "desc"; "asc" end)]
+          end
         else
-          @_array << [os[0], sort_queue.assoc(os[0])[1]]
+          orders.select do |order|
+            sorts.include?(order)
+          end.each do |order|
+            @_array << [order, sort_queue.assoc(order).last]
+          end
+        end
+        sorts.select do |sort|
+          orders.include?(sort) && !@_array.flatten.include?(sort)
+        end.each do |sort|
+          @_array << [sort, sort_queue.assoc(sort).last]
         end
       end
-      order_queue.select do |o|
-        !@_array.flatten.include?(o[0])
-      end.each do |o|
-        @_array << o
+      order_queue.select do |order|
+        !@_array.flatten.include?(order[0])
+      end.each do |order|
+        @_array << order
       end
-      sort_queue.select do |s|
-        !@_array.flatten.include?(s[0])
-      end.each do |s|
-        @_array << s
+      sort_queue.select do |sort|
+        !@_array.flatten.include?(sort[0])
+      end.each do |sort|
+        @_array << sort
       end
       self
     end

data/sorted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorted}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rufus Post"]
-  s.date = %q{2010-07-31}
+  s.date = %q{2010-08-09}
   s.description = %q{lets you sort large data sets using view helpers and a scope}
   s.email = %q{rufuspost@gmail.com}
   s.extra_rdoc_files = [

data/spec/sorted_spec.rb

@@ -13,9 +13,9 @@ describe Sorted::Sorter, "parse methods" do
     sorter.sort_queue.should == [["email", "desc"], ["name", "desc"]]
   end
 
-  it "should allow underscores and and full stops in" do
-    sorter = Sorted::Sorter.new('users.email ASC, users.phone_number DESC, assessments.name ASC', {:sort => "users.email_desc!users.first_name_desc"})
-    sorter.to_sql.should == "users.email DESC, users.first_name DESC, users.phone_number DESC, assessments.name ASC"
+  it "should allow underscores, full stops and colons in" do
+    sorter = Sorted::Sorter.new('users.email ASC, users.phone_number DESC, assessments.name ASC, assessments.number_as_string::BigInt', {:sort => "users.email_desc!users.first_name_desc"})
+    sorter.to_sql.should == "users.email DESC, users.first_name DESC, users.phone_number DESC, assessments.name ASC, assessments.number_as_string::BigInt ASC"
   end
 end
 
@@ -27,7 +27,12 @@ describe Sorted::Sorter, "logic:" do
 
   it "should toggle the sort order and include any sql orders not in sort params" do
     sorter = Sorted::Sorter.new("email DESC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.toggle.to_a.should == [["email", "asc"], ["name", "asc"], ["phone", "asc"]]
+    sorter.toggle.to_a.should == [["email", "desc"], ["name", "desc"], ["phone", "asc"]]
+  end
+
+  it "should toggle the sort order and include any sql orders not in sort params" do
+    sorter = Sorted::Sorter.new("email DESC, phone ASC, name DESC", {:sort => "mobile_asc!email_desc!phone_asc!name_desc"})
+    sorter.toggle.to_a.should == [["email", "desc"], ["phone", "asc"], ["name", "desc"], ["mobile", "asc"]]
   end
 
   it "should return an sql sort string" do
@@ -62,6 +67,15 @@ describe Sorted::Sorter, "logic:" do
     sorter.toggle
     sorter.to_css.should == "sorted desc"
   end
+
+  it "should toggle two order params at once" do
+    first = Sorted::Sorter.new("email ASC, phone ASC")
+    first.toggle.to_a.should == [["email", "asc"],["phone", "asc"]]
+    second = Sorted::Sorter.new(:name, {:sort => first.to_s})
+    second.toggle.to_a.should == [["name", "asc"], ["email", "asc"],["phone", "asc"]]
+    third = Sorted::Sorter.new("email ASC, phone ASC", {:sort => second.to_s})
+    third.toggle.to_a.should == [["email", "asc"],["phone", "asc"], ["name", "asc"]]
+  end
 end
 
 describe Sorted::ActiveRecord do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Rufus Post
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 +10:00
+date: 2010-08-09 00:00:00 +10:00
 default_executable: 
 dependencies: []