sortablecolumns 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.1.3 / 2008-05-05
+* Minor test updates, doc updates
+
 === 0.1.2 / 2008-05-01
 
 * Added date and datetime formats for columns

data/README.txt

@@ -47,7 +47,7 @@ Say we have a Person model (or a custom SQL query result) with the following col
 
 We're going to call this sorter "mysorter".  This will be the name of the YAML file and the name passed into the sortable_columns method in the model.
 
-In model:
+==== Model:
 
   class Person < ActiveRecord::Base
     sortable_columns :mysorter
@@ -63,10 +63,11 @@ In model:
     end
   end
 
-YAML file:
+==== YAML file:
 
-  The YAML file needs to be in an ordered format (i.e., it gets loaded into Ruby as an Array).  The order
-  of the columns in the YAML file determines their display order when rendered as HTML.
+  The YAML file needs to be in an ordered format (i.e., it gets loaded into Ruby 
+  as an Array).  The order of the columns in the YAML file determines their 
+  display order when rendered as HTML.
 
 -
   firstname:
@@ -150,7 +151,7 @@ You can also have extra parameters in the url that are attributes in the results
 
 ...where person_id is a field (method) in the result set that will be invoked.
 
-In the controller:
+==== Controller:
 
   def index #plain HTML table
     @people = Person.find_for_mysorter(options=params.dup)
@@ -176,7 +177,7 @@ In the controller:
     end
   end
 
-In the view:
+==== View:
 
  <%= print_table(@people, :mysorter %>
 Or if you want alternating styles for table rows:
@@ -192,7 +193,7 @@ Also make sure the table is inside a div with the same id as specified in the co
 
 * YUI4Rails gem if you want to use YUI datatables
 
-== Disclaimer 
+== DISCLAIMER 
 
 This is beta-quality software. It works well according to my tests, but the API may change and other features may be added.
 

data/Rakefile

@@ -19,4 +19,21 @@ rule '' do |t|
   system "cd test && ruby sortablecolumns_test.rb"
 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"  
+  rd.rdoc_files.include(  
+      "README.txt",  
+      "History.txt",  
+      "Manifest.txt",  
+      "lib/**/*.rb")  
+  rd.title = "SortableColumns RDoc"  
+
+  rd.options << '-S' # inline source  
+
+  rd.template = ALLISON if File.exist?(ALLISON)  
+end  
+
 # vim: syntax=Ruby

data/lib/sortablecolumns.rb

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

data/test/sortablecolumns_test.rb

@@ -73,9 +73,6 @@ class Dude < Person
     firstname
   end
 
-  def person_id
-    id
-  end
 end
 
 class SubPerson < Person
@@ -352,6 +349,10 @@ class SortablecolumnsHelperTest < Test::Unit::TestCase
     registered_at = DateTime.new(2008,5,1,7,30)
     @dude = Dude.create(:firstname => "The Dude", :lastname => "Lebowski", :age => 45, 
     :description => "The Dude Speaks", :created_at => created_at, :registered_at => registered_at)
+
+    #make sure a find_by_sql query works with an arbitrary attribute (person_id in this case)
+    query = "select p.*, '23445' as person_id from people p where id = #{@dude.id}"
+    @dude = Dude.find_by_sql(query).first
     
     @expected_person_row = "<tr><td class=\"left\"><a href=\"http://test.host/people/show/1\">Billy</a></td><td>Jones</td><td class=\"center\">24</td><td class=\"left\"><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></td><td class=\"right\">£1 234,57</td><td><a href=\"http://test.host/people/edit/1\">Edit</a></td><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></tr>"
     @expected_person_row_alternate = @expected_person_row.gsub(/<tr>/, "<tr class=\"even\">")
@@ -423,7 +424,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=#{@dude.id}\">Print</a></td>"
+    expected = "<td><a href=\"http://test.host/dudes/print_view?person_id=23445\">Print</a></td>"
     assert_equal expected, @view.print_col(@dude, :dude_report, :print_view)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sortablecolumns
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Bryan Donovan - http://www.bryandonovan.com
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-01 00:00:00 -07:00
+date: 2008-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sortablecolumns
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Sortable HTML tables for Rails