sortable-by 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8f7b12ede76157e3c47f2aa2e3448830ec5040
-  data.tar.gz: 32a5f7e54e4be50111e8d9fe40b5c469d37a14b7
+  metadata.gz: c69dc4027db827d7339df15f6b6a82a00dd106c3
+  data.tar.gz: 6542aa11412834bd4360db4f6f989e2fb56358de
 SHA512:
-  metadata.gz: 4f9fe1dec1e74a71f2d73c5b488047a56f5eba5615dcdcf72648b5acd05655467022da4fde1f8dd6aff62ea191ccaeaa3bcbbbbba6b46f7b5ce11926ea486486
-  data.tar.gz: 1a0a02ae09216da95b603fddecbf07bb5e3578961a9f81004e09f4aa9e5976732f1919dd0fc8797b119efdd8a787b5df455bd6be705aea7b3c42a4072279df29
+  metadata.gz: 12165f68bf353d543f8701ed328586822a8c43d729cd514b8695821214a424926507e53e0fb443639a2051e28626733e6edcb47a5f5530949ae9bd6e9e80aa0a
+  data.tar.gz: 9008ae98a2a8aacb2bf807b9db1eb428fc6934e39e84ae11369919f46cbe75463c3e63ceb3897f88819cd5b125071c47591290bb0c2d33f950114c0966cd2219

data/.travis.yml

@@ -2,5 +2,7 @@ rvm:
   - 1.9.3
   - 2.1.2
   - 2.2.2
+  - 2.3.2
+  - 2.4.0
 gemfile:
   - Gemfile

data/Gemfile.lock

@@ -1,48 +1,45 @@
 PATH
   remote: .
   specs:
-    sortable-by (0.8.0)
+    sortable-by (0.9.0)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
-      arel (~> 6.0)
-    activesupport (4.2.3)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.2)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.7.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    arel (7.1.4)
+    concurrent-ruby (1.0.4)
+    diff-lcs (1.3)
+    i18n (0.8.1)
+    minitest (5.10.1)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.5)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -57,4 +54,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.14.3

data/README.md

@@ -17,9 +17,9 @@ class Foo < ActiveRecord::Base
   sortable_by :title, :updated_at, default: { updated_at: :desc }
 end
 
-Foo.sort_by "-updated_at,title" # => ORDER BY updated_at DESC, title ASC
-Foo.sort_by "bad,title"         # => ORDER BY title ASC
-Foo.sort_by nil                 # => ORDER BY updated_at DESC
+Foo.sorted_by "-updated_at,title" # => ORDER BY updated_at DESC, title ASC
+Foo.sorted_by "bad,title"         # => ORDER BY title ASC
+Foo.sorted_by nil                 # => ORDER BY updated_at DESC
 ```
 
 ## LICENCE

data/lib/sortable_by.rb

@@ -21,7 +21,7 @@ module ActiveRecord
 
       # @param [String] expr the sort expr
       # @return [ActiveRecord::Relation] the scoped relation
-      def sort_by(expr)
+      def sorted_by(expr)
         options = {}
         expr.to_s.split(',').each do |name|
           name.strip!

data/sortable-by.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'sortable-by'
-  s.version     = '0.8.0'
+  s.version     = '0.9.0'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate white-listed sort scopes from URL parameter values'

data/spec/sortable_by_spec.rb

@@ -8,15 +8,16 @@ describe ActiveRecord::SortableByHelper do
   end
 
   it 'should generate scopes' do
-    expect(Foo.sort_by("title").pluck(:title)).to eq(["A", "B", "B", "C"])
-    expect(Foo.sort_by("-title").pluck(:title)).to eq(["C", "B", "B", "A"])
-    expect(Foo.sort_by("age,title").pluck(:title)).to eq(["B", "A", "B", "C"])
-    expect(Foo.sort_by("invalid , -age").pluck(:title)).to eq(["C", "B", "A", "B"])
-    expect(Foo.sort_by("").pluck(:title)).to eq(["A", "B", "B", "C"])
-    expect(Foo.sort_by(nil).pluck(:title)).to eq(["A", "B", "B", "C"])
+    expect(Foo.sorted_by("title").pluck(:title)).to eq(["A", "B", "B", "C"])
+    expect(Foo.sorted_by("-title").pluck(:title)).to eq(["C", "B", "B", "A"])
+    expect(Foo.sorted_by("age,title").pluck(:title)).to eq(["B", "A", "B", "C"])
+    expect(Foo.sorted_by("invalid , -age").pluck(:title)).to eq(["C", "B", "A", "B"])
+    expect(Foo.sorted_by("").pluck(:title)).to eq(["A", "B", "B", "C"])
+    expect(Foo.sorted_by(nil).pluck(:title)).to eq(["A", "B", "B", "C"])
 
-    expect(Bar.sort_by("").pluck(:title)).to eq(["Y", "X"])
-    expect(Bar.sort_by("title").pluck(:title)).to eq(["Y", "X"])
+    expect(Bar.sorted_by("").pluck(:title)).to eq(["Y", "X"])
+    expect(Bar.sorted_by("title").pluck(:title)).to eq(["Y", "X"])
+    expect(Bar.where(title: "X").sorted_by("title").pluck(:title)).to eq(["X"])
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortable-by
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Generate white-listed sort scopes from URL parameter values