cheveret 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/cheveret.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cheveret}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Caldwell"]

data/lib/cheveret.rb

@@ -243,6 +243,7 @@ module Cheveret
         @table.columns.map do |column|
           attrs = { :class => [type, column.name].join(' '),
                     :style => "width: #{column.width}px;" }
+          attrs[:class] << ' sortable' if column.sortable?
 
           content_tag(:div, attrs) do
             yield(column)
@@ -258,18 +259,13 @@ module Cheveret
       def sort_tag(column) #:nodoc:
         return nil unless column.sortable? && @url.present?
 
-        klass = [ 'sortable' ]
         sort  = column.name
-        order = "asc"
+        order = "desc" if params[:sort].to_s == column.name.to_s && params[:order] == "asc"
+        attrs = { :href => url_for(@url.merge({ :sort => sort, :order => order || "desc" })) }
 
-        if params[:sort].to_s == column.name.to_s
-          klass << [ 'sorted', params[:order] ]
-          order = "desc" if params[:order] == "asc"
-        end
+        attrs[:class] = "sorted #{params[:order]}" if params[:sort].to_s == column.name.to_s
 
-        content_tag(:a, column.label, {
-          :class => klass.flatten.join(' '),
-          :href => url_for(@url.merge({ :sort => sort, :order => order })) })
+        content_tag(:a, column.label, attrs)
       end
 
       def method_missing(method_name, *args, &block) #:nodoc:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cheveret
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ben Caldwell