sort_n_params 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1699472fa73140a298c054ba1cf30a75c1f08a38cfa991d2b0d738bed8b707a0
-  data.tar.gz: fa259494066c8118ce818a88169b771631550bd8b20dbf39c3966230abc24c54
+  metadata.gz: 65438859688c9289931f4447f73b1939a03058d98360878cb297b62d5c7c2ae4
+  data.tar.gz: 6bf07b3f4bac11774805bb5e2ebc010211b8d0a5b793af7d0d93cf8a7044617f
 SHA512:
-  metadata.gz: 4b7d0e7c550936f4f85a2312935b138490dcce4f252240465b28eac3e4c7268fa87a089607824af3165934abdb1a8e59fdb2f5412e8684c45e6b8980fc666814
-  data.tar.gz: 8f406482183c6f110e9eb13a30a0fbbfe85052c5c235b4e0d3366d879632de367c561b06b984184cef0ca01f737aa81a1f2288d2506663beb477d5e061b69eee
+  metadata.gz: ba8e96b6e58098196af8d86789e9b90c43212c5e2727dcd97aa72dc31d90a9231de96de39cf29aab6ab2c50b6c12074ba633120f139a4f45302b8a7efd493bf0
+  data.tar.gz: '026306599ab142c755abb914c495fb57df5f01bf76a18a503c400c11c8b806186fb54d1b11028bf8ab5316151ddb740b2f22b25787f365800ccba1bbf2bf7911'

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/lib/sort_n_params/concerns/scopes.rb

@@ -14,9 +14,18 @@ module SortNParams
         table = table_name || name.tableize
 
         ordering_array.each_slice(2).map do |order, direction|
-          "#{table}.#{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
 
@@ -10,7 +13,15 @@ class Sortable
 
   def call
     add_previous_order unless @params[:order].nil?
-    @sort_params[:order].include?(@column) ? revert_order : add_order
+    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/sort_n_params.gemspec

@@ -1,38 +1,37 @@
 Gem::Specification.new do |s|
   s.name        = 'sort_n_params'
-  s.version     = '1.0.4'
+  s.version     = '1.1.0'
   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.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       = [
-    ".travis.yml",
-    "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    =
+  s.require_paths = ['lib']
+  s.files = [
+    '.travis.yml',
+    '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.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", ">= 12.3.3"
-  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, [">= 12.3.3"])
+  s.add_dependency('rails'.freeze, ['>= 5.0'])
+  s.add_dependency('nokogiri'.freeze, ['>= 0'])
+  s.add_dependency('rake'.freeze, ['>= 12.3.3'])
 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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sort_n_params
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Francisco Ferrari
@@ -84,14 +84,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency