services 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec2c9fc6cd987c7aed6c82a1aa34e8d16f4948394f167b53209278eff78805a
-  data.tar.gz: 9f09eadc6a1b4294b846a5570491a660f1fe6cffed4b294035ec86381ea1af33
+  metadata.gz: c3085ae1c41a776a15e333d0afbf240b7509f5921f4e75ceada90e834a8c6e05
+  data.tar.gz: 1976cad3543d7f1bb9f5b40507dddde8fa3f805ae189b74a68e843cb68b6b036
 SHA512:
-  metadata.gz: 9ccb8ca1e97cc909828425802a9f1ffdba7e291aeabdba29fa5489c4803898a0147f0521b7235a82f2b23e3b139aa2eaf1170aed4ce8142f07aead9b8beb9cea
-  data.tar.gz: 26a8beb63cba18b20ccecb7894ba0f9c4a260065366d51fdad3d351436a2415734a09695b7402298f0f431976d152baf02475ad60afa1027209b9c522ca9dffe
+  metadata.gz: b633bc24e6c9ede452b76301a1f2fb8478160320fe8e982c0527ee078c8d879375e3f610b3247754853aa0c4faa9a043de865ab70b1b6cccc9eadf446fb1f5ab
+  data.tar.gz: 2bf7df9ef18291cf448a8a6af7e5e850af1027ba1cbcb223127e021e0b31e5191b988db6a882f3a9a51482adae4818b957c8352e52b07c0361ba0ff1d1940234

data/lib/services/query.rb

@@ -30,7 +30,7 @@ module Services
       object_table_id = "#{object_class.table_name}.id"
 
       special_conditions = conditions.extract!(:id_not, :order, :limit, :page, :per_page)
-      special_conditions[:order] ||= object_table_id
+      special_conditions[:order] = object_table_id unless special_conditions.has_key?(:order)
 
       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?

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '6.0.4'.freeze
+  VERSION = '6.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Manuel Meurer