dorsale 3.12.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2929616b8560e74343ed527fd6ede62bc2ee0bfa66e7629390ef8c0963bfd27f
-  data.tar.gz: b3d12ad8b3c19316706583baebe2790b8f26e94e263806781fe6622beb1947fc
+  metadata.gz: 6523b32ed6ded0a2c2973f262d1c4c653e5686b4e46092598b28f7361ac59490
+  data.tar.gz: 2041d1694e962515f16ba41179fa7feb7059f4afae4c68064cecb0a24c85f9fc
 SHA512:
-  metadata.gz: 3817c01b04ff4a47bb5a87f0a9073314a4a1ceae7c55018ddddeb1ed1c692e8d4ab647f1931876bf657d20355557174a2cec19aaa9d99f6a1fd0c6ee2990a888
-  data.tar.gz: 8621383721811a53a903e7c214163ef12ae2919fbec6c05304b1e0af5a1d0a7ddd4d32f9b0c36b5fe922f66ef3c48ed83e500e8e5db76c351ca4fcf6b6bfd9f0
+  metadata.gz: c87828175a390e626c9d924b5f03f08ffd2c7499c15325469200674c632d5b2f5a12c53f54aef24007418b08e27ce8f9cd167bdd92314baa751d6342b32e46cd
+  data.tar.gz: '09140a1d504656c7c02086c420ed0a1805a4f52f9b3176f7cbb48c141ac71121df2eb785f4e398e0b1e0294b45cddf9f6f9bc9c4eacfd96efe1370dfd9cdd7f1'

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next version
 
+## 3.13.0
+- Rails 5.2 compatible
+
 ## 3.12.0
 - Change attachment observers
 

data/app/models/dorsale/application_record.rb

@@ -5,10 +5,7 @@ class Dorsale::ApplicationRecord < ActiveRecord::Base
   include Agilibox::ModelToS
   include Agilibox::ModelI18n
   include Agilibox::PolymorphicId
+  include Agilibox::TimestampHelpers
 
   nilify_blanks before: :validation
-
-  def self.last_created
-    reorder(:created_at, :id).last
-  end
 end

data/app/models/dorsale/customer_vault/person.rb

@@ -37,13 +37,15 @@ class Dorsale::CustomerVault::Person < ::Dorsale::ApplicationRecord
   }
 
   scope :order_by_name, -> {
-    order %(
+    sql = %(
       LOWER(
         COALESCE(corporation_name, '') ||
         COALESCE(last_name, '') ||
         COALESCE(first_name, '')
       ) ASC
     )
+
+    order(Arel.sql sql)
   }
 
   scope :having_email, -> (email) { where("email = :e OR :e = ANY (secondary_emails)", e: email) }

data/app/sorters/dorsale/alexandrie/attachments_sorter.rb

@@ -4,11 +4,11 @@ class Dorsale::Alexandrie::AttachmentsSorter < Agilibox::Sorter
     when :created_at, :updated_at
       {column => direction}
     when :name
-      %(LOWER(#{model.table_name}.#{column}) #{direction})
+      Arel.sql %(LOWER(#{model.table_name}.#{column}) #{direction})
     when :attachment_type_name
       @collection = @collection.joins(:attachment_type)
       table = Dorsale::Alexandrie::AttachmentType.table_name
-      %(LOWER(#{table}.name) #{direction})
+      Arel.sql %(LOWER(#{table}.name) #{direction})
     else
       {created_at: :desc, id: :desc}
     end

data/app/sorters/dorsale/flyboy/tasks_sorter.rb

@@ -1,10 +1,10 @@
 class Dorsale::Flyboy::TasksSorter < Agilibox::Sorter
   def sort
     case column
-    when :name, :status
-      %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
-    when :progress, :term
-      %(dorsale_flyboy_tasks.#{column} #{direction})
+    when :name
+      Arel.sql %(LOWER(dorsale_flyboy_tasks.#{column}) #{direction})
+    when :progress, :term, :status
+      {column => direction}
     when :taskable
       if direction == :asc
         proc { |a, b| a.taskable.to_s.downcase <=> b.taskable.to_s.downcase }
@@ -12,7 +12,7 @@ class Dorsale::Flyboy::TasksSorter < Agilibox::Sorter
         proc { |a, b| b.taskable.to_s.downcase <=> a.taskable.to_s.downcase }
       end
     when :tags
-      %(
+      Arel.sql %(
         (
           SELECT STRING_AGG(n, ' ' ORDER BY n)
           FROM (

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.12.0"
+  VERSION = "3.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement