services 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a54c2710e578f7af30ef239cd96b7f837630a02
-  data.tar.gz: a33159048724d2925ca48fb06acd92a67402833e
+  metadata.gz: dad7bfee465c7ed9ad1586772701aca8adff2912
+  data.tar.gz: 42588b8e641640855dfbc60c291dd0fc0110025d
 SHA512:
-  metadata.gz: 3c117a3e88a73ef1f712407d5fab186500759ec62f66f5617685dbeebed75b2a3a58adf0fd2f225b8b2dcfd6015864d0fe70e8729932abebddd07c93f65a2144
-  data.tar.gz: 8c661d04be05bf37b2916f79033b16f2a5208fb99978a03e31b05c5eddf3f2d39825fd946b95bef7e304b9799c7c6cf48c08cbf192b27e27051fc099119ff7ff
+  metadata.gz: 6daa4d30dc27c1f3338e5426b149c22aa5add6b00f095a0f30d248f9e01973cbbba184974cbb7a386cba810bdd81e60210e357229d8a4c28f16f2b339fb3e596
+  data.tar.gz: 40f96c5d9c5ad7b592e23493f284631acb6e19f8912241bc0ea75060054971a91d96694bd2a80cd61042a0c923ded09865ed039893741bbd02401892bde099d7

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.2.5
   - 2.3.1
+  - 2.4.0
 services:
   - redis-server
 before_install:

data/README.md

@@ -19,11 +19,11 @@ For disambiguation: in this README, when you read "Services" with a uppercase "S
 
 ### Requirements
 
-#### Ruby >= 2.2.3
+#### Ruby >= 2.2.5
 
 #### Rails >= 4.0
 
-#### Redis >= 2.8
+#### Redis >= 3.0
 
 Redis is used at several points, e.g. to store information about the currently running services, so you can enforce uniqueness for specific services, i.e. make sure no more than one instance of such a service is executed simultaneously.
 

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 = object_class.public_send(ActiveRecord::VERSION::MAJOR == 3 ? :scoped : :all)
+      scope = conditions.delete(:scope) || 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.0.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/services.gemspec

@@ -15,21 +15,22 @@ Gem::Specification.new do |gem|
   gem.description           = 'A nifty service layer for your Rails app'
   gem.homepage              = 'http://krautcomputing.github.io/services'
   gem.license               = 'MIT'
-  gem.required_ruby_version = '~> 2.0'
+  gem.required_ruby_version = '>= 2.2.5'
   gem.files                 = `git ls-files`.split($/)
   gem.executables           = gem.files.grep(%r(^bin/)).map { |f| File.basename(f) }
   gem.test_files            = gem.files.grep(%r(^(test|spec|features)/))
   gem.require_paths         = ['lib']
 
-  gem.add_development_dependency 'rake',        '>= 0.9.0'
-  gem.add_development_dependency 'guard-rspec', '~> 4.2'
-  gem.add_development_dependency 'rspec',       '~> 3.0'
-  gem.add_development_dependency 'sidekiq',     '~> 3.0'
-  gem.add_development_dependency 'redis',       '~> 3.0'
-  gem.add_development_dependency 'tries',       '~> 0.3'
-  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     'gem_config',  '~> 0.3'
+  gem.add_development_dependency 'rake',            '>= 0.9.0'
+  gem.add_development_dependency 'guard-rspec',     '~> 4.2'
+  gem.add_development_dependency 'rspec',           '~> 3.0'
+  gem.add_development_dependency 'sidekiq',         '~> 4.0'
+  gem.add_development_dependency 'redis',           '~> 3.0'
+  gem.add_development_dependency 'redis-namespace', '~> 1.5'
+  gem.add_development_dependency 'tries',           '~> 0.3'
+  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     'gem_config',      '~> 0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: tries
   requirement: !ruby/object:Gem::Requirement
@@ -223,9 +237,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="