acfs 0.44.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d7af15fe21ff66b382cb23061cfa56cbba0ed5
-  data.tar.gz: 3e037d00c80edce80f8578570a526467c54ac943
+  metadata.gz: 94d04da7b680edf457505737b4bcc1d18d6e3fb3
+  data.tar.gz: 629b89356e8be9625b20722ca89bfe88ff3d5bc9
 SHA512:
-  metadata.gz: 00e78fa5cad1bfc7eff302b05ce92d7bd798cd581a132ed293e28fe47254b54fa2da3095862eb51c42250e81c04aa84bc91e5ad8cbf02e92a196eb34797bd840
-  data.tar.gz: c690ff3a89317f7a0c488a4752f5d4756bd186cef50306b7bfceff3c07f4b9ca5f4904255aa5ff2ffeecba0783b6d48ad31adae39f595f0a04f740a6cce9f066
+  metadata.gz: 7afc2b923b468780cd3dabd0d6ff592e829b2b158d3b96469513ca324e2644a6e4d30f48408efb0ef48bc53e35595b963b8700131d8a8a81933eb4bef8f324b1
+  data.tar.gz: 45349a36fa4c76f564f95897102e74e4a934b9ddee69cb785868a9b75a2fd652b4ada7687d4c974a856a65b1dfb18caf372eaa963211851edf75edbc8a1a40d1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.45.0
+
+* Fetching multiple records (`find(ary)`) is stable now, but untested (#38)
+* Middleware stack is build on ActionDispatch::MiddlewareStack now
+* Deprecate legacy middleware names (xyEncoder, xyDecoder)
+
 ## 0.44.0
 
 * Add option to configure adapter creation and pass option to typhoeus adapter e.g.

data/acfs.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'multi_json'
 
   # Bundle update w/o version resolves to 0.3.3 ...
-  spec.add_runtime_dependency 'typhoeus', '>= 0.6.5'
+  spec.add_runtime_dependency 'typhoeus', '~> 1.0'
 
   spec.add_runtime_dependency 'rack'
 

data/lib/acfs/middleware/json.rb

@@ -18,7 +18,10 @@ module Acfs
       end
     end
 
+    # @deprecated
     JsonDecoder = JSON
+
+    # @deprecated
     JsonEncoder = JSON
   end
 end

data/lib/acfs/middleware/msgpack.rb

@@ -21,7 +21,10 @@ module Acfs
       end
     end
 
+    # @deprecated
     MessagePackEncoder = MessagePack
+
+    # @deprecated
     MessagePackDecoder = MessagePack
   end
 end

data/lib/acfs/resource/query_methods.rb

@@ -223,9 +223,9 @@ class Acfs::Resource
           collection.__callbacks__ << block unless block.nil?
 
           counter = 0
-          ids.each do |id|
+          ids.each_with_index do |id, index|
             find_single id, opts do |resource|
-              collection << resource
+              collection[index] = resource
               if (counter += 1) == ids.size
                 collection.loaded!
                 collection.__invoke__

data/lib/acfs/service/middleware.rb

@@ -1,3 +1,5 @@
+require 'acfs/service/middleware/stack'
+
 module Acfs
   class Service
     # Module providing all function to register middlewares
@@ -15,27 +17,25 @@ module Acfs
       end
 
       module ClassMethods
-        # @api public
+        # @!method use(klass, *args, &block)
+        #   @api public
         #
-        # Register a new middleware to be used for this service.
+        #   Register a new middleware to be used for this service.
         #
-        # @example
-        #   class MyService < Acfs::Service
-        #     self.base_url = 'http://my.srv'
-        #     use Acfs::Middleware::JsonDecoder
-        #   end
+        #   @example
+        #     class MyService < Acfs::Service
+        #       self.base_url = 'http://my.srv'
+        #       use Acfs::Middleware::JSON
+        #     end
         #
-        # @param [Class] klass Middleware class to instantiate and append to middleware stack.
-        # @param [Hash, Object] options Options to delegate to middleware class initializer.
-        # @return [undefined]
+        #   @param [Class] klass Middleware class to append
+        #   @param [Array<Object>] args Arguments passed to klass initialize
+        #   @param [Proc] block Block passed to klass initialize
+        #   @return [undefined]
         #
-        def use(klass, options = {})
-          @middlewares ||= []
-
-          return false if @middlewares.include? klass
-
-          @middlewares << klass
-          @middleware = klass.new(middleware, options)
+        def use(klass, *args, &block)
+          # Backward compatible behavior
+          middleware.insert(0, klass, *args, &block)
         end
 
         # @api private
@@ -45,19 +45,11 @@ module Acfs
         # @return [#call]
         #
         def middleware
-          @middleware ||= proc {|request| request }
+          @middleware ||= Stack.new
         end
 
-        # @api public
-        #
-        # Clear all registered middlewares.
-        #
-        # @return [undefined]
-        #
-        def clear
-          @middleware  = nil
-          @middlewares = []
-        end
+        # @deprecated
+        delegate :clear, to: :middleware
       end
     end
   end

data/lib/acfs/service/middleware/stack.rb

@@ -0,0 +1,34 @@
+require 'action_dispatch/middleware/stack'
+
+module Acfs
+  class Service
+    module Middleware
+      class Stack < ActionDispatch::MiddlewareStack
+        MUTEX = Mutex.new
+        IDENTITY = -> (i) { i }
+
+        def build!
+          MUTEX.synchronize do
+            return if @stack
+
+            @stack = build
+          end
+        end
+
+        def build(app = IDENTITY)
+          super
+        end
+
+        def call(request)
+          build! unless @stack
+
+          @stack.call request
+        end
+
+        def clear
+          middlewares.clear
+        end
+      end
+    end
+  end
+end

data/lib/acfs/version.rb

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

data/spec/acfs/middleware/json_spec.rb

@@ -12,12 +12,6 @@ describe Acfs::Middleware::JSON 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

data/spec/acfs/middleware/msgpack_spec.rb

@@ -12,12 +12,6 @@ describe Acfs::Middleware::MessagePack 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

data/spec/acfs/service/middleware_spec.rb

@@ -6,7 +6,6 @@ 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
@@ -15,35 +14,20 @@ describe Acfs::Service::Middleware do
     it 'should add middleware to list' do
       srv_class.use middleware
 
-      expect(srv_class.instance_variable_get(:@middlewares)).to include(middleware)
+      expect(srv_class.middleware).to include(middleware)
     end
 
     it 'should add middleware to stack' do
       srv_class.use middleware
 
-      expect(srv_class.middleware).to be_a(middleware)
+      expect(srv_class.middleware.build(1)).to be_a(middleware)
     end
 
     it 'should instantiate middleware object' do
       expect(middleware).to 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
+      srv_class.middleware.build
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'bundler'
 Bundler.require
 
 require 'acfs'
+require 'webmock/rspec'
 
 Dir[File.expand_path('spec/support/**/*.rb')].each {|f| require f }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,16 +70,16 @@ dependencies:
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - lib/acfs/runner.rb
 - lib/acfs/service.rb
 - lib/acfs/service/middleware.rb
+- lib/acfs/service/middleware/stack.rb
 - lib/acfs/singleton_resource.rb
 - lib/acfs/stub.rb
 - lib/acfs/util.rb