acfs 0.40.1.rc1 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f852836691662fa9073035cfc5a63c9bee7bee9
-  data.tar.gz: 7e515c491ba534638dddf22f79df45d40246169f
+  metadata.gz: 1f7155842cf931c03b3f312ffe2eebcb67e7c307
+  data.tar.gz: fa10f1af70144fd949948c932c48027d03a3d2b2
 SHA512:
-  metadata.gz: fc53f946379a3d75a368c50ed76315f96d3529eaa4ee816828801b5b19497230867acbe040d23a9f0835c0ed36f5e88ef4d0f87f411269128148e5085e7e9b4f
-  data.tar.gz: f52b9cc11d7b34f04d8fa09cdc15d4ad9979a5a7e05a6f9814d81979c644d71ebcd5e4f1c5138d7a238ad82c8300787ce9505e49ac53e7955c25b4dfbe89bce8
+  metadata.gz: 65a0ef1e19da01ce233ec7f3dc4c1aa7bc7ca9e908577fcdebea882ae2ae5756eb9b1d0a01980a4f67ed5b34f1e0cbd76579761ac354affbfdf8798808232994
+  data.tar.gz: ee6ebab916d98f53e75d741408f7212e3c822d338c30bb4b950168cd2588d7c90d9c893c414390e9e3986fa6a8c8e048cdcb95a6cd1925fb8eeea1f43fdc4cb1

data/lib/acfs.rb

@@ -31,13 +31,16 @@ module Acfs
   module Middleware
     extend ActiveSupport::Autoload
     require 'acfs/middleware/base'
+    require 'acfs/middleware/serializer'
 
     autoload :Print
     autoload :Logger
-    autoload :JsonDecoder
-    autoload :MessagePackDecoder, 'acfs/middleware/msgpack_decoder'
-    autoload :JsonEncoder
-    autoload :MessagePackEncoder, 'acfs/middleware/msgpack_encoder'
+    autoload :JSON
+    autoload :JsonDecoder, 'acfs/middleware/json'
+    autoload :JsonEncoder, 'acfs/middleware/json'
+    autoload :MessagePack, 'acfs/middleware/msgpack'
+    autoload :MessagePackDecoder, 'acfs/middleware/msgpack'
+    autoload :MessagePackEncoder, 'acfs/middleware/msgpack'
   end
 
   module Adapter

data/lib/acfs/middleware/json.rb

@@ -0,0 +1,25 @@
+require 'multi_json'
+
+module Acfs
+  module Middleware
+
+    # A middleware to encore request data using JSON.
+    #
+    class JSON < Serializer
+      def mime
+        ::Mime::JSON
+      end
+
+      def encode(data)
+        ::MultiJson.dump data
+      end
+
+      def decode(body)
+        ::MultiJson.load body
+      end
+    end
+
+    JsonDecoder = JSON
+    JsonEncoder = JSON
+  end
+end

data/lib/acfs/middleware/msgpack.rb

@@ -0,0 +1,27 @@
+require 'msgpack'
+require 'action_dispatch'
+
+module Acfs
+  module Middleware
+    class MessagePack < Serializer
+      unless defined?(::Mime::MSGPACK)
+        ::Mime::Type.register 'application/x-msgpack', :msgpack
+      end
+
+      def mime
+        ::Mime::MSGPACK
+      end
+
+      def encode(data)
+        ::MessagePack.pack data
+      end
+
+      def decode(body)
+        ::MessagePack.unpack body
+      end
+    end
+
+    MessagePackEncoder = MessagePack
+    MessagePackDecoder = MessagePack
+  end
+end

data/lib/acfs/middleware/serializer.rb

@@ -0,0 +1,42 @@
+module Acfs
+  module Middleware
+
+    # A base middleware that does not modify request or response.
+    # Can be used as super class for custom middleware implementations.
+    #
+    class Serializer < Base
+      def encode(data)
+        raise NotImplementedError
+      end
+
+      def decode(data)
+        raise NotImplementedError
+      end
+
+      def mime
+        raise NotImplementedError
+      end
+
+      def call(request)
+        unless request.headers['Content-Type']
+          request.body = encode request.data
+          request.headers['Content-Type'] = mime
+        end
+
+        accept = request.headers['Accept'].to_s.split(',')
+        accept << "#{mime};q=#{options.fetch(:q, 1)}"
+        request.headers['Accept'] = accept.join(',')
+
+        request.on_complete do |response, nxt|
+          if mime == response.content_type
+            response.data = decode response.body
+          end
+
+          nxt.call response
+        end
+
+        app.call(request)
+      end
+    end
+  end
+end

