services 7.1.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbc8ee7823c6de0d29bccc1fe0e99019253ced65da5a26fdc2c6204c5d003c47
-  data.tar.gz: 6c03b5b5a530568641be0b04354250cc7e54ba8dd57234d96c8a357808e256db
+  metadata.gz: 7aedebb8369e465e6bc0dbde201a6f2e353ef4fb50b9c7e1568914a6aa5c6bdd
+  data.tar.gz: b9fcc3a9b6a1d38de2257bdab6145c68db707e0665d5538430e3db2ac46bef2e
 SHA512:
-  metadata.gz: 3ab77b16e9de075c8aace8df5006a3e6a6a9a8af7828c43468f8abea3f178473c14931d8b1e49ac1f47ff930c770cc7993d141f7727888f42944f97f50a5be94
-  data.tar.gz: bf509b8cb3a1d6825b38fedcb83d202f5f3a82ea5396e1b12f8e8c472eb713ef5eb89379a04f2a95023c3006c876ecfadb000299f765adf1a142c7a83aa302a1
+  metadata.gz: '08637ac5fe53454bd404fd069f00179a010cfb0f32295948b403796b7d24ec106b9485a732f2c37d05e9983bc8188ae5e76152c871c77a9fa1f6008ae3e4dfbb'
+  data.tar.gz: f494e1694f08b16debb2d21d6d82a2473b46822e5ca433d64e5c74b28d85b074937bd94b440c277593253bd5e67b2c1a2b2aaf0058d1155b92ba7880dbf4e772

data/lib/services.rb

@@ -11,11 +11,16 @@ module Services
   with_configuration do
     has :logger, default: Services::Logger::Null.new
     has :redis
+    has :allowed_class_methods_in_queries, default: {}
   end
 
   def self.redis
     @redis ||= self.configuration.redis || (defined?(Redis.current) && Redis.current) or fail RedisNotFound, 'Redis not configured.'
   end
+
+  def self.allow_class_method_in_queries(klass, method)
+    (configuration.allowed_class_methods_in_queries[klass.to_s] ||= Set.new) << method.to_sym
+  end
 end
 
 require_relative 'services/version'

data/lib/services/query.rb

@@ -71,47 +71,64 @@ module Services
       end
 
       conditions.each do |k, v|
-        case k
-        when :id_not
-          scope = scope.where.not(id: v)
-        when CREATED_BEFORE_AFTER_REGEX
-          operator = $1 == 'before' ? '<' : '>'
-          scope = scope.where("#{object_class.table_name}.created_at #{operator} ?", v)
-        when :order
-          next unless v
-
-          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
+        if (Services.configuration.allowed_class_methods_in_queries[object_class.to_s] || []).include?(k)
+          case object_class.method(k).arity
+          when 0
+            unless v == true
+              raise ArgumentError, "Method #{k} of class #{self} takes no arguments, so `true` must be passed as the value for this param, not #{v} (#{v.class})."
+            end
+            scope = scope.public_send(k)
+          when 1, -1
+            scope = scope.public_send(k, v)
+          else
+            unless v.is_a?(Array)
+              raise ArgumentError, "Method #{k} of class #{self} takes more than one argument, so an array must be passed as the value for this param, not #{v} (#{v.class})."
+            end
+            scope = scope.public_send(k, *v)
+          end
+        else
+          case k
+          when :id_not
+            scope = scope.where.not(id: v)
+          when CREATED_BEFORE_AFTER_REGEX
+            operator = $1 == 'before' ? '<' : '>'
+            scope = scope.where("#{object_class.table_name}.created_at #{operator} ?", v)
+          when :order
+            next unless v
+
+            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
 
-              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}'"
+                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)
+              when !table_name
+                order_part.prepend "#{object_class.table_name}."
               end
-            when !table_name
-              order_part.prepend "#{object_class.table_name}."
-            end
-            order_part
-          end.join(', ')
-
-          scope = scope.order(order)
-        when :limit
-          scope = scope.limit(v)
-        when :page
-          scope = scope.page(v)
-        when :per_page
-          scope = scope.per(v)
-        else
-          raise ArgumentError, "Unexpected condition: #{k}"
+              order_part
+            end.join(', ')
+
+            scope = scope.order(order)
+          when :limit
+            scope = scope.limit(v)
+          when :page
+            scope = scope.page(v)
+          when :per_page
+            scope = scope.per(v)
+          else
+            raise ArgumentError, "Unexpected condition: #{k}"
+          end
         end
       end
 

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '7.1.2'.freeze
+  VERSION = '7.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake