services 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 198aaab5dbd57283d7ceda11637e42851b9b2d4a
-  data.tar.gz: 2041ea64c62716706eb62e61e331fa4db9afda41
+  metadata.gz: 33dadcc06c08949fdc4e4e93559ff64582eb87a4
+  data.tar.gz: 3e0c26700eb5ca56247d1c3af47d763b5f5eb69b
 SHA512:
-  metadata.gz: 38dd5e81a6465ccb59b7344fa856e97b589ffab67d2a5ad528835968af73e96b5f07712d4737580075e88b63f58d650193644d1acc160fb35ee4344f31e79d07
-  data.tar.gz: 479ffc18a349655cb744eb2d3d6210399285fcb70f11dc8c5162011536b9f5df99c400ddd2a9594125097e790a301e9ad67fdda0d0303593b19fb36095447fd4
+  metadata.gz: a48465b9e64aab633b7a302474a7b89d9ab5b49ac328c63c7d63c6b84eae3ead24a4fb0e9b36ea75879641a31ccc8ba766bad15b1ea512673096c0a6df5dde2c
+  data.tar.gz: 20f7242e49ecee857233982f512f90ea1d39831c20d29128cf42c726ec6d15287a0adc1de8f65901aa1dfb5d17a275e5e88bc53a47cad6b88022c5bc09757d53

data/.travis.yml

@@ -10,13 +10,6 @@ before_install:
   - gem update --system
   - gem update bundler
 gemfile:
-  - gemfiles/rails_4.0.gemfile
-  - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
-matrix:
-  exclude:
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_5.1.gemfile

data/Appraisals

@@ -1,11 +1,3 @@
-appraise 'rails_4.0' do
-  gem 'rails', '~> 4.0.0'
-end
-
-appraise 'rails_4.1' do
-  gem 'rails', '~> 4.1.0'
-end
-
 appraise 'rails_4.2' do
   gem 'rails', '~> 4.2.0'
 end
@@ -13,3 +5,7 @@ end
 appraise 'rails_5.0' do
   gem 'rails', '~> 5.0.0'
 end
+
+appraise 'rails_5.1' do
+  gem 'rails', '~> 5.1.0'
+end

data/README.md

@@ -21,7 +21,7 @@ For disambiguation: in this README, when you read "Services" with a uppercase "S
 
 #### Ruby >= 2.2.5
 
-#### Rails >= 4.0
+#### Rails >= 4.2
 
 #### Redis >= 3.0
 

data/gemfiles/{rails_4.0.gemfile → rails_5.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.1.0"
 
 gemspec :path => "../"

data/lib/services/query.rb

@@ -23,7 +23,7 @@ module Services
       special_conditions = conditions.extract!(:order, :limit, :page, :per_page)
       special_conditions[:order] = object_table_id unless special_conditions.has_key?(:order)
 
-      scope = conditions.delete(:scope) || object_class.public_send(ActiveRecord::VERSION::MAJOR == 3 ? :scoped : :all)
+      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?
 
       unless conditions.empty?

data/lib/services/version.rb

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

data/services.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'timecop',         '~> 0.7'
   gem.add_development_dependency 'sqlite3',         '~> 1.3'
   gem.add_development_dependency 'appraisal',       '~> 2.1'
-  gem.add_runtime_dependency     'rails',           '>= 4.0.0'
+  gem.add_runtime_dependency     'rails',           '>= 4.2'
   gem.add_runtime_dependency     'gem_config',      '~> 0.3'
 end

data/spec/services/modules/call_logger_spec.rb

@@ -13,7 +13,7 @@ describe Services::Base::CallLogger do
         meta: {
           caller:  a_string_matching(caller_regex),
           service: service.class.to_s,
-          id:      an_instance_of(String)
+          id:      a_kind_of(String)
         },
         severity: 'info'
       )
@@ -22,7 +22,7 @@ describe Services::Base::CallLogger do
         meta: {
           duration: a_value_within(0.1).of(0.0),
           service:  service.class.to_s,
-          id:       an_instance_of(String)
+          id:       a_kind_of(String)
         },
         severity: 'info'
       )

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(Integer), *fail_arg_group, 'reschedule', false)
+            expect(service_class).to receive(:call_in).with(a_kind_of(Integer), *fail_arg_group, 'reschedule', false)
             expect { service.call(*fail_arg_group, 'reschedule', false) }.to_not raise_error
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: gem_config
   requirement: !ruby/object:Gem::Requirement
@@ -193,10 +193,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - lib/services.rb
 - lib/services/asyncable.rb
 - lib/services/base.rb
@@ -247,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A nifty service layer for your Rails app

data/gemfiles/rails_4.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-
-gemspec :path => "../"