data/lib/acfs/runner.rb

@@ -59,14 +59,10 @@ module Acfs
       return if running?
 
       enqueue_operations
-
-      @running = true
-      adapter.start
+      start_all
     rescue
       queue.clear
       raise
-    ensure
-      @running = false
     end
 
     def clear
@@ -76,6 +72,14 @@ module Acfs
     end
 
     private
+
+    def start_all
+      @running = true
+      adapter.start
+    ensure
+      @running = false
+    end
+
     def enqueue_operations
       while (op = queue.shift)
         op_request(op) { |req| adapter.queue req }

data/lib/acfs/version.rb

@@ -1,9 +1,9 @@
 module Acfs
   module VERSION
     MAJOR = 0
-    MINOR = 40
-    PATCH = 1
-    STAGE = 'rc1'
+    MINOR = 41
+    PATCH = 0
+    STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/spec/acfs/middleware/json_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Acfs::Middleware::JSON do
+  let(:data)     { [{id: 1, name: "Anon"},{id: 2, name:"John", friends: [ 1 ]}] }
+  let(:body)     { '' }
+  let(:headers)  { {} }
+  let(:request)  { Acfs::Request.new 'url', method: 'GET', data: data }
+  let(:response) { Acfs::Response.new request, status: 200, headers: headers, body: body }
+  let(:decoder)  { Acfs::Middleware::JSON.new lambda { |req| req } }
+
+  before do
+    decoder.call request
+  end
+
+  context 'API compatibility' do
+    subject { Acfs::Middleware::JSON }
+    it { is_expected.to eql Acfs::Middleware::JsonDecoder }
+    it { is_expected.to eql Acfs::Middleware::JsonEncoder }
+  end
+
+  describe 'encode' do
+    context 'with not serialized request' do
+      it 'should set Content-Type' do
+        expect(request.headers['Content-Type']).to eq 'application/json'
+      end
+
+      it 'should append Accept header' do
+        expect(request.headers['Accept']).to eq 'application/json;q=1'
+      end
+
+      it 'should serialize data to JSON' do
+        expect(JSON.parse(request.body)).to eq data.map(&:stringify_keys)
+      end
+    end
+  end
+
+  describe 'decode' do
+    context 'with JSON response' do
+      let(:headers) { {'Content-Type' => 'application/json; charset=utf-8'} }
+      let(:body)    { data.to_json }
+
+      it 'should decode body data' do
+        request.complete! response
+
+        expect(response.data).to be == data.map(&:stringify_keys)
+      end
+    end
+
+    context 'with invalid JSON response' do
+      let(:headers) { {'Content-Type' => 'application/json'} }
+      let(:body)    { data.to_json[4..-4] }
+
+      it 'should raise an error' do
+        expect { request.complete! response }.to raise_error(MultiJson::LoadError)
+      end
+    end
+
+    context 'without JSON response' do
+      let(:headers) { {'Content-Type' => 'application/text'} }
+      let(:body)    { data.to_json }
+
+      it 'should not decode non-JSON encoded responses' do
+        request.complete! response
+
+        expect(response.data).to be_nil
+      end
+    end
+  end
+end

data/spec/acfs/middleware/msgpack_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Acfs::Middleware::MessagePack do
+  let(:data)     { [{id: 1, name: 'Anon'}, {id: 2, name: 'John', friends: [ 1 ]}] }
+  let(:body)     { '' }
+  let(:headers)  { {} }
+  let(:request)  { Acfs::Request.new 'url', data: data }
+  let(:response) { Acfs::Response.new request, status: 200, headers: headers, body: body }
+  let(:decoder)  { Acfs::Middleware::MessagePack.new ->(req){ req } }
+
+  before do
+    decoder.call request
+  end
+
+  context 'API compatibility' do
+    subject { Acfs::Middleware::MessagePack }
+    it { is_expected.to eql Acfs::Middleware::MessagePackDecoder }
+    it { is_expected.to eql Acfs::Middleware::MessagePackEncoder }
+  end
+
+  describe 'encode' do
+    context 'with not serialized request' do
+      it 'should set Content-Type' do
+        expect(request.headers['Content-Type']).to eq 'application/x-msgpack'
+      end
+
+      it 'should append Accept header' do
+        expect(request.headers['Accept']).to eq 'application/x-msgpack;q=1'
+      end
+
+      context 'with JSON chained' do
+        let(:decoder) { Acfs::Middleware::JSON.new super(), q: 0.5 }
+
+        it 'should append to Accept header' do
+          expect(request.headers['Accept']).to eq 'application/json;q=0.5,application/x-msgpack;q=1'
+        end
+      end
+
+      it 'should serialize data to MessagePack' do
+        expect(MessagePack.unpack(request.body)).to eq data.map(&:stringify_keys)
+      end
+    end
+  end
+
+  context 'with Message Pack response' do
+    let(:headers) { { 'Content-Type' => 'application/x-msgpack' } }
+    let(:body)    { MessagePack.pack data }
+
+    it 'should decode body data' do
+      request.complete! response
+
+      expect(response.data).to be == data.map(&:stringify_keys)
+    end
+  end
+
+  context 'without Message Pack response' do
+    let(:headers) { { 'Content-Type' => 'application/text' } }
+    let(:body)    { data.to_json }
+
+    it 'should not decode non-MessagePack encoded responses' do
+      request.complete! response
+
+      expect(response.data).to be_nil
+    end
+  end
+end

data/spec/acfs/stub_spec.rb

@@ -199,6 +199,18 @@ describe Acfs::Stub do
         }.to raise_error(::Acfs::InvalidResource)
       end
     end
+
+    context 'with create action' do
+      before do
+        Acfs::Stub.resource MyUser, :create, with: {name: 'John Smith', age: 0}, raise: 422
+      end
+
+      it 'should allow to raise error' do
+        expect {
+          user = MyUser.create! name: 'John Smith', age: 0
+        }.to raise_error(::Acfs::InvalidResource)
+      end
+    end
   end
 
   describe '.allow_requests=' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.40.1.rc1
+  version: 0.41.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,12 +130,11 @@ files:
 - lib/acfs/global.rb
 - lib/acfs/location.rb
 - lib/acfs/middleware/base.rb
-- lib/acfs/middleware/json_decoder.rb
-- lib/acfs/middleware/json_encoder.rb
+- lib/acfs/middleware/json.rb
 - lib/acfs/middleware/logger.rb
-- lib/acfs/middleware/msgpack_decoder.rb
-- lib/acfs/middleware/msgpack_encoder.rb
+- lib/acfs/middleware/msgpack.rb
 - lib/acfs/middleware/print.rb
+- lib/acfs/middleware/serializer.rb
 - lib/acfs/model.rb
 - lib/acfs/model/attributes.rb
 - lib/acfs/model/attributes/base.rb
@@ -176,8 +175,8 @@ files:
 - spec/acfs/collection_spec.rb
 - spec/acfs/configuration_spec.rb
 - spec/acfs/global_spec.rb
-- spec/acfs/middleware/json_decoder_spec.rb
-- spec/acfs/middleware/msgpack_decoder_spec.rb
+- spec/acfs/middleware/json_spec.rb
+- spec/acfs/middleware/msgpack_spec.rb
 - spec/acfs/model/attributes/boolean_spec.rb
 - spec/acfs/model/attributes/date_time_spec.rb
 - spec/acfs/model/attributes/float_spec.rb
@@ -222,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -236,8 +235,8 @@ test_files:
 - spec/acfs/collection_spec.rb
 - spec/acfs/configuration_spec.rb
 - spec/acfs/global_spec.rb
-- spec/acfs/middleware/json_decoder_spec.rb
-- spec/acfs/middleware/msgpack_decoder_spec.rb
+- spec/acfs/middleware/json_spec.rb
+- spec/acfs/middleware/msgpack_spec.rb
 - spec/acfs/model/attributes/boolean_spec.rb
 - spec/acfs/model/attributes/date_time_spec.rb
 - spec/acfs/model/attributes/float_spec.rb

