acfs 0.50.0 → 1.0.0.dev.1.b297

data/lib/acfs/response.rb

@@ -3,6 +3,7 @@ require 'acfs/response/status'
 require 'active_support/core_ext/module/delegation'
 
 module Acfs
+
   # This represents a response. In addition to an standard HTTP
   # it has a field `data` for storing the encoded body.
   #
@@ -13,7 +14,7 @@ module Acfs
     include Response::Formats
     include Response::Status
 
-    # delegate :status, :status_message, :success?, :modified?, :timed_out?,
+    #delegate :status, :status_message, :success?, :modified?, :timed_out?,
     #         :response_body, :response_headers, :response_code, :headers,
     #         to: :response
 

data/lib/acfs/response/formats.rb

@@ -2,18 +2,19 @@ require 'action_dispatch'
 
 module Acfs
   class Response
+
     # Quick accessors for format handling.
     module Formats
+
       def content_type
         @content_type ||= read_content_type
       end
 
       def json?
-        content_type == Mime[:json]
+        content_type == Mime::JSON
       end
 
       private
-
       def read_content_type
         return 'text/plain' unless headers && headers['Content-Type']
 

data/lib/acfs/response/status.rb

@@ -1,17 +1,19 @@
 module Acfs
   class Response
+
     # Method to fetch information about response status.
     #
     module Status
+
       # Return response status code. Will return zero if
       # request was not executed or failed on client side.
       #
       def status_code
         return @status.to_i if defined? :@status
-        # return response.response_code unless response.nil?
-        # 0
+        #return response.response_code unless response.nil?
+        #0
       end
-      alias_method :code, :status_code
+      alias :code :status_code
 
       # Return true if response was successful indicated by
       # response status code.

data/lib/acfs/runner.rb

@@ -1,6 +1,7 @@
 require 'acfs/service/middleware'
 
 module Acfs
+
   # @api private
   #
   class Runner
@@ -16,7 +17,6 @@ module Acfs
     # and parallel operations will be queued.
     #
     def process(op)
-      ::ActiveSupport::Notifications.instrument 'acfs.operation.before_process', operation: op
       op.synchronous? ? run(op) : enqueue(op)
     end
 
@@ -24,7 +24,7 @@ module Acfs
     #
     def run(op)
       ::ActiveSupport::Notifications.instrument 'acfs.runner.sync_run', operation: op do
-        op_request(op) {|req| adapter.run req }
+        op_request(op) { |req| adapter.run req }
       end
     end
 
@@ -39,7 +39,7 @@ module Acfs
     def enqueue(op)
       ::ActiveSupport::Notifications.instrument 'acfs.runner.enqueue', operation: op do
         if running?
-          op_request(op) {|req| adapter.queue req }
+          op_request(op) { |req| adapter.queue req }
         else
           queue << op
         end
@@ -55,13 +55,15 @@ module Acfs
     # Start processing queued operations.
     #
     def start
-      return if running?
-
       enqueue_operations
-      start_all
+
+      @running = true
+      adapter.start
     rescue
       queue.clear
       raise
+    ensure
+      @running = false
     end
 
     def clear
@@ -71,27 +73,15 @@ 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 }
+        op_request(op) { |req| adapter.queue req }
       end
     end
 
     def op_request(op)
-      return if Acfs::Stub.enabled? && Acfs::Stub.stubbed(op)
-      req = op.service.prepare op.request
-      return unless req.is_a? Acfs::Request
-      req = prepare req
-      return unless req.is_a? Acfs::Request
-      yield req
+      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,6 +1,7 @@
 require 'acfs/service/middleware'
 
 module Acfs
+
   # User {Acfs::Service} to define your services. That includes
   # an identity used to identify the service in configuration files
   # and middlewares the service uses.
@@ -34,14 +35,14 @@ module Acfs
     # @return [Location]
     #
     def location(resource_class, opts = {})
-      opts.reverse_merge! options
+      opts.reverse_merge! self.options
 
       action = opts[:action] || :list
 
-      path = if opts[:path].is_a?(Hash) && opts[:path].key?(action)
+      path = if Hash === opts[:path] && opts[:path].has_key?(action)
                opts[:path].fetch(action)
              else
