acfs 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '099f37ed68e218d04f91c2f9f636e7b177b84feb8b8e0be4c4403da004937760'
-  data.tar.gz: bfbf0d3dc7f77eb38f16043051350a468baab870b3b002c35bc9f96df492eb07
+  metadata.gz: 9e970f81dff63a351279207100701f7a9be822272a77e5dfc3bd39d9e418a0db
+  data.tar.gz: 81b752674659595a097b951334bb41fa36f9a96de2f3b7ff0a1a82d3e03f0009
 SHA512:
-  metadata.gz: 29c45b69c95afd11cb58af0e02a383a2c1adcfeefb2521a917e1b7f6606a694c66fa0e2d56796e59127d453f4a1f95ab36c6a2e9a384657992b6a821c946c357
-  data.tar.gz: cba2e6df7a7988d2d06fc8ca303aa63875736c6d0fc6c0013ecbb36038b559bcfc085058c086468389905947aba375d6add11f3e8010ab2cff1b70628edd8770
+  metadata.gz: 4d8363f66d917672285318eaf1f68f03c3ef28c560373b4e74054f5d5d4da7dd0a443f6b54c9835fafbd290921e2d8316195a3c015970e539baa37fb8bead339
+  data.tar.gz: 73d009dc5601ba4e4cc06efb41a0990a58779726b86ebf4905c2967dba55de406085b83e9a7c3de71b860e748bae1ff39b2a59de91a2699c488ced2d689d9234

data/CHANGELOG.md

@@ -14,9 +14,17 @@
 ### Breaks
 
 
-## 1.3.1 - (2019-07-02)
+## 1.3.2 - (2019-09-24)
+
+
+### Fixes
+* Fix Acfs.on callbacks for empty find_by results (#42)
+
+
 ---
 
+## 1.3.1 - (2019-07-02)
+
 ### Fixes
 * Improve URL argument encoding when building resource requests
 

data/README.md

@@ -3,8 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/acfs.svg)](http://badge.fury.io/rb/acfs)
 [![Build Status](http://img.shields.io/travis/jgraichen/acfs/master.svg)](https://travis-ci.org/jgraichen/acfs)
 [![Coverage Status](http://img.shields.io/coveralls/jgraichen/acfs/master.svg)](https://coveralls.io/r/jgraichen/acfs)
-[![Code Climate](http://img.shields.io/codeclimate/github/jgraichen/acfs.svg)](https://codeclimate.com/github/jgraichen/acfs)
-[![Dependency Status](http://img.shields.io/gemnasium/jgraichen/acfs.svg)](https://gemnasium.com/jgraichen/acfs)
 [![RubyDoc Documentation](http://img.shields.io/badge/rubydoc-here-blue.svg)](http://rubydoc.info/github/jgraichen/acfs/master/frames)
 
 Acfs is a library to develop API client libraries for single services within a larger service oriented application.

data/lib/acfs/global.rb

@@ -73,7 +73,7 @@ module Acfs
       end
       return false if block.nil?
 
-      if resource.loaded?
+      if resource.nil? || resource.loaded?
         block.call resource
       else
         resource.__callbacks__ << block
@@ -81,9 +81,17 @@ module Acfs
     end
 
     def on(*resources)
+      # If all resources have already been loaded, we run the callback immediately.
+      if resources.all? {|res| res.nil? || res.loaded? }
+        yield(*resources)
+        return
+      end
+
+      # Otherwise, we add a callback to *each* resource with a guard that ensures
+      # that only the very last resource being loaded executes the callback.
       resources.each do |resource|
         add_callback resource do |_|
-          yield(*resources) unless resources.any? {|res| !res.loaded? }
+          yield(*resources) if resources.all? {|res| res.nil? || res.loaded? }
         end
       end
     end

data/lib/acfs/version.rb

@@ -2,7 +2,7 @@ module Acfs
   module VERSION
     MAJOR = 1
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/acfs/global_spec.rb

@@ -71,6 +71,50 @@ describe ::Acfs::Global do
       end
       Acfs.run
     end
+
+    context 'with an empty result for a find_by call' do
+      before do
+        stub_request(:get, %r{http://users.example.org/users})
+          .with(query: {id: '2'})
+          .to_return(
+            status: 200,
+            body: '{}',
+            headers: {'Content-Type' => 'application/json'}
+          )
+      end
+
+      it 'invokes once both requests are finished' do
+        user1 = MyUser.find 1
+        user2 = MyUser.find_by id: 2
+
+        expect do |cb|
+          Acfs.on(user1, user2, &cb)
+          Acfs.run
+        end.to yield_with_args(user1, be_nil)
+      end
+
+      it 'invokes once remaining requests are finished' do
+        user1 = MyUser.find 1
+        Acfs.run # Finish the first request
+
+        user2 = MyUser.find_by id: 2
+
+        expect do |cb|
+          Acfs.on(user1, user2, &cb)
+          Acfs.run
+        end.to yield_with_args(user1, be_nil)
+      end
+
+      it 'invokes immediately when all requests have already been finished' do
+        user1 = MyUser.find 1
+        user2 = MyUser.find_by id: 2
+        Acfs.run
+
+        expect do |cb|
+          Acfs.on(user1, user2, &cb)
+        end.to yield_with_args(user1, be_nil)
+      end
+    end
   end
 
   describe '#runner' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -228,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.