sortablecolumns 0.1.6 → 3.0.3

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/.specification

@@ -0,0 +1,77 @@
+--- !ruby/object:Gem::Specification 
+name: sortablecolumns
+version: !ruby/object:Gem::Version 
+  version: 0.1.6
+platform: ruby
+authors: 
+- Bryan Donovan - http://www.bryandonovan.com
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-02-20 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.3
+    version: 
+description: Sortable HTML tables for Rails
+email: b.dondo+rubyforge@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- lib/sortablecolumns.rb
+- lib/sortablecolumns/helpers.rb
+- lib/sortablecolumns/sortablecolumns.rb
+- test/col_def_test_yaml_files/person/dude/dude_report.yml
+- test/col_def_test_yaml_files/person/mysorter.yml
+- test/col_def_test_yaml_files/person/tacosorter.yml
+- test/sortablecolumns_test.rb
+has_rdoc: true
+homepage: http://rubyforge.org/projects/sortablecolumns/
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: sortablecolumns
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 2
+summary: Sortable HTML tables for Rails
+test_files: []
+

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in bundletest.gemspec
+gemspec
+
+group :development, :test do
+  gem 'mocha'
+  gem 'hpricot'
+	gem 'rails', ">=3.0.3"
+	gem 'sqlite3-ruby'
+	gem 'rcov'
+end
+
+# vim: syntax=Ruby

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.0.3 / 2011-02-06
+* Compatible with Rails 3 (tested against Rails 3.0.3 in particular)
+* Changing version numbering to match Rails version tested against.
+
 === 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.
 

data/Rakefile

@@ -1,26 +1,28 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'rcov'
+require 'rcov/rcovtask'
 require './lib/sortablecolumns.rb'
-
-Hoe.new('sortablecolumns', Sortablecolumns::VERSION) do |p|
-  p.name = "sortablecolumns"
-  p.author = "Bryan Donovan - http://www.bryandonovan.com"
-  p.email = "b.dondo+rubyforge@gmail.com"
-  p.description = "Sortable HTML tables for Rails"
-  p.summary = "Sortable HTML tables for Rails"
-  p.url = "http://rubyforge.org/projects/sortablecolumns/"
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.remote_rdoc_dir = '' # Release to root
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+desc "Run unit tests"
+Rake::TestTask.new("test") do |t|
+  t.libs << "test"
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
 end
 
-rule '' do |t|
-  system "cd test && ruby sortablecolumns_test.rb"
+desc "Run unit tests with rcov"
+Rcov::RcovTask.new('rcov') do |t|
+  t.test_files = FileList['test/*_test.rb']
+  t.ruby_opts << "-Ilib:ext/rcovrt" # in order to use this rcov
+  t.verbose = true
 end
 
-ALLISON = "/opt/local/lib/ruby/gems/1.8/gems/allison-2.0.3/lib/allison.rb"
-
 Rake::RDocTask.new do |rd|  
   rd.main = "README.txt"  
   rd.rdoc_dir = "doc"  
@@ -29,11 +31,9 @@ Rake::RDocTask.new do |rd|
       "History.txt",  
       "Manifest.txt",  
       "lib/**/*.rb")  
-  rd.title = "SortableColumns RDoc"  
+  rd.title = "Sortablecolumns RDoc"  
 
   rd.options << '-S' # inline source  
-
-  rd.template = ALLISON if File.exist?(ALLISON)  
 end  
 
 # vim: syntax=Ruby

data/lib/sortablecolumns/helpers.rb

@@ -47,7 +47,7 @@ module Sortablecolumns
         if link_ops[:object_url]
           #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>"
+          txt = link_to(txt, url)
         elsif link_ops[:controller] && link_ops[:action]
           if link_ops[:id] && link_ops[:id] == 'obj_id'
             link_ops[:id] = obj.id
@@ -60,19 +60,20 @@ module Sortablecolumns
               # cycle through link_ops, other than controller, action, and id, 
               # and check if the option value is a method for this object.  If not, 
               # assign the value directly in the url.
-              ops = link_ops.reject{|key,val| key == :controller or key == :action or key == :id}
+              ops = link_ops.reject{|key,val| key == :controller || key == :action }# || key == :id}
               ops.each do |key, val|
-                link_ops[key] = obj.send(val) if obj.respond_to?(val)
+                unless key == :id && val == 'obj_id'
+                  if val.is_a?(String) || val.is_a?(Symbol)
+                    link_ops[key] = obj.send(val) if val && obj.respond_to?(val.to_sym)
+                  end
+                end
               end
             end
             txt = link_to(txt, link_ops)
           end
         elsif link_ops[:url]
           url = link_ops[:url].gsub(/:id/, obj.id.to_s)
-          unless url.match(/http/)
-            url = 'http://' + default_url_options[:host] + url
-          end
-          txt = "<a href=\"#{url}\">#{txt}</a>"
+          txt = link_to(txt, url)
         end
       end
 
@@ -102,7 +103,7 @@ module Sortablecolumns
       cols.each do |col|
         txt << print_col(obj, sorter, col)
       end
-      content_tag("tr", txt, options)
+      content_tag("tr", txt.html_safe, options)
     end
 
     #Prints table body with content
@@ -121,7 +122,7 @@ module Sortablecolumns
         txt << print_table_row(obj, sorter, :class => tr_class) 
         i += 1
       end
-      content_tag("tbody", txt)
+      content_tag("tbody", txt.html_safe)
     end
 
     #Prints single TH tag with content
@@ -133,8 +134,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 = "<a href=\"#{url}\">#{th_txt}</a>"
+      link = link_to(th_txt, url)
+      #link = "<a href=\"#{url}\">#{th_txt}</a>"
       return content_tag("th", link, :class => th_class)
     end
 
@@ -174,14 +175,12 @@ module Sortablecolumns
       cols.each do |col|
         txt << print_col_heading(klass, sorter, col)
       end
-      txt
-      content_tag("tr", txt, options)
+      content_tag("tr", txt.html_safe, options)
     end
 
     #Prints THEAD tags with content
     def print_table_thead(klass, sorter)
       content_tag('thead', print_table_heading_row(klass, sorter))
     end
-
   end 
 end

data/lib/sortablecolumns/sortablecolumns.rb

@@ -5,6 +5,7 @@
 
 require 'active_record'
 require 'active_support'
+require 'active_support/core_ext/hash/keys'
 require 'action_controller'
 
 module ActiveRecord #:nodoc:
@@ -15,7 +16,7 @@ module ActiveRecord #:nodoc:
       end
 
       module ClassMethods
-        include ActiveSupport::CoreExtensions::Hash::Keys
+        #include ActiveSupport::CoreExtensions::Hash::Keys
 
         # == Configuration options
         #
@@ -63,7 +64,7 @@ module ActiveRecord #:nodoc:
 
           def self.#{sorter_name}_yaml_path
             raise "RAILS_ROOT is not defined" unless defined?(RAILS_ROOT)
-            klass_name = ActiveSupport::Inflector.underscore(self.class_name)
+            klass_name = ActiveSupport::Inflector.underscore(self.table_name.classify)
             file_name = "#{sorter_name}.yml"
             if sorter_options[:subclass_name]
               sub_path = File.join(klass_name, ActiveSupport::Inflector.underscore(sorter_options[:subclass_name]), file_name)

data/lib/sortablecolumns/version.rb

@@ -0,0 +1,3 @@
+module Sortablecolumns #:nodoc:
+  VERSION = '3.0.3'
+end

data/lib/sortablecolumns.rb

@@ -1,6 +1,3 @@
-module Sortablecolumns #:nodoc:
-  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)
 ActionView::Base.send(:include, Sortablecolumns::Helpers)

data/sortablecolumns.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "sortablecolumns/version"
+
+Gem::Specification.new do |s|
+  s.name        = "sortablecolumns"
+  s.version     = Sortablecolumns::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Bryan Donovan"]
+  s.email       = ["b.dondo+rubyforge@gmail.com"]
+  s.homepage    = "http://rubyforge.org/projects/sortablecolumns/"
+  s.summary     = "Sortable HTML tables for Rails"
+  s.description = "Sortable HTML tables for Rails"
+
+  s.rubyforge_project = "sortablecolumns"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+	s.add_dependency "activerecord", ">=3.0.3"
+	s.add_dependency "activesupport", ">=3.0.3"
+	s.add_dependency "actionpack", ">=3.0.3"
+end

data/test/sortablecolumns_test.rb

@@ -1,8 +1,17 @@
 require 'rubygems'
 require 'test/unit'
+require 'mocha'
+require 'hpricot'
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'sortablecolumns'
-require 'action_controller/integration'
+require 'rails'
+require 'action_dispatch/testing/integration'
+require 'active_record/railtie'
+
+module MySorterApp
+  class Application < Rails::Application
+  end
+end
 
 RAILS_ROOT = File.dirname(__FILE__) + '/../' 
 
@@ -11,7 +20,7 @@ RAILS_ROOT = File.dirname(__FILE__) + '/../'
 #Based on test code for Rails' acts_as_tree
 #http://dev.rubyonrails.org/svn/rails/plugins/acts_as_tree/test/acts_as_tree_test.rb
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 # AR keeps printing annoying schema statements
 $stdout = StringIO.new
@@ -74,7 +83,6 @@ class Dude < Person
   def dudename
     firstname
   end
-
 end
 
 class SubPerson < Person
@@ -85,32 +93,35 @@ end
 #---------------------------------------------------
 # Routes 
 #---------------------------------------------------
-ActionController::Routing::Routes.draw do |map|
-  map.person '/people/show/:id',
-    :controller => 'people',
-    :action => 'show'
-  map.people_foods '/people/:person_id/foods',
-    :controller => 'foods',
-    :action => 'show'
+MySorterApp::Application.routes.draw do
+  #   match 'products/:id' => 'catalog#view'
+  match 'people/show/:id' => 'people#show', :as => :person
+  match 'people/:person_id/foods' => 'foods#show', :as => :people_foods
+  #match 'foods/meats/:id' => 'foods#show', :as => :meat
+
+  #map.people_foods '/people/:person_id/foods',
+    #:controller => 'foods',
+    #:action => 'show'
   #simulate the RESTful urls:
-  map.dude '/dudes/:id',
-    :controller => 'dudes',
-    :action => 'show'
+  resources :dudes
+  #map.dude '/dudes/:id',
+    #:controller => 'dudes',
+    #:action => 'show'
 
-  map.connect '/:controller/:action/:id'
-    
+  match ':controller(/:action(/:id(.:format)))'
 end
 
 
 #---------------------------------------------------
 # Tests
 #---------------------------------------------------
-class SortableColumnsTest< Test::Unit::TestCase
+class SortableColumnsTest < Test::Unit::TestCase
   def setup
     setup_db
     @person = Person.create(:firstname => "Billy", :lastname => "Jones", :age => 24, 
     :description => "Billy is an awesome guy.\nHowever, he is also a punk. He loves www.google.com. ")
     @person.save 
+		@this_dir = File.expand_path(File.dirname(__FILE__))
   end
 
   def teardown
@@ -122,12 +133,14 @@ class SortableColumnsTest< Test::Unit::TestCase
   end
 
   def test_person_yaml_path
-    assert_equal "./../test/col_def_test_yaml_files/person/mysorter.yml", Person.mysorter_yaml_path
+		expected = File.expand_path(File.join(@this_dir,"col_def_test_yaml_files/person/mysorter.yml")) 
+    assert_equal expected, File.expand_path(Person.mysorter_yaml_path)
   end
 
   def test_sub_person_yaml_path
     #test sub-models & models with multi-word names, such as SubPerson
-    assert_equal "./../test/col_def_test_yaml_files/person/sub_person/cool_sorter_thing.yml", SubPerson.cool_sorter_thing_yaml_path
+		expected = File.expand_path(File.join(@this_dir,"col_def_test_yaml_files/person/sub_person/cool_sorter_thing.yml")) 
+    assert_equal expected, File.expand_path(SubPerson.cool_sorter_thing_yaml_path)
   end
 
   def test_person_mysorter_yaml_load
@@ -152,7 +165,8 @@ class SortableColumnsTest< Test::Unit::TestCase
   end
 
   def test_dude_yaml_path
-    assert_equal "./../test/col_def_test_yaml_files/person/dude/dude_report.yml", Dude.dude_report_yaml_path
+		expected = File.expand_path(File.join(@this_dir,"col_def_test_yaml_files/person/dude/dude_report.yml")) 
+    assert_equal expected, File.expand_path(Dude.dude_report_yaml_path)
   end
 
   def test_dude_yaml_load
@@ -343,7 +357,6 @@ class SortableColumnsTest< Test::Unit::TestCase
     assert_equal 'number', Person.default_sorter_datatype('age')
     assert_equal 'Balance', Person.default_sorter_heading('balance')
   end
-
 end
 
 
@@ -360,9 +373,9 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
     include ActionView::Helpers::SanitizeHelper
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
-    include ActionController::UrlWriter
-
+		include Rails.application.routes.url_helpers
     include Sortablecolumns::Helpers
+
     default_url_options[:host] = 'test.host'
     attr_accessor :params
     attr_accessor :request
@@ -382,6 +395,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
 
   def setup
     @view = View.new
+    @view.stubs(:controller).returns('people')
     setup_db
     @person = Person.create(:firstname => "Billy", :lastname => "Jones", 
       :age => 24, :balance => '1234.5678',
@@ -420,7 +434,17 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
   def test_print_col_person_description
     #should be same as: simple_format(sanitize(auto_link(@person.description)))
     expected = "<p>Billy is an awesome guy.\n<br />However, he is also a punk. <a href=\"http://www.google.com\">www.google.com</a></p>"
-    assert_equal "<td class=\"left\">#{expected}</td>", @view.print_col(@person, :mysorter, :description)
+    html = @view.print_col(@person, :mysorter, :description)
+    doc = Hpricot(html)
+    td = doc.at("/td")
+    assert_equal 'left', td['class']
+    _p = doc.at("/td/p").inner_text
+    assert _p.match(/Billy.*\n.*punk/)
+    assert_equal 1, doc.search("/td/p/br").size
+    link = doc.search("/td/p/a").last
+    assert_equal 'http://www.google.com', link['href']
+    assert_equal 'www.google.com', link.inner_text
+    assert_equal 0, doc.search("/script").size
   end
 
   def test_print_col_dude_description
@@ -438,7 +462,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
   end
 
   def test_print_col_person_firstname
-    assert_equal "<td class=\"left\"><a href=\"http://test.host/people/show/#{@person.id}\">Billy</a></td>", @view.print_col(@person, :mysorter, :firstname)
+    assert_equal "<td class=\"left\"><a href=\"/people/show/#{@person.id}\">Billy</a></td>", @view.print_col(@person, :mysorter, :firstname)
   end
 
   def test_print_col_dude_dudename
@@ -446,7 +470,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
   end
 
   def test_print_col_taco_meat
-    assert_equal "<td><a href=\"http://test.host/foods/meats/#{@person.id}\">Beef</a></td>", @view.print_col(@person, :tacosorter, :meat)
+    assert_equal "<td><a href=\"/foods/meats/#{@person.id}\">Beef</a></td>", @view.print_col(@person, :tacosorter, :meat)
   end
 
   def test_print_col_taco_type
@@ -455,7 +479,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
 
   def test_print_col_taco_calories
     #testing if we can have extra parameters in the url
-    assert_equal "<td><a href=\"http://test.host/foods/calories?foo=bar\">1200.00</a></td>", @view.print_col(@person, :tacosorter, :calories)
+    assert_equal "<td><a href=\"/foods/calories?foo=bar\">1200.00</a></td>", @view.print_col(@person, :tacosorter, :calories)
   end
 
   def test_print_col_dude_print_view
@@ -471,7 +495,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
     #
     # Where person_id is a field in the result set (in this test, there's a mock method instead)
 
-    expected = "<td><a href=\"http://test.host/dudes/print_view?person_id=23445\">Print</a></td>"
+    expected = "<td><a href=\"/dudes/print_view?person_id=23445\">Print</a></td>"
     assert_equal expected, @view.print_col(@dude, :dude_report, :print_view)
   end
 
@@ -491,13 +515,22 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
   end
 
   def test_print_col_edit
-    expected = "<td><a href=\"http://test.host/people/edit/#{@person.id}\">Edit</a></td>" 
+    expected = "<td><a href=\"/people/edit/#{@person.id}\">Edit</a></td>" 
     assert_equal expected, @view.print_col(@person, :mysorter, :edit)
   end
 
   def test_print_col_delete
-    expected = "<td><a href=\"http://test.host/people/destroy/1\" onclick=\"if (confirm('Are you sure?')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); };return false;\">Delete</a></td>"
-    assert_equal expected, @view.print_col(@person, :mysorter, :delete)
+    # Should be something like:
+    # <td><a href=\"/people/destroy/1\" data-confirm=\"Are you sure?\" data-method=\"delete\" rel=\"nofollow\">Delete</a></td>
+    html = @view.print_col(@person, :mysorter, :delete)
+    doc = Hpricot(html)
+    assert_equal 1, doc.search("/td").size
+    link = doc.at("/td/a")
+    assert_equal "/people/destroy/1", link['href']
+    assert_equal "Delete", link.inner_text
+    ['data-confirm', 'data-method', 'rel'].each do |attr|
+      assert_not_nil link[attr]
+    end
   end
 
   #---[ Column Headings ]-------------------------------------------------
@@ -511,7 +544,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
     @view.params[:dir] = 'desc'
     new_order = 'windshield_strength'
     new_dir = 'asc'
-    expected = "http://test.host/cars/wheels?bar=123&dir=asc&foo=blah&order_by=windshield_strength"
+    expected = "/cars/wheels?bar=123&dir=asc&foo=blah&order_by=windshield_strength"
     assert_equal expected, @view.get_url(new_order, new_dir)
   end
 
@@ -530,49 +563,52 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
     @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"
+    expected = "/cars/wheels?bar=123&dir=asc&foo=blah&order_by=windshield_strength"
     assert_equal expected, @view.get_url(new_order, new_dir)
   end
 
   def test_person_heading_firstname
-    expected = "<th><a href=\"http://test.host/people?dir=asc&order_by=firstname\">First</a></th>"
+    expected = "<th><a href=\"/people?dir=asc&amp;order_by=firstname\">First</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :firstname)
 
     #test if controller changes
+    #@view.stubs(:controller).returns('blah')
     @view.params[:controller] = 'blah'
-    expected = "<th><a href=\"http://test.host/blah?dir=asc&order_by=firstname\">First</a></th>"
+    expected = "<th><a href=\"/blah?dir=asc&amp;order_by=firstname\">First</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :firstname)
 
     #test if action changes
     @view.params[:action] = 'foo'
-    expected = "<th><a href=\"http://test.host/blah/foo?dir=asc&order_by=firstname\">First</a></th>"
+    expected = "<th><a href=\"/blah/foo?dir=asc&amp;order_by=firstname\">First</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :firstname)
 
     #test if sort direction changes
     @view = View.new
+    @view.stubs(:controller).returns('people')
     @view.params[:order_by] = 'firstname'
     @view.params[:dir] = 'asc'
     #should switch the direction to descending:
-    expected = "<th><a href=\"http://test.host/people?dir=desc&order_by=firstname\">First</a></th>"
+    expected = "<th><a href=\"/people?dir=desc&amp;order_by=firstname\">First</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :firstname)
 
     #test a url route that has more than just controller and action 
     @view = View.new
+    @view.stubs(:controller).returns('people')
     @view.params[:controller] = 'foods'
     @view.params[:action] = 'show'
     @view.params[:person_id] = 1 
-    expected = "<th><a href=\"http://test.host/people/1/foods?dir=asc&order_by=firstname\">First</a></th>"
+    expected = "<th><a href=\"/people/1/foods?dir=asc&amp;order_by=firstname\">First</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :firstname)
   end
 
   def test_person_heading_age
     #default direction should be desc
-    expected = "<th><a href=\"http://test.host/people?dir=desc&order_by=age\">Age</a></th>"
+    expected = "<th><a href=\"/people?dir=desc&amp;order_by=age\">Age</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :age)
     @view.params[:order_by] = 'age'
     @view.params[:dir] = 'desc'
     #back to asc
-    expected = "<th><a href=\"http://test.host/people?dir=asc&order_by=age\">Age</a></th>"
+    expected = "<th><a href=\"/people?dir=asc&amp;order_by=age\">Age</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :mysorter, :age)
   end
 
@@ -584,7 +620,7 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
 
   def test_taco_heading_meat
     #test order_by sort_option from col_defs
-    expected = "<th><a href=\"http://test.host/people?dir=asc&order_by=meats.id\">Meat</a></th>"
+    expected = "<th><a href=\"/people?dir=asc&amp;order_by=meats.id\">Meat</a></th>"
     assert_equal expected, @view.print_col_heading(Person, :tacosorter, :meat)
   end
 
@@ -594,42 +630,67 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
   end
 
   def test_person_print_table_row
-    assert_equal @expected_person_row, @view.print_table_row(@person, :mysorter)
+    html = @view.print_table_row(@person, :mysorter)
+    doc = Hpricot(html)
+    assert_equal 1, doc.search("/tr").size
+    assert_equal 7, doc.search("/tr/td").size
+    first_td = doc.at("/tr/td")
+    assert_equal 'left', first_td['class']
+    assert_equal "/people/show/1", first_td.at("/a")['href']
   end
 
   def test_person_print_table_heading_row
-    assert_equal @expected_person_heading_row, @view.print_table_heading_row(Person, :mysorter)
+    html = @view.print_table_heading_row(Person, :mysorter)
+    doc = Hpricot(html)
+    assert_equal 1, doc.search("/tr").size
+    assert_equal 7, doc.search("/tr/th").size
+    first_th = doc.at("/tr/th")
+    assert_equal "/people?dir=asc&order_by=firstname", first_th.at("/a")['href']
   end
 
   def test_person_print_table_thead
     expected = "<thead>#{@expected_person_heading_row}</thead>"
-    assert_equal expected, @view.print_table_thead(Person, :mysorter)
+    html = @view.print_table_thead(Person, :mysorter)
+    doc = Hpricot(html)
+    assert_equal 1, doc.search("/thead").size
+    assert_equal 7, doc.search("/thead/tr/th").size
   end
 
+
   def test_person_print_table_body
     people = [@person, @person2]
     expected = "<tbody>" + @expected_person_row + @expected_person2_row + "</tbody>"
-    assert_equal expected, @view.print_table_body(people, :mysorter)
+    html = @view.print_table_body(people, :mysorter)
+    doc = Hpricot(html)
+    assert_equal 2, doc.search("/tbody/tr").size
+    assert_equal 14, doc.search("/tbody/tr/td").size
   end
 
   def test_person_print_table
     people = [@person, @person2]
-    expected = "<table><thead>#{@expected_person_heading_row}</thead>" +
-      "<tbody>" + @expected_person_row + @expected_person2_row + "</tbody></table>"
-    assert_equal expected, @view.print_table(people, :mysorter)
-
-    expected = "<table class=\"yui-skin-sam\" id=\"yui_table\">" + 
-      "<thead>#{@expected_person_heading_row}</thead>" +
-      "<tbody>" + @expected_person_row + @expected_person2_row + "</tbody></table>"
-    assert_equal expected, @view.print_table(people, :mysorter, 
+    html = @view.print_table(people, :mysorter)
+    doc = Hpricot(html)
+    assert_equal 1, doc.search("/table").size
+    assert_equal 2, doc.search("/table/tbody/tr").size
+    assert_equal 14, doc.search("/table/tbody/tr/td").size
+
+    html = @view.print_table(people, :mysorter, 
       {:table => {:class => 'yui-skin-sam', :id => 'yui_table'}})
+    doc = Hpricot(html)
+    table = doc.at("/table")
+    assert_equal 'yui-skin-sam', table['class']
+    assert_equal 'yui_table', table['id']
 
-    expected = "<table class=\"yui-skin-sam\" id=\"yui_table\">" + 
-      "<thead>#{@expected_person_heading_row}</thead>" +
-      "<tbody>" + @expected_person_row_alternate + @expected_person2_row_alternate + 
-      "</tbody></table>"
-    assert_equal expected, @view.print_table(people, :mysorter, 
+    html = @view.print_table(people, :mysorter, 
       :table => {:class => 'yui-skin-sam', :id => 'yui_table'},
        :tr => {:classes => ['even','odd']})
+    doc = Hpricot(html)
+    assert_equal 'yui-skin-sam', table['class']
+    assert_equal 'yui_table', table['id']
+    rows = doc.search("/table/tbody/tr")
+    first_td_row = rows[0]
+    assert_equal 'even', first_td_row['class']
+    second_td_row = rows[1]
+    assert_equal 'odd', second_td_row['class']
   end
 end

metadata

@@ -1,38 +1,84 @@
 --- !ruby/object:Gem::Specification 
 name: sortablecolumns
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  hash: 1
+  prerelease: 
+  segments: 
+  - 3
+  - 0
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
-- Bryan Donovan - http://www.bryandonovan.com
+- Bryan Donovan
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2011-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
-    version: 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id003
 description: Sortable HTML tables for Rails
-email: b.dondo+rubyforge@gmail.com
+email: 
+- b.dondo+rubyforge@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .specification
+- Gemfile
 - History.txt
 - Manifest.txt
 - README.txt
@@ -40,36 +86,48 @@ files:
 - lib/sortablecolumns.rb
 - lib/sortablecolumns/helpers.rb
 - lib/sortablecolumns/sortablecolumns.rb
+- lib/sortablecolumns/version.rb
+- sortablecolumns.gemspec
 - test/col_def_test_yaml_files/person/dude/dude_report.yml
 - test/col_def_test_yaml_files/person/mysorter.yml
 - test/col_def_test_yaml_files/person/tacosorter.yml
 - test/sortablecolumns_test.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/sortablecolumns/
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sortablecolumns
-rubygems_version: 1.3.1
+rubygems_version: 1.4.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Sortable HTML tables for Rails
-test_files: []
-
+test_files: 
+- test/col_def_test_yaml_files/person/dude/dude_report.yml
+- test/col_def_test_yaml_files/person/mysorter.yml
+- test/col_def_test_yaml_files/person/tacosorter.yml
+- test/sortablecolumns_test.rb