handles_sortable_columns 0.1.1 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 1
+:patch: 2

data/handles_sortable_columns.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{handles_sortable_columns}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Fortuna"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-09-08}
   s.description = %q{Sortable Table Columns}
   s.email = %q{alex.r@askit.org}
   s.extra_rdoc_files = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dadooda/handles_sortable_columns}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sortable Table Columns}
   s.test_files = [
     "spec/handles_sortable_columns_spec.rb"
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/action_controller/base/handles_sortable_columns.rb

@@ -1,3 +1,3 @@
 class ActionController::Base    #:nodoc:
-  include Handles::SortableColumns
+  include ::Handles::SortableColumns
 end

data/lib/handles/sortable_columns.rb

@@ -203,6 +203,7 @@ module Handles  #:nodoc:
       # * <tt>:column</tt> -- Column name. E.g. <tt>"created_at"</tt>.
       # * <tt>:direction</tt> -- Sort direction on first click. <tt>:asc</tt> or <tt>:desc</tt>. Default is <tt>:asc</tt>.
       # * <tt>:class</tt> -- CSS class for link (regardless of sorted state).
+      # * <tt>:style</tt> -- CSS style for link (regardless of sorted state).
       #
       # Examples:
       #
@@ -223,6 +224,7 @@ module Handles  #:nodoc:
         o[k = :column] = options.delete(k) || controller.class.sortable_column_name_from_title(title)
         o[k = :direction] = options.delete(k).to_s.downcase =~ /\Adesc\z/ ? :desc : :asc
         o[k = :class] = options.delete(k) || controller.class.sortable_columns_config[k]
+        o[k = :style] = options.delete(k)
         #HELP /sortable_column
 
         raise "Unknown option(s): #{options.inspect}" if not options.empty?
@@ -235,26 +237,33 @@ module Handles  #:nodoc:
           css_class << s
         end
 
+        # If already sorted and indicator class defined, append it.
+        if pp[:column] == o[:column].to_s and (s = conf[:indicator_class][pp[:direction]]).present?
+          css_class << s
+        end
+
         # Build link itself.
         pcs = []
 
+        html_options = {}
+        html_options[:class] = css_class.join(" ") if css_class.present?
+        html_options[:style] = o[:style] if o[:style].present?
+
         # Already sorted?
         if pp[:column] == o[:column].to_s
-          if (s = conf[:indicator_class][pp[:direction]]).present?
-            css_class << s
-          end
-
-          pcs << link_to(title, params.merge({conf[:sort_param] => [("-" if pp[:direction] == :asc), o[:column]].join, conf[:page_param] => 1}), {:class => css_class.present?? css_class.join(" ") : nil})       # Opposite sort order when clicked.
+          pcs << link_to(title, params.merge({conf[:sort_param] => [("-" if pp[:direction] == :asc), o[:column]].join, conf[:page_param] => 1}), html_options)       # Opposite sort order when clicked.
 
+          # Append indicator, if configured.
           if (s = conf[:indicator_text][pp[:direction]]).present?
             pcs << s
           end
         else
           # Not sorted.
-          pcs << link_to(title, params.merge({conf[:sort_param] => [("-" if o[:direction] != :asc), o[:column]].join, conf[:page_param] => 1}), {:class => css_class.present?? css_class.join(" ") : nil})
+          pcs << link_to(title, params.merge({conf[:sort_param] => [("-" if o[:direction] != :asc), o[:column]].join, conf[:page_param] => 1}), html_options)
         end
 
-        pcs.join
+        # For Rails 3 provide #html_safe.
+        (v = pcs.join).respond_to?(:html_safe) ? v.html_safe : v
       end
     end # HelperMethods
   end # SortableColumns

data/lib/handles_sortable_columns.rb

@@ -1,4 +1,5 @@
 # Rails gem init.
-Dir[File.join(File.dirname(__FILE__), "**/*.rb")].each do |fn|
-  require fn
-end
+
+# NOTE: Rails 3 seems to require exact order.
+require File.join(File.dirname(__FILE__), "handles/sortable_columns")
+require File.join(File.dirname(__FILE__), "action_controller/base/handles_sortable_columns")

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: handles_sortable_columns
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alex Fortuna
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +04:00
+date: 2010-09-08 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +37,7 @@ files:
 - lib/action_controller/base/handles_sortable_columns.rb
 - lib/handles/sortable_columns.rb
 - lib/handles_sortable_columns.rb
+- spec/handles_sortable_columns_spec.rb
 has_rdoc: true
 homepage: http://github.com/dadooda/handles_sortable_columns
 licenses: []
@@ -41,21 +48,27 @@ 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: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sortable Table Columns