ransack_memory 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abefb2da0c94c8caee92ef550ca93bc48538e8a9
-  data.tar.gz: 442d357d0778cde47013f4f680721e0ff26bbe9a
+  metadata.gz: 53163621f241e9f3a29c0a8bffe48e32c5f3e60b
+  data.tar.gz: '0960d53e98ecbb53b8dd62589e4d277531d03978'
 SHA512:
-  metadata.gz: ceb4da1cd2186094774fac35ff3e697a7d7e716f40d00b949a1a32d2d7fa65087360cd8969178ad3a159f82f50d9a8af507b330ebf87a21e74b244e6f453e05b
-  data.tar.gz: 8b1bbacd8e909bb8746db3ffbc52dcbaa898764172339418c0ac6d79a05306d68978bd374f2b11e0b2d4c74cc40a8abff985605f18e0ec7f06edc178d28bef79
+  metadata.gz: c6844bd183a86491ab2f8f24538585ab557e1a00b9801ef03962342424e2df72e8077359a9e2a326c74e8aae60d37ca94b618a1eb5637aca2787d238a92bdb93
+  data.tar.gz: f4de744aac0b48d88d3e30f39d872d1854a1917677df5b5667d33bd168b06c250f96a8742cfdd73eadff3b500ce2880b2580b0ec52ea857cca8f75ae988519b2

data/app/controllers/concerns/ransack_memory/concern.rb

@@ -3,54 +3,46 @@ module RansackMemory
     extend ActiveSupport::Concern
 
     def save_and_load_filters
+      
+      session_key_base = "#{controller_name}_#{action_name}_#{request.xhr?}"
+
+      # permit search params
+      params[::RansackMemory::Core.config[:param]].permit! if params[::RansackMemory::Core.config[:param]].present? && params[::RansackMemory::Core.config[:param]].respond_to?(:permit)
 
       # cancel filter if button pressed
-      if params[:cancel_filter].present? && params[:cancel_filter] == "true"
-        @selected_filter = nil
-        session["#{controller_name}_#{action_name}_#{request.xhr?}"] = nil
-        session["#{controller_name}_#{action_name}_#{request.xhr?}_page"] = nil
+      if params[:cancel_filter] == "true"
+        session["#{session_key_base}"] = nil
+        session["#{session_key_base}_page"] = nil
+        session["#{session_key_base}_per_page"] = nil
       end
 
-      if user_signed_in?
-        # search term saving
-        session["#{controller_name}_#{action_name}_#{request.xhr?}"] = params[::RansackMemory::Core.config[:param]] if params[::RansackMemory::Core.config[:param]].present?
+      # search term saving
+      session["#{session_key_base}"] = params[::RansackMemory::Core.config[:param]] if params[::RansackMemory::Core.config[:param]].present?
 
-        # page number saving
-        session["#{controller_name}_#{action_name}_#{request.xhr?}_page"] = params[:page] if params[:page].present?
+      # page number saving
+      session["#{session_key_base}_page"] = params[:page] if params[:page].present?
 
-        # per page saving
-        session["#{controller_name}_#{action_name}_#{request.xhr?}_per_page"] = params[:per_page] if params[:per_page].present?
-      end
+      # per page saving
+      session["#{session_key_base}_per_page"] = params[:per_page] if params[:per_page].present?
+
+      # search term load
+      params[::RansackMemory::Core.config[:param]] = session["#{session_key_base}"].presence
+
+      # page number load
+      params[:page] = session["#{session_key_base}_page"].presence
 
-      if user_signed_in?
-        # search term load
-        if session["#{controller_name}_#{action_name}_#{request.xhr?}"]
-          params[::RansackMemory::Core.config[:param]] = session["#{controller_name}_#{action_name}_#{request.xhr?}"]
-        else
-          params[::RansackMemory::Core.config[:param]] = nil
-        end
-
-        # page number load
-        if session["#{controller_name}_#{action_name}_#{request.xhr?}_page"]
-          params[:page] = session["#{controller_name}_#{action_name}_#{request.xhr?}_page"]
-        else
-          params[:page] = nil
-        end
-
-        # set page number to 1 if filter has changed
-        if (params[::RansackMemory::Core.config[:param]] && session[:last_q_params] != params[::RansackMemory::Core.config[:param]]) || (params[:cancel_filter].present? && session["#{controller_name}_#{action_name}_#{request.xhr?}_page"] != params[:page])
-          params[:page] = nil
-          session["#{controller_name}_#{action_name}_#{request.xhr?}_page"] = nil
-        end
-        session[:last_q_params] = params[::RansackMemory::Core.config[:param]]
-
-        # per page load
-        if session["#{controller_name}_#{action_name}_#{request.xhr?}_per_page"]
-          params[:per_page] = session["#{controller_name}_#{action_name}_#{request.xhr?}_per_page"]
-        else
-          params[:per_page] = nil
-        end
+      # per page load
+      params[:per_page] = session["#{session_key_base}_per_page"].presence
+
+      # set page number to 1 if filter has changed
+      if (params[::RansackMemory::Core.config[:param]].present? && session[:last_q_params] != params[::RansackMemory::Core.config[:param]]) || (params[:cancel_filter].present? && session["#{session_key_base}_page"] != params[:page])
+        params[:page] = nil
+        session["#{session_key_base}_page"] = nil
       end
+
+      session[:last_q_params] = params[::RansackMemory::Core.config[:param]]
+
+      # session[:last_page] = params[:page]
     end
   end
 end

data/lib/ransack_memory/version.rb

@@ -1,3 +1,3 @@
 module RansackMemory
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_memory
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Richard Lapiš
@@ -36,17 +36,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 3
 summary: Automatically save and load ransack's filtered params into session