acfs 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e4fa8c5a501299db87e1fd63da042f42b4064d
-  data.tar.gz: 267732ea7fae5e6d110038ff8769ceb8ee3fb9dd
+  metadata.gz: 70e3e163082aec963c5162cd4fd59d69eb915819
+  data.tar.gz: c4385962f0d06f27a89cb48e4d5d214e904478a9
 SHA512:
-  metadata.gz: 1ef40e8272f8396f232e14efd645ded71b393cdeeea7ddd4057b3e671d212ab627d03e39b58e32e62f90e478b26656b1856ad48e9ad8cdf747c707ae284d5001
-  data.tar.gz: d5693941256b767e34fe7934bdfba838156af64f00d1c3d7bd29fc24a1483b4473d3adcfeba616d709183c14bbbe7db8790c8864a3d8918eb2db2b74ec3ea58d
+  metadata.gz: f1e2908198cf1314b37fa8c1829ac1995ec36458069203daf334ff0a46b1e35efe9e022f9b375c12dfe3ef6dff9a140594671e33866ecd479384c8c26a1900a7
+  data.tar.gz: d1c128c7028e83f9e79a52bbd449495c38a5aa97c116d02df18828fe2084c739a5b06dd65e805b80e477c19d56e0819c47e802dff01cff45271db2b67e6ccb38

data/README.md

@@ -2,15 +2,18 @@
 
 [![Gem Version](https://badge.fury.io/rb/acfs.png)](http://badge.fury.io/rb/acfs) [![Build Status](https://travis-ci.org/jgraichen/acfs.png?branch=master)](https://travis-ci.org/jgraichen/acfs) [![Coverage Status](https://coveralls.io/repos/jgraichen/acfs/badge.png?branch=master)](https://coveralls.io/r/jgraichen/acfs) [![Code Climate](https://codeclimate.com/github/jgraichen/acfs.png)](https://codeclimate.com/github/jgraichen/acfs) [![Dependency Status](https://gemnasium.com/jgraichen/acfs.png)](https://gemnasium.com/jgraichen/acfs)
 
-TODO: Develop asynchronous parallel API client library for service oriented applications.
+Acfs is a library to develop API client libraries for single services within a
+larger service oriented application.
 
-TODO: Write a gem description
+Acfs covers model and service abstraction, convenient query and filter methods,
+full middleware stack for pre-processing requests and responses on a per service
+level and automatic request queuing and parallel processing. See Usage for more.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'acfs', '0.7.0'
+    gem 'acfs', '0.8.0'
 
 **Note:** Acfs is under development. I'll try to avoid changes to the public
 API but internal APIs may change quite often.
@@ -31,7 +34,7 @@ First you need to define your service(s):
 class UserService < Acfs::Service
   self.base_url = 'http://users.myapp.org'
 
-  # You can configure middlewares you want use for the service here.
+  # You can configure middlewares you want to use for the service here.
   # Each service has it own middleware stack.
   #
   use Acfs::Middleware::JsonDecoder
@@ -39,8 +42,8 @@ class UserService < Acfs::Service
 end
 ```
 
-This specifies where the `UserService` can be reached. You can now create some
-models representing resources serviced by the `UserService`.
+This specifies where the `UserService` is located. You can now create some
+models representing resources served by the `UserService`.
 
 ```ruby
 class User
@@ -122,9 +125,30 @@ Acfs.run # This call will fire all request as parallel as possible.
 @friends[0].name # => "Miraculix"
 ```
 
-## TODO
+Acfs has basic update support using `PUT` requests:
 
-* Create/Update operations
+```ruby
+@user = User.find 5
+@user.name = "Bob"
+
+@user.changed? # => true
+@user.persisted? # => false
+
+@user.save # Or .save!
+           # Will PUT new resource to service synchronously.
+
+@user.changed? # => false
+@user.persisted? # => true
+```
+
+## Roadmap
+
+* Create operations
+* Update
+    * Better new? detection eg. storing ETag from request resources.
+    * Use PATCH for with only changed attributes and `If-Unmodifed-Since`
+      and `If-Match` header fields if resource was surly loaded from service
+      and not created with an id (e.g `User.new id: 5, name: "john"`).
 * High level features
     * Pagination? Filtering? (If service API provides such features.)
     * Messaging Queue support for services and models

data/lib/acfs.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'acfs/version'
+require 'acfs/errors'
 
 module Acfs
   extend ActiveSupport::Autoload
@@ -18,6 +19,8 @@ module Acfs
     autoload :Print
     autoload :JsonDecoder
     autoload :MessagePackDecoder, 'acfs/middleware/msgpack_decoder'
+    autoload :JsonEncoder
+    autoload :MessagePackEncoder, 'acfs/middleware/msgpack_encoder'
   end
 
   module Adapter

data/lib/acfs/adapter/typhoeus.rb

@@ -9,8 +9,10 @@ module Acfs
 
       # Run all queued requests.
       #
-      def run
-        hydra.run
+      def run(request = nil)
+        return hydra.run unless request
+
+        convert_request(request).run
       end
 
       # Add a new request or URL to the queue.
@@ -25,7 +27,11 @@ module Acfs
       end
 
       def convert_request(req)
-        request = ::Typhoeus::Request.new req.url, params: req.params, headers: req.headers, body: req.body
+        request = ::Typhoeus::Request.new req.url,
+                                          method: req.method,
+                                          params: req.params,
+                                          headers: req.headers,
+                                          body: req.body
 
         request.on_complete do |response|
           req.complete! convert_response(req, response)

data/lib/acfs/errors.rb

@@ -0,0 +1,7 @@
+module Acfs
+
+  # Acfs base error.
+  #
+  class Error < StandardError; end
+
+end

data/lib/acfs/middleware/json_encoder.rb

@@ -0,0 +1,20 @@
+require 'multi_json'
+
+module Acfs
+  module Middleware
+
+    # A middleware to encore request data using JSON.
+    #
+    class JsonEncoder < Base
+
+      def call(request)
+        unless request.method == :get or request.data.nil?
+          request.body = ::MultiJson.dump(request.data)
+          request.headers['Content-Type'] = 'application/json'
+        end
+
+        app.call request
+      end
+    end
+  end
+end

data/lib/acfs/middleware/msgpack_encoder.rb

@@ -0,0 +1,19 @@
+require 'msgpack'
+require 'action_dispatch'
+
+module Acfs
+  module Middleware
+
+    # A middleware to encode request data with Message Pack.
+    #
+    class MessagePackEncoder < Base
+
+      def call(request)
+        request.body = ::MessagePack.dump(request.data)
+        request.headers['Content-Type'] = 'application/x-msgpack'
+
+        app.call request
+      end
+    end
+  end
+end

data/lib/acfs/model.rb

@@ -1,8 +1,10 @@
 require 'active_model'
 
 require 'acfs/model/attributes'
+require 'acfs/model/dirty'
 require 'acfs/model/loadable'
 require 'acfs/model/locatable'
+require 'acfs/model/persistence'
 require 'acfs/model/query_methods'
 require 'acfs/model/relations'
 require 'acfs/model/service'
@@ -26,10 +28,12 @@ module Acfs
 
       include Model::Attributes
       include Model::Loadable
+      include Model::Persistence
       include Model::Locatable
       include Model::QueryMethods
       include Model::Relations
       include Model::Service
+      include Model::Dirty
     end
   end
 end

data/lib/acfs/model/attributes.rb

@@ -16,10 +16,11 @@ module Acfs::Model
   #
   module Attributes
     extend ActiveSupport::Concern
+    include ActiveModel::AttributeMethods
 
     def initialize(*attrs) # :nodoc:
-      self.class.attributes.each { |k, v| public_send :"#{k}=", v }
-      super *attrs
+      self.write_attributes self.class.attributes, change: false
+      super
     end
 
     # Returns ActiveModel compatible list of attributes and values.
@@ -38,11 +39,50 @@ module Acfs::Model
     # Update all attributes with given hash.
     #
     def attributes=(attributes)
-      self.attributes.each do |key, _|
-        send :"#{key}=", attributes[key] if attributes.has_key? key
+      write_attributes attributes
+    end
+
+    # Read an attribute.
+    #
+    def read_attribute(name)
+      instance_variable_get :"@#{name}"
+    end
+
+    # Write a hash of attributes and values.
+    #
+    def write_attributes(attributes, opts = {})
+      procs = {}
+
+      attributes.each do |key, _|
+        if attributes[key].is_a? Proc
+          procs[key] = attributes[key]
+        else
+          write_attribute key, attributes[key], opts
+        end
+      end
+
+      procs.each do |key, proc|
+        write_attribute key, instance_exec(&proc), opts
       end
     end
 
+    # Write an attribute.
+    #
+    def write_attribute(name, value, opts = {})
+      if (type = self.class.attribute_types[name.to_sym]).nil?
+        raise "Unknown attribute #{name}."
+      end
+
+      write_raw_attribute name, value.nil? ? nil : type.cast(value), opts
+    end
+
+    # Write an attribute without checking type and existence or casting
+    # value to attributes type.
+    #
+    def write_raw_attribute(name, value, _ = {})
+      instance_variable_set :"@#{name}", value
+    end
+
     module ClassMethods # :nodoc:
 
       # Define a model attribute by name and type. Will create getter and
@@ -76,17 +116,26 @@ module Acfs::Model
         @attributes ||= {}
       end
 
+      # Return hash of attributes and there types.
+      #
+      def attribute_types
+        @attribute_types ||= {}
+      end
+
       private
       def define_attribute(name, type, opts = {}) # :nodoc:
-        @attributes       ||= {}
-        @attributes[name] = type.cast opts.has_key?(:default) ? opts[:default] : nil
+        default_value    = opts.has_key?(:default) ? opts[:default] : nil
+        default_value    = type.cast default_value unless default_value.is_a? Proc or default_value.nil?
+        attributes[name] = default_value
+        attribute_types[name.to_sym] = type
+        define_attribute_method name
 
         self.send :define_method, name do
-          instance_variable_get :"@#{name}"
+          read_attribute name
         end
 
         self.send :define_method, :"#{name}=" do |value|
-          instance_variable_set :"@#{name}", type.cast(value)
+          write_attribute name, value
         end
       end
     end

data/lib/acfs/model/dirty.rb

@@ -0,0 +1,39 @@
+module Acfs
+  module Model
+
+    # Thin wrapper around ActiveModel::Dirty
+    #
+    module Dirty
+      extend ActiveSupport::Concern
+      include ActiveModel::Dirty
+
+      # Resets all changes. Do not touch previous changes.
+      #
+      def reset_changes
+        changed_attributes.clear
+      end
+
+      # Save current changes as previous changes and reset
+      # current one.
+      #
+      def swap_changes
+        @previously_changed = changes
+        reset_changes
+      end
+
+      def save!(*) # :nodoc:
+        super.tap { |__| swap_changes }
+      end
+
+      def loaded! # :nodoc:
+        reset_changes
+        super
+      end
+
+      def write_raw_attribute(name, value, opts = {}) # :nodoc:
+        attribute_will_change! name if opts[:change].nil? or opts[:change]
+        super
+      end
+    end
+  end
+end

data/lib/acfs/model/initialization.rb

@@ -24,18 +24,5 @@ module Acfs::Model
       end if params
     end
 
-    # Indicates if the model is persisted. Default is +false+.
-    #
-    #  class User
-    #    include Acfs::Model
-    #    attribute :name
-    #  end
-    #
-    #  user = User.new(name: 'bob')
-    #  user.persisted? # => false
-    #
-    def persisted?
-      false
-    end
   end
 end

data/lib/acfs/model/locatable.rb

@@ -20,5 +20,10 @@ module Acfs::Model
         service.url_for(self, suffix: suffix)
       end
     end
+
+    def url
+      return nil if id.nil?
+      self.class.service.url_for self, suffix: read_attribute(:id)
+    end
   end
 end

data/lib/acfs/model/persistence.rb

@@ -0,0 +1,73 @@
+module Acfs
+  module Model
+
+    # Allow to track the persistence state of a model.
+    #
+    module Persistence
+
+      # Check if the model is persisted. A model is persisted if
+      # it is saved after beeing created or when it was not changed
+      # since it was loaded.
+      #
+      # user = User.new name: "John"
+      # user.persisted? # => false
+      # user.save
+      # user.persisted? # => true
+      #
+      # user2 = User.find 5
+      # user2.persisted? # => true
+      # user2.name = 'Amy'
+      # user2.persisted? # => false
+      # user2.save
+      # user2.persisted? # => true
+      #
+      def persisted?
+        !new? && !changed?
+      end
+
+      # Return true if model is a new record and was not saved yet.
+      #
+      def new?
+        read_attribute(:id).nil?
+      end
+      alias :new_record? :new?
+
+      # Save the resource.
+      #
+      # It will PATCH to the service to update the resource or send
+      # a POST to create a new one if the resource is new.
+      #
+      # `#save` return true of operation was successful, otherwise false.
+      #
+      def save(*args)
+        save! *args
+        true
+      rescue Acfs::Error
+        false
+      end
+
+      def save!(*) # :nodoc:
+        request = new? ? create_request : put_request
+        request.on_complete do |response|
+          update_with response.data
+        end
+
+        self.class.service.run request
+      end
+
+      private
+      def update_with(data)
+        self.attributes = data
+        loaded!
+      end
+
+      def create_request
+        Acfs::Request.new self.class.url, method: :post, data: attributes
+      end
+
+      def put_request
+        Acfs::Request.new url, method: :put, data: attributes
+      end
+    end
+  end
+end

data/lib/acfs/request.rb

@@ -7,7 +7,7 @@ module Acfs
   #
   class Request
     attr_accessor :body, :format
-    attr_reader :url, :headers, :params, :data
+    attr_reader :url, :headers, :params, :data, :method
 
     include Request::Callbacks
 
@@ -17,6 +17,7 @@ module Acfs
         @format  = options.delete(:format) || :json
         @headers = options.delete(:headers) || {}
         @params  = options.delete(:params) || {}
+        @method  = options.delete(:method) || :get
 
         url.query = nil # params.any? ? params.to_param : nil
       end.to_s

data/lib/acfs/response/formats.rb

@@ -7,15 +7,20 @@ module Acfs
     module Formats
 
       def content_type
-        @content_type ||= begin
-          content_type = headers['Content-Type'].split(/;\s*\w+="?\w+"?/).first
-          Mime::Type.parse(content_type).first
-        end
+        @content_type ||= read_content_type
       end
 
       def json?
         content_type == Mime::JSON
       end
+
+      private
+      def read_content_type
+        return 'text/plain' unless headers && headers['Content-Type']
+
+        content_type = headers['Content-Type'].split(/;\s*\w+="?\w+"?/).first
+        Mime::Type.parse(content_type).first
+      end
     end
   end
 end

data/lib/acfs/service.rb

@@ -1,5 +1,5 @@
+require 'acfs/service/request_handler'
 require 'acfs/service/middleware'
-require 'acfs/service/queue'
 
 module Acfs
 
@@ -9,7 +9,7 @@ module Acfs
     attr_accessor :options
     class_attribute :base_url
 
-    include Service::Queue
+    include Service::RequestHandler
     include Service::Middleware
 
     def initialize(options = {})

data/lib/acfs/service/middleware.rb

@@ -8,11 +8,8 @@ module Acfs
     module Middleware
       extend ActiveSupport::Concern
 
-      # Queue a new request. The request will travel through
-      # all registered middleware.
-      #
-      def queue(req)
-        super self.class.middleware.call req
+      def prepare(_) # :nodoc:
+        self.class.middleware.call super
       end
 
       module ClassMethods

data/lib/acfs/service/request_handler.rb

@@ -0,0 +1,27 @@
+module Acfs
+  class Service
+
+    # Methods to queue or executed request through this service.
+    #
+    module RequestHandler
+
+      # Queue a new request on global adapter queue.
+      #
+      def queue(request)
+        Acfs.adapter.queue prepare request
+      end
+
+      # Executes a request now.
+      #
+      def run(request)
+        Acfs.adapter.run prepare request
+      end
+
+      # Prepares a request to be processed through this service.
+      #
+      def prepare(request)
+        request
+      end
+    end
+  end
+end

data/lib/acfs/version.rb

@@ -1,7 +1,7 @@
 module Acfs
   module VERSION
     MAJOR = 0
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
     STAGE = nil
 

data/spec/{model → acfs/model}/attributes_spec.rb

@@ -13,6 +13,17 @@ describe Acfs::Model::Attributes do
     it 'should set default attributes' do
       expect(model.new.name).to be == 'John'
     end
+
+    context 'with dynamic default value' do
+      before do
+        model.attribute :name, :string, default: 'John'
+        model.attribute :mail, :string, default: -> { "#{name}@srv.tld" }
+      end
+
+      it 'should set dynamic default attributes' do
+        expect(model.new.mail).to be == 'John@srv.tld'
+      end
+    end
   end
 
   describe '#attributes' do
@@ -90,7 +101,7 @@ describe Acfs::Model::Attributes do
     it 'should add an attribute to model attribute list' do
       model.send :attribute, :name, :string
 
-      expect(model.attributes).to be == { :name => '' }
+      expect(model.attributes).to be == { :name => nil }
     end
 
     it 'should accept a default value' do

data/spec/acfs/model/dirty_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Acfs::Model::Dirty do
+  let(:model) { MyUser.new }
+  before do
+    stub_request(:get, "http://users.example.org/users/1").to_return(
+        body: MessagePack.dump({ id: 1, name: 'Anon', age: 12 }),
+        headers: {'Content-Type' => 'application/x-msgpack'})
+
+    stub_request(:post, 'http://users.example.org/users').to_return(
+        body: MessagePack.dump({ id: 5, name: 'dhh', age: 12 }),
+        headers: {'Content-Type' => 'application/x-msgpack'})
+  end
+
+  it 'includes ActiveModel::Dirty' do
+    model.is_a? ActiveModel::Dirty
+  end
+
+  describe '#changed?' do
+    context 'after attribute change' do
+      let(:user) { MyUser.new name: 'dhh' }
+
+      it { expect(user).to be_changed }
+
+      context 'and saving' do
+        before { user.save }
+        it { expect(user).to_not be_changed }
+      end
+    end
+
+    context 'after model load' do
+      let(:user) { MyUser.find 1 }
+      before { user; Acfs.run}
+
+      it { expect(user).to_not be_changed }
+    end
+
+    context 'after model new without attrs' do
+      let(:user) { MyUser.new }
+
+      it { expect(user).to_not be_changed }
+    end
+
+    context 'after model new with attrs' do
+      let(:user) { MyUser.new name: "Uschi" }
+
+      it { expect(user).to be_changed }
+    end
+  end
+end

data/spec/acfs/model/loadable_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Acfs::Model::Loadable do
+  let(:model) { MyUser.find 1 }
+  before do
+    stub_request(:get, "http://users.example.org/users/1").to_return(
+        body: MessagePack.dump({ id: 1, name: "Anon", age: 12 }),
+        headers: {'Content-Type' => 'application/x-msgpack'})
+  end
+
+  describe '#loaded?' do
+    context 'before Acfs#run' do
+      it { expect(model).to_not be_loaded }
+    end
+
+    context 'afer Acfs#run' do
+      before { model; Acfs.run}
+      it { expect(model).to be_loaded }
+    end
+  end
+end

data/spec/acfs/model/locatable_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Acfs::Model::Locatable do
+  let(:model) { MyUser }
+  before do
+    stub_request(:get, "http://users.example.org/users/1").to_return(
+        body: MessagePack.dump({ id: 1, name: "Anon", age: 12 }),
+        headers: {'Content-Type' => 'application/x-msgpack'})
+  end
+
+  describe '.url' do
+    it 'should return URL' do
+      expect(model.url).to be == 'http://users.example.org/users'
+    end
+
+    it 'should return URL with id path part if specified' do
+      expect(model.url(5)).to be == 'http://users.example.org/users/5'
+    end
+  end
+
+  describe '#url' do
+    context 'new resource' do
+      let(:m) { model.new }
+
+      it "should return nil" do
+        expect(m.url).to be == nil
+      end
+
+      context 'new resource with id' do
+        let(:m) { model.new id: 475 }
+
+        it "should return resource URL" do
+          expect(m.url).to be == 'http://users.example.org/users/475'
+        end
+      end
+    end
+
+    context 'loaded resource' do
+      let(:m) { model.find 1 }
+      before { m; Acfs.run }
+
+      it "should return resource's URL" do
+        expect(m.url).to be == 'http://users.example.org/users/1'
+      end
+    end
+  end
+end

data/spec/acfs/model/persistance_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Acfs::Model::Persistence do
+  let(:model_class) { MyUser }
+  before do
+    @get_stub = stub_request(:get, "http://users.example.org/users/1").to_return(
+        body: MessagePack.dump({ id: 1, name: "Anon", age: 12 }),
+        headers: {'Content-Type' => 'application/x-msgpack'})
+
+    @patch_stub = stub_request(:put, 'http://users.example.org/users/1')
+        .with(
+          body: '{"id":1,"name":"Idefix","age":12}')
+        .to_return(
+          body: MessagePack.dump({ id: 1, name: 'Idefix', age: 12 }),
+          headers: {'Content-Type' => 'application/x-msgpack'})
+
+    @post_stub = stub_request(:post, 'http://users.example.org/users').to_return(
+        body: MessagePack.dump({ id: 5, name: 'Idefix', age: 12 }),
+        headers: {'Content-Type' => 'application/x-msgpack'})
+  end
+
+  context 'new model' do
+    let(:model) { model_class.new }
+
+    it { expect(model).to_not be_persisted }
+    it { expect(model).to be_new }
+
+    describe '#save!' do
+      context 'when modified' do
+        let(:model) { model_class.find 1 }
+        before do
+          model
+          Acfs.run
+          model.name = 'Idefix'
+        end
+
+        it 'should PUT to model URL' do
+          model.save!
+
+          expect(@patch_stub).to have_been_requested
+        end
+      end
+
+      context 'when new' do
+        let(:model) { model_class.new name: 'Idefix', age: 12 }
+
+        it 'should POST to collection URL' do
+          model.save!
+
+          expect(@post_stub).to have_been_requested
+        end
+      end
+    end
+
+    context 'after save' do
+      before { model.save! }
+
+      it { expect(model).to be_persisted }
+      it { expect(model).to_not be_new }
+    end
+  end
+
+  context 'loaded model' do
+    context 'without changes' do
+      let(:model) { model_class.find 1 }
+      before { model; Acfs.run }
+
+      it { expect(model).to be_persisted }
+      it { expect(model).to_not be_new }
+    end
+
+    context 'with changes' do
+      let(:model) { model_class.find 1 }
+      before { model; Acfs.run; model.name = "dhh" }
+
+      it { expect(model).to_not be_persisted }
+      it { expect(model).to_not be_new }
+    end
+  end
+end

data/spec/acfs/model/query_methods_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Acfs::Model::QueryMethods do
+  let(:model) { MyUser }
+
+  describe '.find' do
+    context 'with single id' do
+      before do
+        stub_request(:get, 'http://users.example.org/users/1').to_return(
+            body: MessagePack.dump({ id: 1, name: 'Anon', age: 12 }),
+            headers: {'Content-Type' => 'application/x-msgpack'})
+      end
+
+      it 'should load a single remote resource' do
+        user = model.find 1
+        Acfs.run
+
+        expect(user.attributes).to be == { id: 1, name: 'Anon', age: 12 }.stringify_keys
+      end
+
+      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).to be_loaded
+        end
+
+        @user = model.find 1, &proc
+        Acfs.run
+      end
+    end
+
+    context 'with multiple ids' do
+      before do
+        stub_request(:get, 'http://users.example.org/users/1').to_return(
+            body: MessagePack.dump({ id: 1, name: 'Anon', age: 12 }),
+            headers: {'Content-Type' => 'application/x-msgpack'})
+        stub_request(:get, 'http://users.example.org/users/2').to_return(
+            body: MessagePack.dump({ id: 2, name: 'Johnny', age: 42 }),
+            headers: {'Content-Type' => 'application/x-msgpack'})
+      end
+
+      it 'should load a multiple remote resources' do
+        users = model.find 1, 2
+        Acfs.run
+
+        expect(users.size).to be == 2
+        expect(users[0].attributes).to be == { id: 1, name: 'Anon', age: 12 }.stringify_keys
+        expect(users[1].attributes).to be == { id: 2, name: 'Johnny', age: 42 }.stringify_keys
+      end
+
+      it 'should invoke callback after all models are loaded' do
+        proc = Proc.new { }
+        proc.should_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, &proc
+        Acfs.run
+      end
+    end
+  end
+end

data/spec/acfs/request_spec.rb

@@ -5,7 +5,8 @@ describe Acfs::Request do
   let(:headers) { nil }
   let(:params)  { nil }
   let(:data)    { nil }
-  let(:options) { {headers: headers, params: params, data: data} }
+  let(:method)  { :get }
+  let(:options) { {method: method, headers: headers, params: params, data: data} }
   let(:request) { Acfs::Request.new(url, options) }
 
   describe '#url' do
@@ -39,6 +40,20 @@ describe Acfs::Request do
     end
   end
 
+  describe '#method' do
+    context 'when nil given' do
+      let(:method) { nil }
+
+      it 'should default to :get' do
+        expect(request.method).to be == :get
+      end
+    end
+
+    it 'should return request method' do
+      expect(request.method).to be == method
+    end
+  end
+
   describe '#params' do
     let(:params) { { id: 10 }}
 

data/spec/acfs/response/formats_spec.rb

@@ -8,6 +8,14 @@ describe Acfs::Response::Formats do
   let(:body)      { nil }
   let(:response)  { Acfs::Response.new request, status, headers, body }
 
+  context 'without Content-Type header' do
+    let(:headers)   { {} }
+
+    it "should fallback on 'text/plain'" do
+      expect(response.content_type).to be == Mime::TEXT
+    end
+  end
+
   context 'with JSON mimetype' do
     let(:mime_type) { 'application/json' }
 

data/spec/acfs_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe "Acfs" do
 
   before do
-    headers         = {}
+    headers = {}
     stub_request(:get, "http://users.example.org/users").to_return(
         body: MessagePack.dump([{ id: 1, name: "Anon", age: 12 }, { id: 2, name: "John", age: 26 }]),
         headers: headers.merge({'Content-Type' => 'application/x-msgpack'}))
     stub_request(:get, "http://users.example.org/users/2").to_return(
         body: MessagePack.dump({ id: 2, name: "John", age: 26 }),
-        headers: headers.merge({'Content-Type' => 'application/x-msgpack'}))
+        headers: headers.merge({'Content-Type' => 'application/x-msgpack', 'ETag' => 'LukeSkywalker' }))
     stub_request(:get, "http://users.example.org/users/3").to_return(
-        body: MessagePack.dump({ id: 2, name: "Miraculix", age: 122 }),
+        body: MessagePack.dump({ id: 3, name: "Miraculix", age: 122 }),
         headers: headers.merge({'Content-Type' => 'application/x-msgpack'}))
     stub_request(:get, "http://users.example.org/users/100").to_return(
-        body: '{"id":2,"name":"Jimmy","age":45}',
+        body: '{"id":100,"name":"Jimmy","age":45}',
         headers: headers.merge({'Content-Type' => 'application/json'}))
     stub_request(:get, "http://users.example.org/users/2/friends").to_return(
         body: '[{"id":1,"name":"Anon","age":12}]',
@@ -24,6 +24,28 @@ describe "Acfs" do
         headers: headers.merge({'Content-Type' => 'application/json'}))
   end
 
+  it 'should update single resource synchronously' do
+    stub = stub_request(:put, "http://users.example.org/users/2")
+      .to_return { |request| { body: request.body, headers: {'Content-Type' => request.headers['Content-Type']}} }
+
+    @user = MyUser.find(2)
+    Acfs.run
+
+    expect(@user).to_not be_changed
+    expect(@user).to be_persisted
+
+    @user.name = "Johnny"
+
+    expect(@user).to be_changed
+    expect(@user).to_not be_persisted
+
+    @user.save
+
+    expect(stub).to have_been_requested
+    expect(@user).to_not be_changed
+    expect(@user).to be_persisted
+  end
+
   it 'should load single resource' do
     @user = MyUser.find(2)
 
@@ -32,6 +54,7 @@ describe "Acfs" do
     Acfs.run
 
     expect(@user).to be_loaded
+    expect(@user.id).to be == 2
     expect(@user.name).to be == 'John'
     expect(@user.age).to be == 26
   end
@@ -51,14 +74,17 @@ describe "Acfs" do
     expect(@users).to be_loaded
     expect(@users).to have(3).items
 
+    expect(@users[0].id).to be == 2
     expect(@users[0].name).to be == 'John'
     expect(@users[0].age).to be == 26
     expect(@users[0]).to be == @john
 
+    expect(@users[1].id).to be == 3
     expect(@users[1].name).to be == 'Miraculix'
     expect(@users[1].age).to be == 122
     expect(@users[1]).to be == @mirx
 
+    expect(@users[2].id).to be == 100
     expect(@users[2].name).to be == 'Jimmy'
     expect(@users[2].age).to be == 45
     expect(@users[2]).to be == @jimy
@@ -95,12 +121,13 @@ describe "Acfs" do
   end
 
   it 'should load associated resources from different service' do
-    @user = MyUser.find(2) do |user|
+    @user = MyUser.find 2 do |user|
       @comments = Comment.where user: user.id
     end
 
     Acfs.run
 
+    expect(@user.id).to be == 2
     expect(@user.name).to be == 'John'
     expect(@user.age).to be == 26
 

data/spec/support/service.rb

@@ -3,6 +3,7 @@ class UserService < Acfs::Service
   self.base_url = 'http://users.example.org'
   use Acfs::Middleware::MessagePackDecoder
   use Acfs::Middleware::JsonDecoder
+  use Acfs::Middleware::JsonEncoder
 end
 
 class CommentService < Acfs::Service
@@ -23,5 +24,6 @@ class Comment
   include Acfs::Model
   service CommentService
 
+  attribute :id, :integer
   attribute :text, :string
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -200,18 +200,23 @@ files:
 - lib/acfs.rb
 - lib/acfs/adapter/typhoeus.rb
 - lib/acfs/collection.rb
+- lib/acfs/errors.rb
 - lib/acfs/middleware/base.rb
 - lib/acfs/middleware/json_decoder.rb
+- lib/acfs/middleware/json_encoder.rb
 - lib/acfs/middleware/msgpack_decoder.rb
+- lib/acfs/middleware/msgpack_encoder.rb
 - lib/acfs/middleware/print.rb
 - lib/acfs/model.rb
 - lib/acfs/model/attributes.rb
 - lib/acfs/model/attributes/boolean.rb
 - lib/acfs/model/attributes/integer.rb
 - lib/acfs/model/attributes/string.rb
+- lib/acfs/model/dirty.rb
 - lib/acfs/model/initialization.rb
 - lib/acfs/model/loadable.rb
 - lib/acfs/model/locatable.rb
+- lib/acfs/model/persistence.rb
 - lib/acfs/model/query_methods.rb
 - lib/acfs/model/relations.rb
 - lib/acfs/model/service.rb
@@ -221,18 +226,22 @@ files:
 - lib/acfs/response/formats.rb
 - lib/acfs/service.rb
 - lib/acfs/service/middleware.rb
-- lib/acfs/service/queue.rb
+- lib/acfs/service/request_handler.rb
 - lib/acfs/version.rb
 - spec/acfs/middleware/json_decoder_spec.rb
 - spec/acfs/middleware/msgpack_decoder_spec.rb
+- spec/acfs/model/attributes_spec.rb
+- spec/acfs/model/dirty_spec.rb
+- spec/acfs/model/initialization_spec.rb
+- spec/acfs/model/loadable_spec.rb
+- spec/acfs/model/locatable_spec.rb
+- spec/acfs/model/persistance_spec.rb
+- spec/acfs/model/query_methods_spec.rb
 - spec/acfs/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
 - spec/acfs/response/formats_spec.rb
 - spec/acfs/service_spec.rb
 - spec/acfs_spec.rb
-- spec/model/attributes_spec.rb
-- spec/model/initialization_spec.rb
-- spec/model/locatable_spec.rb
 - spec/spec_helper.rb
 - spec/support/service.rb
 homepage: ''
@@ -262,13 +271,17 @@ summary: An abstract API base client for service oriented application.
 test_files:
 - spec/acfs/middleware/json_decoder_spec.rb
 - spec/acfs/middleware/msgpack_decoder_spec.rb
+- spec/acfs/model/attributes_spec.rb
+- spec/acfs/model/dirty_spec.rb
+- spec/acfs/model/initialization_spec.rb
+- spec/acfs/model/loadable_spec.rb
+- spec/acfs/model/locatable_spec.rb
+- spec/acfs/model/persistance_spec.rb
+- spec/acfs/model/query_methods_spec.rb
 - spec/acfs/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
 - spec/acfs/response/formats_spec.rb
 - spec/acfs/service_spec.rb
 - spec/acfs_spec.rb
-- spec/model/attributes_spec.rb
-- spec/model/initialization_spec.rb
-- spec/model/locatable_spec.rb
 - spec/spec_helper.rb
 - spec/support/service.rb

data/lib/acfs/service/queue.rb

@@ -1,16 +0,0 @@
-module Acfs
-  class Service
-
-    # Allows to queue request on this service that will be
-    # delegated to global Acfs adapter queue.
-    #
-    module Queue
-
-      # Queue a new request on global adapter queue.
-      #
-      def queue(request)
-        Acfs.adapter.queue request
-      end
-    end
-  end
-end

data/spec/model/locatable_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe 'Acfs::Model::Locatable' do
-  let(:model) { MyUser }
-
-  describe '.url' do
-    it 'should return URL' do
-      expect(model.url).to be == 'http://users.example.org/users'
-    end
-
-    it 'should return URL with id path part if specified' do
-      expect(model.url(5)).to be == 'http://users.example.org/users/5'
-    end
-  end
-end