sorted 0.3.1 → 0.3.2

data/README.rdoc

@@ -14,7 +14,7 @@ This will make a url like this:
 
   http://myapp/users?sort=email_asc
 
-Or on the next page load when you then sort by something else....
+or on the next page load when you then sort by something else....
 
   http://myapp/users?sort=name_asc!email_asc
 
@@ -24,17 +24,34 @@ This will initially sort by email ascending:
 
   @users = User.sorted(:order => "email ASC", :sort => params[:sort]).paginate(:page => params[:page])
 
+== Advanced
+
+You might want to roll your own link_to_sorted method to use jQuery ui css classes for example, all you need is the sorted object.
+
+  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"
+                end
+    link_to(name, sorter.params) + content_tag(:span, nil, {:class => css_class}) 
+  end
+
 == Rails 2.3.x
 
-This gem works with rails 2.3.x but you will have to roll your own scope and view helper
+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:
+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 }
   }
 
-And this in your application helper:
+and the the application helper methods:
 
   def sorted(order)
     Sorted::Sorter.new(order, (request.get? && !params.nil?) ? params.dup : nil).toggle
@@ -42,5 +59,5 @@ And this in your application helper:
 
   def link_to_sorted(name, order)
     sorter = sorted(order)
-    link_to(name, sorter.params, {:class => sorter.css_class})
+    link_to(name, sorter.params, {:class => "sorted-#{sorter.order_first}"})
   end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/sorted/action_view.rb

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

data/lib/sorted.rb

@@ -28,7 +28,7 @@ module Sorted
     end
     
     def parse_query(sort)
-      if m = sort.match(/([a-zA-Z0-9._]+)_(asc|desc)/)
+      if m = sort.match(/([a-zA-Z0-9._]+)_(asc|desc)$/)
         [m[1],m[2]]
       end
     end
@@ -49,17 +49,17 @@ module Sorted
       order_queue.select do |o|
         !@_array.flatten.include?(o[0])
       end.each do |o|
-        @_array << [o[0], o[1]]
+        @_array << o
       end
       sort_queue.select do |s|
         !@_array.flatten.include?(s[0])
       end.each do |s|
-        @_array << [s[0], s[1]]
+        @_array << s
       end
       self
     end
 
-    def un_toggle
+    def reset
       @_array = default
       self
     end
@@ -76,8 +76,12 @@ module Sorted
       _array.map{|a| a.join('_')}.join('!')
     end
 
-    def css_class
-      "sorted-#{_array[0][1]}"
+    def to_a
+      _array
+    end
+
+    def order_first
+      _array.empty? ? nil : _array[0][1]
     end
 
     def params
@@ -96,13 +100,11 @@ module Sorted
     
     private
     def default
-      _default = sort_queue.dup
+      sq = sort_queue.dup
       order_queue.each do |o|
-        unless _default.flatten.include?(o[0])
-          _default << [o[0], o[1]]
-        end
+          sq << o unless sq.flatten.include?(o[0])
       end
-      _default
+      sq
     end
     
     def _array

data/sorted.gemspec

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

@@ -120,9 +120,9 @@ describe Sorted::ActionView do
     sorter.to_s.should == "email_asc"
   end
 
-  it "should return css class" do
+  it "should return the order of the first attribute" do
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)
-    sorter.css_class.should == "sorted-asc"
+    sorter.order_first.should == "asc"
   end
 
   it "should allow underscores and and full stops in" do

metadata

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