sortable-by 0.11.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4cdc4741e458addb43e7d95a66f12695cf601f4178d188de2fa5197d6dc199
-  data.tar.gz: b1c4bb549dcdea2ca6879d5c4e360b75d099171ed2a3b1bd4e28fa89e0b968d9
+  metadata.gz: 4bb07dd11741d2ea29ae694e1e6bc11711e8427b137855ff84fe6760e182e59e
+  data.tar.gz: a5d2b6e874053630307e891855e542b6874adad75788e6a0c822a2e9336d490d
 SHA512:
-  metadata.gz: 381a3fbb778b6540e44f76de77b733781f26686848342235b865608bcaa5aaa5878bbf184de2386570568642c637d419ffe7a68eb980ecd7e084eaf8564ad98c
-  data.tar.gz: 705e4e7a6eae3f496ae2e84f3d2f818c4a0c2341d2e93bdb7ebde678bbc32d0f8b7c4375447168025c222bd466dde5ba72cd2624690ef5c5c99c03cb66c094e3
+  metadata.gz: 95feb9e2a5ba054e128572c35da39246760472ecb12c456976e267cac7eaa425c61505bce2037af98c5e33d5f20513571405395f1c462ad2054f6032d6600a5c
+  data.tar.gz: 610babd95b3ba593f9f566720e549929e13aef5031aa7330f7e87a07feac48b68483f2c5d2bc14489d81dd0728e39d405aeeb6d7681437598a98078e10f2e437

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -2,3 +2,4 @@ spec/tmp
 pkg
 *.gem
 .rake_tasks~
+.rubocop-*

data/.rubocop.yml

@@ -1,29 +1,15 @@
-AllCops:
-  TargetRubyVersion: 2.2
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 
+AllCops:
+  TargetRubyVersion: 2.6
+Naming/MethodParameterName:
+  MinNameLength: 2
 Naming/MemoizedInstanceVariableName:
   Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
 Naming/FileName:
   Exclude: [lib/sortable-by.rb]
