services 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1b3541d084340548b9d3779618d88edcf3c10e50ec42c92f1447aa54621a22
-  data.tar.gz: fb22582a1c74e144ace44144fb79272d68e0f9f73fadeea69f4ce2947f8bcc10
+  metadata.gz: 14581b93267e780498f4371c8b3a5810e122d1137f42bc6bed45149f2cc0881f
+  data.tar.gz: 135e7e2cfda92981d940a63fa26c68c092a3560ec5c372aa27c52403b19e0e4c
 SHA512:
-  metadata.gz: f62bef4a68d9c9be6b9b9a345f22ee95401cb27c76aaf36a3344af308fbcbc4ba850e670961e0051127624a8e5a1f35eb7d861b695d43cba8c25c284c1bff7c1
-  data.tar.gz: af9097b696e781fd46c6456a37277a5e0500b70153759faf438f66813071f550a78b615f2bb90e26fc4098dd17d62d203399e96a443ac1a038951494488221ea
+  metadata.gz: 9f172dfd9a404b678faff6a7652f78a92410f68a4bf1237defa5be719448cf5ea8e2b62efddd6dd2853955fd6fa22a08063ba0d6e19d2c1e49248948597f06fd
+  data.tar.gz: ce9a268f99827c431eab2f05cf12eb72f7d4452766500f16f8d62f274f4ee017daf40bccaa38e8ec652841dafa078a87f39b700afd84d5da4ad816ad2559da74

data/gemfiles/rails_4.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

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

data/lib/services/asyncable.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'global_id'
 
 begin
   require 'sidekiq'

data/lib/services/query.rb

@@ -14,10 +14,19 @@ module Services
       end
     end
 
-    def call(ids = [], conditions = {})
-      raise ArgumentError, 'ids parameter must not be nil.' if ids.nil?
+    def call(ids_or_conditions, _conditions = {})
+      ids, conditions = if ids_or_conditions.is_a?(Hash)
+        if _conditions.any?
+          fail ArgumentError, 'If conditions are passed as first argument, there must not be a second argument.'
+        end
+        [[], ids_or_conditions.symbolize_keys]
+      else
+        if ids_or_conditions.nil?
+          fail ArgumentError, 'IDs must not be nil.'
+        end
+        [Array(ids_or_conditions), _conditions.symbolize_keys]
+      end
 
-      ids, conditions = Array(ids), conditions.symbolize_keys
       object_table_id = "#{object_class.table_name}.id"
 
       special_conditions = conditions.extract!(:order, :limit, :page, :per_page)

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.0.1'.freeze
 end

data/services.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -24,7 +22,7 @@ Gem::Specification.new do |gem|
   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 'sidekiq',         '~> 5.0'
   gem.add_development_dependency 'redis',           '~> 3.0'
   gem.add_development_dependency 'redis-namespace', '~> 1.5'
   gem.add_development_dependency 'tries',           '~> 0.3'

data/spec/services/query_spec.rb

@@ -22,4 +22,12 @@ describe Services::Query do
       end
     end
   end
+
+  describe 'calling without IDs parameter' do
+    let(:post) { Post.create! title: 'Superpost!' }
+
+    it 'works' do
+      expect(Services::Posts::Find.call title: post.title).to eq([post])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A nifty service layer for your Rails app