services 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3957769bb927ced167265444d98a3a10992e8eb6
-  data.tar.gz: 230cfe057c104954db348751127dea932c661b69
+  metadata.gz: 97b67785d62fb93ba36e511d6e6a2a7f1f949468
+  data.tar.gz: 95180d3cc52cdb8e86a12f8937b46967739adb1b
 SHA512:
-  metadata.gz: 8f0643545a27ab417933795342a71e898778bf752477ab889ac4b63ab22962dc0f4297a2a779673ff5a264b7495c9a6c1fcf530241eadf1635be6928d3d473e7
-  data.tar.gz: d76942f091238687ae52cb3fbeffe1f6d61f3d93c3d3e926f3eb092936937ef5f4da5fcb58bcdff8868d4c89dbcf1b1220f3cd995e9df08d872aac081d2fb3af
+  metadata.gz: 3610f3f8aa0b79110ea17583191f4f5dec5a976eb8b9a6fc632bf614aa5a96d0b38508ecb80e1c6f4f35a7b65198c6c341634c171f53f732fce6278b38505580
+  data.tar.gz: d43bca63c94f9ef81c24752720c5e5d3d08c352c35c5c2905090a956882b20ffb0427908aa1bdc863ad5f4ddee7b476c2909ba1b57eef88fd731471fab363445

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.0
+
+* Add `find_ids` and `find_id` helpers to base service
+
 ## 2.0.2
 
 * Make BaseFinder smarter, don't create SQL subquery if not necessary

data/lib/services/base.rb

@@ -25,12 +25,23 @@ module Services
 
     private
 
-    def find_objects(ids_or_objects, klass = object_class)
+    def _split_ids_and_objects(ids_or_objects, klass)
       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 { |id_or_object| [id_or_object.class, id_or_object.inspect].join(' - ')}}"
       end
+      [ids, objects]
+    end
+
+    def find_ids(ids_or_objects, klass = object_class)
+      ids, objects = _split_ids_and_objects(ids_or_objects, klass)
+      ids.concat objects.map(&:id) if objects.any?
+      ids
+    end
+
+    def find_objects(ids_or_objects, klass = object_class)
+      ids, objects = _split_ids_and_objects(ids_or_objects, klass)
       if ids.any?
         find_service = "Services::#{klass.to_s.pluralize}::Find"
         objects_from_ids = find_service.constantize.call(ids)
@@ -46,10 +57,12 @@ module Services
       objects
     end
 
-    def find_object(*args)
-      find_objects(*args).tap do |objects|
-        raise "Expected exactly one object but found #{objects.size}" unless objects.size == 1
-      end.first
+    %i(object id).each do |type|
+      define_method "find_#{type}" do |*args|
+        send("find_#{type.to_s.pluralize}", *args).tap do |objects_or_ids|
+          raise "Expected exactly one object or ID but found #{objects_or_ids.size}." unless objects_or_ids.size == 1
+        end.first
+      end
     end
 
     def object_class

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/spec/services/base_finder_spec.rb

@@ -6,6 +6,7 @@ describe Services::BaseFinder do
   let(:base_find) { Services::Models::BaseFind }
 
   it 'has call logging disabled by default' do
+    pending 'Rails has to be loaded to call BaseFinder'
     expect(base_find.call_logging_disabled).to eq(true)
     expect { base_find.call }.to_not change { logs }
   end

data/spec/services/base_spec.rb

@@ -1,39 +1,33 @@
 require 'spec_helper'
 
 describe Services::Base do
-  let(:model_objects) { (1..5).to_a.shuffle.map { |id| Model.new(id) } }
+  let(:model_ids)             { (1..5).to_a.shuffle }
+  let(:model_objects)         { model_ids.map { |id| Model.new(id) } }
+  let(:model_ids_and_objects) { model_ids[0..2] + model_objects[3..-1] }
 
   describe '#find_objects' do
     context 'when passing in objects' do
       it 'returns the same objects' do
-        expect(Services::Models::FindObjectsTest.call(model_objects)).to eq(model_objects)
+        expect(Services::Models::FindObjectsTest.call(model_objects)).to match_array(model_objects)
       end
     end
 
     context 'when passing in IDs' do
       it 'returns the objects for the IDs' do
-        expect(Services::Models::FindObjectsTest.call(model_objects.map(&:id))).to eq(model_objects)
+        expect(Services::Models::FindObjectsTest.call(model_ids)).to match_array(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 = model_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)
+        expect(Services::Models::FindObjectsTest.call(model_ids_and_objects)).to match_array(model_objects)
       end
     end
 
     context 'when passing in a single object or ID' do
       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])
+        [model_ids.first, model_objects.first].each do |id_or_object|
+          expect(Services::Models::FindObjectsTest.call(id_or_object)).to match_array([model_objects.first])
         end
       end
     end
@@ -42,9 +36,8 @@ describe Services::Base do
   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)
+        [model_ids.first, model_objects.first].each do |id_or_object|
+          expect(Services::Models::FindObjectTest.call(id_or_object)).to eq(model_objects.first)
         end
       end
     end
@@ -57,4 +50,50 @@ describe Services::Base do
       end
     end
   end
+
+  describe '#find_ids' do
+    context 'when passing in objects' do
+      it 'returns the IDs for the objects' do
+        expect(Services::Models::FindIdsTest.call(model_objects)).to match_array(model_ids)
+      end
+    end
+
+    context 'when passing in IDs' do
+      it 'returns the same IDs' do
+        expect(Services::Models::FindIdsTest.call(model_ids)).to match_array(model_ids)
+      end
+    end
+
+    context 'when passing in objects and IDs' do
+      it 'returns the IDs for the objects plus the passed in IDs' do
+        expect(Services::Models::FindIdsTest.call(model_ids_and_objects)).to match_array(model_ids)
+      end
+    end
+
+    context 'when passing in a single object or ID' do
+      it 'returns an array containing the ID' do
+        [model_ids.first, model_objects.first].each do |id_or_object|
+          expect(Services::Models::FindIdsTest.call(id_or_object)).to match_array([model_ids.first])
+        end
+      end
+    end
+  end
+
+  describe '#find_id' do
+    context 'when passing in a single object or ID' do
+      it 'returns the ID' do
+        [model_ids.first, model_objects.first].each do |id_or_object|
+          expect(Services::Models::FindIdTest.call(id_or_object)).to eq(model_ids.first)
+        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::FindIdTest.call(object) }.to raise_error
+        end
+      end
+    end
+  end
 end

data/spec/support/test_services.rb

@@ -67,6 +67,18 @@ module Services
         find_object id_or_object
       end
     end
+
+    class FindIdsTest < Services::Base
+      def call(ids_or_objects)
+        find_ids ids_or_objects
+      end
+    end
+
+    class FindIdTest < Services::Base
+      def call(id_or_object)
+        find_id id_or_object
+      end
+    end
   end
 end
 

metadata

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