sortable_by 1.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b73a5ddc646d2e3c337439264cb4ca123aa3e30e
-  data.tar.gz: 5790ac2d41f873ebaffe8e2a20a7329ee667f180
+SHA256:
+  metadata.gz: 57aec93c545980e73c92b7135b14d161981ea29d0760ee3aab3317bd6ada0bdd
+  data.tar.gz: 632442d5cc37d21280d95da6a09a66966ca7d8329a73ba8dce4790c01dd1f444
 SHA512:
-  metadata.gz: fd6f579e3c5b90e976c23be7f5c03192d5fa816e1dbf7ee466d7df1ea02b13ab3eae36275fec8b6fa2278c791c68b16511f706ac36a0105415f2c62e12317d02
-  data.tar.gz: ec9f53443ec60403476953b6f8beabf3982ea7342f5134adf725f1ce3c247d07ce4af80fdb29379308fc22470022676ba6f007f2a4f4a93385bd526247b504cb
+  metadata.gz: df35102a578b4b0331642f68f06c07940b746a159d51a3af851142ae2b5f6aa5b77bd3b88e9ebdf783c4c9af75ee1cf04e4e72817a059b9f9535d2bdc1262f6f
+  data.tar.gz: bd1d63ab89b77020d5c376bc6ea78d6cd674477731ec0866bc7d624e60bb428c6983e1f6659e2c371339b3adf89b3c73185b60df7ccadf94cb5a50090360bd6f

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'

data/app/helpers/sortable_by/table_helper.rb

@@ -25,11 +25,11 @@ module SortableBy
     #
     def sortable_table_header(path_helper, model: nil, permit: [], icon: SortableBy.icon_strategy, &block)
       header = SortableBy::TableHeader.new(
-        path_helper: path_helper,
-        model: model,
+        path_helper:,
+        model:,
         params: params.permit(permit.concat(SortableBy.params_list)),
         context: self,
-        icon: icon)
+        icon:)
       header.capture(block) if block
       header.to_html
     end

data/lib/sortable_by/configuration.rb

@@ -7,5 +7,5 @@ module SortableBy
   self.params_list = [:sort, :dir, :search, :tab]
 
   # Default icon strategy to be used
-  self.icon_strategy = :glyph
+  self.icon_strategy = :basic
 end

data/lib/sortable_by/engine.rb

@@ -1,7 +1,7 @@
 module SortableBy
   class Engine < ::Rails::Engine
     initializer :controller do
-      ActionController::Base.send(:include, SortableBy::Params)
+      ActiveSupport.on_load(:action_controller) { include SortableBy::Params }
     end
   end
 end

data/{app/controllers/concerns → lib}/sortable_by/params.rb

@@ -3,9 +3,7 @@ module SortableBy
     extend ActiveSupport::Concern
 
     module ClassMethods
-      attr_accessor :default_sort_attribute
-      attr_accessor :default_sort_dir
-      attr_accessor :sortable_mapping
+      attr_accessor :default_sort_attribute, :default_sort_dir, :sortable_mapping
 
       # Define attributes you wish to sort by
       #
@@ -27,7 +25,7 @@ module SortableBy
       def sortable_by(*attributes, **options)
         @default_sort_attribute = options.delete(:default)
         @default_sort_dir = options.delete(:direction) || :asc
-        @sortable_mapping = options.merge(attributes.map { |att| [att, att] }.to_h)
+        @sortable_mapping = options.merge(attributes.to_h { |att| [att, att] })
       end
     end
 
@@ -56,6 +54,7 @@ module SortableBy
     #
     def sortable_query
       return unless sort_attribute
+
       normalize_sort_value(
         sort_attribute,
         sort_direction
@@ -66,13 +65,14 @@ module SortableBy
     #
     def normalize_sort_value(sort_by, direction)
       mapping = self.class.sortable_mapping[sort_by]
-      if mapping.is_a? Symbol
+      case mapping
+      when Symbol
         { mapping => sort_direction }
-      elsif mapping.is_a? String
+      when String
         mapping.gsub(':dir', sort_direction.to_s)
-      elsif mapping.is_a? Array
-        mapping.map { |att| [att, direction] }.to_h
-      elsif mapping.is_a? Proc
+      when Array
+        mapping.index_with { |_att| direction }
+      when Proc
         mapping.call(direction)
       else
         logger.debug("WARNING: Sort attribute '#{sort_by}' is not recognized. Did you mean to pass it to sortable_by?")

data/lib/sortable_by/table_header.rb

@@ -8,7 +8,7 @@ module SortableBy
     # Forward view helper methods to the view context
     delegate :concat, :content_tag, :link_to, to: :context
 
-    def initialize(path_helper:, model: nil, params: {}, context:, icon:)
+    def initialize(path_helper:, context:, icon:, model: nil, params: {})
       @path_helper = path_helper
       @model = model
       @params = params
@@ -39,7 +39,7 @@ module SortableBy
     end
 
     def to_html
-      content_tag :thead, to_row, class: 'tb-table-header'
+      content_tag :thead, to_row, class: 'sortable-table-header'
     end
 
     private
@@ -88,6 +88,7 @@ module SortableBy
 
     def sort_arrow_for_attribute(attribute)
       return '' unless @params[:sort] == attribute.to_s
+
       IconStrategy.send(@icon, context, current_direction) if IconStrategy.respond_to?(@icon)
     end
   end
@@ -103,5 +104,10 @@ module SortableBy
       icon_class = dir == 'asc' ? 'up' : 'down'
       context.content_tag(:span, '', class: "glyphicon glyphicon-arrow-#{icon_class}")
     end
+
+    def self.basic(context, dir)
+      text = dir == 'desc' ? '▼' : '▲'
+      context.content_tag(:span, text, class: 'sortable-direction')
+    end
   end
 end

data/lib/sortable_by/version.rb

@@ -1,3 +1,3 @@
 module SortableBy
-  VERSION = '1.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/sortable_by.rb

@@ -2,5 +2,6 @@ require 'sortable_by/engine'
 
 module SortableBy
   require 'sortable_by/configuration'
+  require 'sortable_by/params'
   require 'sortable_by/table_header'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortable_by
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.2
 platform: ruby
 authors:
 - Greg Woods
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,8 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem adds capabilities to create sortable table headersconnect those
-  headers to a back end ActiveRecord sort query
+description: Adds capabilities to create sortable table headers and connect them to
+  an ActiveRecord query
 email:
 - greg.woods@moserit.com
 executables: []
@@ -105,19 +105,20 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/controllers/concerns/sortable_by/params.rb
 - app/helpers/sortable_by/table_helper.rb
 - lib/sortable_by.rb
 - lib/sortable_by/configuration.rb
 - lib/sortable_by/engine.rb
+- lib/sortable_by/params.rb
 - lib/sortable_by/table_header.rb
 - lib/sortable_by/version.rb
 - lib/tasks/sortable_by_tasks.rake
 homepage: https://github.com/moser-inc/sortable_by
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,16 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Simple tool for sorting tables of data in rails
 test_files: []