table-for 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a06e3f4c62b8e960ce23e069b5a9e988d0a36721
-  data.tar.gz: eaf4a354271a193e83a835036dacd42cf4bc696a
+SHA256:
+  metadata.gz: 0ed186963c980c1b8a756b21fb207d93817e6a1b09e0d39a5048af3cd44675bd
+  data.tar.gz: ea3427c27fcd27836a6d1902b8c13452f0fe545eac441305bb4503a12b1b208f
 SHA512:
-  metadata.gz: 8d4d10c87846a31dcd086dcf266dab6e28f171c08190f69fa0e8e551015053c909663ab389ec4f9921ec0e00e66433f08cb6453228db1840d3e0a52f20786245
-  data.tar.gz: 62dbeac5635056aeda4b3cf2dc33dbb0eda9f9b08491e19997588e6b1a900786981e5c2efdb638696315df04c93b7b903a73454f213a9c84afdbbfce153fbaf0
+  metadata.gz: 5aa25b5877ce491bbcdbab566bb05fe42b9cf204f587be3a380dce5244ea3d1a8d34220dd75ed2fb33f568329cf41e7abbc9a1d4f9fb1db49906ad773c27ee82
+  data.tar.gz: a29d3f3548725d57b84ba350c449be5d2afe10c012ef0bfadacfbc4f98e9ad65e9128770ce932cfc5a5d1dbaa1b161c2a5d48a281dbacbc3ba3647e8c964bf5e

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+
+script: 'bundle exec rake'
+
+notifications:
+  email:
+    recipients:
+      - hunterae@gmail.com
+    on_failure: change
+    on_success: never

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+3.6.2
+* Added :sort_modes option to be able to specify sort_modes on a column by column basis (thanks {karwank}[https://github.com/karwank])
+* Fixed bug preventing action and controller from being removed in pagination link params in some versions of Rails (thanks {karwank}[https://github.com/karwank])
+
 3.6.1
 * Fixed :sortable option for Rails 5 that was breaking when
 ActionController::Parameters#to_query was being called without any arguments

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec

data/README.rdoc

@@ -263,7 +263,7 @@ link_url::
       <% table.column :header => false,
                       :data => "DELETE",
                       :link_method => :DELETE,
-                      :link_url => lambda { admin_user_path(user) } %>
+                      :link_url => lambda { |user| admin_user_path(user) } %>
     <% end %>
 link_action::
   (defaults to nil)

data/lib/table_for/base.rb

@@ -58,7 +58,7 @@ module TableFor
       if options[:sortable]
         order = options[:order] ? options[:order].to_s : column.name.to_s
 
-        sort_modes = TableFor.config.sort_modes
+        sort_modes = options[:sort_modes].presence || TableFor.config.sort_modes
         current_sort_mode = (view.params[:order] != order || view.params[:sort_mode].blank?) ? nil : view.params[:sort_mode]
         current_sort_mode = sort_modes[sort_modes.index(current_sort_mode.to_sym)] rescue nil if current_sort_mode
         sort_class = "sorting#{"_#{current_sort_mode}" if current_sort_mode}"
@@ -105,7 +105,7 @@ module TableFor
       if options[:sortable] && (options[:header] || !column.anonymous)
         order = options[:order] ? options[:order].to_s : column.name.to_s
 
-        sort_modes = TableFor.config.sort_modes
+        sort_modes = options[:sort_modes].presence || TableFor.config.sort_modes
         current_sort_mode = (view.params[:order] != order || view.params[:sort_mode].blank?) ? nil : view.params[:sort_mode]
         next_sort_mode_index = sort_modes.index(current_sort_mode.to_sym) + 1 rescue 0
         if next_sort_mode_index == sort_modes.length
@@ -115,11 +115,11 @@ module TableFor
         end
 
         parameters = view.params.merge(:order => order, :sort_mode => next_sort_mode)
+        parameters.delete(:action)
+        parameters.delete(:controller)
         if parameters.respond_to?(:to_unsafe_h)
           parameters = parameters.to_unsafe_h
         end
-        parameters.delete(:action)
-        parameters.delete(:controller)
         url = options[:sort_url] ? options[:sort_url] : ""
         view.link_to view.capture(self, &block), "#{url}?#{parameters.to_query}"
       else

data/lib/table_for/version.rb

@@ -1,3 +1,3 @@
 module TableFor
-  VERSION = "3.6.1"
+  VERSION = "3.6.2"
 end

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ require 'xmlsimple'
 require 'active_record'
 require 'active_support/all'
 require 'with_model'
-require 'byebug'
 
 def print_hash(hash)
   hash.inject("") { |s, (k, v)| "#{s} #{k}: #{v}." }

data/table-for.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "supermodel"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "with_model"
-  spec.add_development_dependency "byebug"
   spec.add_development_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table-for
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".byebug_history"
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -200,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: table-for is a table builder for an array of objects, easily allowing overriding