acfs 1.0.0.dev.1.b305 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTU2MGNhOGYzMzZiYWQyMWZjMDc2ZDA1ZmI0OTUxNTJkMDEzNTI2OA==
-  data.tar.gz: !binary |-
-    N2QwNTZiNDBiZDc4NjJhNjc3NjU3M2YxOTI4MzY2YWM4ZGZjMzE0MA==
+SHA1:
+  metadata.gz: 6d20f4360733b38c6a3fde5716cf43ff586e7579
+  data.tar.gz: b3f8ba827e8813e21182d1b48d3e17ab4b8e1f89
 SHA512:
-  metadata.gz: !binary |-
-    MmU2NDdiNzRkODE4NTQzM2I4MDIzY2QwYTA2OWE3NjUwZGMwYTUyZmUwMGE5
-    OTBiMjY4ZDE4ZTJjNDk4YjEwZjVjYjEzMGJiNzNkZDY3Y2IxMWM3Y2VhN2Q1
-    M2I1OWI0NTVlODIxMjFiYzJhYTYwZTZjMTI3M2ZmMTQxYjBkYzI=
-  data.tar.gz: !binary |-
-    Zjk4MzhhNGM0YzNjNmY4ZDAzOWFiYTE2MzViYTdhM2QxMTc0ZTI3MzJkMmI3
-    MThkZDNlYWFiM2FjYmE4MWVkY2I5N2RlZTMwYjA4OGE5ZTZmMmUzM2MxZjUz
-    ZTZkZTNhNmUwNmEyYTIzZGJhZDk0ZjgyN2Q2ZjAzMjkzMzdkMzA=
+  metadata.gz: 0841dd869d9e38ae2cc009c80fa7c9a327f970ee35ec3011f535a5f1f0f43bf6fd086efd1d16256793f8c80abeb6db6962ab7459d3c123f405f62b457639effc
+  data.tar.gz: bd81043d09374bbd5984120563c3425441fda4939fcd3154182aed6e28bd78fb0b6118025c17003ff642c274657ab575bf420045d8bbfd468b0eadaaa79a9cab

data/CHANGELOG.md

@@ -1,5 +1,69 @@
 # Changelog
 
+## 1.0.0
+
+* Switch to first non-development major as it's long time used in production.
+* Fix NewRelic RPM inference with middleware stack inherited from `ActionDispatch::MiddlewareStack`.
+
+## 0.48.0
+
+* Remove #attribute_types broke since f7e4109 (Sep 2013, v0.23)
+* Fix attribute inheritance on subclassing broken since commit 7cf1d11 (Apr 2014, v0.43)
+
+## 0.47.0
+
+* Change blank value handling of dict and list type (0a12ef1)
+
+## 0.46.0
+
+* Rework types system (#39)
+
+## 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.
+  limiting concurrency.
+
+## 0.43.2
+
+* add `total_count` for paginated collections
+
+## 0.43.1
+
+* Fix `:with` condition matching on stubs
+
+## 0.43.0
+
+* Remove `Acfs::Model` (inherit from `Acfs::Resource`)
+* Stub does only a partial match of `:with` attributes now
+* Allow blocks as stub `:return`s
+
+## 0.42.0
+
+* Add simple dict attribute type
+
+## 0.40.0
+
+* Change `Resource#persisted?` to return true if it is not new
+
+## 0.39.1
+
+* Fix automatic path parameter handling for #destroy
+
+## 0.39.0
+
+* Add new event acfs.operation.before_process
+
+## 0.38.0
+
+* Allow middlewares to abort request processing
+* Allow middlewares to receive the request operation object (via the request)
+
 ## 0.37.0
 
 * Add Acfs.on

data/README.md

@@ -250,8 +250,8 @@ it 'should find user number one' do
   expect(user.name).to be == 'John Smith'
   expect(user.age).to be == 32
 
-  expect(@stub).to has_called
-  expect(@stub).to_not have_called 5.times
+  expect(@stub).to be_called
+  expect(@stub).to_not be_called 5.times
 end
 
 it 'should not find user number two' do

data/acfs.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
   spec.version       = Acfs::VERSION
   spec.authors       = ['Jan Graichen']
   spec.email         = %w(jg@altimos.de)
-  spec.description   = %q{API Client For Services}
-  spec.summary       = %q{An abstract API base client for service oriented application.}
+  spec.description   = 'API Client For Services'
+  spec.summary       = 'An abstract API base client for service oriented application.'
   spec.homepage      = 'https://github.com/jgraichen/acfs'
   spec.license       = 'MIT'
 
   spec.files         = Dir['**/*'].grep(%r{^((bin|lib|test|spec|features)/|.*\.gemspec|.*LICENSE.*|.*README.*|.*CHANGELOG.*)})
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w(lib)
 
@@ -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.rb

@@ -30,13 +30,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
@@ -44,4 +47,3 @@ module Acfs
     require 'acfs/adapter/typhoeus'
   end
 end
-

data/lib/acfs/adapter/base.rb

@@ -1,10 +1,8 @@
 module Acfs::Adapter
-
   # Base adapter handling operation queuing
   # and processing.
   #
   class Base
-
     # Start processing queued requests.
     #
     def start

data/lib/acfs/adapter/typhoeus.rb

@@ -2,10 +2,12 @@ require 'typhoeus'
 
 module Acfs
   module Adapter
-
     # Adapter for Typhoeus.
     #
     class Typhoeus < Base
+      def initialize(**kwargs)
+        @options = kwargs
+      end
 
       def start
         hydra.run
@@ -14,9 +16,7 @@ module Acfs
         raise
       end
 
-      def abort
-        hydra.abort
-      end
+      delegate :abort, to: :hydra
 
       def run(request)
         convert_request(request).run
@@ -26,17 +26,21 @@ module Acfs
         hydra.queue convert_request request
       end
 
-    protected
+      protected
+
       def hydra
-        @hydra ||= ::Typhoeus::Hydra.new
+        @hydra ||= ::Typhoeus::Hydra.new(**@options)
       end
 
       def convert_request(req)
         request = ::Typhoeus::Request.new req.url,
-                                          method: req.method,
-                                          params: req.params,
-                                          headers: req.headers,
-                                          body: req.body
+          method: req.method,
+          params: req.params,
+          headers: req.headers.merge(
+            'Expect'            => '',
+            'Transfer-Encoding' => ''
+          ),
+          body: req.body
 
         request.on_complete do |response|
           req.complete! convert_response(req, response)
@@ -47,9 +51,9 @@ module Acfs
 
       def convert_response(request, response)
         Acfs::Response.new request,
-                           status: response.code,
-                           headers: response.headers,
-                           body: response.body
+          status: response.code,
+          headers: response.headers,
+          body: response.body
       end
     end
   end

data/lib/acfs/collections/paginatable.rb

@@ -1,15 +1,14 @@
 module Acfs::Collections
-
   #
   module Paginatable
     extend ActiveSupport::Concern
 
     included do
-      def self.operation(action, opts = {}, &block)
+      def self.operation(_action, opts = {}, &_block)
         opts[:url]
       end
 
-      attr_reader :total_pages, :current_page
+      attr_reader :total_pages, :current_page, :total_count
     end
 
     def process_response(response)
@@ -34,12 +33,9 @@ module Acfs::Collections
     end
 
     def page(rel, &block)
-      if relations[rel]
-        @resource_class.all nil, url: relations[rel], &block
-      else
-        # raise ArgumentError.new "No relative page `#{rel}'."
-        nil
-      end
+      return unless relations[rel]
+
+      @resource_class.all nil, url: relations[rel], &block
     end
 
     private
@@ -53,13 +49,17 @@ module Acfs::Collections
         @total_pages = Integer(headers['X-Total-Pages'])
       end
 
+      if headers['X-Total-Count']
+        @total_count = Integer(headers['X-Total-Count'])
+      end
+
       setup_links headers['Link'] if headers['Link']
     end
 
     def setup_links(links)
       links.split(/,\s+/).each do |link|
         if link =~ /^\s*<([^>]+)>.*\s+rel="([\w_-]+)".*$/
-          relations[$2] = $1
+          relations[Regexp.last_match[2]] = Regexp.last_match[1]
         end
       end
     end

data/lib/acfs/configuration.rb

@@ -2,11 +2,11 @@ require 'uri'
 require 'yaml'
 
 module Acfs
-
   # Acfs configuration is used to locate services and get their base URLs.
   #
   class Configuration
     attr_reader :locations
+    attr_accessor :adapter
 
     # @api private
     def initialize
@@ -28,7 +28,7 @@ module Acfs
       if block.arity > 0
         block.call self
       else
-        instance_eval &block
+        instance_eval(&block)
       end
     end
 
@@ -64,10 +64,10 @@ module Acfs
     # @return [undefined]
     #
     def load(filename)
-      config = YAML::load File.read filename
+      config = YAML.load File.read filename
       env    = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
 
-      config = config[env] if config.has_key? env
+      config = config[env] if config.key? env
       config.each do |key, value|
         case key
           when 'services' then load_services value
@@ -88,7 +88,6 @@ module Acfs
     end
 
     class << self
-
       # @api private
       #
       # Return current configuration object.

data/lib/acfs/errors.rb

@@ -1,5 +1,4 @@
 module Acfs
-
   # Acfs base error.
   #
   class Error < StandardError
@@ -23,20 +22,20 @@ module Acfs
         message << ": #{response.code}"
         if response.data
           message << "\n  with content:\n    "
-          message << response.data.map{|k,v| "#{k.inspect}: #{v.inspect}"}.join("\n    ")
+          message << response.data.map {|k, v| "#{k.inspect}: #{v.inspect}" }.join("\n    ")
         end
         if response.headers.any?
           message << "\n  with headers:\n    "
-          message << response.headers.map{|k,v| "#{k}: #{v}"}.join("\n    ")
+          message << response.headers.map {|k, v| "#{k}: #{v}" }.join("\n    ")
         end
         message << "\nbased on request: #{response.request.method.upcase} #{response.request.url} #{response.request.format}"
         if response.request.data
           message << "\n  with content:\n    "
-          message << response.request.data.map{|k,v| "#{k.inspect}: #{v.inspect}"}.join("\n    ")
+          message << response.request.data.map {|k, v| "#{k.inspect}: #{v.inspect}" }.join("\n    ")
         end
         if response.request.headers.any?
           message << "\n  with headers:\n    "
-          message << response.request.headers.map{|k,v| "#{k}: #{v}"}.join("\n    ")
+          message << response.request.headers.map {|k, v| "#{k}: #{v}" }.join("\n    ")
         end
       end
       super opts, message
@@ -47,12 +46,14 @@ module Acfs
     attr_reader :stubs, :operation
 
     def initialize(opts = {})
+      require 'pp'
+
       @stubs     = opts.delete :stubs
       @operation = opts.delete :operation
 
-      super opts, 'Ambiguous stubs.'
+      super opts, "Ambiguous stubs for #{operation.action} on #{operation.resource}.\n" +
+        stubs.map {|s| "  #{s.opts.pretty_inspect}" }.join
     end
-
   end
 
   # Resource not found error raised on a 404 response
@@ -67,7 +68,7 @@ module Acfs
     def initialize(opts = {})
       @errors   = opts.delete :errors
       @resource = opts.delete :resource
-      opts[:message] ||= @errors.map{ |k,v| "#{k}: #{v.join ', '}" }.join ', ' if @errors.is_a? Hash
+      opts[:message] ||= @errors.map {|k, v| "#{k}: #{v.join ', '}" }.join ', ' if @errors.is_a? Hash
       opts[:message] ||= @errors.join ', ' if @errors.is_a? Array
       super
     end
@@ -99,7 +100,7 @@ module Acfs
     def initialize(opts = {})
       @base_class    = opts.delete :base_class
       @type_name     = opts.delete :type_name
-      opts[:message] = "Recieved ressource type `#{type_name}` is no subclass of #{base_class}"
+      opts[:message] = "Received resource type `#{type_name}` is no subclass of #{base_class}"
       super
     end
   end

data/lib/acfs/global.rb

@@ -1,14 +1,22 @@
 module Acfs
-
+  #
   # Global Acfs module methods.
   #
   module Global
-
+    #
     # @api private
     # @return [Runner]
     #
     def runner
-      @runner ||= Runner.new Adapter::Typhoeus.new
+      Thread.current[:acfs_runner] ||= begin
+        adapter = Configuration.current.adapter
+
+        if adapter
+          Runner.new adapter.call
+        else
+          Runner.new Adapter::Typhoeus.new
+        end
+      end
     end
 
     # @api public
@@ -59,9 +67,10 @@ module Acfs
     #   Acfs.add_callback(user, &callback_two)
     #
     def add_callback(resource, &block)
-      raise ArgumentError.new "Given resource is not an Acfs resource but "\
-                              "a: #{resource.class.name}" \
-                              unless resource.respond_to?(:__callbacks__)
+      unless resource.respond_to?(:__callbacks__)
+        raise ArgumentError.new 'Given resource is not an Acfs resource ' \
+          "delegator but a: #{resource.class.name}"
+      end
       return false if block.nil?
 
       if resource.loaded?
@@ -73,7 +82,7 @@ module Acfs
 
     def on(*resources)
       resources.each do |resource|
-        add_callback resource do |ret|
+        add_callback resource do |_|
           yield(*resources) unless resources.any? {|res| !res.loaded? }
         end
       end

data/lib/acfs/location.rb

@@ -1,5 +1,4 @@
 module Acfs
-
   # @api private
   #
   # Describes a URL with placeholders.
@@ -7,17 +6,17 @@ module Acfs
   class Location
     attr_reader :arguments, :raw, :struct, :args
 
-    REGEXP= /^:([A-z][A-z0-9_]*)$/
+    REGEXP = /^:([A-z][A-z0-9_]*)$/
 
     def initialize(uri, args = {})
       @raw       = URI.parse uri
       @args      = args
-      @struct    = raw.path.split('/').reject(&:empty?).map{|s| s =~ REGEXP ? $1.to_sym : s }
-      @arguments = struct.select{|s| Symbol === s }
+      @struct    = raw.path.split('/').reject(&:empty?).map {|s| s =~ REGEXP ? Regexp.last_match[1].to_sym : s }
+      @arguments = struct.select {|s| s.is_a?(Symbol) }
     end
 
     def build(args = {})
-      unless Hash === args
+      unless args.is_a?(Hash)
         raise ArgumentError.new "URI path arguments must be a hash, `#{args.inspect}' given."
       end
 
@@ -25,8 +24,8 @@ module Acfs
     end
 
     def extract_from(*args)
-      args = Hash.new.tap do |collect|
-        arguments.each{|key| collect[key] = extract_arg key, args }
+      args = {}.tap do |collect|
+        arguments.each {|key| collect[key] = extract_arg key, args }
       end
 
       build args
@@ -34,7 +33,7 @@ module Acfs
 
     def str
       uri = raw.dup
-      uri.path = URI.escape '/' + struct.map{|s| lookup_arg(s, args) }.join('/')
+      uri.path = URI.escape '/' + struct.map {|s| lookup_arg(s, args) }.join('/')
       uri.to_s
     end
 
@@ -44,16 +43,17 @@ module Acfs
     alias_method :to_s, :raw_uri
 
     private
+
     def extract_arg(key, hashes)
       hashes.each_with_index do |hash, index|
-        return (index == 0 ? hash.delete(key) : hash.fetch(key)) if hash.has_key?(key)
+        return (index == 0 ? hash.delete(key) : hash.fetch(key)) if hash.key?(key)
       end
 
       nil
     end
 
     def lookup_arg(arg, args)
-      Symbol === arg ? lookup_replacement(arg, args) : arg
+      arg.is_a?(Symbol) ? lookup_replacement(arg, args) : arg
     end
 
     def lookup_replacement(sym, args)
@@ -67,7 +67,7 @@ module Acfs
       args.fetch(sym.to_s) do
         args.fetch(sym) do
           if args[:raise].nil? || args[:raise]
-            raise ArgumentError.new "URI path argument `#{sym}' missing on `#{to_s}'. Given: `#{args}.inspect'"
+            raise ArgumentError.new "URI path argument `#{sym}' missing on `#{self}'. Given: `#{args}.inspect'"
           else
             ":#{sym}"
           end