sort_n_params 1.0.3 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d7d660d21516f59a4a914359a26d53a20fdc3699793e0928957546baee823e
-  data.tar.gz: 928b68de9c0da24d7d454f445dbfe2b2cdfcd1a55762b9fd226edf86a85ec25f
+  metadata.gz: cea1f96ef8bba32a0577ca8e86bf1325aae552427f5403a2c03d00d536a5f2b0
+  data.tar.gz: ea209f082dc417900a8e873d6a4bddc0901e25f6958b811743f168d0ff46a779
 SHA512:
-  metadata.gz: '093b2206de1545750e2da682723fb6c725d6ca907156ccd7068edd827d87923f46ca100887d7a9f8d1f47923c1230214db6aca59a312a8da949291810637861a'
-  data.tar.gz: 431f0adadd6e5fc19f105afa7eac5a2ed3ea7d0471363473af5ba896e2b6c35f3d3ea4b2963cdb9f72955312c36cc8df1cfe59a01437ab005db6737f2e66ff32
+  metadata.gz: 998f053ac4c19a0e14fe46064568a9260d1c3f5ac1f0dbcb2ad8db67b76284379ab709313bf85411515803a5b8d97bdff25d24dbd596bb07069a68fc3decfb2f
+  data.tar.gz: f5c313061ea1c2c365092ba5a91239aa38d7e5ee9616104cbc6bfd9fcbbfe8d0516f74f60cc22d6a749f36b3e450910f7cbd0ab3d399c4e5d7e19942d9972ab0

data/lib/sort_n_params/concerns/scopes.rb

@@ -4,17 +4,28 @@ module SortNParams
   module Scopes
     extend ActiveSupport::Concern
     class_methods do
-      def sorting_order(ordering_array)
+      def sorting_order(ordering_array, table_name = nil)
         return all if ordering_array.blank?
 
-        all.order(parse_array(ordering_array))
+        all.order(parse_array(ordering_array, table_name))
       end
 
-      def parse_array(ordering_array)
+      def parse_array(ordering_array, table_name = nil)
+        table = table_name || name.tableize
+
         ordering_array.each_slice(2).map do |order, direction|
-          "#{name.tableize}.#{order} #{direction}"
+          table_custom, order_custom = get_field_order(table, order)
+          "#{table_custom}.#{order_custom} #{direction}"
         end.join(', ')
       end
+
+      private
+
+      def get_field_order(table, order)
+        return [table, order] if order.split('.').one?
+
+        order.split('.')
+      end
     end
   end
 end

data/lib/sort_n_params/sort_helpers.rb

@@ -2,7 +2,21 @@ module SortNParams
   module SortHelpers
     def sortable(column, title = nil)
       data = Sortable.new(column, title, params).call
-      link_to "#{data.title} <i class='#{data.icon}'".html_safe, data.sort_params, class: data.css
+      capture do
+        concat(
+          link_to(data.title, data.sort_params, class: data.css)
+        )
+        concat(
+          link_to(data.sort_params, class: SortNParams.badge_main_class) do
+            "<b>#{data.position}</b><i class='#{data.icon}'></i>".html_safe
+          end
+        ) if data.position.present?
+        concat(
+          link_to(data.clear_params, class: SortNParams.badge_secondary_class) do
+            "<i class='#{SortNParams.sort_clear_class}'></i>".html_safe
+          end
+        ) if data.clear_params.present?
+      end
     end
   end
 end

data/lib/sort_n_params/sortable.rb

@@ -1,3 +1,6 @@
+require 'ostruct'
+require 'sort_n_params'
+
 class Sortable
   DEFAULT_ORDER = 'asc'.freeze
 
@@ -9,8 +12,16 @@ class Sortable
   end
 
   def call
-    add_previous_order if @params[:order].present?
-    @sort_params[:order].include?(@column) ? revert_order : add_order
+    add_previous_order unless @params[:order].nil?
+    if @sort_params[:order].include?(@column)
+      revert_order
+      set_clear_params
+      set_position
+    else
+      add_order
+      reset_clear_params
+    end
+
     build_data
   end
 
@@ -19,10 +30,11 @@ class Sortable
   def add_previous_order
     @sort_params[:order] << @params[:order]
     @sort_params[:order].flatten!
+    @clear_params = Marshal.load(Marshal.dump(@sort_params))
   end
 
   def build_data
-    OpenStruct.new(css: set_css, icon: set_icon, title: @title, sort_params: @sort_params)
+    OpenStruct.new(css: set_css, icon: set_icon, title: @title, position: @column_position, sort_params: @sort_params, clear_params: @clear_params)
   end
 
   def revert_order
@@ -37,6 +49,19 @@ class Sortable
     @sort_params[:order] << DEFAULT_ORDER
   end
 
+  def set_clear_params
+    column_index = @clear_params[:order].find_index(@column)
+    2.times{|x| @clear_params[:order].delete_at(column_index) }
+  end
+
+  def reset_clear_params
+    @clear_params = nil
+  end
+
+  def set_position
+    @column_position = @sort_params[:order].each_slice(2).map(&:first).find_index(@column) + 1
+  end
+
   def set_css
     return nil unless @params[:order]
 
@@ -45,7 +70,7 @@ class Sortable
 
   def set_icon
     if @params[:order] && @params[:order].detect { |e| e == @column } == @column && @params[:order][ @params[:order].find_index(@column) + 1 ]
-      @column == @params[:order].detect { |e| e == @column } && @params[:order][ @params[:order].find_index(@column) + 1 ] == 'asc' ? 'fa fa-sort-up' : 'fa fa-sort-desc'
+      @column == @params[:order].detect { |e| e == @column } && @params[:order][ @params[:order].find_index(@column) + 1 ] == 'asc' ? SortNParams.sort_asc_class : SortNParams.sort_desc_class
     end
   end
 end

data/lib/sort_n_params.rb

@@ -3,6 +3,14 @@ require 'sort_n_params/sortable'
 require 'rails/engine'
 
 module SortNParams
+  class << self
+    attr_accessor :badge_main_class,
+                  :badge_secondary_class,
+                  :sort_asc_class,
+                  :sort_desc_class,
+                  :sort_clear_class
+  end
+
   class Engine < ::Rails::Engine
     require 'sort_n_params/concerns/scopes'
 

data/sort_n_params.gemspec

@@ -1,36 +1,37 @@
 Gem::Specification.new do |s|
   s.name        = 'sort_n_params'
-  s.version     = '1.0.3'
-  s.date        = '2019-05-07'
-  s.summary     = "Sort N Params"
-  s.description = "Make your html <tables> sortables with N <th> parameters this gem."
-  s.authors     = ["Juan Francisco Ferrari"]
+  s.version     = '1.2.2'
+  s.date        = '2022-06-17'
+  s.summary     = 'Sort N Params'
+  s.description = 'Make your html <tables> sortables with N <th> parameters this gem.'
+  s.authors     = ['Juan Francisco Ferrari']
   s.email       = 'juannferrari@gmail.com'
-  s.require_paths = ["lib"]
-  s.files       = [
-    "Gemfile",
-    "MIT-LICENSE",
-    "Rakefile",
-    "sort_n_params.gemspec",
-    "lib/sort_n_params.rb",
-    "lib/sort_n_params/sortable.rb",
-    "lib/sort_n_params/sort_helpers.rb",
-    "lib/sort_n_params/concerns/scopes.rb",
-    "spec/spec_helper.rb",
-    "spec/sortable_spec.rb"
-    ]
-  s.homepage    =
+  s.require_paths = ['lib']
+  s.files = [
+    'Gemfile',
+    'LICENSE',
+    'Rakefile',
+    'sort_n_params.gemspec',
+    'lib/sort_n_params.rb',
+    'lib/sort_n_params/sortable.rb',
+    'lib/sort_n_params/sort_helpers.rb',
+    'lib/sort_n_params/concerns/scopes.rb',
+    'spec/concerns/scopes_spec.rb',
+    'spec/spec_helper.rb',
+    'spec/sortable_spec.rb'
+  ]
+  s.homepage =
     'https://github.com/JuannFerrari/sort_n_params'
-  s.license       = 'MIT'
+  s.license = 'MIT'
+  s.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'factory_bot', '~> 4.0'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'rake', '>= 12.3.3'
+  s.add_development_dependency 'rspec', '~> 3.0'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "factory_bot", "~> 4.0"
-  s.add_development_dependency "pry-byebug"
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "rspec", "~> 3.0"
-
-  s.add_dependency(%q<rails>.freeze, ["~> 5.0"])
-  s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
-  s.add_dependency(%q<rake>.freeze, ["~> 10.1"])
+  s.add_dependency('rails'.freeze, ['>= 7.0'])
+  s.add_dependency('nokogiri'.freeze, ['>= 0'])
+  s.add_dependency('rake'.freeze, ['>= 12.3.3'])
 end

data/spec/concerns/scopes_spec.rb

@@ -0,0 +1,25 @@
+require 'sort_n_params/concerns/scopes'
+
+RSpec.describe SortNParams::Scopes do
+  let(:test_class) do
+    CustomTable = Struct.new(:custom_field) do
+      include SortNParams::Scopes
+    end
+  end
+
+  context 'when you pass only an ordering array' do
+    subject { test_class.parse_array(["test_field","asc"]) }
+
+    it "builds the array correctly without the table_name param passed" do
+      expect(subject).to eq("custom_tables.test_field asc")
+    end
+  end
+
+  context 'when you pass both ordering array and table name' do
+    subject { test_class.parse_array(["test_field","asc"], "another_table_name" ) }
+
+    it "builds the array correctly with the table_name param passed" do
+      expect(subject).to eq("another_table_name.test_field asc")
+    end
+  end
+end

data/spec/sortable_spec.rb

@@ -1,4 +1,5 @@
-require 'pry'
+require 'sort_n_params'
+
 RSpec.describe Sortable do
   subject(:data) { Sortable.new('id', 'code', {}).call }
 
@@ -54,7 +55,7 @@ RSpec.describe Sortable do
     end
 
     it 'returns fa-sort-up class for icon' do
-      expect(already_ordered.icon).to eq 'fa fa-sort-up'
+      expect(already_ordered.icon).to eq SortNParams.sort_asc_class
     end
 
     it 'returns title of passed param' do
@@ -87,7 +88,7 @@ RSpec.describe Sortable do
       end
 
       it 'returns fa-sort-down class for icon' do
-        expect(twice_ordered.icon).to eq 'fa fa-sort-desc'
+        expect(twice_ordered.icon).to eq SortNParams.sort_desc_class
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'factory_bot'
+require 'sort_n_params/sortable'
 
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
   FactoryBot.find_definitions
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sort_n_params
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.2
 platform: ruby
 authors:
 - Juan Francisco Ferrari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 description: Make your html <tables> sortables with N <th> parameters this gem.
 email: juannferrari@gmail.com
 executables: []
@@ -129,13 +129,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- MIT-LICENSE
+- LICENSE
 - Rakefile
 - lib/sort_n_params.rb
 - lib/sort_n_params/concerns/scopes.rb
 - lib/sort_n_params/sort_helpers.rb
 - lib/sort_n_params/sortable.rb
 - sort_n_params.gemspec
+- spec/concerns/scopes_spec.rb
 - spec/sortable_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/JuannFerrari/sort_n_params
@@ -150,14 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Sort N Params