sortablecolumns 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.1.4 / 2008-06-04
+* Table heading (TH) urls now remove any parameter named "page". This is to support paginated tables
+  since, if a user is on a page other than 1, clicking on a column heading should sort all data and 
+  revert back to page 1.
+* Changed self.#{sorter_name}_col_text to return non-breaking space when nil or empty string.  
+  (this is to force TD elements to be displayed when empty)
+
 === 0.1.3 / 2008-05-05
 * Minor test updates, doc updates
 

data/lib/sortablecolumns.rb

@@ -1,5 +1,5 @@
 module Sortablecolumns #:nodoc:
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end
 Dir[File.join(File.dirname(__FILE__), "sortablecolumns/**/*.rb")].sort.each { |lib| require lib }
 ActiveRecord::Base.send(:include, ActiveRecord::Acts::Sortablecolumns)

data/lib/sortablecolumns/helpers.rb

@@ -160,6 +160,7 @@ module Sortablecolumns
       _params = params.dup
       _params[:order_by] = order_by
       _params[:dir] = dir 
+      _params.delete(:page)
       url_for(_params)
     end
 

data/lib/sortablecolumns/sortablecolumns.rb

@@ -51,7 +51,13 @@ module ActiveRecord #:nodoc:
             end
 
             def self.#{sorter_name}_col_text(obj, col)
-               return obj.send(col) if self.#{sorter_name}_in_resultset?(col)
+               if self.#{sorter_name}_in_resultset?(col)
+                 ret = obj.send(col)
+                 if ret == '' or ret.nil?
+                   ret = " " #so empty TD cells still get displayed
+                 end
+                 return ret
+               end
                return self.#{sorter_name}_print_text(col)
             end
 

data/test/sortablecolumns_test.rb

@@ -367,6 +367,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
 
   def test_print_col_person_lastname
     assert_equal '<td>Jones</td>', @view.print_col(@person, 'mysorter', 'lastname')
+    #while we're here, make sure we can use symbols or strings
     assert_equal '<td>Jones</td>', @view.print_col(@person, :mysorter, :lastname)
   end
 
@@ -464,9 +465,26 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
     @view.params[:dir] = 'desc'
     new_order = 'windshield_strength'
     new_dir = 'asc'
-    _params = @view.params
     expected = "http://test.host/cars/wheels?bar=123&dir=asc&foo=blah&order_by=windshield_strength"
-    #assert_equal expected, @view.get_url(new_order, new_dir, _params)
+    assert_equal expected, @view.get_url(new_order, new_dir)
+  end
+
+  def test_get_url_with_page
+    # If pagination is being used and a page param is in the url, it should be removed.  
+    # That is, we don't want to sort the current page of results, we want to start 
+    # back at the beginning (page 1) and sort that.  Maybe make this customizable in 
+    # the future.
+
+    @view.params[:controller] = 'cars'
+    @view.params[:action] = 'wheels'
+    @view.params[:foo] = 'blah'
+    @view.params[:bar] = '123'
+    @view.params[:order_by] = 'wheel_type'
+    @view.params[:dir] = 'desc'
+    @view.params[:page] = '2' 
+    new_order = 'windshield_strength'
+    new_dir = 'asc'
+    expected = "http://test.host/cars/wheels?bar=123&dir=asc&foo=blah&order_by=windshield_strength"
     assert_equal expected, @view.get_url(new_order, new_dir)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sortablecolumns
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Bryan Donovan - http://www.bryandonovan.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-05 00:00:00 -07:00
+date: 2008-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
 description: Sortable HTML tables for Rails
 email: b.dondo+rubyforge@gmail.com