-Metrics/BlockLength:
-  Exclude: [spec/**]
-Metrics/MethodLength:
-  Enabled: false
-Metrics/LineLength:
-  Max: 120
-
-Style/NumericLiterals:
-  Exclude: [spec/**]
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: consistent_comma
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma

data/Gemfile.lock

@@ -1,63 +1,86 @@
 PATH
   remote: .
   specs:
-    sortable-by (0.11.0)
+    sortable-by (0.13.1)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activesupport (5.2.0)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.0)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    i18n (1.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.0.5)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.4)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -66,9 +89,9 @@ DEPENDENCIES
   bundler
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sortable-by!
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -20,23 +20,23 @@ class Post < ActiveRecord::Base
   sortable_by :title, :id
 end
 
-Post.sorted_by('title')     # => ORDER BY posts.title ASC
-Post.sorted_by('-title')    # => ORDER BY posts.title DESC
-Post.sorted_by('bad,title') # => ORDER BY posts.title ASC
-Post.sorted_by(nil)         # => ORDER BY posts.title ASC
+Post.sorted_by('title')     # => ORDER BY LOWER(posts.title) ASC
+Post.sorted_by('-title')    # => ORDER BY LOWER(posts.title) DESC
+Post.sorted_by('bad,title') # => ORDER BY LOWER(posts.title) ASC
+Post.sorted_by(nil)         # => ORDER BY LOWER(posts.title) ASC
 ```
 
-Case-insensitive:
+Case-sensitive:
 
 ```ruby
 class Post < ActiveRecord::Base
   sortable_by do |x|
-    x.field :title, as: arel_table[:title].lower
+    x.field :title, case_sensitive: true
     x.field :id
   end
 end
 
-Post.sorted_by('title') # => ORDER BY LOWER(posts.title) ASC
+Post.sorted_by('title') # => ORDER BY posts.title ASC
 ```
 
 With custom default:
@@ -46,7 +46,7 @@ class Post < ActiveRecord::Base
   sortable_by :id, :topic, :created_at, default: 'topic,-created_at'
 end
 
-Post.sorted_by(nil) # => ORDER BY posts.topic ASC, posts.created_at DESC
+Post.sorted_by(nil) # => ORDER BY LOWER(posts.topic) ASC, posts.created_at DESC
 ```
 
 Composition:
@@ -68,8 +68,8 @@ Associations (eager load):
 class Product < ActiveRecord::Base
   belongs_to :shop
   sortable_by do |x|
-    x.field :name, as: arel_table[:name].lower
-    x.field :shop, as: Shop.arel_table[:name].lower, eager_load: :shop
+    x.field :name
+    x.field :shop, as: Shop.arel_table[:name], eager_load: :shop
     x.default 'shop,name'
   end
 end
@@ -77,11 +77,11 @@ end
 
 Associations (custom scope):
 
-```
+```ruby
 class Product < ActiveRecord::Base
   belongs_to :shop
   sortable_by do |x|
-    x.field :shop, as: Shop.arel_table[:name].lower, scope: -> { joins(:shop) }
+    x.field :shop, as: Shop.arel_table[:name], scope: -> { joins(:shop) }
   end
 end
 ```

data/lib/sortable_by.rb

@@ -17,9 +17,9 @@ module ActiveRecord # :nodoc:
         duplicate
       end
 
-      def field(name, opts = {})
+      def field(name, **opts)
         name = name.to_s
-        @_fields[name] = Field.new(name, opts)
+        @_fields[name] = Field.new(name, **opts)
         @_default ||= name
       end
 
@@ -36,7 +36,7 @@ module ActiveRecord # :nodoc:
 
       protected
 
-      def order(relation, expr, fallback = true)
+      def order(relation, expr, fallback: true)
         matched = false
         expr.to_s.split(',').each do |name|
           name.strip!
@@ -44,31 +44,32 @@ module ActiveRecord # :nodoc:
           rank = :asc
           if name[0] == '-'
             rank = :desc
-            name = name[1..-1]
+            name = name[1..]
           end
 
           field = _fields[name]
           next unless field
 
-          matched  = true
+          matched = true
           relation = field.order(relation, rank)
         end
 
-        relation = order(relation, _default, false) if fallback && !matched && _default
+        relation = order(relation, _default, fallback: false) if fallback && !matched && _default
         relation
       end
     end
 
     class Field # :nodoc:
-      def initialize(name, opts = {})
-        @cols = Array.wrap(opts[:as])
-        @eager_load = Array.wrap(opts[:eager_load]).presence
+      STRING_TYPES = %i[string text].freeze # :nodoc:
+
+      def initialize(name, as: nil, scope: nil, eager_load: nil, case_sensitive: false)
+        @cols = Array.wrap(as)
+        @eager_load = Array.wrap(eager_load).presence
+        @case_sensitive = case_sensitive == true
 
         # validate custom_scope
-        @custom_scope = opts[:scope]
-        if @custom_scope && !@custom_scope.is_a?(Proc)
-          raise ArgumentError, "Invalid sortable-by field '#{name}': scope must be a Proc."
-        end
+        @custom_scope = scope
+        raise ArgumentError, "Invalid sortable-by field '#{name}': scope must be a Proc." if @custom_scope && !@custom_scope.is_a?(Proc)
 
         # normalize cols
         @cols.push name if @cols.empty?
@@ -77,9 +78,7 @@ module ActiveRecord # :nodoc:
           when String, Symbol, Arel::Attributes::Attribute, Arel::Nodes::Node
             next
           when Proc
-            unless col.arity == 2
-              raise ArgumentError, "Invalid sortable-by field '#{name}': proc must accept 2 arguments."
-            end
+            raise ArgumentError, "Invalid sortable-by field '#{name}': proc must accept 2 arguments." unless col.arity == 2
           else
             raise ArgumentError, "Invalid sortable-by field '#{name}': invalid type #{col.class}."
           end
@@ -90,7 +89,10 @@ module ActiveRecord # :nodoc:
         @cols.each do |col|
           case col
           when String, Symbol
-            relation = relation.order(col => rank)
+            type = relation.columns_hash[col.to_s].type
+            col  = relation.arel_table[col]
+            col  = col.lower if STRING_TYPES.include?(type) && !@case_sensitive
+            relation = relation.order(col.send(rank))
           when Arel::Nodes::Node, Arel::Attributes::Attribute
             relation = relation.order(col.send(rank))
           when Proc
@@ -121,10 +123,10 @@ module ActiveRecord # :nodoc:
     #     sortable_by :title, :id
     #   end
     #
-    #   # Case-insensitive
+    #   # Case-sensitive
     #   class Post < ActiveRecord::Base
     #     sortable_by do |x|
-    #       x.field :title, as: arel_table[:title].lower
+    #       x.field :title, case_sensitive: true
     #       x.field :id
     #     end
     #   end
@@ -148,7 +150,7 @@ module ActiveRecord # :nodoc:
     #
     #     sortable_by do |x|
     #       x.field :name
-    #       x.field :shop, as: Shop.arel_table[:name].lower, eager_load: :shop
+    #       x.field :shop, as: Shop.arel_table[:name], eager_load: :shop
     #       x.default 'shop,name'
     #     end
     #   end
@@ -158,17 +160,16 @@ module ActiveRecord # :nodoc:
     #     belongs_to :shop
     #
     #     sortable_by do |x|
-    #       x.field :shop, as: Shop.arel_table[:name].lower, scope: -> { joins(:shop) }
+    #       x.field :shop, as: Shop.arel_table[:name], scope: -> { joins(:shop) }
     #     end
     #   end
     #
-    def sortable_by(*attributes)
+    def sortable_by(*attributes, **opts)
       config  = _sortable_by_config
-      opts    = attributes.extract_options!
       default = opts.delete(:default)
 
       attributes.each do |name|
-        config.field(name, opts)
+        config.field(name, **opts)
       end
       config.default(default) if default
       yield config if block_given?

data/sortable-by.gemspec

@@ -1,7 +1,6 @@
-
 Gem::Specification.new do |s|
   s.name        = 'sortable-by'
-  s.version     = '0.11.0'
+  s.version     = '0.13.1'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate white-listed sort scopes from URL parameter values'
@@ -9,10 +8,10 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/bsm/sortable-by'
   s.license     = 'MIT'
 
-  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_dependency 'activerecord'
   s.add_dependency 'activesupport'
@@ -20,6 +19,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
 end

data/spec/{sortable_by_spec.rb → active_record/sortable_by_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('./spec_helper', __dir__)
+require 'spec_helper'
 
 describe ActiveRecord::SortableBy do
   before do
@@ -8,7 +8,7 @@ describe ActiveRecord::SortableBy do
     end
   end
 
-  it 'should have config' do
+  it 'has config' do
     expect(Post._sortable_by_config._fields.keys).to match_array(%w[title created])
     expect(Post._sortable_by_config._default).to eq('-created')
     expect(SubPost._sortable_by_config._fields.keys).to match_array(%w[title created])
@@ -24,7 +24,7 @@ describe ActiveRecord::SortableBy do
     expect(Product._sortable_by_config._default).to eq('shop,name')
   end
 
-  it 'should simply order' do
+  it 'simplies order' do
     Post.create! title: 'A', created_at: Time.at(1515151500)
     Post.create! title: 'b', created_at: Time.at(1515151600)
     Post.create! title: 'C', created_at: Time.at(1515151400)
@@ -41,7 +41,7 @@ describe ActiveRecord::SortableBy do
     expect(Post.sorted_by('   title ').pluck(:title)).to eq(%w[A C b])
   end
 
-  it 'should support STI inheritance and overrides' do
+  it 'supports STI inheritance and overrides' do
     SubPost.create! title: 'A', created_at: Time.at(1515151700)
     SubPost.create! title: 'b', created_at: Time.at(1515151600)
     Post.create! title: 'C', created_at: Time.at(1515151400)
@@ -56,7 +56,7 @@ describe ActiveRecord::SortableBy do
     expect(SubPost.sorted_by('title').pluck(:title)).to eq(%w[A b D])
   end
 
-  it 'should support composition' do
+  it 'supports composition' do
     App.create! name: 'E', major: 0, minor: 9, patch: 2
     App.create! name: 'A', major: 1, minor: 0, patch: 1
     App.create! name: 'D', major: 1, minor: 0, patch: 6
@@ -68,7 +68,7 @@ describe ActiveRecord::SortableBy do
     expect(App.sorted_by('-version').pluck(:name)).to eq(%w[B C D A E])
   end
 
-  it 'should support associations' do
+  it 'supports associations' do
     y = Shop.create! name: 'Y'
     x = Shop.create! name: 'X'
 

data/spec/spec_helper.rb

@@ -2,9 +2,11 @@ ENV['RACK_ENV'] ||= 'test'
 require 'sortable-by'
 require 'rspec'
 
-ActiveRecord::Base.configurations['test'] = {
-  'adapter' => 'sqlite3',
-  'database' => ':memory:',
+ActiveRecord::Base.configurations = {
+  'test' => {
+    'adapter'  => 'sqlite3',
+    'database' => ':memory:',
+  },
 }
 ActiveRecord::Base.establish_connection :test
 
@@ -15,14 +17,14 @@ ActiveRecord::Base.connection.create_table :posts do |t|
 end
 
 class Post < ActiveRecord::Base
-  sortable_by :title, default: '-created' do |s|
+  sortable_by :title, default: '-created', case_sensitive: true do |s|
     s.field :created, as: arel_table[:created_at]
   end
 end
 
 class SubPost < Post
   sortable_by do |s|
-    s.field :title, as: arel_table[:title].lower
+    s.field :title
   end
 end
 
@@ -63,8 +65,8 @@ class Product < ActiveRecord::Base
   belongs_to :shop
 
   sortable_by do |s|
-    s.field :name, as: arel_table[:name].lower
-    s.field :shop, as: Shop.arel_table[:name].lower, eager_load: :shop
+    s.field :name
+    s.field :shop, as: Shop.arel_table[:name], eager_load: :shop
     s.default 'shop,name'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortable-by
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -126,7 +126,7 @@ files:
 - lib/sortable-by.rb
 - lib/sortable_by.rb
 - sortable-by.gemspec
-- spec/sortable_by_spec.rb
+- spec/active_record/sortable_by_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bsm/sortable-by
 licenses:
@@ -140,18 +140,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Generate white-listed sort scopes from URL parameter values
 test_files:
-- spec/sortable_by_spec.rb
+- spec/active_record/sortable_by_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-gemfile:
-  - Gemfile