-               path = if opts[:path].is_a?(Hash)
+               path = if Hash === opts[:path]
                         opts[:path][:all].to_s
                       else
                         opts[:path].to_s
@@ -58,6 +59,7 @@ module Acfs
     end
 
     class << self
+
       # @api public
       #
       # @overload identity()
@@ -81,7 +83,7 @@ module Acfs
       #
       def base_url
         unless (base = Acfs::Configuration.current.locate identity)
-          raise ArgumentError.new "#{identity} not configured. Add `locate '#{identity.to_s.underscore}', 'http://service.url/'` to your configuration."
+          raise ArgumentError, "#{identity} not configured. Add `locate '#{identity.to_s.underscore}', 'http://service.url/'` to your configuration."
         end
 
         base.to_s

data/lib/acfs/service/middleware.rb

@@ -1,7 +1,6 @@
-require 'acfs/service/middleware/stack'
-
 module Acfs
   class Service
+
     # Module providing all function to register middlewares
     # on services and process queued request through the
     # middleware stack.
@@ -17,25 +16,28 @@ module Acfs
       end
 
       module ClassMethods
-        # @!method use(klass, *args, &block)
-        #   @api public
+
+        # @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::JSON
-        #     end
+        # @example
+        #   class MyService < Acfs::Service
+        #     self.base_url = 'http://my.srv'
+        #     use Acfs::Middleware::JsonDecoder
+        #   end
         #
-        #   @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]
+        # @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]
         #
-        def use(klass, *args, &block)
-          # Backward compatible behavior
-          middleware.insert(0, klass, *args, &block)
+        def use(klass, options = {})
+          @middlewares ||= []
+
+          return false if @middlewares.include? klass
+
+          @middlewares << klass
+          @middleware = klass.new(middleware, options)
         end
 
         # @api private
@@ -45,11 +47,19 @@ module Acfs
         # @return [#call]
         #
         def middleware
-          @middleware ||= Stack.new
+          @middleware ||= proc { |request| request}
         end
 
-        # @deprecated
-        delegate :clear, to: :middleware
+        # @api public
+        #
+        # Clear all registered middlewares.
+        #
+        # @return [undefined]
+        #
+        def clear
+          @middleware  = nil
+          @middlewares = []
+        end
       end
     end
   end

data/lib/acfs/singleton_resource.rb

@@ -1,4 +1,5 @@
 module Acfs
+
   # Acfs SingletonResources
   #
   # Usage explanation:
@@ -13,6 +14,7 @@ module Acfs
   # always only a single instance of the resource is being returned
   #
   class SingletonResource < Acfs::Resource
+
     # @api public
     #
     # Destroy resource by sending a DELETE request.

data/lib/acfs/stub.rb

@@ -1,6 +1,7 @@
 require 'rack/utils'
 
 module Acfs
+
   # Global handler for stubbing resources.
   #
   class Stub
@@ -13,7 +14,7 @@ module Acfs
 
       @opts[:with].stringify_keys! if @opts[:with].is_a? Hash
       @opts[:return].stringify_keys! if @opts[:return].is_a? Hash
-      @opts[:return].map! {|h| h.stringify_keys! if h.is_a? Hash } if @opts[:return].is_a? Array
+      @opts[:return].map! { |h| h.stringify_keys! if h.is_a? Hash } if @opts[:return].is_a? Array
     end
 
     def accept?(op)
@@ -21,21 +22,14 @@ module Acfs
 
       params = op.full_params.stringify_keys
       data   = op.data.stringify_keys
-      with   = opts[:with]
-
-      return true if with.nil?
-
-      case opts.fetch(:match, :inclusion)
-        when :legacy
-          return true if with.empty? && params.empty? && data.empty?
-          return true if with.reject {|_, v| v.nil? } == params.reject {|_, v| v.nil? }
-          return true if with.reject {|_, v| v.nil? } == data.reject {|_, v| v.nil? }
-          false
-        when :inclusion
-          with.each_pair.all? do |k, v|
-            (params.key?(k) && params[k] == v) || (data.key?(k) && data[k] == v)
-          end
-      end
+
+      return true if opts[:with] == params || data == opts[:with]
+      return true if (opts[:with].nil? && params.empty? && data.empty?)
+
+      return true if opts[:with].reject { |k, v| v.nil? } == params.reject { |k, v| v.nil? }
+      return true if opts[:with].reject { |k, v| v.nil? } == data.reject { |k, v| v.nil? }
+
+      false
     end
 
     def calls
@@ -56,20 +50,17 @@ module Acfs
       if err
         raise_error op, err, opts[:return]
       elsif data
-        data = data.call(op) if data.respond_to?(:call)
-
         response = Acfs::Response.new op.request,
-          headers: opts[:headers] || {},
-          status:  opts[:status] || 200,
-          data:    data || {}
+                                      headers: opts[:headers] || {},
+                                      status:  opts[:status] || 200,
+                                      data:    data || {}
         op.call data, response
       else
-        raise ArgumentError.new 'Unsupported stub.'
+        raise ArgumentError, 'Unsupported stub.'
       end
     end
 
     private
-
     def raise_error(op, name, data)
       raise name if name.is_a? Class
       data.stringify_keys! if data.respond_to? :stringify_keys!
@@ -78,12 +69,13 @@ module Acfs
     end
 
     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)
+      def resource(klass, action, opts = {}, &block)
         action = action.to_sym
-        raise ArgumentError.new "Unknown action `#{action}`." unless ACTIONS.include? action
+        raise ArgumentError, "Unknown action `#{action}`." unless ACTIONS.include? action
 
         Stub.new(opts).tap do |stub|
           stubs[klass]         ||= {}
@@ -104,11 +96,11 @@ module Acfs
         @enabled ||= false
       end
 
-      def enable
+      def enable;
         @enabled = true
       end
 
-      def disable
+      def disable;
         @enabled = false
       end
 
@@ -126,7 +118,7 @@ module Acfs
         return false unless (classes = stubs[op.resource])
         return false unless (stubs = classes[op.action])
 
-        accepted_stubs = stubs.select {|stub| stub.accept? op }
+        accepted_stubs = stubs.select { |stub| stub.accept? op }
 
         raise AmbiguousStubError.new stubs: accepted_stubs, operation: op if accepted_stubs.size > 1
 
@@ -150,9 +142,8 @@ module Acfs
       end
 
       private
-
       def pretty_print
-        out = ''
+        out = String.new
         stubs.each do |klass, actions|
           out << '  ' << klass.name << ":\n"
           actions.each do |action, stubs|

data/lib/acfs/util.rb

@@ -7,7 +7,7 @@ module Acfs
       end
 
       def __invoke__
-        __callbacks__.each {|c| c.call self }
+        __callbacks__.each{|c| c.call self}
       end
     end
 

data/lib/acfs/version.rb

@@ -1,14 +1,12 @@
 module Acfs
   module VERSION
-    MAJOR = 0
-    MINOR = 50
+    MAJOR = 1
+    MINOR = 0
     PATCH = 0
-    STAGE = nil
+    STAGE = 'dev'
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 
-    def self.to_s
-      STRING
-    end
+    def self.to_s; STRING end
   end
 end

data/spec/acfs/adapter/typhoeus_spec.rb

@@ -5,24 +5,16 @@ describe Acfs::Adapter::Typhoeus do
   before { WebMock.allow_net_connect! }
 
   it 'raises an error' do
-    request1 = Acfs::Request.new 'http://altimos.de/404.1' do |_rsp|
+    request1 = Acfs::Request.new 'http://altimos.de/404.1' do |rsp|
       raise '404-1'
     end
-    request2 = Acfs::Request.new 'http://altimos.de/404.2' do |_rsp|
+    request2 = Acfs::Request.new 'http://altimos.de/404.2' do |rsp|
       raise '404-2'
     end
     adapter.queue request1
     adapter.queue request2
 
-    expect { adapter.start }.to raise_error(/404\-[12]/)
-    expect { adapter.start }.to_not raise_error
-  end
-
-  it 'passes arguments to typhoeus hydra' do
-    value = {key: 1, key2: 2}
-
-    expect(::Typhoeus::Hydra).to receive(:new).with(value)
-
-    described_class.new(**value).send :hydra
+    expect{ adapter.start }.to raise_error /404\-[12]/
+    expect{ adapter.start }.to_not raise_error
   end
 end