acfs 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0522ae91e3c94fadb85d436d0526914db67fe867
-  data.tar.gz: 5b867fc16138f4d4ae1800d14375877477571d36
+  metadata.gz: f5bd82876ac05bd67b6a8d95a8d9e0779eb7d1c1
+  data.tar.gz: 5234ed3bfb459596c3cc0533bec51a67013f0b69
 SHA512:
-  metadata.gz: 16155101c03288a59633bacc3810454c34b5631ff71f2712fa2a3d7b384971e3798d8577dd3f01f0ccaeb3a5863e6673764a6e7d93db8d343835608e2009576d
-  data.tar.gz: 9e17ca080917e2151e8d4ae0dc27c661f35322458b0295a8f9c4577cf6aec089f319ec533b86b0721c2ec296727e52ab638d28ff11db068df3f9fdd4739aa3f5
+  metadata.gz: e10f336df5c116c5155ab4c51dbbe8a746ce3235b87180c69a5a1651ed285c75abeccd219b95fc0dda1a5e65bd9ccd3bfa74a42f672ae9de60d8ec1f9f99f14a
+  data.tar.gz: 8631fdb5b179084f4f54ca953aa750f6b70242c5ebcd6aa6c52f97836663dd88e3d98c6dc30239c9144a63718913d3bac4041530a3aaccebedf8567f4404ef4e

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.rbx
 .bundle
 .config
 .yardoc

data/README.md

@@ -2,12 +2,9 @@
 
 [![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)
 
-Acfs is a library to develop API client libraries for single services within a
-larger service oriented application.
+Acfs is a library to develop API client libraries for single services within a larger service oriented application.
 
-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.
+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
 
@@ -15,8 +12,7 @@ Add this line to your application's Gemfile:
 
     gem 'acfs', '~> 0.14.0'
 
-**Note:** Acfs is under development. I'll try to avoid changes to the public
-API but internal APIs may change quite often.
+**Note:** Acfs is under development. I'll try to avoid changes to the public API but internal APIs may change quite often.
 
 And then execute:
 
@@ -42,8 +38,7 @@ class UserService < Acfs::Service
 end
 ```
 
-This specifies where the `UserService` is located. You can now create some
-models representing resources served 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
@@ -63,8 +58,7 @@ class User
 end
 ```
 
-The service and model classes can be shipped as a gem or git submodule to be
-included by the frontend application(s).
+The service and model classes can be shipped as a gem or git submodule to be included by the frontend application(s).
 
 You can use the model there:
 
@@ -87,8 +81,7 @@ Acfs.run # Will request `http://users.myapp.org/users`
 @users #=> [<User>, ...]
 ```
 
-If you need multiple resources or dependent resources first define a "plan"
-how they can be loaded:
+If you need multiple resources or dependent resources first define a "plan" how they can be loaded:
 
 ```ruby
 @user = User.find(5) do |user|
@@ -141,6 +134,57 @@ Acfs has basic update support using `PUT` requests:
 @user.persisted? # => true
 ```
 
+## Stubbing
+
+You can stub resources in applications using an Acfs service client:
+
+```ruby
+# Enable stubs in spec helper
+Acfs::Stub.enable
+
+before do
+  Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 }
+  Acfs::Stub.resource MyUser, :read, with: { id: 2 }, raise: :not_found
+  Acfs::Stub.resource Session, :create, with: { ident: 'john@exmaple.org', password: 's3cr3t' }, return: { id: 'longhash', user: 1 }
+end
+
+it 'should find user number one' do
+  user = MyUser.find 1
+  Acfs.run
+
+  expect(user.id).to be == 1
+  expect(user.name).to be == 'John Smith'
+  expect(user.age).to be == 32
+end
+
+it 'should not find user number two' do
+  MyUser.find 3
+
+  expect { Acfs.run }.to raise_error(Acfs::ResourceNotFound)
+end
+
+it 'should allow stub resource creation' do
+  session = Session.create! ident: 'john@exmaple.org', password: 's3cr3t'
+
+  expect(session.id).to be == 'longhash'
+  expect(session.user).to be == 1
+end
+```
+
+By default Acfs raises an error when a non stubbed resource should be requested. You can switch of the behavior:
+
+```ruby
+before do
+  Acfs::Stub.allow_requests = true
+end
+
+it 'should find user number one' do
+  user = MyUser.find 1
+  Acfs.run             # Would have raised Acfs::RealRequestNotAllowedError
+                       # Will run real request to user service instead.
+end
+```
+
 ## Roadmap
 
 * Update
@@ -157,7 +201,6 @@ Acfs has basic update support using `PUT` requests:
           Modified Headers, conflict detection, ...
     * Pagination? Filtering? (If service API provides such features.)
     * Messaging Queue support for services and models
-    * Allow stubbing of resources as objects for testing services.
 * Documentation
 
 ## Contributing

data/acfs.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'actionpack'
   spec.add_runtime_dependency 'multi_json'
   spec.add_runtime_dependency 'typhoeus'
+  spec.add_runtime_dependency 'rack'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
 end

data/lib/acfs.rb

@@ -1,16 +1,24 @@
 require 'active_support'
-require 'active_support/core_ext'
+require 'active_support/core_ext/class'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/module'
+
 require 'acfs/version'
 require 'acfs/errors'
+require 'acfs/global'
 
 module Acfs
   extend ActiveSupport::Autoload
+  extend Global
 
   autoload :Collection
   autoload :Model
   autoload :Request
   autoload :Response
   autoload :Service
+  autoload :Stub
+  autoload :Operation
+  autoload :Runner
 
   module Middleware
     extend ActiveSupport::Autoload
@@ -27,19 +35,8 @@ module Acfs
   module Adapter
     extend ActiveSupport::Autoload
 
+    autoload :Base
     autoload :Typhoeus
   end
-
-  class << self
-
-    # Run all queued
-    def run
-      adapter.run
-    end
-
-    def adapter
-      @adapter ||= Adapter::Typhoeus.new
-    end
-  end
 end
 

data/lib/acfs/adapter/base.rb

@@ -0,0 +1,28 @@
+module Acfs::Adapter
+
+  # Base adapter handling operation queuing
+  # and processing.
+  #
+  class Base
+
+    # Start processing queued requests.
+    #
+    def start
+    end
+
+    # Abort running and queued requests.
+    #
+    def abort
+    end
+
+    # Run request right now skipping queue.
+    #
+    def run(_)
+    end
+
+    # Enqueue request to be run later.
+    #
+    def queue(_)
+    end
+  end
+end

data/lib/acfs/adapter/typhoeus.rb

@@ -5,26 +5,22 @@ module Acfs
 
     # Adapter for Typhoeus.
     #
-    class Typhoeus
+    class Typhoeus < Base
 
-      # Run all queued requests.
-      #
-      def run(request = nil)
-        return hydra.run unless request
+      def start
+        hydra.run
+      end
 
-        convert_request(request).run
+      def abort
+        hydra.abort
       end
 
-      # Add a new request or URL to the queue.
-      #
-      def queue(req)
-        hydra.queue convert_request(req)
+      def run(request)
+        convert_request(request).run
       end
 
-      # Remove all requests from queue.
-      #
-      def clear
-        hydra.abort
+      def queue(request)
+        hydra.queue convert_request request
       end
 
     protected

data/lib/acfs/errors.rb

@@ -28,4 +28,6 @@ module Acfs
       super
     end
   end
+
+  class RealRequestNotAllowedError < StandardError; end
 end

data/lib/acfs/global.rb

@@ -0,0 +1,17 @@
+module Acfs
+
+  # Global Acfs module methods.
+  #
+  module Global
+
+    def runner
+      @runner ||= Runner.new Adapter::Typhoeus.new
+    end
+
+    # Run all queued operations.
+    #
+    def run
+      runner.start
+    end
+  end
+end

data/lib/acfs/model.rb

@@ -5,6 +5,7 @@ require 'acfs/model/dirty'
 require 'acfs/model/loadable'
 require 'acfs/model/locatable'
 require 'acfs/model/persistence'
+require 'acfs/model/operational'
 require 'acfs/model/query_methods'
 require 'acfs/model/relations'
 require 'acfs/model/service'
@@ -30,6 +31,7 @@ module Acfs
       include Model::Loadable
       include Model::Persistence
       include Model::Locatable
+      include Model::Operational
       include Model::QueryMethods
       include Model::Relations
       include Model::Service

data/lib/acfs/model/operational.rb

@@ -0,0 +1,19 @@
+module Acfs::Model
+
+  # Provide methods for creating and processing CRUD operations and
+  # handling responses. That includes error handling as well as
+  # handling stubbed resources.
+  #
+  # Should only be used internal.
+  #
+  module Operational
+    extend ActiveSupport::Concern
+    delegate :operation, to: :'self.class'
+
+    module ClassMethods
+      def operation(action, opts = {}, &block)
+        Acfs.runner.process ::Acfs::Operation.new self, action, opts, &block
+      end
+    end
+  end
+end

data/lib/acfs/model/persistence.rb

@@ -52,16 +52,9 @@ module Acfs
 
         opts[:data] = attributes unless opts[:data]
 
-        request = new? ? create_request(opts) : put_request(opts)
-        request.on_complete do |response|
-          if response.success?
-            update_with response.data
-          else
-            self.class.raise! response
-          end
+        operation (new? ? :create : :update), opts do |data|
+          update_with data
         end
-
-        self.class.service.run request
       end
 
       module ClassMethods
@@ -96,14 +89,6 @@ module Acfs
         self.attributes = data
         loaded!
       end
-
-      def create_request(opts = {})
-        Acfs::Request.new self.class.url, method: :post, data: opts[:data]
-      end
-
-      def put_request(opts = {})
-        Acfs::Request.new url, method: :put, data: opts[:data]
-      end
     end
   end
 end

data/lib/acfs/model/query_methods.rb

@@ -37,8 +37,8 @@ module Acfs::Model
       def all(params = {}, &block)
         collection = ::Acfs::Collection.new
 
-        request = Acfs::Request.new(url, params: params) do |response|
-          response.data.each do |obj|
+        operation :list, params: params do |data|
+          data.each do |obj|
             collection << self.new.tap do |m|
               m.attributes = obj
               m.loaded!
@@ -47,37 +47,23 @@ module Acfs::Model
           collection.loaded!
           block.call collection unless block.nil?
         end
-        service.queue request
 
         collection
       end
       alias :where :all
 
-      def raise!(response)
-        case response.code
-          when 404
-            raise ::Acfs::ResourceNotFound.new response: response
-          when 422
-            raise ::Acfs::InvalidResource.new response: response, errors: response.data['errors']
-          else
-            raise ::Acfs::ErroneousResponse.new response: response
-        end
-      end
-
       private
       def find_single(id, opts, &block)
         model = self.new
 
-        request = Acfs::Request.new url(id.to_s) do |response|
-          if response.success?
-            model.attributes = response.data
-            model.loaded!
-            block.call model unless block.nil?
-          else
-            raise! response
-          end
+        opts[:params] ||= {}
+        opts[:params].merge!({ id: id })
+
+        operation :read, opts do |data|
+          model.attributes = data
+          model.loaded!
+          block.call model unless block.nil?
         end
-        service.queue request
 
         model
       end

data/lib/acfs/operation.rb

@@ -0,0 +1,60 @@
+module Acfs
+
+  # Describes a CRUD operation. Handle request creation and response
+  # processing as well as error handling and stubbing.
+  #
+  class Operation
+    attr_reader :action, :params, :resource, :data, :callback
+    delegate :service, to: :resource
+
+    def initialize(resource, action, opts = {}, &block)
+      @resource = resource
+      @action   = action.to_sym
+      @params   = opts[:params] || {}
+      @data     = opts[:data]   || {}
+      @callback = block
+
+      raise ArgumentError, 'ID parameter required for READ, UPDATE and DELETE operation.' if single? and id.nil?
+    end
+
+    def single?
+      [:read, :update, :delete].include? action
+    end
+
+    def synchronous?
+      [:update, :delete, :create].include? action
+    end
+
+    def id
+      @id ||= params.delete(:id) || data[:id]
+    end
+
+    def url
+      single? ? resource.url(id) : resource.url
+    end
+
+    def method
+      { read: :get, list: :get, update: :put, create: :post, delete: :delete }[action]
+    end
+
+    def request
+      request = ::Acfs::Request.new url, method: method, params: params, data: data
+      request.on_complete do |response|
+        handle_failure response unless response.success?
+        callback.call response.data
+      end
+      request
+    end
+
+    def handle_failure(response)
+      case response.code
+        when 404
+          raise ::Acfs::ResourceNotFound.new response: response
+        when 422
+          raise ::Acfs::InvalidResource.new response: response, errors: response.data.try(:[], 'errors')
+        else
+          raise ::Acfs::ErroneousResponse.new response: response
+      end
+    end
+  end
+end

data/lib/acfs/runner.rb

@@ -0,0 +1,76 @@
+require 'acfs/service/middleware'
+
+module Acfs
+
+  class Runner
+    include Service::Middleware
+    attr_reader :adapter
+
+    def initialize(adapter)
+      @adapter = adapter
+      @running = false
+    end
+
+    # Process an operation. Synchronous operations will be run
+    # and parallel operations will be queued.
+    #
+    def process(op)
+      op.synchronous? ? run(op) : enqueue(op)
+    end
+
+    # Run operation right now skipping queue.
+    #
+    def run(op)
+      op_request(op) { |req| adapter.run req }
+    end
+
+    # List of current queued operations.
+    #
+    def queue
+      @queue ||= []
+    end
+
+    # Enqueue operation to be run later.
+    #
+    def enqueue(op)
+      if running?
+        op_request(op) { |req| adapter.queue req }
+      else
+        queue << op
+      end
+    end
+
+    # Return true if queued operations are currently processed.
+    #
+    def running?
+      @running
+    end
+
+    # Start processing queued operations.
+    #
+    def start
+      enqueue_operations
+
+      @running = true
+      adapter.start
+      @running = false
+    end
+
+    def clear
+      queue.clear
+      adapter.abort
+    end
+
+    private
+    def enqueue_operations
+      while (op = queue.shift)
+        op_request(op) { |req| adapter.queue req }
+      end
+    end
+
+    def op_request(op)
+      return if Acfs::Stub.enabled? and Acfs::Stub.stubbed(op)
+      yield prepare op.service.prepare op.request
+    end
+  end
+end

data/lib/acfs/service.rb

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

data/lib/acfs/service/middleware.rb

@@ -8,8 +8,8 @@ module Acfs
     module Middleware
       extend ActiveSupport::Concern
 
-      def prepare(_) # :nodoc:
-        self.class.middleware.call super
+      def prepare(request) # :nodoc:
+        self.class.middleware.call request
       end
 
       module ClassMethods
@@ -40,7 +40,7 @@ module Acfs
         #
         def clear
           @middleware  = nil
-          @middlewares = nil
+          @middlewares = []
         end
       end
     end

data/lib/acfs/stub.rb

@@ -0,0 +1,85 @@
+require 'rack/utils'
+
+module Acfs
+
+  # Global handler for stubbing resources.
+  #
+  class Stub
+    ACTIONS = [ :read, :create, :update, :delete, :list ]
+
+    class << self
+
+      # Stub a resource with given handler block. An already created handler
+      # for same resource class will be overridden.
+      #
+      def resource(klass, action, opts = {}, &block)
+        action = action.to_sym
+        raise ArgumentError, "Unknown action `#{action}`." unless ACTIONS.include? action
+
+        stubs[klass] ||= {}
+        stubs[klass][action] ||= []
+        stubs[klass][action] << opts
+      end
+
+      def allow_requests=(allow)
+        @allow_requests = allow ? true : false
+      end
+
+      def allow_requests?
+        @allow_requests ||= false
+      end
+
+      def enabled?
+        @enabled ||= false
+      end
+
+      def enable; @enabled = true end
+      def disable; @enabled = false end
+
+      # Clear all stubs.
+      #
+      def clear(klass = nil)
+        klass.nil? ? stubs.clear : stubs[klass].try(:clear)
+      end
+
+      def stubs
+        @stubs ||= {}
+      end
+
+      def stub_for(op)
+        return false unless (classes = stubs[op.resource])
+        return false unless (actions = classes[op.action])
+
+        params = op.params
+        params.merge! id: op.id unless op.id.nil?
+        actions.select! { |stub| stub[:with] == params || stub[:with] == op.data }
+        actions.first
+      end
+
+      def stubbed(op)
+        stub = stub_for op
+        unless stub
+          return false if allow_requests?
+          raise RealRequestNotAllowedError, "No stub found for `#{op.resource.name}` with params `#{op.params}`"
+        end
+
+        if (data = stub[:return])
+          op.callback.call data
+        elsif (err = stub[:raise])
+          raise_error op, err, stub[:return]
+        else
+          raise ArgumentError, 'Unsupported stub.'
+        end
+
+        true
+      end
+
+      private
+      def raise_error(op, name, data)
+        raise name if name.is_a? Class
+
+        op.handle_failure ::Acfs::Response.new nil, status: Rack::Utils.status_code(name), data: data
+      end
+    end
+  end
+end

data/lib/acfs/version.rb

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

data/spec/acfs/service/middleware_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+class TestMiddleware < Acfs::Middleware::Base
+end
+
+describe Acfs::Service::Middleware do
+  let(:srv_class) { Class.new(Acfs::Service) }
+  let(:options) { {} }
+  let(:service) { srv_class.new options }
+  let(:middleware) { TestMiddleware }
+
+  describe '.use' do
+    let(:options) { { abc: 'cde' } }
+
+    it 'should add middleware to list' do
+      srv_class.use middleware
+
+      expect(srv_class.instance_variable_get(:@middlewares)).to include(middleware)
+    end
+
+    it 'should add middleware to stack' do
+      srv_class.use middleware
+
+      expect(srv_class.middleware).to be_a(middleware)
+    end
+
+    it 'should instantiate middleware object' do
+      middleware.should_receive(:new).with(anything, options)
+
+      srv_class.use middleware, options
+    end
+  end
+
+  describe '.clear' do
+    before { srv_class.use middleware }
+
+    it 'should clear middleware list' do
+      srv_class.clear
+
+      expect(srv_class.instance_variable_get(:@middlewares)).to be_empty
+    end
+
+    it 'should reset middleware stack' do
+      srv_class.clear
+
+      expect(srv_class.instance_variable_get(:@middleware)).to be_nil
+    end
+  end
+end

data/spec/acfs/stub_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+class SpecialCustomError < StandardError; end
+
+describe Acfs::Stub do
+  let(:stub) { Class.new(Acfs::Stub) }
+
+  before(:all) { Acfs::Stub.enable }
+  after(:all) { Acfs::Stub.disable }
+
+  before do
+    Acfs::Stub.allow_requests = false
+
+    #Acfs::Stub.read(MyUser).with(id: 5).and_return({ id: 5, name: 'John', age: 32 })
+    #Acfs::Stub.read(MyUser).with(id: 6).and_raise(:not_found)
+    #Acfs::Stub.create(MyUser).with(name: '', age: 12).and_return(:invalid, errors: { name: [ 'must be present ']})
+  end
+
+  describe '.resource' do
+    context 'with read action' do
+      before do
+        Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 }
+        Acfs::Stub.resource MyUser, :read, with: { id: 2 }, raise: SpecialCustomError
+        Acfs::Stub.resource MyUser, :read, with: { id: 3 }, raise: :not_found
+      end
+
+      it 'should allow to stub resource reads' do
+        user = MyUser.find 1
+        Acfs.run
+
+        expect(user.id).to be == 1
+        expect(user.name).to be == 'John Smith'
+        expect(user.age).to be == 32
+      end
+
+      context 'with error' do
+        it 'should allow to raise errors' do
+          MyUser.find 2
+
+          expect { Acfs.run }.to raise_error(SpecialCustomError)
+        end
+
+        it 'should allow to raise symbolic errors' do
+          MyUser.find 3
+
+          expect { Acfs.run }.to raise_error(Acfs::ResourceNotFound)
+        end
+      end
+    end
+
+    context 'with create action' do
+      before do
+        Acfs::Stub.resource Session, :create, with: { ident: 'john@exmaple.org', password: 's3cr3t' }, return: { id: 'longhash', user: 1 }
+        Acfs::Stub.resource Session, :create, with: { ident: 'john@exmaple.org', password: 'wrong' }, raise: 422
+      end
+
+      it 'should allow stub resource creation' do
+        session = Session.create! ident: 'john@exmaple.org', password: 's3cr3t'
+
+        expect(session.id).to be == 'longhash'
+        expect(session.user).to be == 1
+      end
+
+      it 'should allow to raise error' do
+        expect {
+          Session.create! ident: 'john@exmaple.org', password: 'wrong'
+        }.to raise_error(::Acfs::InvalidResource)
+      end
+    end
+  end
+
+  describe '.allow_requests=' do
+    context 'when enabled' do
+      before do
+        Acfs::Stub.allow_requests = true
+        stub_request(:get, 'http://users.example.org/users/2').to_return response({ id: 2, name: 'John', age: 26 })
+      end
+
+      it 'should allow real requests' do
+        @user = MyUser.find 2
+        expect { Acfs.run }.to_not raise_error
+      end
+    end
+
+    context 'when disabled' do
+      before do
+        Acfs::Stub.allow_requests = false
+      end
+
+      it 'should allow real requests' do
+        @user = MyUser.find 2
+        expect { Acfs.run }.to raise_error(Acfs::RealRequestNotAllowedError)
+      end
+    end
+  end
+end

data/spec/acfs_spec.rb

@@ -1,19 +1,18 @@
 require 'spec_helper'
 
-describe "Acfs" do
+describe 'Acfs' do
 
   before do
-    headers = {}
-    stub_request(:get, "http://users.example.org/users").to_return response([{ id: 1, name: "Anon", age: 12 }, { id: 2, name: "John", age: 26 }])
-    stub_request(:get, "http://users.example.org/users/2").to_return response({ id: 2, name: "John", age: 26 })
-    stub_request(:get, "http://users.example.org/users/3").to_return response({ id: 3, name: "Miraculix", age: 122 })
-    stub_request(:get, "http://users.example.org/users/100").to_return response({ id:100, name: "Jimmy", age: 45 })
-    stub_request(:get, "http://users.example.org/users/2/friends").to_return response([{ id: 1, name: "Anon", age: 12 }])
-    stub_request(:get, "http://comments.example.org/comments?user=2").to_return response([{ id: 1, text: "Comment #1"}, { id: 2, text: "Comment #2" }])
+    stub_request(:get, 'http://users.example.org/users').to_return response([{ id: 1, name: 'Anon', age: 12 }, { id: 2, name: 'John', age: 26 }])
+    stub_request(:get, 'http://users.example.org/users/2').to_return response({ id: 2, name: 'John', age: 26 })
+    stub_request(:get, 'http://users.example.org/users/3').to_return response({ id: 3, name: 'Miraculix', age: 122 })
+    stub_request(:get, 'http://users.example.org/users/100').to_return response({ id:100, name: 'Jimmy', age: 45 })
+    stub_request(:get, 'http://users.example.org/users/2/friends').to_return response([{ id: 1, name: 'Anon', age: 12 }])
+    stub_request(:get, 'http://comments.example.org/comments?user=2').to_return response([{ id: 1, text: 'Comment #1' }, { id: 2, text: 'Comment #2' }])
   end
 
   it 'should update single resource synchronously' do
-    stub = stub_request(:put, "http://users.example.org/users/2")
+    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
@@ -22,7 +21,7 @@ describe "Acfs" do
     expect(@user).to_not be_changed
     expect(@user).to be_persisted
 
-    @user.name = "Johnny"
+    @user.name = 'Johnny'
 
     expect(@user).to be_changed
     expect(@user).to_not be_persisted
@@ -35,7 +34,7 @@ describe "Acfs" do
   end
 
   it 'should create a single resource synchronously' do
-    stub = stub_request(:post, "http://users.example.org/sessions").to_return response({id: 'sessionhash', user: 1})
+    stub = stub_request(:post, 'http://users.example.org/sessions').to_return response({id: 'sessionhash', user: 1})
 
     session = Session.create ident: 'Anon'
 
@@ -104,7 +103,7 @@ describe "Acfs" do
   end
 
   it 'should load associated resources' do
-    pending "TODO: Implement high level feature"
+    pending 'TODO: Implement high level feature'
 
     @user = MyUser.find(2) do |user|
       @friends = user.friends.all

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ RSpec.configure do |config|
   end
 
   config.before :each do
-    Acfs.adapter.clear
+    Acfs.runner.clear
+    Acfs::Stub.clear
   end
 end

data/spec/support/response.rb

@@ -1,3 +1,4 @@
+require 'json'
 
 def response(data = nil, opts = {})
   if data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,9 +127,11 @@ files:
 - gemfiles/Gemfile.rails-3-2
 - gemfiles/Gemfile.rails-4-0
 - lib/acfs.rb
