brainstem 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4ef646937471e3b40be68a1ff71f4faf4cdd63
-  data.tar.gz: 1fadd886ec5c7125858223abbe7be3d620dad232
+  metadata.gz: 1e9525fa7be23bf9243bcda856506afc3ee2011c
+  data.tar.gz: ff5542a4d0eb4965677364a477ea53c9717e9e17
 SHA512:
-  metadata.gz: 076d515bc2db2839b04a764bffd19b4505a3c600cdd83819bb01cbae337bdc42f93802cdc13c662ca60a7d5e32f1dff3a8d9a0bde800021795888e48bbdda6fc
-  data.tar.gz: 6bf6f7174b79e66141cd080463ec5a16f6ebd99bf9bbf1dace67a067c6f72530df4b9d992ce720ac824b63e37418f411e963aab72b7b3bf1cd71f227919d01c1
+  metadata.gz: f432c131f41522c093db48efc27e1750071d43ac5f0166c365f8ca2ca6958e4c706bff3150ff0de5fb04ecfc0ef99e1c3f2065f609c9e9476d07f39f42e6e635
+  data.tar.gz: 5470b0dd0c46265edfb8c3229bc2a71bb3a4b8a277d560f4747f242e2e68784416ff566ab8979adc55acf9d6a2d89d5e3b583f83f0e1e253d762339f1b5db337

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brainstem (2.3.0)
+    brainstem (2.3.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 

data/gemfiles/activerecord4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    brainstem (2.3.0)
+    brainstem (2.3.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 

data/gemfiles/activerecord5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    brainstem (2.3.0)
+    brainstem (2.3.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 

data/gemfiles/activerecord5_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    brainstem (2.3.0)
+    brainstem (2.3.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 

data/gemfiles/activerecord5_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    brainstem (2.3.0)
+    brainstem (2.3.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 

data/gemfiles/activerecord6_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    brainstem (2.3.0)
+    brainstem (2.3.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
 

data/lib/brainstem/presenter.rb

@@ -214,7 +214,7 @@ module Brainstem
         when nil
           scope
         else
-          scope.reorder(order.to_s + " " + direction)
+          scope.reorder(Arel.sql(order.to_s + " " + direction))
       end
 
       fallback_deterministic_sort = assemble_primary_key_sort(scope)

data/lib/brainstem/version.rb

@@ -1,3 +1,3 @@
 module Brainstem
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/spec/brainstem/presenter_spec.rb

@@ -1000,6 +1000,21 @@ describe Brainstem::Presenter do
           # match SQLite and MySQL quotes
           expect(sql).to match(/ORDER BY workspaces\.title asc, [`"]workspaces[`"]\.[`"]id[`"] ASC/i)
         end
+
+        context 'when sorting by associated models' do
+          let(:scope) { Workspace.where(nil).joins(:tasks) }
+          let(:order) { { 'order' => 'tasks:asc' } }
+
+          before do
+            presenter_class.sort_order :tasks, 'COALECE(tasks.name, tasks.created_at)'
+          end
+
+          it 'applies the named ordering in the given direction and adds the primary key as a fallback sort' do
+            sql = presenter.apply_ordering_to_scope(scope, order).to_sql
+            # match SQLite and MySQL quotes
+            expect(sql).to match(/ORDER BY COALECE\(tasks\.name, tasks\.created_at\) asc, [`"]workspaces[`"]\.[`"]id[`"] ASC/i)
+          end
+        end
       end
 
       context 'and is a symbol' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brainstem
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Mavenlink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -406,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord presenters with a rich request API