sortablecolumns 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.1.6 / 2009-02-20
+* Fixed bugs so tests actually pass in Rails 2.2.2.  Erroneously tested against 2.1.2 for release 0.1.5.
+
 === 0.1.5 / 2009-02-19
 * Fixed bug 23868 - now works with Rails 2.2 - http://rubyforge.org/tracker/?atid=23868&group_id=6158&func=browse
 * Added default_sorter as an option instead of creating a yaml file.  Also able to generate default yaml output using 

data/lib/sortablecolumns/helpers.rb

@@ -20,7 +20,7 @@ module Sortablecolumns
 
       if datatype == 'number'
         precision = klass.send("#{sorter}_precision",col) 
-        txt = number_with_precision(txt, precision) if precision
+        txt = number_with_precision(txt, :precision => precision) if precision
       end
 
       if datatype == 'currency'
@@ -45,7 +45,9 @@ module Sortablecolumns
         link_ops = klass.send("#{sorter}_link_options",col).dup
         raise "link_options must be defined for #{klass}:#{col}" unless link_ops
         if link_ops[:object_url]
-          txt = link_to(txt, send("#{klass.to_s.downcase}_url", obj))
+          #link_to failed in the tests in Rails 2.2.2
+          url = send("#{klass.to_s.downcase}_url", obj)
+          txt = "<a href=\"#{url}\">#{txt}</a>"
         elsif link_ops[:controller] && link_ops[:action]
           if link_ops[:id] && link_ops[:id] == 'obj_id'
             link_ops[:id] = obj.id
@@ -70,7 +72,7 @@ module Sortablecolumns
           unless url.match(/http/)
             url = 'http://' + default_url_options[:host] + url
           end
-          txt = link_to(txt, url)
+          txt = "<a href=\"#{url}\">#{txt}</a>"
         end
       end
 
@@ -131,7 +133,8 @@ module Sortablecolumns
       sortable = klass.send("#{sorter}_sortable?", col)
       return content_tag("th", th_txt, :class => th_class) unless sortable
       url = get_col_heading_url(klass, sorter, col)
-      link = link_to(th_txt, url)
+      #link = link_to(th_txt, url)
+      link = "<a href=\"#{url}\">#{th_txt}</a>"
       return content_tag("th", link, :class => th_class)
     end
 

data/lib/sortablecolumns.rb

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

data/test/col_def_test_yaml_files/person/dude/dude_report.yml

@@ -20,7 +20,8 @@
     sortable: false
     print_options:
       wrappers: 
-        - truncate: 5 
+        - truncate: 
+           :length: 5 
         - simple_format
 -
   print_view:

data/test/sortablecolumns_test.rb

@@ -172,7 +172,7 @@ class SortableColumnsTest< Test::Unit::TestCase
     "print_text"=>"Print"},
     "lastname"=>{"heading"=>"Last", "datatype"=>"string"},
     "description"=>
-    {"print_options"=>{"wrappers"=>[{"truncate"=>5}, "simple_format"]},
+    {"print_options"=>{"wrappers"=>[{"truncate"=>{:length => 5}}, "simple_format"]},
     "sortable"=>false,
     "heading"=>"Description",
     "datatype"=>"string"},
@@ -235,7 +235,7 @@ class SortableColumnsTest< Test::Unit::TestCase
     assert_equal({"wrappers"=> ['auto_link','sanitize', 'simple_format']}, Person.mysorter_print_options('description'))
     assert_equal({"wrappers"=> 'sanitize'}, Person.mysorter_print_options('lastname'))
     assert_equal nil, Person.mysorter_print_options('age')
-    assert_equal({"wrappers"=> [{'truncate' => 5},'simple_format']}, Dude.dude_report_print_options('description'))
+    assert_equal({"wrappers"=> [{'truncate' => {:length => 5}},'simple_format']}, Dude.dude_report_print_options('description'))
   end
 
   def test_td_class
@@ -354,12 +354,14 @@ end
 class SortablecolumnsHelperTest < Test::Unit::TestCase
 
   class View
+    include ActionView::Helpers
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::NumberHelper
     include ActionView::Helpers::SanitizeHelper
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
     include ActionController::UrlWriter
+
     include Sortablecolumns::Helpers
     default_url_options[:host] = 'test.host'
     attr_accessor :params
@@ -422,7 +424,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
   end
 
   def test_print_col_dude_description
-    #should be same as: simple_format(truncate(@dude.description, 5))
+    #should be same as: simple_format(truncate(@dude.description, :length => 5))
     expected = "<p>Th...</p>"
     assert_equal "<td>#{expected}</td>", @view.print_col(@dude, :dude_report, :description)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sortablecolumns
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Bryan Donovan - http://www.bryandonovan.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency