acfs 0.22.2.b194 → 0.22.2.b196

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBlODUyYTBjYWJmOTJmYTczYjVjNTc5YTc3OTkzYjc3YTQ5NWE1NA==
+    YjNkYThhNTU4ZGM5MWFiOWQyNDRlY2MxYmU2ZGRmMzIxYzhjZDQ1Zg==
   data.tar.gz: !binary |-
-    NzZiYTA2NGNhZWViZGM2NzY1YTcxYWYzZGNiNmZlYmU3YWM0ZTE1Yg==
+    MDFmNGVlYzg1YThiMzljMDMwZGE5MmQzZDc3ZDhlOTgxMDhmZDVlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWUwYjdjMjVkMzMwY2Q4MGY1YWU2YmJiNWMxNDY3MDRkYWFkNWNhYzkwMGMx
-    NjZiZDZkYzg0NWM0ZTk1NWI2ZDg1ZmIwNmZkM2Q0NDUxZDYwMWFhMDM1NjMz
-    ZDdlNzU1ODEzMWI0ZDAxZmM5ZDQ5ZmNlN2M4ODFmYjY2MzlhMzU=
+    MjViYjlhZmIwYjUxOTZjZTc2NTgxNmQwMDNhOTczZWVkMGFlMzgyZTEyM2Ni
+    OTNiODg3NDA1NmE3MjNiNDViNGYzOTcxZTQ5NDc5Y2I5NTk5YWVkMTZhNGJh
+    ODM1NGNlNGNhNDEyMTBmMTlhZjJkNzY1N2Y3YTYyMmY2YWMxMjg=
   data.tar.gz: !binary |-
-    YmNlOWU1YzkyNGNjZDRmMmI2ZWIzNDMwN2RhMWU0M2FkNTZmNjFjMjFkNzUy
-    ZWI5MmQ0MWZhM2YwYzY5MmZjYmRhZmViYzViYmI5OWRhN2ExZDc3Njc5NWE5
-    MGRiYmNjYmRkZGQ0YzcxNjljZmY2MzM2ODU1YjdkNDkxYjE5NmY=
+    OTllM2RlYThiNjUzYzNlYTIwYTJmZDcwNDQ1MzI4MTQyMWJmNTY1ZWQ0ZjM1
+    MDdiMWQ0YzZhMzlmMmUyZDQ4MDk2ZWRiMTBiOTQ1YTVmNTE1OTA4YzcwNmM3
+    MTRlZjE1MDMyZmMzNGRmODdjOGU0YmVlNzY4MDIzN2Y5ZjY2Zjk=

data/lib/acfs/errors.rb

@@ -86,5 +86,20 @@ module Acfs
     end
   end
 
+  # Gets raised if ressource type is no valid subclass of
+  # parent resource. Check if the type is set to the correct
+  # Acfs::Resource Name
+  class RessourceTypeError < Error
+    attr_reader :base_class
+    attr_reader :type_name
+
+    def initialize(opts = {})
+      @base_class    = opts.delete :base_class
+      @type_name     = opts.delete :type_name
+      opts[:message] = "Recieved ressource type #{type_name} is no subclass of #{base_class}"
+      super
+    end
+  end
+
   class RealRequestsNotAllowedError < StandardError; end
 end

data/lib/acfs/model/query_methods.rb

@@ -76,10 +76,7 @@ module Acfs::Model
 
         operation :list, params: params do |data|
           data.each do |obj|
-            collection << self.new.tap do |m|
-              m.attributes = obj
-              m.loaded!
-            end
+            collection << create_resource(obj)
           end
           collection.loaded!
           block.call collection unless block.nil?
@@ -91,14 +88,13 @@ module Acfs::Model
 
       private
       def find_single(id, opts, &block)
-        model = self.new
+        model = SimpleDelegator.new self.new
 
         opts[:params] ||= {}
         opts[:params].merge!({ id: id })
 
         operation :read, opts do |data|
-          model.attributes = data
-          model.loaded!
+          model.__setobj__ create_resource data, origin: model.__getobj__
           block.call model unless block.nil?
         end
 
@@ -119,6 +115,23 @@ module Acfs::Model
           end
         end
       end
+
+      def create_resource(data, opts = {})
+        type = data.delete 'type'
+        klass = resource_class_lookup(type)
+        (opts[:origin].is_a?(klass) ? opts[:origin] : klass.new).tap do |m|
+          m.attributes = data
+          m.loaded!
+        end
+      end
+
+      def resource_class_lookup(type)
+        return self if type.nil?
+        klass = type.camelize.constantize
+        raise Acfs::RessourceTypeError, type_name: type, base_class: self unless klass <= self
+        klass
+      end
+
     end
   end
 end

data/spec/acfs/model/persistance_spec.rb

@@ -113,7 +113,7 @@ describe Acfs::Model::Persistence do
 
       it 'should be frozen after DELETE' do
         model.delete!
-        expect(model).to be_frozen
+        expect(model.__getobj__).to be_frozen
       end
     end
 
@@ -127,12 +127,12 @@ describe Acfs::Model::Persistence do
       end
 
       it 'should save resource' do
-        expect(model).to receive(:save).with({})
+        expect(model.__getobj__).to receive(:save).with({})
         model.update_attributes name: 'Idefix'
       end
 
       it 'should pass second hash to save' do
-        expect(model).to receive(:save).with({ bla: 'blub' })
+        expect(model.__getobj__).to receive(:save).with({ bla: 'blub' })
         model.update_attributes({ name: 'Idefix' }, { bla: 'blub' })
       end
     end
@@ -147,12 +147,12 @@ describe Acfs::Model::Persistence do
       end
 
       it 'should save resource' do
-        expect(model).to receive(:save!).with({})
+        expect(model.__getobj__).to receive(:save!).with({})
         model.update_attributes! name: 'Idefix'
       end
 
       it 'should pass second hash to save' do
-        expect(model).to receive(:save!).with({ bla: 'blub' })
+        expect(model.__getobj__).to receive(:save!).with({ bla: 'blub' })
         model.update_attributes!({ name: 'Idefix' }, { bla: 'blub' })
       end
     end

data/spec/acfs/model/query_methods_spec.rb

@@ -20,7 +20,7 @@ describe Acfs::Model::QueryMethods do
         it 'should invoke callback after model is loaded' do
           proc = Proc.new { }
           proc.should_receive(:call) do |user|
-            expect(user).to be === @user
+            expect(user.__getobj__).to equal @user.__getobj__
             expect(user).to be_loaded
           end
 
@@ -100,4 +100,40 @@ describe Acfs::Model::QueryMethods do
       end
     end
   end
+
+  describe '.all' do
+    let(:computer) { Computer }
+    let(:pc) { PC }
+    let(:mac) { Mac }
+    before do
+      stub_request(:get, 'http://computers.example.org/computers').to_return response([{ id: 1, type: 'PC' }, { id: 2, type: 'Computer' }, { id: 3, type: 'Mac' }])
+    end
+
+    context 'with resource type inheritance' do
+      it 'should create appropriate subclass resources' do
+        @computers = Computer.all
+
+        expect(@computers).to_not be_loaded
+
+        Acfs.run
+
+        expect(@computers).to be_loaded
+        expect(@computers).to have(3).items
+        expect(@computers[0]).to be_a PC
+        expect(@computers[1]).to be_a Computer
+        expect(@computers[2]).to be_a Mac
+      end
+
+      context 'with invalid type set' do
+        before do
+          stub_request(:get, 'http://computers.example.org/computers').to_return response([{ id: 1, type: 'MyUser' }, { id: 2, type: 'Computer' }, { id: 3, type: 'Mac' }])
+        end
+
+        it 'should raise error if type is no subclass' do
+          Computer.all
+          expect { Acfs.run }.to raise_error(Acfs::RessourceTypeError)
+        end
+      end
+    end
+  end
 end

data/spec/support/service.rb

@@ -1,6 +1,7 @@
 
 Acfs.configure do
   locate :user_service, 'http://users.example.org'
+  locate :computer_service, 'http://computers.example.org'
   locate :comments, 'http://comments.example.org'
 end
 
@@ -47,6 +48,26 @@ class Comment < Acfs::Resource
   attribute :text, :string
 end
 
+class ComputerService < Acfs::Service
+  use Acfs::Middleware::MessagePackDecoder
+  use Acfs::Middleware::JsonDecoder
+  use Acfs::Middleware::JsonEncoder
+end
+
+class Computer < Acfs::Resource
+  service ComputerService, path: 'computers'
+
+  attribute :id, :integer
+end
+
+class PC < Computer
+
+end
+
+class Mac < Computer
+
+end
+
 # DRAFT: Singular resource
 #class Singular < Acfs::Resource
 #  service UserService, singular: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.22.2.b194
+  version: 0.22.2.b196
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport