services 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad7bfee465c7ed9ad1586772701aca8adff2912
-  data.tar.gz: 42588b8e641640855dfbc60c291dd0fc0110025d
+  metadata.gz: 198aaab5dbd57283d7ceda11637e42851b9b2d4a
+  data.tar.gz: 2041ea64c62716706eb62e61e331fa4db9afda41
 SHA512:
-  metadata.gz: 6daa4d30dc27c1f3338e5426b149c22aa5add6b00f095a0f30d248f9e01973cbbba184974cbb7a386cba810bdd81e60210e357229d8a4c28f16f2b339fb3e596
-  data.tar.gz: 40f96c5d9c5ad7b592e23493f284631acb6e19f8912241bc0ea75060054971a91d96694bd2a80cd61042a0c923ded09865ed039893741bbd02401892bde099d7
+  metadata.gz: 38dd5e81a6465ccb59b7344fa856e97b589ffab67d2a5ad528835968af73e96b5f07712d4737580075e88b63f58d650193644d1acc160fb35ee4344f31e79d07
+  data.tar.gz: 479ffc18a349655cb744eb2d3d6210399285fcb70f11dc8c5162011536b9f5df99c400ddd2a9594125097e790a301e9ad67fdda0d0303593b19fb36095447fd4

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 services:
   - redis-server
 before_install:
@@ -13,4 +14,9 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
-sudo: false
+matrix:
+  exclude:
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.1.gemfile

data/lib/services/base.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'securerandom'
 require 'action_dispatch'
 require 'digest'
@@ -33,9 +34,9 @@ module Services
 
     def _split_ids_and_objects(ids_or_objects, klass)
       ids_or_objects = Array(ids_or_objects)
-      ids, objects = ids_or_objects.grep(Fixnum), ids_or_objects.grep(klass)
+      ids, objects = ids_or_objects.grep(Integer), ids_or_objects.grep(klass)
       if ids.size + objects.size < ids_or_objects.size
-        raise "All params must be either #{klass.to_s.pluralize} or Fixnums: #{ids_or_objects.map { |id_or_object| [id_or_object.class, id_or_object.inspect].join(' - ')}}"
+        raise "All params must be either #{klass.to_s.pluralize} or Integers: #{ids_or_objects.map { |id_or_object| [id_or_object.class, id_or_object.inspect].join(' - ')}}"
       end
       [ids, objects]
     end

data/lib/services/modules/uniqueness_checker.rb

@@ -80,7 +80,7 @@ module Services
           arg.map do |array_arg|
             convert_for_rescheduling array_arg
           end
-        when Fixnum, String, TrueClass, FalseClass, NilClass
+        when Integer, String, TrueClass, FalseClass, NilClass
           arg
         when object_class
           arg.id

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '5.1.0'.freeze
+  VERSION = '5.1.1'.freeze
 end

data/spec/services/modules/uniqueness_checker_spec.rb

@@ -57,7 +57,7 @@ shared_examples 'checking the uniqueness properly' do
           fail_args.each do |fail_arg_group|
             service = service_class.new
             expect(service).to_not receive(:do_work)
-            expect(service_class).to receive(:call_in).with(an_instance_of(Fixnum), *fail_arg_group, 'reschedule', false)
+            expect(service_class).to receive(:call_in).with(an_instance_of(Integer), *fail_arg_group, 'reschedule', false)
             expect { service.call(*fail_arg_group, 'reschedule', false) }.to_not raise_error
           end
         end

data/spec/support/helpers.rb

@@ -3,7 +3,7 @@ require 'sidekiq/api'
 ExpectedDataNotFoundError = Class.new(StandardError)
 
 def wait_for(&block)
-  50.tries on: ExpectedDataNotFoundError, delay: 0.1 do
+  60.tries on: ExpectedDataNotFoundError, delay: 0.1 do
     block.call or raise ExpectedDataNotFoundError
   end
 end

data/spec/support/test_services.rb

@@ -116,7 +116,9 @@ class UniqueService < Services::Base
   def call(on_error, sleep)
     check_uniqueness on_error: on_error
     do_work
-    sleep 0.5 if sleep
+    # Sleep 6 seconds, this needs to be at least the time
+    # between Sidekiq's "heartbeats", which occur every 5 seconds.
+    sleep 6 if sleep
   end
   def do_work; end
 end
@@ -125,7 +127,9 @@ class UniqueWithCustomArgsService < Services::Base
   def call(uniqueness_arg1, uniqueness_arg2, ignore_arg, on_error, sleep)
     check_uniqueness uniqueness_arg1, uniqueness_arg2, on_error: on_error
     do_work
-    sleep 0.5 if sleep
+    # Sleep 6 seconds, this needs to be at least the time
+    # between Sidekiq's "heartbeats", which occur every 5 seconds.
+    sleep 6 if sleep
   end
   def do_work; end
 end
@@ -136,7 +140,9 @@ class UniqueMultipleService < Services::Base
       check_uniqueness arg, on_error: on_error
     end
     do_work
-    sleep 0.5 if sleep
+    # Sleep 6 seconds, this needs to be at least the time
+    # between Sidekiq's "heartbeats", which occur every 5 seconds.
+    sleep 6 if sleep
   end
   def do_work; end
 end
@@ -144,7 +150,9 @@ end
 class NonUniqueService < Services::Base
   def call(on_error, sleep)
     do_work
-    sleep 0.5 if sleep
+    # Sleep 6 seconds, this needs to be at least the time
+    # between Sidekiq's "heartbeats", which occur every 5 seconds.
+    sleep 6 if sleep
   end
   def do_work; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A nifty service layer for your Rails app
@@ -268,4 +268,3 @@ test_files:
 - spec/support/redis-server
 - spec/support/shared.rb
 - spec/support/test_services.rb
-has_rdoc: