acfs 0.29.1.1.b257 → 0.29.1.1.b259

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg2OTZhYjY2MTUyY2FkZWIzYWY0ODI1MjI3YjJmM2YzODQ1ZWJmYg==
+    OWVkNzczZWRjZWMxNzJlZmQ2YjJjYjQ2ZTQ4ODhjOTA1MDc1M2Y5YQ==
   data.tar.gz: !binary |-
-    YTQxOWE5YzgzOTA4Nzk1OTk4NzEyYWQwZDdjZGE5MTU2ZjcyNTMzNA==
+    YjJkYTUyZTMwMWRlMDUwYjQ2OTM5YzdiMDZjYWNhZDgyOTRlMGQ0OQ==
 SHA512:
   metadata.gz: !binary |-
-    YmM4MGFjYWQwODlkZWI3OTE0Nzc1MWRlY2ZhOTZkZGRjMzIwYzU3ZTcwMGI5
-    ODljYTlkZTdkODlkMWY4MjI0ZmEwM2I1OWM2NjY3MjdhN2JlYzQyMWY1MDJk
-    NzI5Zjc0NWQwNGQ5YzAxN2YwMGQ0ZTkxMTkxZDBiYjFjMDQxM2U=
+    NTJmMWVjYjA4MTU0YjllOTBiMGUxZDc5N2JmOGJjYjY1ZTdjZmFjOGI5OWMw
+    ZDY2NGUxMGZhMGMwZTQzNzIzNGM1ZWM5MmMxMzQ0ZjZmZTM0YzQ4YmI4OWEx
+    OTEwOWMwMmFhYTA5NTcyNmI2N2MwZjU4OTk4NGM5NTQ2MTk0M2E=
   data.tar.gz: !binary |-
-    ZjMwYzFlZjA3MjhkNTBjZjljNjk5NjAxZTFhM2MzODlmOTU5YTQ2MTQyMmRm
-    ZGYwNzY5NWE3NzZmMjNiOTE0ODg3ZjNhOGFjYjhhNThmMWNjMGY5YjY5Nzk4
-    YjVjZGFmZGE5ZmM1YTI5MjhlNDE3OTdjOTNiZjAyNDc3MjMyZDE=
+    ZDYxNGJlMDE2ODhlOWY1NWMxNDJkMTg5YjcwM2UyMzlmM2IwMWVlYWI2Y2Rh
+    ZTAyNDY2NzYxNzdhNDZlNzg3NDg2ODVhY2E1ZmY1ODQyNzU4MmIwNWYxZmE5
+    MWFlOWYwNGU1ZThhNGE4MDRhZmNmOWQxNDZlZGI0NjM3MmVkZTA=

data/lib/acfs.rb

@@ -9,6 +9,7 @@ module Acfs
   require 'acfs/version'
   require 'acfs/errors'
   require 'acfs/global'
+  require 'acfs/util'
 
   require 'acfs/collection'
   require 'acfs/configuration'

data/lib/acfs/collection.rb

@@ -6,6 +6,7 @@ module Acfs
 
   class Collection < ::Delegator
     include Model::Loadable
+    include Acfs::Util::Callbacks
 
     def initialize
       super([])

data/lib/acfs/global.rb

@@ -40,5 +40,28 @@ module Acfs
       self.runner.clear
       Acfs::Stub.clear
     end
+
+    # @api public
+    #
+    # Add an additional callback hook to not loaded resource.
+    # If given resource already loaded callback will be invoked immediately.
+    #
+    # This method will be replaced by explicit callback handling when query methods
+    # return explicit future objects.
+    #
+    # @example
+    #   user = MyUser.find 1, &callback_one
+    #   Acfs.add_callback(user, &callback_two)
+    #
+    def add_callback(resource, &block)
+      raise ArgumentError.new "Given resource is not an Acfs resource but a: #{resource.class.name}" unless resource.respond_to?(:__callbacks__)
+      return false if block.nil?
+
+      if resource.loaded?
+        block.call resource
+      else
+        resource.__callbacks__ << block
+      end
+    end
   end
 end

data/lib/acfs/model/query_methods.rb

@@ -98,15 +98,16 @@ module Acfs::Model
       # @return [ self ] Resource object, nil if empty list is returned
       #
       def find_by(params, &block)
-        model = ResourceDelegator.new self.new
+        model = Acfs::Util::ResourceDelegator.new self.new
+        model.__callbacks__ << block unless block.nil?
 
         operation :list, params: params do |data|
-          unless data.empty?
-            model.__setobj__ create_resource data.first, origin: model.__getobj__
-          else
+          if data.empty?
             model.__setobj__ nil
+          else
+            model.__setobj__ create_resource data.first, origin: model.__getobj__
           end
-          block.call model unless block.nil?
+          model.__invoke__
         end
 
         model
@@ -130,21 +131,18 @@ module Acfs::Model
         end
       end
 
-      # TODO: Replace delegator with promise or future for the long run.
-      class ResourceDelegator < SimpleDelegator
-        delegate :class, :is_a?, :kind_of?, :nil?, to: :__getobj__
-      end
-
       private
       def find_single(id, opts, &block)
-        model = ResourceDelegator.new self.new
+        model = Acfs::Util::ResourceDelegator.new self.new
 
         opts[:params] ||= {}
         opts[:params].merge!({ id: id })
 
+        model.__callbacks__ << block unless block.nil?
+
         operation :read, opts do |data|
           model.__setobj__ create_resource data, origin: model.__getobj__
-          block.call model unless block.nil?
+          model.__invoke__
         end
 
         model
@@ -152,13 +150,15 @@ module Acfs::Model
 
       def find_multiple(ids, opts, &block)
         ::Acfs::Collection.new.tap do |collection|
+          collection.__callbacks__ << block unless block.nil?
+
           counter = 0
           ids.each do |id|
             find_single id, opts do |resource|
               collection << resource
               if (counter += 1) == ids.size
                 collection.loaded!
-                block.call collection unless block.nil?
+                collection.__invoke__
               end
             end
           end

data/lib/acfs/singleton_resource.rb

@@ -69,7 +69,7 @@ module Acfs
       def find(*attrs, &block)
         opts = { params: attrs.extract_options! }
 
-        model = ResourceDelegator.new self.new
+        model = Util::ResourceDelegator.new self.new
 
         operation :read, opts do |data|
           model.__setobj__ create_resource data, origin: model.__getobj__

data/lib/acfs/util.rb

@@ -0,0 +1,20 @@
+module Acfs
+  module Util
+    # TODO: Merge wit features in v1.0
+    module Callbacks
+      def __callbacks__
+        @__callbacks__ ||= []
+      end
+
+      def __invoke__
+        __callbacks__.each{|c| c.call self}
+      end
+    end
+
+    # TODO: Replace delegator with promise or future for the long run.
+    class ResourceDelegator < SimpleDelegator
+      delegate :class, :is_a?, :kind_of?, :nil?, to: :__getobj__
+      include Callbacks
+    end
+  end
+end

data/spec/acfs/model/query_methods_spec.rb

@@ -29,6 +29,23 @@ describe Acfs::Model::QueryMethods do
           Acfs.run
         end
 
+        it 'should invoke multiple callback after model is loaded' do
+          proc1 = Proc.new { }
+          proc2 = Proc.new { }
+          expect(proc1).to receive(:call) do |user|
+            expect(user).to equal @user
+            expect(user).to be_loaded
+          end
+          expect(proc2).to receive(:call) do |user|
+            expect(user).to equal @user
+            expect(user).to be_loaded
+          end
+
+          @user = model.find 1, &proc1
+          Acfs.add_callback(@user, &proc2)
+          Acfs.run
+        end
+
         context 'with resource type inheritance' do
           let!(:user) { MyUser.find 2 }
           subject { user }
@@ -104,6 +121,25 @@ describe Acfs::Model::QueryMethods do
           Acfs.run
         end
 
+        it 'should invoke multiple callback after all models are loaded' do
+          proc1 = Proc.new { }
+          proc2 = Proc.new { }
+          expect(proc1).to receive(:call) do |users|
+            expect(users).to be === @users
+            expect(users.size).to be == 2
+            expect(users).to be_loaded
+          end
+          expect(proc2).to receive(:call) do |users|
+            expect(users).to be === @users
+            expect(users.size).to be == 2
+            expect(users).to be_loaded
+          end
+
+          @users = model.find 1, 2, &proc1
+          Acfs.add_callback(@users, &proc2)
+          Acfs.run
+        end
+
         it 'should respect resource type inheritance' do
           customers = MyUser.find 3, 4
           Acfs.run
@@ -220,6 +256,27 @@ describe Acfs::Model::QueryMethods do
           Acfs.run
         end
 
+        it 'should invoke multiple callbacks after model is loaded' do
+          proc1 = Proc.new { }
+          proc2 = Proc.new { }
+
+          expect(proc1).to receive(:call) do |user|
+            expect(user).to eql @user.__getobj__
+            expect(user).to be_a MyUser
+            expect(user).to be_loaded
+          end
+
+          expect(proc2).to receive(:call) do |user|
+            expect(user).to eql @user.__getobj__
+            expect(user).to be_a MyUser
+            expect(user).to be_loaded
+          end
+
+          @user = model.send described_method, age: 24, &proc1
+          Acfs.add_callback @user, &proc2
+          Acfs.run
+        end
+
         it 'should load a single MyUser object' do
           expect(subject).to be_a MyUser
         end
@@ -260,6 +317,24 @@ describe Acfs::Model::QueryMethods do
           @user = model.find_by age: 24, &proc
           Acfs.run
         end
+
+        it 'should invoke multiple callbacks after model is loaded' do
+          proc1 = Proc.new { }
+          proc2 = Proc.new { }
+
+          expect(proc1).to receive(:call) do |user|
+            expect(user).to eql @user.__getobj__
+            expect(user).to be_a NilClass
+          end
+          expect(proc2).to receive(:call) do |user|
+            expect(user).to eql @user.__getobj__
+            expect(user).to be_a NilClass
+          end
+
+          @user = model.find_by age: 24, &proc1
+          Acfs.add_callback @user, &proc2
+          Acfs.run
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.29.1.1.b257
+  version: 0.29.1.1.b259
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -165,6 +165,7 @@ files:
 - lib/acfs/service/middleware.rb
 - lib/acfs/singleton_resource.rb
 - lib/acfs/stub.rb
+- lib/acfs/util.rb
 - lib/acfs/version.rb
 - lib/acfs/yard.rb
 - spec/acfs/configuration_spec.rb