sorted 0.3.2 → 0.3.3

data/README.rdoc

@@ -30,13 +30,13 @@ You might want to roll your own link_to_sorted method to use jQuery ui css class
 
   def link_to_sorted(name, order)
     sorter = sorted(order)
-    css_class = case sorter.order_first
-                when "asc"
-                  "css_right ui-icon ui-icon-triangle-1-n"
-                when "desc"
-                  "css_right ui-icon ui-icon-triangle-1-s"
-                else
-                  "css_right ui-icon ui-icon-carat-2-n-s"
+    css_class = case sorter.to_css
+                when "sorted asc"
+                  "ui-icon ui-icon-triangle-1-n"
+                when "sorted desc"
+                  "ui-icon ui-icon-triangle-1-s"
+                when "sorted"
+                  "ui-icon ui-icon-carat-2-n-s"
                 end
     link_to(name, sorter.params) + content_tag(:span, nil, {:class => css_class}) 
   end
@@ -48,7 +48,7 @@ This gem works with rails 2.3.x but you will have to roll your own scope and vie
 Here is the named scope for you model(s):
 
   named_scope :sorted, lambda { |params|
-    { :order =>  Sorted::Sorter.new(params[:order], {:sort => params[:sort]}).to_sql }
+    params.merge(:order => Sorted::Sorter.new(params[:order], {:sort => params.delete(:sort)}).to_sql)
   }
 
 and the the application helper methods:
@@ -59,5 +59,5 @@ and the the application helper methods:
 
   def link_to_sorted(name, order)
     sorter = sorted(order)
-    link_to(name, sorter.params, {:class => "sorted-#{sorter.order_first}"})
+    link_to(name, sorter.params, {:class => sorter.to_css})
   end

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/sorted.rb

@@ -44,7 +44,11 @@ module Sorted
       order_queue.select do |os|
         sort_queue.flatten.include?(os[0])
       end.each do |os|
-        @_array << [os[0], (case sort_queue.assoc(os[0])[1]; when "asc"; "desc"; when "desc"; "asc" end)]
+        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)]
+        else
+          @_array << [os[0], sort_queue.assoc(os[0])[1]]
+        end
       end
       order_queue.select do |o|
         !@_array.flatten.include?(o[0])
@@ -79,14 +83,18 @@ module Sorted
     def to_a
       _array
     end
-
-    def order_first
-      _array.empty? ? nil : _array[0][1]
+    
+    def to_css
+      if sort_queue.flatten.include?(order_queue.first.first)
+        "sorted #{sort_queue.assoc(order_queue.first.first).last}"
+      else
+        "sorted"
+      end
     end
 
     def params
       @params ||= {}
-      @params[:sort] = to_s unless _array.empty?
+      @params[:sort] = to_s
       @params
     end
 

data/lib/sorted/action_view.rb

@@ -8,8 +8,8 @@ module Sorted
     end
 
     def link_to_sorted(name, order, options = {})
-      sorter = sorted(order)
-      options[:class] = options[:class].nil? ? "sorted-#{sorter.order_first}" : "#{options[:class]} sorted-#{sorter.order_first}"
+      sorter          = sorted(order)
+      options[:class] = options[:class].nil? ? sorter.to_css : "#{options[:class]} #{sorter.to_css}"
       link_to(name, sorter.params, options)
     end
   end

data/lib/sorted/active_record.rb

@@ -5,7 +5,9 @@ module Sorted
   module ActiveRecord
     def self.enable!
       ::ActiveRecord::Base.class_eval do
-        scope :sorted, lambda { |params| Hash[:order, ::Sorted::Sorter.new(params[:order], {:sort => params[:sort]}).to_sql] }
+        scope :sorted, lambda { |params|
+          params.merge(:order => ::Sorted::Sorter.new(params[:order], {:sort => params.delete(:sort)}).to_sql)
+        }
       end
     end
   end

data/sorted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorted}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rufus Post"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-07-31}
   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

@@ -2,6 +2,68 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'action_controller'
 require 'sorted'
 
+describe Sorted::Sorter, "parse methods" do
+  it "should return a nice array from the order sql" do
+    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    sorter.order_queue.should == [["email", "asc"], ["phone", "asc"], ["name", "desc"]]
+  end
+
+  it "should return a nice array from the sort params" do
+    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    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"
+  end
+end
+
+describe Sorted::Sorter, "logic:" do
+  it "should not toggle the sort order and include any sql orders not in sort params" do
+    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    sorter.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 => "email_desc!name_desc"})
+    sorter.toggle.to_a.should == [["email", "asc"], ["name", "asc"], ["phone", "asc"]]
+  end
+
+  it "should return an sql sort string" do
+    Sorted::Sorter.new(:email).to_sql.should == "email ASC"
+    Sorted::Sorter.new(:email, {:sort => "name_desc!email_desc"}).to_sql.should == "name DESC, email DESC"
+  end
+
+  it "should handle a large initial order string" do
+    sorter = Sorted::Sorter.new('email ASC, name DESC, phone ASC', {:sort => "email_desc!name_desc"})
+    sorter.to_sql.should == "email DESC, name DESC, phone ASC"
+  end
+
+  it "should handle a large initial order string" do
+    sorter = Sorted::Sorter.new('email ASC, phone DESC, name ASC', {:sort => "email_desc!name_desc"})
+    sorter.to_sql.should == "email DESC, name DESC, phone DESC"
+  end
+
+  it "should should fail becasue the sort order is incorect" do
+    sorter = Sorted::Sorter.new(:jsci_complete, {:sort => "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"})
+    sorter.toggle
+    sorter.to_s.should_not == "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"
+  end
+
+  it "should return css base class for to_css if not in sort params" do
+    sorter = Sorted::Sorter.new(:email)
+    sorter.toggle
+    sorter.to_css.should == "sorted"
+  end
+
+  it "should return css class for to_css" do
+    sorter = Sorted::Sorter.new(:email, {:sort => "email_desc"})
+    sorter.toggle
+    sorter.to_css.should == "sorted desc"
+  end
+end
+
 describe Sorted::ActiveRecord do
   before(:each) do
     Sorted::ActiveRecord.enable!
@@ -38,56 +100,41 @@ describe Sorted::ActionView do
     ActionView::Base.new.should respond_to(:sorted)
   end
 
-  it "should return a nice hash from the order sql" do
-    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.order_queue.should == [["email", "asc"], ["phone", "asc"], ["name", "desc"]]
-  end
-
-  it "should return a nice hash from the sort params" do
-    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.sort_queue.should == [["email", "desc"], ["name", "desc"]]
-  end
-  
-  it "should not 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.to_hash.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 => "email_desc!name_desc"})
-    sorter.toggle.to_hash.should == {"email" => "asc", "name" => "asc", "phone" => "asc"}
-  end
-
   it "should not change the direction of name using view helper" do
     @controller.params = {:sort => "name_desc!email_asc"}
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
-    sorter.toggle.to_hash.should == {"email" => "desc", "name" => "desc"}
+    sorter.toggle.to_a.should == [["email", "asc"], ["name", "desc"]]
   end
 
   it "should reverse email direction using view helper" do
     @controller.params = {:sort => "email_asc!name_desc"}
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
-    sorter.toggle.to_hash.should == {"email" => "desc", "name" => "desc"}
+    sorter.toggle.to_a.should == [["email", "desc"], ["name", "desc"]]
   end
 
   it "should reverse email direction using view helper" do
-    @controller.params = {:sort => "phone_desc!name_desc!email_desc"}
+    @controller.params = {:sort => "email_desc!name_desc!phone_desc"}
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
-    sorter.toggle.params.should == {:sort => "email_asc!phone_desc!name_desc"}
+    sorter.toggle.params.should == {:sort => "email_asc!name_desc!phone_desc"}
     @controller.params = sorter.params
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
+    sorter.toggle.params.should == {:sort => "email_desc!name_desc!phone_desc"}
+  end
+
+  it "should not reverse order when made first again" do
+    @controller.params = {:sort => "phone_desc!name_desc!email_desc"}
+    sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
     sorter.toggle.params.should == {:sort => "email_desc!phone_desc!name_desc"}
-    @controller.params = sorter.params
-    sorter = ActionView::Base.new([], {}, @controller).sorted(:phone)
-    sorter.toggle.params.should == {:sort => "phone_asc!email_desc!name_desc"}
     sorter = ActionView::Base.new([], {}, @controller).sorted(:name)
-    sorter.toggle.params.should == {:sort => "name_asc!email_desc!phone_desc"}
+    sorter.toggle.params.should == {:sort => "name_desc!phone_desc!email_desc"}
   end
 
-  it "should should fail becasue the sort order is incorect" do
-    sorter = Sorted::Sorter.new(:jsci_complete, {:sort => "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"})
-    sorter.toggle
-    sorter.to_s.should_not == "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"
+  it "should order correctly" do
+    sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
+    sorter.toggle.params.should == {:sort => "email_asc"}
+    @controller.params = sorter.params
+    sorter = ActionView::Base.new([], {}, @controller).sorted(:name)
+    sorter.toggle.params.should == {:sort => "name_asc!email_asc"}
   end
 
   it "should return a hash of options for url builder with sorted query string" do
@@ -95,38 +142,8 @@ describe Sorted::ActionView do
     ActionView::Base.new([], {}, @controller).sorted(:email).params.should == {:sort => "email_desc!name_desc", :page => 2}
   end
 
-  it "should return an sql sort string" do
-    Sorted::Sorter.new(:email).to_sql.should == "email ASC"
-    Sorted::Sorter.new(:email, {:sort => "name_desc!email_desc"}).to_sql.should == "name DESC, email DESC"
-  end
-
-  it "should handle a large initial order string" do
-    sorter = Sorted::Sorter.new('email ASC, name DESC, phone ASC', {:sort => "email_desc!name_desc"})
-    sorter.to_sql.should == "email DESC, name DESC, phone ASC"
-  end
-
-  it "should handle a large initial order string" do
-    sorter = Sorted::Sorter.new('email ASC, phone DESC, name ASC', {:sort => "email_desc!name_desc"})
-    sorter.to_sql.should == "email DESC, name DESC, phone DESC"
-  end
-
   it "should not die if params nil" do
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
     sorter.params.should == {:sort => "email_asc"}
   end
-
-  it "should have some roll your own methods" do
-    sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
-    sorter.to_s.should == "email_asc"
-  end
-
-  it "should return the order of the first attribute" do
-    sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
-    sorter.order_first.should == "asc"
-  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"
-  end
 end

metadata

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