services 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174a80aa11d343dbbbf8a4e44293530534635159
-  data.tar.gz: 733e7d7374a736b8d0d0abe8b6183118015e4539
+  metadata.gz: 29308e17d5df01f543e985f8aeeb933a0e22e66f
+  data.tar.gz: 8ccb2f4ca9d250a98a9b78e87d2a5291078a1e00
 SHA512:
-  metadata.gz: 371972b84cd904629577b38de062ce71734d7d22a2ace45ae844e764128eee68648703c6073bb6ec4847d42505af56b36b2dd3554274b8a75847d06ec3ec5266
-  data.tar.gz: ad3c0b04f60a7b35f84f5879db9661ee05040c0dcfc5c5cecdac6c9ad0b022f0d2782f8a739605e976ea3e74b9fe905c3b4647f21b25ec39d11e56c1b6e0a40b
+  metadata.gz: 54d37715aaea3ffbc50852d8ceff00374d58443f3b67a93ee686ec9b88223904ee22fe49cb3ce6d2a36bdc1831f6b490c40ee542f0eca0f5b29634169a237c33
+  data.tar.gz: c324202d7c4311b6d549f1c764fe817ec1540cd0a3ab02dc9aeacc4493bf479621282aed5dfd8f447c35be7c86a27b2d324714b8a5937d85c29045a6a4a0a1ac

data/lib/services/base.rb

@@ -25,15 +25,11 @@ module Services
 
     private
 
-    def find_objects(ids_or_objects, klass = nil)
-      if klass.nil?
-        klass = self.class.to_s[/Services::([^:]+)/, 1].singularize.constantize rescue nil
-        raise "Could not determine class from #{self.class}" if klass.nil?
-      end
-      ids_or_objects_array = Array(ids_or_objects)
-      ids, objects = ids_or_objects_array.grep(Fixnum), ids_or_objects_array.grep(klass)
-      if ids.size + objects.size < ids_or_objects_array.size
-        raise "All params must be either #{klass.to_s.pluralize} or Fixnums: #{ids_or_objects_array.map(&:class)}"
+    def find_objects(ids_or_objects, klass = determine_service_class)
+      ids_or_objects = Array(ids_or_objects)
+      ids, objects = ids_or_objects.grep(Fixnum), 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(&:class)}"
       end
       if ids.any?
         find_service = "Services::#{klass.to_s.pluralize}::Find"
@@ -47,9 +43,20 @@ module Services
         raise self.class::Error, "#{klass.to_s.pluralize(missing_ids)} #{missing_ids.join(', ')} not found." if missing_ids.size > 0
         objects.concat objects_from_ids
       end
-      ids_or_objects.is_a?(Array) ? objects : objects.first
+      objects
+    end
+
+    def find_object(*args)
+      find_objects(*args).tap do |objects|
+        raise "Expected only one object but found #{objects.size}" unless objects.size == 1
+      end.first
+    end
+
+    def determine_service_class
+      self.class.to_s[/Services::([^:]+)/, 1].singularize.constantize
+    rescue
+      raise "Could not determine service class from #{self.class}"
     end
-    alias_method :find_object, :find_objects
 
     def controller
       @controller ||= begin

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/spec/services/base_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
 describe Services::Base do
-  describe '#find_objects' do
-    let(:objects) { (1..5).to_a.shuffle.map { |id| Model.new(id) } }
+  let(:model_objects) { (1..5).to_a.shuffle.map { |id| Model.new(id) } }
 
+  describe '#find_objects' do
     context 'when passing in objects' do
       it 'returns the same objects' do
-        expect(Services::Models::FindObjectsTest.call(objects)).to eq(objects)
+        expect(Services::Models::FindObjectsTest.call(model_objects)).to eq(model_objects)
       end
     end
 
     context 'when passing in IDs' do
       it 'returns the objects for the IDs' do
-        expect(Services::Models::FindObjectsTest.call(objects.map(&:id))).to eq(objects)
+        expect(Services::Models::FindObjectsTest.call(model_objects.map(&:id))).to eq(model_objects)
       end
     end
 
     context 'when passing in objects and IDs' do
       it 'returns the objects plus the objects for the IDs' do
-        objects_as_objects, objects_as_ids = objects.partition do |object|
+        objects_as_objects, objects_as_ids = model_objects.partition do |object|
           rand(2) == 1
         end
 
@@ -30,10 +30,29 @@ describe Services::Base do
     end
 
     context 'when passing in a single object or ID' do
-      it 'returns a single object' do
-        object = objects.sample
+      it 'returns an array containing the object' do
+        object = model_objects.sample
         [object.id, object].each do |id_or_object|
-          expect(Services::Models::FindObjectsTest.call(id_or_object)).to eq(object)
+          expect(Services::Models::FindObjectsTest.call(id_or_object)).to eq([object])
+        end
+      end
+    end
+  end
+
+  describe '#find_object' do
+    context 'when passing in a single object or ID' do
+      it 'returns the object' do
+        object = model_objects.sample
+        [object.id, object].each do |id_or_object|
+          expect(Services::Models::FindObjectTest.call(id_or_object)).to eq(object)
+        end
+      end
+    end
+
+    context 'when passing in something else than a single object or ID' do
+      it 'raises an error' do
+        [%w(foo bar), nil, Object.new].each do |object|
+          expect { Services::Models::FindObjectTest.call(object) }.to raise_error
         end
       end
     end

data/spec/support/test_services.rb

@@ -38,6 +38,12 @@ module Services
         find_objects ids_or_objects
       end
     end
+
+    class FindObjectTest < Services::Base
+      def call(id_or_object)
+        find_object id_or_object
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Manuel Meurer