services 6.0.5 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3085ae1c41a776a15e333d0afbf240b7509f5921f4e75ceada90e834a8c6e05
-  data.tar.gz: 1976cad3543d7f1bb9f5b40507dddde8fa3f805ae189b74a68e843cb68b6b036
+  metadata.gz: dff8b6c800a3b2ddd63f70e6f532f67bc96b6ad84433f82dddc38af9e3d5c8ca
+  data.tar.gz: d55ac6170d97a46766ca49184469496f8e50e3c79f651cb35becf33ca312dfc7
 SHA512:
-  metadata.gz: b633bc24e6c9ede452b76301a1f2fb8478160320fe8e982c0527ee078c8d879375e3f610b3247754853aa0c4faa9a043de865ab70b1b6cccc9eadf446fb1f5ab
-  data.tar.gz: 2bf7df9ef18291cf448a8a6af7e5e850af1027ba1cbcb223127e021e0b31e5191b988db6a882f3a9a51482adae4818b957c8352e52b07c0361ba0ff1d1940234
+  metadata.gz: 30794a6468fb2d966a73690336230fb49f5ce33ef42cc70c18a04e30dddd8efc71c85d9eb07a0f52775c04baa6f2c5216bc290b7fa03d0373748e5549560aad6
+  data.tar.gz: d61ca8f78c4d902bbb5b0ee7f697a3236e4526f6fc9b249fb24c1abf7bb052e429c59cf7f981f5c66509bcfba8d9501555226cb1652438b898513ae0fbd1db6b

data/lib/services/query.rb

@@ -29,8 +29,9 @@ 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)
+      unless conditions.key?(:order)
+        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?
@@ -50,18 +51,26 @@ module Services
           end
         end
 
-        scope = process(scope, conditions)
+        conditions.each do |k, v|
+          if new_scope = process(scope, k, v)
+            conditions.delete k
+            scope = new_scope
+          end
+        end
 
-        # If a JOIN is involved, use a subquery to make sure we're getting DISTINCT records.
+        # If a JOIN is involved, use a subquery to make sure we get DISTINCT records.
         if scope.to_sql =~ / join /i
           scope = object_class.where(id: scope.select("DISTINCT #{object_table_id}"))
         end
       end
 
-      special_conditions.each do |k, v|
+      conditions.each do |k, v|
         case k
         when :id_not
           scope = scope.where.not(id: v)
+        when /\Acreated_(before|after)\z/
+          operator = $1 == 'before' ? '<' : '>'
+          scope = scope.where("created_at #{operator} ?", v)
         when :order
           next unless v
           case v
@@ -93,7 +102,7 @@ module Services
         when :per_page
           scope = scope.per(v)
         else
-          raise ArgumentError, "Unexpected special condition: #{k}"
+          raise ArgumentError, "Unexpected condition: #{k}"
         end
       end
 

data/lib/services/version.rb

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

data/spec/services/logger/redis_spec.rb

@@ -45,7 +45,7 @@ describe Services::Logger::Redis do
       %i(message severity).each do |k|
         log[k] = log[k].try(:to_s) || ''
       end
-      log[:meta] = if log.has_key?(:meta)
+      log[:meta] = if log.key?(:meta)
         log[:meta].stringify_keys
       else
         {}
@@ -59,7 +59,7 @@ describe Services::Logger::Redis do
       Timecop.freeze log[:time] do
         args = [log[:message]]
         args.push log[:meta] || {}
-        args.push log[:severity] if log.has_key?(:severity)
+        args.push log[:severity] if log.key?(:severity)
         logger.log *args
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 7.0.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-10 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake