services 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba562140a8277b78a80f08fc3da2ef986e9c809
-  data.tar.gz: b7dc8f429b69fcf41634603055c9424bf6533ce2
+  metadata.gz: 1400e6ff9c2b46562e08881c6d094a0bb5de1459
+  data.tar.gz: 5e7b0018546aadd2b51d8e319cc2c5a551d7c893
 SHA512:
-  metadata.gz: bc79aed015a6e7fb3170c046210ed0647d8ebc528fc9f32e436c6501e574c64c61a1ae791e9319c1577c4fedf4881a24cdfa07643d822a6316753dcaaa64fa00
-  data.tar.gz: d13742753844a6dfdf35b98324084ddf774de0561d9da7b49cef635fae36f8b010a629ed94a7ffa9df704df8cb047c9b225483025b33dc51e944c1383845d91d
+  metadata.gz: e0bd521415d59a379fb9f3dce599d18631df2e6255239d559d12b52d6e92d235bac4f10234e959257ca44ab0c235c7e4f0ffc565682555247c249167487dbffe
+  data.tar.gz: d9af93a2ce8ad3c855bde9e30b9681a2ec0a877758acf5297c0828bddf95524d7926f23a699e2179b18dfa7b2e0e55deaa25922d9c51edc652165205994f5ad9

data/lib/services/base_finder.rb

@@ -7,7 +7,7 @@ module Services
       object_table_id = "#{object_class.table_name}.id"
 
       special_conditions = conditions.extract!(:order, :limit, :page, :per_page)
-      special_conditions[:order] ||= object_table_id
+      special_conditions[:order] = object_table_id unless special_conditions.has_key?(:order)
 
       scope = object_class.public_send(Rails::VERSION::MAJOR == 3 ? :scoped : :all)
       scope = scope.where(object_table_id => ids) unless ids.empty?
@@ -20,6 +20,7 @@ module Services
       special_conditions.each do |k, v|
         case k
         when :order
+          next unless v
           order = case v
           when 'random' then 'RANDOM()'
           when /\./     then v

data/lib/services/version.rb

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

data/spec/services/modules/call_logger_spec.rb

@@ -20,7 +20,7 @@ describe Services::Base::CallLogger do
       expect(logs.last).to match(
         message: 'END',
         meta: {
-          duration: 0.0,
+          duration: a_value_within(0.1).of(0.0),
           service:  service.class.to_s,
           id:       an_instance_of(String)
         },

metadata

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