services 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3f42f5b3d4869497acf2e3405f0f278b25582d
-  data.tar.gz: 8c4d047373b919125c3117da284fd345f7a81816
+  metadata.gz: bba562140a8277b78a80f08fc3da2ef986e9c809
+  data.tar.gz: b7dc8f429b69fcf41634603055c9424bf6533ce2
 SHA512:
-  metadata.gz: 3c776d68b4a336b6a7a04a0003137a176447d1a13a0061c25d3e78806b2243ee81c1cec2a46951be2713acabef16d734681a911cb81eb2ca4a2667b5ea1ae4df
-  data.tar.gz: 933e0c58c79076b20ab1448b7c6105154703b5aea272ef590d17002d4b092fea4cc5149fd385d1b8d1d6c1af7114fa6446501ef104ac141ec09ed58a4e95a4db
+  metadata.gz: bc79aed015a6e7fb3170c046210ed0647d8ebc528fc9f32e436c6501e574c64c61a1ae791e9319c1577c4fedf4881a24cdfa07643d822a6316753dcaaa64fa00
+  data.tar.gz: d13742753844a6dfdf35b98324084ddf774de0561d9da7b49cef635fae36f8b010a629ed94a7ffa9df704df8cb047c9b225483025b33dc51e944c1383845d91d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.4
+
+* Increase TTL for Redis keys for uniqueness and error count to one day
+* Fix ordering in `BaseFinder`
+
 ## 2.2.3
 
 * Add `on_error` option `return` to uniqueness checker

data/lib/services/base_finder.rb

@@ -4,28 +4,26 @@ module Services
 
     def call(ids = [], conditions = {})
       ids, conditions = Array(ids), conditions.symbolize_keys
-      special_conditions = conditions.extract!(:order, :limit, :page, :per_page)
-
       object_table_id = "#{object_class.table_name}.id"
 
+      special_conditions = conditions.extract!(:order, :limit, :page, :per_page)
+      special_conditions[:order] ||= object_table_id
+
       scope = object_class.public_send(Rails::VERSION::MAJOR == 3 ? :scoped : :all)
       scope = scope.where(object_table_id => ids) unless ids.empty?
 
       unless conditions.empty?
-        scope = scope
-          .select("DISTINCT #{object_table_id}")
-          .order(object_table_id)
         scope = process(scope, conditions)
-        scope = object_class.where(id: scope)
+        scope = object_class.where(id: scope.select("DISTINCT #{object_table_id}"))
       end
 
       special_conditions.each do |k, v|
         case k
         when :order
-          order = if v == 'random'
-            'RANDOM()'
-          else
-            "#{object_class.table_name}.#{v}"
+          order = case v
+          when 'random' then 'RANDOM()'
+          when /\./     then v
+          else               "#{object_class.table_name}.#{v}"
           end
           scope = scope.order(order)
         when :limit

data/lib/services/modules/uniqueness_checker.rb

@@ -14,7 +14,7 @@ module Services
       )
 
       MAX_RETRIES = 10
-      ONE_HOUR = 60 * 60
+      ONE_DAY     = 60 * 60 * 24
 
       def self.prepended(mod)
         mod.const_set :NotUniqueError, Class.new(mod::Error)
@@ -37,7 +37,7 @@ module Services
         else
           @_uniqueness_keys ||= []
           @_uniqueness_keys << new_uniqueness_key
-          Services.configuration.redis.setex new_uniqueness_key, ONE_HOUR, @id
+          Services.configuration.redis.setex new_uniqueness_key, ONE_DAY, @id
           true
         end
       end
@@ -62,7 +62,7 @@ module Services
           raise "Unexpected on_error: #{@_on_error}"
         end
       ensure
-        Services.configuration.redis.del @_uniqueness_keys unless @_uniqueness_keys.nil? || @_uniqueness_keys.empty?
+        Services.configuration.redis.del @_uniqueness_keys unless Array(@_uniqueness_keys).empty?
         Services.configuration.redis.del error_count_key
       end
 
@@ -103,7 +103,7 @@ module Services
       end
 
       def increase_error_count
-        Services.configuration.redis.setex error_count_key, retry_delay + ONE_HOUR, error_count + 1
+        Services.configuration.redis.setex error_count_key, retry_delay + ONE_DAY, error_count + 1
       end
 
       def uniqueness_key(args)

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake