Merge branch 'tablesorter-2.4.6'

Author: linjunpop

README.markdown

@@ -1,72 +1,94 @@
-jQuery Table Sorter plugin for Rails
-===
+# jQuery Table Sorter plugin for Rails
 
 Simple integration of jquery-tablesorter into the asset pipeline.
 
-Current version: 2.3.11(7/12/2012), [documentation]
+Current tablesorter version: 2.4.6 (10/25/2012), [documentation]
 
 Any issue associate with the js/css files, please report to [Mottie's fork].
 
 
-NOTICE:
----
+## NOTICE:
 
 v0.0.5 users, from v1.0.0, this gem will use [Mottie's fork] :smile:.
 
-Install
----
-In your Gemfile
+## Installation
 
-```
-gem 'jquery-tablesorter'
-```
+Add this line to your application's Gemfile:
+
+    gem 'jquery-tablesorter'
+
+And then execute:
+
+    $ bundle
 
-Requirements
----
+Or install it yourself as:
+
+    $ gem install jquery-tablesorter
+
+## Requirements
 
 Rails 3.1 and higher
 
-Usage
----
+## Usage
 
-### In your `application.js`
+### JavaScript files
 
-```
-require jquery-tablesorter
+In your `application.js`
+
+```javascript
+//= require jquery-tablesorter
 ```
 
-this will require all files.
+This will require all jquery-tablesorter files (exclude addons).
 
 Or you can include single file with:
 
-```
+```javascript
 //= require jquery-tablesorter/jquery.metadata
 //= require jquery-tablesorter/jquery.tablesorter
 //= require jquery-tablesorter/jquery.tablesorter.widgets
-//= require jquery-tablesorter/addons/jquery.tablesorter.pager
+//= require jquery-tablesorter/addons/pager/jquery.tablesorter.pager
 ```
 
+### Stylesheet files
 
-### In your `application.css`
+In your `application.css`
 
-```
+```css
 /*
- * = require jquery-tablesorter/<theme name>
+ *= require jquery-tablesorter/<theme name>
  */
 ```
 
 Avaliable theme names:
 
-* blue
-* ui
+* theme.black-ice
+* theme.blue
+* theme.bootstrap
+* theme.dark
+* theme.default
+* theme.dropbox
+* theme.green
+* theme.grey
+* theme.ice
+* theme.jui
 
+pager theme:
 
-### In CoffeeScript file:
-
-```
-$('table.tablesorter').tablesorter()
+```css
+/*
+ *= require jquery-tablesorter/addons/pager/jquery.tablesorter.pager
+ */
 ```
 
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
 [Mottie's fork]: https://github.com/Mottie/tablesorter
 [documentation]: http://mottie.github.com/tablesorter/docs/index.html
 

Rakefile

@@ -3,4 +3,59 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-load 'lib/tasks/jquery-tablesorter_tasks.rake'
+namespace :jquery_tablesorter do
+  desc 'update tablesorter'
+  task :update do
+    # javascripts
+    #
+    javascript_dir = 'vendor/assets/javascripts/jquery-tablesorter'
+    FileUtils.mkdir_p(javascript_dir)
+    Dir.glob('tablesorter/js/*.js').each do |file|
+      FileUtils.cp file, javascript_dir, :verbose => true
+    end
+
+    # stylesheets
+    #
+    stylesheet_dir = 'vendor/assets/stylesheets/jquery-tablesorter'
+    FileUtils.mkdir_p(stylesheet_dir)
+    Dir.glob('tablesorter/css/*.css').each do |file|
+      FileUtils.cp file, stylesheet_dir, :verbose => true
+    end
+
+    # images
+    #
+    images_dir = 'vendor/assets/images/jquery-tablesorter'
+    FileUtils.mkdir_p(images_dir)
+    Dir.glob('tablesorter/css/images/*').each do |file|
+      FileUtils.cp file, images_dir, :verbose => true
+    end
+
+    # addons
+    #
+    ## pager
+    pager_stylesheet_dir = stylesheet_dir + '/addons/pager'
+    FileUtils.mkdir_p(pager_stylesheet_dir)
+    FileUtils.cp 'tablesorter/addons/pager/jquery.tablesorter.pager.css',
+      pager_stylesheet_dir,
+      :verbose => true
+
+    pager_javascript_dir = javascript_dir + '/addons/pager'
+    FileUtils.mkdir_p(pager_javascript_dir)
+    FileUtils.cp 'tablesorter/addons/pager/jquery.tablesorter.pager.js',
+      pager_javascript_dir,
+      :verbose => true
+
+    pager_images_dir = images_dir + '/addons/pager'
+    FileUtils.mkdir_p(pager_images_dir)
+    FileUtils.cp_r 'tablesorter/addons/pager/icons', pager_images_dir,
+      :verbose => true
+  end
+
+  desc 'Sanitize image paths'
+  task :sanitize_image_paths do
+    Dir.glob('vendor/assets/stylesheets/jquery-tablesorter/*.css').each do |file_path|
+      content = File.read(file_path).gsub(/url\(images\//, "url(/assets/jquery-tablesorter/")
+      File.open(file_path, "w") {|file| file.write content}
+    end
+  end
+end

lib/tasks/jquery-tablesorter_tasks.rake

@@ -1 +1,3 @@
-//= require_tree ./jquery-tablesorter
+//= require jquery-tablesorter/jquery.metadata
+//= require jquery-tablesorter/jquery.tablesorter
+//= require jquery-tablesorter/jquery.tablesorter.widgets