sortofil 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a4dcd80595143b4fcc6e2fca54b63c4ce764e0
-  data.tar.gz: 2b25e97c6751ebb90ce4adf95d5f2aea8d4bae0b
+  metadata.gz: 5d4641eae47c9f53c7d10a7418c05d561397b26d
+  data.tar.gz: 2281c2722d8f7df61449a4147c7bab48c7c367fd
 SHA512:
-  metadata.gz: '09abef00e03a65ff3e6b072320d0fd240ccdc81885b27ac0244d2a6e450a8cff88cf0c9a2c042c0454877061f0888bbf3b5ee0646c14470f13e153cb42be4682'
-  data.tar.gz: ab957f62a7c10c7c3bdb3427d68a62c5b4139b82335b3ce91d758428dbd0a01e05423e0693cf2474bf09ac4479d7f1366628bb2cb4c8d39f36a712dd327331ec
+  metadata.gz: 9dc7235589e180504915cb7e6bad41d5242026f6dd9bdb7399e205d18741f8101bc61597bb79a60b5bea8ad0fbe97f384c244bb5a8f52ee262a2b24ff7791d27
+  data.tar.gz: ad9725c04597ad954bbd920f25f5f184874f42faee159e3c5f0d253681aab00780d8885911ef52db7ab94ee32968825cc52a929d8775f039305247a4472ba047

data/app/controllers/concerns/sortofilterable.rb

@@ -2,47 +2,45 @@
 module Sortofilterable
   extend ActiveSupport::Concern
 
-  included do
-    private
-
-    def filter_params
-      []
-    end
-
-    def sort_params
-      %i[sort_by direction]
-    end
-
-    def pagination_params
-      %i[page]
-    end
-
-    def set_default_sort_opts
-      set_default_sort_field
-      set_default_sort_direction
-    end
-
-    def set_default_sort_field
-      @default_sort_field = { nil => :id }
-    end
-
-    def set_default_sort_direction
-      @default_sort_direction = { nil => :asc }
-    end
-
-    def sort_field(scope = nil)
-      params.dig(scope, :sort_by) || params[:sort_by] ||
-        @default_sort_field[scope]
-    end
-
-    def sort_direction(scope = nil)
-      params.dig(scope, :direction) || params[:direction] ||
-        @default_sort_direction[scope]
-    end
-
-    def permit_params
-      @permitted_params = params.permit(sort_params, filter_params,
-                                        pagination_params)
-    end
+  private
+
+  def filter_params
+    []
+  end
+
+  def sort_params
+    %i[sort_by direction]
+  end
+
+  def pagination_params
+    %i[page]
+  end
+
+  def set_default_sort_opts
+    set_default_sort_field
+    set_default_sort_direction
+  end
+
+  def set_default_sort_field
+    @default_sort_field = { nil => :id }
+  end
+
+  def set_default_sort_direction
+    @default_sort_direction = { nil => :asc }
+  end
+
+  def sort_field(scope = nil)
+    params.dig(scope, :sort_by) || params[:sort_by] ||
+      @default_sort_field[scope]
+  end
+
+  def sort_direction(scope = nil)
+    params.dig(scope, :direction) || params[:direction] ||
+      @default_sort_direction[scope]
+  end
+
+  def permit_params
+    @permitted_params = params.permit(sort_params, filter_params,
+                                      pagination_params)
   end
 end

data/app/controllers/concerns/url_restorable.rb

@@ -2,42 +2,39 @@
 module UrlRestorable
   extend ActiveSupport::Concern
 
-  included do
-    private
+  private
 
-    def restore_url_params(key_prefix)
-      key = "#{key_prefix}_url_params"
-      if @permitted_params
-        params_wo_paging = @permitted_params.reject do |k, _|
-          pagination_params.include?(k.to_sym)
-        end
+  def restore_url_params(key_prefix)
+    key = "#{key_prefix}_url_params"
+    if @permitted_params
+      params_wo_paging = @permitted_params.reject do |k, _|
+        pagination_params.include?(k.to_sym)
       end
-      all_params = params_wo_paging ||
-                   params.permit(filter_params + sort_params)
+    end
+    all_params = params_wo_paging || params.permit(filter_params + sort_params)
 
-      if params[:reset_url]
-        if params[:reset_url] == 'all'
-          session[key] = nil
-        else
-          session[key] = Rack::Utils.parse_nested_query(session[key])
-                                    .except(params[:reset_url]).to_query
-        end
-      elsif session[key].blank?
-        session[key] = all_params.to_h.to_query
+    if params[:reset_url]
+      if params[:reset_url] == 'all'
+        session[key] = nil
+      else
+        session[key] = Rack::Utils.parse_nested_query(session[key])
+                                  .except(params[:reset_url]).to_query
       end
+    elsif session[key].blank?
+      session[key] = all_params.to_h.to_query
+    end
 
-      return if session[key].blank?
+    return if session[key].blank?
 
-      new_params = Rack::Utils.parse_nested_query(session[key])
-                              .merge(deep_transform(all_params.to_h))
-      session[key] = new_params.to_query
-      params.merge!(new_params)
-    end
+    new_params = Rack::Utils.parse_nested_query(session[key])
+                            .merge(deep_transform(all_params.to_h))
+    session[key] = new_params.to_query
+    params.merge!(new_params)
+  end
 
-    def deep_transform(hash)
-      hash.transform_values do |val|
-        val.is_a?(String) ? val : val.transform_values { |vv| vv }
-      end
+  def deep_transform(hash)
+    hash.transform_values do |val|
+      val.is_a?(String) ? val : val.transform_values { |vv| vv }
     end
   end
 end

data/lib/sortofil/version.rb

@@ -1,3 +1,3 @@
 module Sortofil
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortofil
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rinat Garifullin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails