services 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ba31679cb700fe46cd163fd984d7243e2478650cfa1bcb0c59bdf26badbf28
-  data.tar.gz: dcb3badaefe09c30cf07ac866b5c441da841f83663c408d53df0c76a9904ec79
+  metadata.gz: 0ec2c9fc6cd987c7aed6c82a1aa34e8d16f4948394f167b53209278eff78805a
+  data.tar.gz: 9f09eadc6a1b4294b846a5570491a660f1fe6cffed4b294035ec86381ea1af33
 SHA512:
-  metadata.gz: a3388b6c8219826576969e9b3165fffedf629eeb116d7ddb96da84cd1801e24c9903eb16ac8c32feb3dca638222f066e7f3d9c4b19a6e5bf8a79e325b807e93b
-  data.tar.gz: b80ae9265e8aaefc22c57bafe90c17c7923b1b9c497531832a8c46a803eeb759cfc938422b8eb14ffa543540c15705898efc3def86e65575b04d4124c7f08adc
+  metadata.gz: 9ccb8ca1e97cc909828425802a9f1ffdba7e291aeabdba29fa5489c4803898a0147f0521b7235a82f2b23e3b139aa2eaf1170aed4ce8142f07aead9b8beb9cea
+  data.tar.gz: 26a8beb63cba18b20ccecb7894ba0f9c4a260065366d51fdad3d351436a2415734a09695b7402298f0f431976d152baf02475ad60afa1027209b9c522ca9dffe

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 unless special_conditions.has_key?(:order)
+      special_conditions[:order] ||= object_table_id
 
       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?
@@ -64,10 +64,26 @@ module Services
           scope = scope.where.not(id: v)
         when :order
           next unless v
-          order = case v
-          when 'random' then 'RANDOM()'
-          when /\./     then v
-          else               "#{object_class.table_name}.#{v}"
+          case v
+          when 'random'
+            order = 'RANDOM()'
+          when /\A([A-Za-z0-9_]+)\./
+            table_name = $1
+            unless 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}'"
+              end
+              scope = scope.joins(join_conditions)
+            end
+            order = v
+          else
+            order = "#{object_class.table_name}.#{v}"
           end
           scope = scope.order(order)
         when :limit

data/lib/services/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A nifty service layer for your Rails app