aptible-resource 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1078563399bcc7f0a38c4e7d50484ff651d9eb3
-  data.tar.gz: 215a2cc8a937f9374e2cf47fd3cb3afb61a63935
+  metadata.gz: ee0f90532f2a22b297d63c81281cc0640ea3d3ec
+  data.tar.gz: f65e4bb4d3d6d72b01c326ed21a170f359189281
 SHA512:
-  metadata.gz: 15d3b191e78476558901b7ef51cf0e81b7478b320da2c0c622c8d52e8373a995c2cc73605ca79ca0efbb258ea1e62789e98e8c437f059b885a978be7c71780ab
-  data.tar.gz: 0fdbf8f5e075619dfe9468b205ded4bcb7865eb9e3ef61aff69fb49b84e695a6c11d37f7c201d4c28cef8035f43ed228d5d122aef9c7ecf9393a97ccd0a0d417
+  metadata.gz: 90c8d6bbb0c37f2167a84cb14c2580232fa165ec5cb032bcddb9a5af261cd558aba7a31d4f6b43285df2c7d712d4f1659fd455df54d45151feca933ec1b04c53
+  data.tar.gz: 4b0132d4eb1e9b9d80a6c747725895c5de39351bafe23cd7f34a5543ff64afd2749ec800b3f1b782c524048e3f249125e2247181b728d74da5d059516c21451b

data/lib/aptible/resource/base.rb

@@ -37,7 +37,8 @@ module Aptible
       end
 
       def self.each_page(options = {})
-        return unless block_given?
+        return enum_for(:each_page, options) unless block_given?
+
         href = options[:href] || collection_href
         while href
           # TODO: Breaking here is consistent with the existing behavior of
@@ -101,7 +102,7 @@ module Aptible
       # rubocop:enable PredicateName
 
       def self.embeds_many(relation)
-        define_embeds_many_getter(relation)
+        define_embeds_many_getters(relation)
         define_has_many_setter(relation)
       end
 
@@ -147,11 +148,16 @@ module Aptible
           end
         end
 
-        define_method "each_#{relation.to_s.singularize}" do |&block|
-          return if block.nil?
-          self.class.each_page(href: links[relation].base_href,
-                               token: token,
-                               headers: headers) do |page|
+        iterator_method = "each_#{relation.to_s.singularize}".to_sym
+
+        define_method iterator_method do |&block|
+          next enum_for(iterator_method) if block.nil?
+
+          self.class.each_page(
+            href: links[relation].base_href,
+            token: token,
+            headers: headers
+          ) do |page|
             page.each { |entry| block.call entry }
           end
         end
@@ -166,11 +172,18 @@ module Aptible
         end
       end
 
-      def self.define_embeds_many_getter(relation)
+      def self.define_embeds_many_getters(relation)
         define_method relation do
           get unless loaded
           objects[relation].entries
         end
+
+        iterator_method = "each_#{relation.to_s.singularize}".to_sym
+
+        define_method iterator_method do |&block|
+          next enum_for(iterator_method) if block.nil?
+          send(relation).each(&block)
+        end
       end
 
       # rubocop:disable MethodLength

data/lib/aptible/resource/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Resource
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/spec/aptible/resource/base_spec.rb

@@ -130,6 +130,14 @@ describe Aptible::Resource::Base do
       Api::Mainframe.each_page { break }
       expect(calls).to eq(['/mainframes'])
     end
+
+    it 'should return an enum if no block is given' do
+      e = Api::Mainframe.each_page
+      pages = 0
+      e.each { pages += 1 }
+      expect(pages).to eq(2)
+      expect(calls).to eq(urls)
+    end
   end
 
   describe '.create' do
@@ -362,8 +370,53 @@ describe Aptible::Resource::Base do
         expect(calls).to eq([urls[0]])
       end
 
-      it 'should not fail if not passed a block' do
-        subject.each_mainframe
+      it 'should return an enum if no block is given' do
+        e = subject.each_mainframe
+        records = []
+        e.each { |m| records << m }
+        expect(records.size).to eq(2)
+        expect(calls).to eq(urls)
+      end
+    end
+  end
+
+  context '.embeds_many' do
+    let(:m1) { Api::Mainframe.new }
+    let(:m2) { Api::Mainframe.new }
+
+    before { subject.stub(:loaded) { true } }
+    before { subject.stub(:objects) { { embedded_mainframes: [m1, m2] } } }
+    before { m1.stub(id: 1) }
+    before { m2.stub(id: 2) }
+
+    describe '#{relation}s' do
+      it 'should return all records' do
+        records = subject.embedded_mainframes
+
+        expect(records.size).to eq(2)
+        expect(records.first.id).to eq(1)
+        expect(records.second.id).to eq(2)
+      end
+    end
+
+    describe 'each_#{relation}' do
+      it 'should iterate over all records' do
+        records = []
+        subject.each_embedded_mainframe { |mainframe| records << mainframe }
+
+        expect(records.size).to eq(2)
+        expect(records.first.id).to eq(1)
+        expect(records.second.id).to eq(2)
+      end
+
+      it 'should return an enum if no block is given' do
+        e = subject.each_embedded_mainframe
+        records = []
+        e.each { |mainframe| records << mainframe }
+
+        expect(records.size).to eq(2)
+        expect(records.first.id).to eq(1)
+        expect(records.second.id).to eq(2)
       end
     end
   end

data/spec/fixtures/api.rb

@@ -2,6 +2,7 @@ require 'aptible/resource'
 
 class Api < Aptible::Resource::Base
   has_many :mainframes
+  embeds_many :embedded_mainframes
   embeds_one :best_mainframe
 
   def namespace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri_template