sortable-for-rails 1.0.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d4bbc350e99a47d9970db6c37b5d89e47bf6a0f26fd4fccd1e8dec71757d84
-  data.tar.gz: 966cc6ebac6496a4632c886830068c7e9e30a3bead23344f94ead732e75369a1
+  metadata.gz: 8241cfda491ab92c3630f541f3ebe420c30dfa477a08eeb84924adacd5499c80
+  data.tar.gz: 63fb69082b1f418680e4c1292eea9ae5c327bd5b9a11b796ed4f08f0883267d1
 SHA512:
-  metadata.gz: d07d2354242f3cea174566598705962d955189f86facb9a6c0691e4b49ed3ebc65b1ca73df48ee77d6fb894cc78a9cb8e588c4dc3cb2545ddb537e7ddca44324
-  data.tar.gz: 4d9c3a6b109ba6d9b180843e73f2c24d90cb5d381ecb81ccb60cc1a0f8e3b0b11a9ca5e46742efa9e2f1b388ca8d0dd3fe1aa76c20ad02cfe1d6cb2fbbd78ba3
+  metadata.gz: 9164aa52cf51722b00543e5f407cc9776fad8ea054d64277851824308f8dfa3831c652759e8f9a5936d4a62424a21e7b7d6ec0e3b1937710f29cba4ab3518fcd
+  data.tar.gz: 499dbd023f27937514ee211dcc1817c13a40503b2b2f3516111080e0b3b0223a52336439ce1126e59f3d8c70864998d0a177f99f3fc65f871643925c73478874

data/README.md

@@ -27,6 +27,15 @@ class User < ApplicationRecord
 
   sortable :id, :updated_at, :email
   sortable :profile_name, -> { joins(:profile) }, column: "profiles.name"
+  sortable :status, method: :sortable_status
+
+  # we can sort in memory also if needed (for data not stored directly in DB)
+  # just remember on performance impact
+  def self.sortable_status(direction)
+    results = all.sort_by { |user| user.status }
+    results.reverse! if direction == :desc
+    results
+  end
 
 end
 ```

data/app/helpers/sortable/sortable_helper.rb

@@ -10,7 +10,9 @@ module Sortable::SortableHelper
       new_direction = current_direction.to_s == "asc" ? "desc" : "asc"
     end
 
-    link_to(url_for(sort: column, direction: new_direction), options) do
+    url = url_for params.permit!.merge(sort: column, direction: new_direction)
+
+    link_to(url, options) do
       label = block_given? ? capture(&block) : column
       sortable_label_for(label, current, current_direction, scope)
     end

data/lib/sortable.rb

@@ -12,32 +12,34 @@ module Sortable
         @sortable
       end
 
-      def sorting(column, direction = :asc)
-        Sortable::Sort.new(self, column, direction).all
+      def sorting(column, direction = :asc, *args)
+        Sortable::Sort.new(self, column, direction, *args).all
       end
     end
   end
 
   class Column
-    attr_reader :name, :column, :scope
-    def initialize(name, scope = nil, column: name)
+    attr_reader :name, :column, :scope, :method
+    def initialize(name, scope = nil, column: name, method: nil)
       @name = name
       @column = column
+      @method = method
       @scope = scope
     end
   end
 
   class Sort
-    attr_reader :scope
+    attr_reader :scope, :args
 
-    def initialize(scope, column, direction)
+    def initialize(scope, column, direction, *args)
       @scope = scope
       @column = column
       @direction = direction
+      @args = args
     end
 
     def columns
-      @columns = create_columns
+      @columns ||= create_columns
     end
 
     def all
@@ -45,7 +47,14 @@ module Sortable
 
       if column
         all = all.merge(column.scope) if column.scope.present?
-        all = all.order("#{column.column} #{direction}")
+
+        if column.method
+          all = all.public_send(column.method, direction.to_sym, *args)
+        elsif column.column.is_a?(Symbol)
+          all = all.order(column.column => direction)
+        else
+          all = all.order("#{column.column} #{direction}")
+        end
       end
 
       all
@@ -62,8 +71,16 @@ module Sortable
     def create_columns
       scope.sortable.flat_map do |columns|
         columns = [columns] unless columns.all? { |column| column.is_a?(Symbol) }
-        columns.map { |column| Column.new(*column) }
+        columns.map { |column| create_column(column) }
       end.group_by { |column| column.name.to_s }
     end
+
+    def create_column(column)
+      if column.respond_to?(:last) && column.last.is_a?(Hash)
+        Column.new(*column[0...-1], **column.last)
+      else
+        Column.new(*column)
+      end
+    end
   end
 end

data/sortable-for-rails.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sortable-for-rails"
-  spec.version       = "1.0.0"
+  spec.version       = "1.2.2"
   spec.authors       = ["Grzegorz Derebecki"]
   spec.email         = ["grzegorz.derebecki@fdb.pl"]
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", ">= 5.2"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortable-for-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Grzegorz Derebecki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Allow easy sorting tables tables in rails