sortable-table 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a955921e2db9b9ed641b8747366ba2e28f0a3fca
-  data.tar.gz: 68cc86e153706bf32411c61536197b5d6fcd913e
+  metadata.gz: aba999a67bdf3d1a0066095391f9821525141a32
+  data.tar.gz: 9a05d9b5ce69b6e7233412fd2db0849643240ec2
 SHA512:
-  metadata.gz: a7fbebbb2210f86fc87eaa3a5fb55240a3b0f6be5293f33e06fa98f2f754a5f29ff471f59b3fc92280af68e9daa84f1bb960e63d5fba98d094cee517de6b1cfc
-  data.tar.gz: 30a48be0ec2089ccbbadf651f61184152fddd46d6ff6c8054e4a30cf734b0e6caaff4a8eed752f6358d2bc7f633472c148871b77ac17761f7b01dc45e8f74b6f
+  metadata.gz: d50db3465e7de283f2b2c3ef256bb2f50a50282cdd2165e6675bcb6529d063cccad4c745f0dcff829be81956d78d3f9d524e54650f9372d99acb37c93e607642
+  data.tar.gz: 1784df03d14167d2b4f30133727679b96aa87b852813554afa73db1a96dcc8c03ac6b6c83109737453b3b22f0f65f0a3d60a23b731eb18e1e15f41cb56ed8f6a

data/lib/sortable_table/helpers/action_view_extension.rb

@@ -1,16 +1,22 @@
 module SortableTable
   module ActionViewExtension
     def sort_by(column, options = {})
-      current_column = options[:current_column] || SortableTable::SortColumn.new(nil, nil)
-      title = options[:title] || column.titleize
-      prefix = options[:prefix]
+      current_column = options.delete(:current_column) || SortableTable::SortColumn.new(nil, nil)
+      title = options.delete(:title) || column.titleize
+      prefix = options.delete(:prefix)
       is_current_column = column == current_column.column
-      css_class = is_current_column ? "current #{current_column.direction}" : nil
+      options_class = options.delete(:class)
+      css_class = is_current_column ? "current #{current_column.direction} #{options_class}" : options_class
       direction = is_current_column && current_column.direction == 'asc' ? 'desc' : 'asc'
-      link_to title, params.merge("#{prefix}sort" => column,
+      sort_params = { "#{prefix}sort" => column,
                                   "#{prefix}direction" => direction,
-                                  "#{prefix}page" => nil),
-              class: css_class
+                                  "#{prefix}page" => nil }
+      if options.has_key?(:route_method)
+        goto = options.delete(:route_method).call sort_params
+      else
+        goto = params.merge( sort_params )
+      end
+      link_to title, goto, options.merge( {class: css_class } )
     end
   end
-end
+end

data/lib/sortable_table/models/sort_table.rb

@@ -12,7 +12,7 @@ module SortableTable
     end
 
     def sort_column(column, direction)
-      column_definition = column_definitions[column] || column_definitions[default_column]
+      column_definition = column_definitions[column] || (column && column_definitions[column.to_sym]) || column_definitions[default_column]
       column_definition.create_sort_column(direction || default_direction.to_s)
     end
   end

data/lib/sortable_table/version.rb

@@ -1,3 +1,3 @@
 module SortableTable
-  VERSION = '0.1.0'
-end
+  VERSION = '0.1.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortable-table
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jay Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
 summary: Sort HTML table columns
@@ -171,4 +171,3 @@ test_files:
 - spec/models/sort_column_spec.rb
 - spec/models/sort_table_spec.rb
 - spec/spec_helper.rb
-has_rdoc: