rails_db 1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f9007f5a20bba8d137e16225eec8c228e759c3
-  data.tar.gz: d9fcaa4b91379b4ef9ab51680ce2cf1032cbda88
+  metadata.gz: 30c03fb955b0d8932f2dbd935bab422dfe0644f6
+  data.tar.gz: 853129177a8045c693cbea03308b12ba161accf2
 SHA512:
-  metadata.gz: 54244b49bfa40501caf7bcb28d77f327ae1a28d722c04474c9e7d3d45a3cf4e636d4d1d4d233c29f89a29cac398ec7ecd9fb6f472b2a0b9b274f51309d14dd7b
-  data.tar.gz: c08362351be2776606ad4c9c267c8838ffa524945a94db7a62aff15467d4b01689178c6eefcae90589e91e080b4531e016e8361c99c1a73df429da436ab503f1
+  metadata.gz: 687909d318a7eee756e0b9030db9df7fb9f0e7476d43eec8c8d7af2af8fbab43ddc7885e75a527c3d033a1017514b2179ab01a39fb6adf5ace96befa0783f385
+  data.tar.gz: d0129ed74fe4eb16174f0eeb496917f1a50c00b846c7163eb1b0f6bc7ce6b24d746748aa9c96212f0c419c74e13728040a17acb529a53b2df129aebe57ff34f7

data/Gemfile

@@ -8,7 +8,7 @@ gem 'codemirror-rails'
 gem 'terminal-table'
 gem 'simple_form'
 gem 'ransack'
-gem 'kaminari'
+gem 'kaminari', '>= 0.17.0'
 
 group :assets do
   gem 'uglifier'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_db (1.2)
+    rails_db (1.3.1)
       codemirror-rails
       jquery-rails
       kaminari
@@ -71,7 +71,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.3)
@@ -151,7 +151,7 @@ DEPENDENCIES
   axlsx_rails
   codemirror-rails
   jquery-rails
-  kaminari
+  kaminari (>= 0.17.0)
   launchy
   mime-types (< 3.0)
   mysql2 (<= 0.3.20)

data/app/controllers/rails_db/tables_controller.rb

@@ -84,7 +84,12 @@ module RailsDb
     private
 
     def build_search
-      @q       = model.ransack(params[:q])
+      if Rails::VERSION::MAJOR >= 5
+        search_params = params.dup.permit!.to_h.with_indifferent_access
+      else
+        search_params = params
+      end
+      @q       = model.ransack(search_params[:q])
       @sql     = @q.result.page(params[:page]).per(per_page).to_sql
       @records = @q.result.page(params[:page]).per(per_page)
       @q.build_condition if @q.conditions.empty?

data/lib/ext/ransack_ext.rb

@@ -0,0 +1,26 @@
+if Rails::VERSION::MAJOR >= 5
+
+  module Ransack
+    module Helpers
+      module FormHelper
+
+        class SortLink
+
+          def url_options_with_feature
+            result = url_options_without_feature
+            if result.respond_to?(:permit!)
+              result.permit!
+            else
+              result
+            end
+          end
+
+          alias_method :url_options_without_feature, :url_options
+          alias_method :url_options, :url_options_with_feature
+        end
+
+      end
+    end
+  end
+
+end

data/lib/rails_db.rb

@@ -62,4 +62,5 @@ end
 
 require_relative "rails_db/engine"
 require_relative "rails/routes"
-require_relative "ext/simple_form_ext"
+require_relative "ext/simple_form_ext"
+require_relative "ext/ransack_ext"

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "1.3"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_db
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.3.1
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -322,6 +322,7 @@ files:
 - config/initializers/will_paginate_fix.rb
 - config/locales/simple_form.en.yml
 - config/routes.rb
+- lib/ext/ransack_ext.rb
 - lib/ext/simple_form_ext.rb
 - lib/ext/string_ext.rb
 - lib/generators/USAGE