+- lib/acfs/adapter/base.rb
 - lib/acfs/adapter/typhoeus.rb
 - lib/acfs/collection.rb
 - lib/acfs/errors.rb
+- lib/acfs/global.rb
 - lib/acfs/middleware/base.rb
 - lib/acfs/middleware/json_decoder.rb
 - lib/acfs/middleware/json_encoder.rb
@@ -132,18 +148,21 @@ files:
 - lib/acfs/model/initialization.rb
 - lib/acfs/model/loadable.rb
 - lib/acfs/model/locatable.rb
+- lib/acfs/model/operational.rb
 - lib/acfs/model/persistence.rb
 - lib/acfs/model/query_methods.rb
 - lib/acfs/model/relations.rb
 - lib/acfs/model/service.rb
+- lib/acfs/operation.rb
 - lib/acfs/request.rb
 - lib/acfs/request/callbacks.rb
 - lib/acfs/response.rb
 - lib/acfs/response/formats.rb
 - lib/acfs/response/status.rb
+- lib/acfs/runner.rb
 - lib/acfs/service.rb
 - lib/acfs/service/middleware.rb
-- lib/acfs/service/request_handler.rb
+- lib/acfs/stub.rb
 - lib/acfs/version.rb
 - spec/acfs/middleware/json_decoder_spec.rb
 - spec/acfs/middleware/msgpack_decoder_spec.rb
@@ -158,7 +177,9 @@ files:
 - spec/acfs/request_spec.rb
 - spec/acfs/response/formats_spec.rb
 - spec/acfs/response/status_spec.rb
+- spec/acfs/service/middleware_spec.rb
 - spec/acfs/service_spec.rb
+- spec/acfs/stub_spec.rb
 - spec/acfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/response.rb
@@ -201,7 +222,9 @@ test_files:
 - spec/acfs/request_spec.rb
 - spec/acfs/response/formats_spec.rb
 - spec/acfs/response/status_spec.rb
+- spec/acfs/service/middleware_spec.rb
 - spec/acfs/service_spec.rb
+- spec/acfs/stub_spec.rb
 - spec/acfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/response.rb

data/lib/acfs/service/request_handler.rb

@@ -1,27 +0,0 @@
-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