data/lib/acfs/middleware/json_decoder.rb

@@ -1,16 +0,0 @@
-require 'multi_json'
-
-module Acfs
-  module Middleware
-
-    # A middleware to automatically decode JSON responses.
-    #
-    class JsonDecoder < Base
-
-      def response(response, nxt)
-        response.data = ::MultiJson.load(response.body) if response.json?
-        nxt.call response
-      end
-    end
-  end
-end

data/lib/acfs/middleware/json_encoder.rb

@@ -1,20 +0,0 @@
-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_decoder.rb

@@ -1,26 +0,0 @@
-require 'msgpack'
-require 'action_dispatch'
-
-module Acfs
-  module Middleware
-
-    # Register msgpack mime type
-    ::Mime::Type.register 'application/x-msgpack', :msgpack
-
-    # A middleware to decode Message Pack responses.
-    #
-    class MessagePackDecoder < Base
-
-      CONTENT_TYPES = %w(application/x-msgpack)
-
-      def response(response, nxt)
-        response.data = ::MessagePack.unpack(response.body) if message_pack?(response)
-        nxt.call response
-      end
-
-      def message_pack?(response)
-        CONTENT_TYPES.include? response.content_type
-      end
-    end
-  end
-end

data/lib/acfs/middleware/msgpack_encoder.rb

@@ -1,19 +0,0 @@
-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/spec/acfs/middleware/json_decoder_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe Acfs::Middleware::JsonDecoder do
-  let(:data)     { [{id: 1, name: "Anon"},{id: 2, name:"John", friends: [ 1 ]}] }
-  let(:body)     { data.to_param }
-  let(:headers)  { {} }
-  let(:request)  { Acfs::Request.new "fubar" }
-  let(:response) { Acfs::Response.new request, status: 200, headers: headers, body: body }
-  let(:decoder)  { Acfs::Middleware::JsonDecoder.new lambda { |req| req } }
-
-  before do
-    decoder.call request
-  end
-
-  context 'with JSON response' do
-    let(:headers) { { 'Content-Type' => 'application/json; charset=utf-8' } }
-    let(:body)    { data.to_json }
-
-    it 'should decode body data' do
-      request.complete! response
-
-      expect(response.data).to be == data.map(&:stringify_keys)
-    end
-  end
-
-  context 'with invalid JSON response' do
-    let(:headers) { { 'Content-Type' => 'application/json' } }
-    let(:body)    { data.to_json[4..-4] }
-
-    it 'should raise an error' do
-      expect { request.complete! response }.to raise_error(MultiJson::LoadError)
-    end
-  end
-
-  context 'without JSON response' do
-    let(:headers) { { 'Content-Type' => 'application/text' } }
-    let(:body)    { data.to_json }
-
-    it 'should not decode non-JSON encoded responses' do
-      request.complete! response
-
-      expect(response.data).to be_nil
-    end
-  end
-end

data/spec/acfs/middleware/msgpack_decoder_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe Acfs::Middleware::MessagePackDecoder do
-  let(:data)     { [{id: 1, name: "Anon"},{id: 2, name:"John", friends: [ 1 ]}] }
-  let(:body)     { data.to_param }
-  let(:headers)  { {} }
-  let(:request)  { Acfs::Request.new "fubar" }
-  let(:response) { Acfs::Response.new request, status: 200, headers: headers, body: body }
-  let(:decoder)  { Acfs::Middleware::MessagePackDecoder.new lambda { |req| req } }
-
-  before do
-    decoder.call request
-  end
-
-  context 'with Message Pack response' do
-    let(:headers) { { 'Content-Type' => 'application/x-msgpack' } }
-    let(:body)    { MessagePack.pack data }
-
-    it 'should decode body data' do
-      request.complete! response
-
-      expect(response.data).to be == data.map(&:stringify_keys)
-    end
-  end
-
-  context 'without Message Pack response' do
-    let(:headers) { { 'Content-Type' => 'application/text' } }
-    let(:body)    { data.to_json }
-
-    it 'should not decode non-MessagePack encoded responses' do
-      request.complete! response
-
-      expect(response.data).to be_nil
-    end
-  end
-end