smart_listing 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d094a24f3cf879ec07471fa78e42f6d7923476971f03f0b3d0ffdc4243488e28
-  data.tar.gz: 44f9ec23a184ff3c3df4fa2af4e053115dc78830036fba5f5584733c38b03977
+  metadata.gz: ebac27f2385c61936cbfe49ef0e7922b9748aae2a4fd35fc0b8df3a1ce4955b1
+  data.tar.gz: 52fe90ebcc6fb39f5b3201a39ca99177430c3adb1ab9ee4c538a051829acb411
 SHA512:
-  metadata.gz: 5c71f8202ab047e5727f8f0ca04aaa7d940aaf1f304758690905cc4be8f96ecb32cd3de1e616d5e355c9e21773b57d7ace88987c0ced8d7e09599fa3d700c627
-  data.tar.gz: 7c7377b916ab03f30a4992f7fa37241f474033a8aa38320e27e454ebbd01617d49ac480a4879b8f2f88c38023633a66b155939e8dfff000389096d50d745ce9c
+  metadata.gz: e8dc0079b18c666332c12885629a0e203bdb18f52897ad81cc6157f0cf67a6e8ed551a6eb2c171192a71cbf8f5e1a0066382cac657623c6461b846e69fcfc2a3
+  data.tar.gz: 629f3483ef13c5b5042f051a303a0d6b4f3b480ada5bde1dc5dc6d1932babc1944c7fa74a72bcd046c0f7a4f4f042f0dfe41f1723a996370d763162f5e53db3c

data/lib/smart_listing.rb

@@ -24,6 +24,10 @@ module SmartListing
     attr_reader :name, :collection, :options, :per_page, :sort, :page, :partial, :count, :params
     # Params that should not be visible in pagination links (pages, per-page, sorting, etc.)
     UNSAFE_PARAMS = [:authenticity_token, :commit, :utf8, :_method, :script_name].freeze
+    # For fast-check, like:
+    #   puts variable if ALLOWED_DIRECTIONS[variable]
+    ALLOWED_DIRECTIONS = Hash[['asc', 'desc', ''].map { |d| [d, true] }].freeze
+    private_constant :ALLOWED_DIRECTIONS
 
     def initialize name, collection, options = {}
       @name = name
@@ -200,16 +204,24 @@ module SmartListing
       sort = nil
 
       if @options[:sort_attributes] == :implicit
-        sort = sort_params.dup if sort_params.present?
+        return sort if sort_params.blank?
+
+        sort_params.map do |attr, dir|
+          key = attr.to_s if @options[:array] || @collection.klass.attribute_method?(attr)
+          if key && ALLOWED_DIRECTIONS[dir.to_s]
+            sort ||= {}
+            sort[key] = dir.to_s
+          end
+        end
       elsif @options[:sort_attributes]
         @options[:sort_attributes].each do |a|
           k, v = a
           if sort_params && sort_params[k.to_s]
-            dir = ["asc", "desc", ""].delete(sort_params[k.to_s])
+            dir = sort_params[k.to_s].to_s
 
-            if dir
+            if ALLOWED_DIRECTIONS[dir]
               sort ||= {}
-              sort[k] = dir
+              sort[k] = dir.to_s
             end
           end
         end

data/lib/smart_listing/version.rb

@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_listing
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Sology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails