sortable-by 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4cdc4741e458addb43e7d95a66f12695cf601f4178d188de2fa5197d6dc199
-  data.tar.gz: b1c4bb549dcdea2ca6879d5c4e360b75d099171ed2a3b1bd4e28fa89e0b968d9
+  metadata.gz: f74bd1b80f7d18fe84542fd593e14be0d8dc552bb0a5936fd733d5cf9c93018e
+  data.tar.gz: f44b03bfeb96d7bbdfda93013a10614d394e2731dcf57b0a68233005ba25f063
 SHA512:
-  metadata.gz: 381a3fbb778b6540e44f76de77b733781f26686848342235b865608bcaa5aaa5878bbf184de2386570568642c637d419ffe7a68eb980ecd7e084eaf8564ad98c
-  data.tar.gz: 705e4e7a6eae3f496ae2e84f3d2f818c4a0c2341d2e93bdb7ebde678bbc32d0f8b7c4375447168025c222bd466dde5ba72cd2624690ef5c5c99c03cb66c094e3
+  metadata.gz: c9ee512ce1eeeb0e4230ee8fe43e01f2bb5695a0b3633dae440f5231ddb53aa6d7cc3e65a97353f3fd344e5838a89340f72349ab43a53dfba9ad50918ac43bd7
+  data.tar.gz: 32bcfed467633bfe35825501e1d8abd6fdf4e48a931e71d66499b705cef73834a20cf62814d40db765e9223bd3338549319cf31b785f6cf6fb0c35ddccb05650

data/.gitignore

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

data/.rubocop.yml

@@ -1,29 +1,10 @@
+inherit_from:
+  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
+
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
 
 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/.travis.yml

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

data/Gemfile.lock

@@ -1,63 +1,63 @@
 PATH
   remote: .
   specs:
-    sortable-by (0.11.0)
+    sortable-by (0.11.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)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.0)
+    activesupport (5.2.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)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    i18n (1.0.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.3)
     minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.0.5)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
     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 (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    rubocop (0.72.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sqlite3 (1.3.13)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -71,4 +71,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/lib/sortable_by.rb

@@ -17,7 +17,7 @@ module ActiveRecord # :nodoc:
         duplicate
       end
 
-      def field(name, opts = {})
+      def field(name, opts={})
         name = name.to_s
         @_fields[name] = Field.new(name, opts)
         @_default ||= name
@@ -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!
@@ -60,15 +60,13 @@ module ActiveRecord # :nodoc:
     end
 
     class Field # :nodoc:
-      def initialize(name, opts = {})
+      def initialize(name, opts={})
         @cols = Array.wrap(opts[:as])
         @eager_load = Array.wrap(opts[:eager_load]).presence
 
         # 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
+        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 +75,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

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.11.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.4'
 
   s.add_dependency 'activerecord'
   s.add_dependency 'activesupport'

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'sortable-by'
 require 'rspec'
 
 ActiveRecord::Base.configurations['test'] = {
-  'adapter' => 'sqlite3',
+  'adapter'  => 'sqlite3',
   'database' => ':memory:',
 }
 ActiveRecord::Base.establish_connection :test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortable-by
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,15 +140,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.4'
 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.0.3
 signing_key: 
 specification_version: 4
 summary: Generate white-listed sort scopes from URL parameter values