services 7.0.3 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 061cb612feb2b4f1da9bb7117fac09c029eff49c7372db3e8a8d7eacf85de384
-  data.tar.gz: 1d32e9e17ebe5c27413d1aad1ec243ecd7285e91e043969592964b7f002e1c7a
+  metadata.gz: 6fe25182ce1c9112cb5038acb3c2b2142bb62e4cc92457d4db4da8ef5b0a323a
+  data.tar.gz: 395f8a026b22de6fa716faba2e336c75542f79b23fcc0c7c7ed6f8d8926a0008
 SHA512:
-  metadata.gz: 66093db9f4b3199596f016c99a82f735e8576daeff3d6fc73dcaf4100b08fceace291e8eb9bf0c7f4a6a1f076aed62aa0bce81e31616914c1160056f6bd04af6
-  data.tar.gz: 6409121bf266995e1ad13c124f487ca5f5312dbbde47785bea5c088f6f6986a8b15ea5bffe40fa47d0bde7a12101df8387a53a4681f0d22cea48ce5a6c4d420f
+  metadata.gz: 7dd47187a80a3f174d7699160c1e4ae0606fa145bbed2b07c8c363a8b4eebde80586031ee6035ee0b9637be33af3b560a8e29d20789ab7db5338f6487c152802
+  data.tar.gz: 938b7cc0457dbed15ef374b8ba9771c6f91de395d095f8864ba7959f848731d5d60262f4c2110809eecb741eb8506afb6f7e658ba449e74b197dfd770d0062a6

data/lib/services/query.rb

@@ -2,6 +2,10 @@ module Services
   class Query
     include ObjectClass
 
+    COMMA_REGEX                = /\s*,\s*/
+    TABLE_NAME_REGEX           = /\A([A-Za-z0-9_]+)\./
+    CREATED_BEFORE_AFTER_REGEX = /\Acreated_(before|after)\z/
+
     class << self
       delegate :call, to: :new
 
@@ -33,10 +37,12 @@ module Services
         conditions[:order] = object_table_id
       end
 
-      scope = conditions.delete(:scope).try(:dup) || object_class.public_send(ActiveRecord::VERSION::MAJOR == 3 ? :scoped : :all)
-      scope = scope.where(object_table_id => ids) unless ids.empty?
+      scope = conditions.delete(:scope).try(:dup) || object_class.all
+      if ids.any?
+        scope = scope.where(object_table_id => ids)
+      end
 
-      unless conditions.empty?
+      if conditions.any?
         self.class.object_to_id_class_names.each do |class_name|
           if object_or_objects = conditions.delete(class_name)
             ids = case object_or_objects
@@ -68,32 +74,36 @@ module Services
         case k
         when :id_not
           scope = scope.where.not(id: v)
-        when /\Acreated_(before|after)\z/
+        when CREATED_BEFORE_AFTER_REGEX
           operator = $1 == 'before' ? '<' : '>'
           scope = scope.where("#{object_class.table_name}.created_at #{operator} ?", v)
         when :order
           next unless v
-          case v
-          when 'random'
-            order = 'RANDOM()'
-          when /\A([A-Za-z0-9_]+)\./
-            table_name = $1
-            unless table_name == object_class.table_name
+
+          order = v.split(COMMA_REGEX).map do |order_part|
+            table_name = order_part[TABLE_NAME_REGEX, 1]
+            case
+            when table_name && table_name != object_class.table_name
               unless reflection = object_class.reflections.values.detect { |reflection| reflection.table_name == table_name }
                 fail "Reflection on class #{object_class} with table name #{table_name} not found."
               end
-              # TODO: In Rails 5, we can use #left_outer_joins
-              # http://blog.bigbinary.com/2016/03/24/support-for-left-outer-joins-in-rails-5.html
-              join_conditions = "LEFT OUTER JOIN #{table_name} ON #{table_name}.#{reflection.foreign_key} = #{object_class.table_name}.id"
-              if reflection.type
-                join_conditions << " AND #{table_name}.#{reflection.type} = '#{object_class}'"
+
+              if ActiveRecord::VERSION::MAJOR >= 5
+                scope = scope.left_outer_joins(reflection.name)
+              else
+                join_conditions = "LEFT OUTER JOIN #{table_name} ON #{table_name}.#{reflection.foreign_key} = #{object_class.table_name}.id"
+                if reflection.type
+                  join_conditions << " AND #{table_name}.#{reflection.type} = '#{object_class}'"
+                end
+                scope = scope.joins(join_conditions)
               end
-              scope = scope.joins(join_conditions)
+
+              order = order_part
+            when !table_name
+              order = "#{object_class.table_name}.#{order_part}"
             end
-            order = v
-          else
-            order = "#{object_class.table_name}.#{v}"
-          end
+          end.join(', ')
+
           scope = scope.order(order)
         when :limit
           scope = scope.limit(v)

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '7.0.3'.freeze
+  VERSION = '7.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.1.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake