services 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad10bcd2778a3534fbc648b1dd2610a05037e7ce
-  data.tar.gz: 052a46223424bb49023619f47ba7a5a031ce49c4
+  metadata.gz: 174a80aa11d343dbbbf8a4e44293530534635159
+  data.tar.gz: 733e7d7374a736b8d0d0abe8b6183118015e4539
 SHA512:
-  metadata.gz: b8ef850720eee935e3009f2926437ae2639e8145cbde40498a616d3fcd813093f894b663b3c3956516f5cc183745fe578f07e1174b5bae7765aa2b0663fc052b
-  data.tar.gz: 1837efa6d130430ef7420b3cd4fdbeb0d9c6936b73840734adc242270aa9b336b4450bde0ceaf13f9c7d8af2121ecfc8e6c223ab0e302de6bdc8091636297aa1
+  metadata.gz: 371972b84cd904629577b38de062ce71734d7d22a2ace45ae844e764128eee68648703c6073bb6ec4847d42505af56b36b2dd3554274b8a75847d06ec3ec5266
+  data.tar.gz: ad3c0b04f60a7b35f84f5879db9661ee05040c0dcfc5c5cecdac6c9ad0b022f0d2782f8a739605e976ea3e74b9fe905c3b4647f21b25ec39d11e56c1b6e0a40b

data/lib/services/base.rb

@@ -25,28 +25,31 @@ module Services
 
     private
 
-    def find_object(ids_or_objects, klass = nil)
+    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
-      case ids_or_objects
-      when klass
-        return ids_or_objects
-      when Array
-        raise 'Array can only contain IDs.' if ids_or_objects.any? { |ids_or_object| !ids_or_object.is_a?(Fixnum) }
-        objects = "Services::#{klass.to_s.pluralize}::Find".constantize.call(ids_or_objects)
-        missing_ids = ids_or_objects - objects.pluck(:id)
+      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)}"
+      end
+      if ids.any?
+        find_service = "Services::#{klass.to_s.pluralize}::Find"
+        objects_from_ids = find_service.constantize.call(ids)
+        object_ids = if objects_from_ids.respond_to?(:pluck)
+          objects_from_ids.pluck(:id)
+        else
+          objects_from_ids.map(&:id)
+        end
+        missing_ids = ids - object_ids
         raise self.class::Error, "#{klass.to_s.pluralize(missing_ids)} #{missing_ids.join(', ')} not found." if missing_ids.size > 0
-        return objects
-      when Fixnum
-        object = "Services::#{klass.to_s.pluralize}::Find".constantize.call(ids_or_objects).first
-        raise self.class::Error, "#{klass} #{ids_or_objects} not found." if object.nil?
-        return object
-      else
-        raise "Unexpected ids_or_objects class: #{ids_or_objects.class}"
+        objects.concat objects_from_ids
       end
+      ids_or_objects.is_a?(Array) ? objects : objects.first
     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.2'
+  VERSION = '0.2.4'
 end

data/spec/services/base_spec.rb

@@ -1,18 +1,51 @@
 require 'spec_helper'
 
 describe Services::Base do
-  class ServiceWithError < Services::Base
-    def call
-      raise Error.new('I am a service error.')
+  describe '#find_objects' do
+    let(:objects) { (1..5).to_a.shuffle.map { |id| Model.new(id) } }
+
+    context 'when passing in objects' do
+      it 'returns the same objects' do
+        expect(Services::Models::FindObjectsTest.call(objects)).to eq(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)
+      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|
+          rand(2) == 1
+        end
+
+        objects_and_ids = objects_as_objects + objects_as_ids.map(&:id)
+        only_objects = objects_as_objects + objects_as_ids
+
+        expect(Services::Models::FindObjectsTest.call(objects_and_ids)).to eq(only_objects)
+      end
+    end
+
+    context 'when passing in a single object or ID' do
+      it 'returns a single object' do
+        object = objects.sample
+        [object.id, object].each do |id_or_object|
+          expect(Services::Models::FindObjectsTest.call(id_or_object)).to eq(object)
+        end
+      end
     end
   end
-  if ServiceWithError::Error.new.respond_to?(:cause)
+
+  if StandardError.new.respond_to?(:cause)
     context 'wrapping exceptions' do
       it 'does not wrap service errors or subclasses' do
         expect do
-          ServiceWithError.call
+          ErrorService.call
         end.to raise_error do |error|
-          expect(error).to be_a(ServiceWithError::Error)
+          expect(error).to be_a(ErrorService::Error)
           expect(error.message).to eq('I am a service error.')
           expect(error.cause).to be_nil
         end

data/spec/support/test_services.rb

@@ -1,3 +1,52 @@
+class Model
+  attr_reader :id
+
+  def initialize(id)
+    @id = id
+    ModelRepository.add self
+  end
+
+  def ==(another_model)
+    self.id == another_model.id
+  end
+end
+
+class ModelRepository
+  def self.add(model)
+    @models ||= []
+    @models << model
+  end
+
+  def self.find(id)
+    return nil unless defined?(@models)
+    @models.detect do |model|
+      model.id == id
+    end
+  end
+end
+
+module Services
+  module Models
+    class Find < Services::Base
+      def call(ids)
+        ids.map { |id| ModelRepository.find id }.compact
+      end
+    end
+
+    class FindObjectsTest < Services::Base
+      def call(ids_or_objects)
+        find_objects ids_or_objects
+      end
+    end
+  end
+end
+
+class ErrorService < Services::Base
+  def call
+    raise Error.new('I am a service error.')
+  end
+end
+
 class UniqueService < Services::Base
   def call
     check_uniqueness!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake