json_api_client 1.22.0 → 1.24.0

data/Rakefile

@@ -1,32 +1,32 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'JsonApiClient'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'JsonApiClient'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+
+
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task default: :test

data/lib/json_api_client/associations/base_association.rb

@@ -1,33 +1,33 @@
-module JsonApiClient
-  module Associations
-    class BaseAssociation
-      attr_reader :attr_name, :klass, :options
-      def initialize(attr_name, klass, options = {})
-        @attr_name = attr_name
-        @klass = klass
-        @options = options
-      end
-
-      def association_class
-        @association_class ||= Utils.compute_type(klass, options.fetch(:class_name) do
-          attr_name.to_s.classify
-        end)
-      end
-
-      def data(url)
-        from_result_set(association_class.requestor.linked(url))
-      end
-
-      def from_result_set(result_set)
-        result_set.to_a
-      end
-
-      def load_records(data)
-        data.map do |d|
-          record_class = Utils.compute_type(klass, klass.key_formatter.unformat(d["type"]).classify)
-          record_class.load id: d["id"]
-        end
-      end
-    end
-  end
-end
+module JsonApiClient
+  module Associations
+    class BaseAssociation
+      attr_reader :attr_name, :klass, :options
+      def initialize(attr_name, klass, options = {})
+        @attr_name = attr_name
+        @klass = klass
+        @options = options
+      end
+
+      def association_class
+        @association_class ||= Utils.compute_type(klass, options.fetch(:class_name) do
+          attr_name.to_s.classify
+        end)
+      end
+
+      def data(url)
+        from_result_set(association_class.requestor.linked(url))
+      end
+
+      def from_result_set(result_set)
+        result_set.to_a
+      end
+
+      def load_records(data)
+        data.map do |d|
+          record_class = Utils.compute_type(klass, klass.key_formatter.unformat(d["type"]).classify)
+          record_class.load id: d["id"]
+        end
+      end
+    end
+  end
+end

data/lib/json_api_client/associations/belongs_to.rb

@@ -1,31 +1,31 @@
-module JsonApiClient
-  module Associations
-    module BelongsTo
-      class Association < BaseAssociation
-        include Helpers::URI
-
-        attr_reader :param
-
-        def initialize(attr_name, klass, options = {})
-          super
-          @param = options.fetch(:param, :"#{attr_name}_id").to_sym
-          @shallow_path = options.fetch(:shallow_path, false)
-        end
-
-        def shallow_path?
-          @shallow_path
-        end
-
-        def to_prefix_path(formatter)
-          "#{formatter.format(attr_name.to_s.pluralize)}/%{#{param}}"
-        end
-
-        def set_prefix_path(attrs, formatter)
-          return if shallow_path? && !attrs[param]
-          attrs[param] = encode_part(attrs[param]) if attrs.key?(param)
-          to_prefix_path(formatter) % attrs
-        end
-      end
-    end
-  end
-end
+module JsonApiClient
+  module Associations
+    module BelongsTo
+      class Association < BaseAssociation
+        include Helpers::URI
+
+        attr_reader :param
+
+        def initialize(attr_name, klass, options = {})
+          super
+          @param = options.fetch(:param, :"#{attr_name}_id").to_sym
+          @shallow_path = options.fetch(:shallow_path, false)
+        end
+
+        def shallow_path?
+          @shallow_path
+        end
+
+        def to_prefix_path(formatter)
+          "#{formatter.format(attr_name.to_s.pluralize)}/%{#{param}}"
+        end
+
+        def set_prefix_path(attrs, formatter)
+          return if shallow_path? && !attrs[param]
+          attrs[param] = encode_part(attrs[param]) if attrs.key?(param)
+          to_prefix_path(formatter) % attrs
+        end
+      end
+    end
+  end
+end

data/lib/json_api_client/associations/has_many.rb

@@ -1,8 +1,8 @@
-module JsonApiClient
-  module Associations
-    module HasMany
-      class Association < BaseAssociation
-      end
-    end
-  end
+module JsonApiClient
+  module Associations
+    module HasMany
+      class Association < BaseAssociation
+      end
+    end
+  end
 end

data/lib/json_api_client/associations/has_one.rb

@@ -1,16 +1,16 @@
-module JsonApiClient
-  module Associations
-    module HasOne
-      class Association < BaseAssociation
-        def from_result_set(result_set)
-          result_set.first
-        end
-
-        def load_records(data)
-          record_class = Utils.compute_type(klass, klass.key_formatter.unformat(data["type"]).classify)
-          record_class.load id: data["id"]
-        end
-      end
-    end
-  end
-end
+module JsonApiClient
+  module Associations
+    module HasOne
+      class Association < BaseAssociation
+        def from_result_set(result_set)
+          result_set.first
+        end
+
+        def load_records(data)
+          record_class = Utils.compute_type(klass, klass.key_formatter.unformat(data["type"]).classify)
+          record_class.load id: data["id"]
+        end
+      end
+    end
+  end
+end

data/lib/json_api_client/associations.rb

@@ -1,8 +1,8 @@
-module JsonApiClient
-  module Associations
-    autoload :BaseAssociation, 'json_api_client/associations/base_association'
-    autoload :BelongsTo, 'json_api_client/associations/belongs_to'
-    autoload :HasMany, 'json_api_client/associations/has_many'
-    autoload :HasOne, 'json_api_client/associations/has_one'
-  end
+module JsonApiClient
+  module Associations
+    autoload :BaseAssociation, 'json_api_client/associations/base_association'
+    autoload :BelongsTo, 'json_api_client/associations/belongs_to'
+    autoload :HasMany, 'json_api_client/associations/has_many'
+    autoload :HasOne, 'json_api_client/associations/has_one'
+  end
 end

data/lib/json_api_client/connection.rb

@@ -1,41 +1,41 @@
-module JsonApiClient
-  class Connection
-
-    attr_reader :faraday
-
-    def initialize(options = {})
-      site = options.fetch(:site)
-      connection_options = options.slice(:proxy, :ssl, :request, :headers, :params)
-      adapter_options = Array(options.fetch(:adapter, Faraday.default_adapter))
-      status_middleware_options = {}
-      status_middleware_options[:custom_handlers] = options[:status_handlers] if options[:status_handlers].present?
-      @faraday = Faraday.new(site, connection_options) do |builder|
-        builder.request :json
-        builder.use Middleware::JsonRequest
-        builder.use Middleware::Status, status_middleware_options
-        builder.use Middleware::ParseJson
-        builder.use ::FaradayMiddleware::Gzip
-        builder.adapter(*adapter_options)
-      end
-      yield(self) if block_given?
-    end
-
-    # insert middleware before ParseJson - middleware executed in reverse order -
-    #   inserted middleware will run after json parsed
-    def use(middleware, *args, &block)
-      return if faraday.builder.locked?
-      faraday.builder.insert_before(Middleware::ParseJson, middleware, *args, &block)
-    end
-
-    def delete(middleware)
-      faraday.builder.delete(middleware)
-    end
-
-    def run(request_method, path, params: nil, headers: {}, body: nil)
-      faraday.run_request(request_method, path, body, headers) do |request|
-        request.params.update(params) if params
-      end
-    end
-
-  end
-end
+module JsonApiClient
+  class Connection
+
+    attr_reader :faraday
+
+    def initialize(options = {})
+      site = options.fetch(:site)
+      connection_options = options.slice(:proxy, :ssl, :request, :headers, :params)
+      adapter_options = Array(options.fetch(:adapter, Faraday.default_adapter))
+      status_middleware_options = {}
+      status_middleware_options[:custom_handlers] = options[:status_handlers] if options[:status_handlers].present?
+      @faraday = Faraday.new(site, connection_options) do |builder|
+        builder.request :json
+        builder.use Middleware::JsonRequest
+        builder.use Middleware::Status, status_middleware_options
+        builder.response :json
+        builder.use ::Faraday::Gzip::Middleware
+        builder.adapter(*adapter_options)
+      end
+      yield(self) if block_given?
+    end
+
+    # insert middleware before ParseJson - middleware executed in reverse order -
+    #   inserted middleware will run after json parsed
+    def use(middleware, *args, &block)
+      return if faraday.builder.locked?
+      faraday.builder.insert_before(::Faraday::Response::Json, middleware, *args, &block)
+    end
+
+    def delete(middleware)
+      faraday.builder.delete(middleware)
+    end
+
+    def run(request_method, path, params: nil, headers: {}, body: nil)
+      faraday.run_request(request_method, path, body, headers) do |request|
+        request.params.update(params) if params
+      end
+    end
+
+  end
+end

data/lib/json_api_client/error_collector.rb

@@ -1,91 +1,91 @@
-module JsonApiClient
-  class ErrorCollector < Array
-    class Error
-      delegate :[], to: :attrs
-
-      def initialize(attrs = {})
-        @attrs = (attrs || {}).with_indifferent_access
-      end
-
-      def id
-        attrs[:id]
-      end
-
-      def about
-        res = attrs.fetch(:links, {})
-        res ? res[:about] : {}
-      end
-
-      def status
-        attrs[:status]
-      end
-
-      def code
-        attrs[:code]
-      end
-
-      def title
-        attrs[:title]
-      end
-
-      def detail
-        attrs[:detail]
-      end
-
-      def source_parameter
-        source[:parameter]
-      end
-
-      def source_pointer
-        source[:pointer]
-      end
-
-      def error_key
-        if source_pointer && source_pointer != "/data"
-          source_pointer.split("/").last
-        else
-          "base"
-        end
-      end
-
-      def error_msg
-        msg = title || detail || "invalid"
-        if source_parameter
-          "#{source_parameter} #{msg}"
-        else
-          msg
-        end
-      end
-
-      def source
-        res = attrs.fetch(:source, {})
-        res ? res : {}
-      end
-
-      def meta
-        MetaData.new(attrs.fetch(:meta, {}))
-      end
-
-      protected
-
-      attr_reader :attrs
-    end
-
-    def initialize(error_data)
-      super(error_data.map do |data|
-        Error.new(data)
-      end)
-    end
-
-    def full_messages
-      map(&:title)
-    end
-
-    def [](source)
-      map do |error|
-        error.error_key == source
-      end
-    end
-
-  end
-end
+module JsonApiClient
+  class ErrorCollector < Array
+    class Error
+      delegate :[], to: :attrs
+
+      def initialize(attrs = {})
+        @attrs = (attrs || {}).with_indifferent_access
+      end
+
+      def id
+        attrs[:id]
+      end
+
+      def about
+        res = attrs.fetch(:links, {})
+        res ? res[:about] : {}
+      end
+
+      def status
+        attrs[:status]
+      end
+
+      def code
+        attrs[:code]
+      end
+
+      def title
+        attrs[:title]
+      end
+
+      def detail
+        attrs[:detail]
+      end
+
+      def source_parameter
+        source[:parameter]
+      end
+
+      def source_pointer
+        source[:pointer]
+      end
+
+      def error_key
+        if source_pointer && source_pointer != "/data"
+          source_pointer.split("/").last
+        else
+          "base"
+        end
+      end
+
+      def error_msg
+        msg = title || detail || "invalid"
+        if source_parameter
+          "#{source_parameter} #{msg}"
+        else
+          msg
+        end
+      end
+
+      def source
+        res = attrs.fetch(:source, {})
+        res ? res : {}
+      end
+
+      def meta
+        MetaData.new(attrs.fetch(:meta, {}))
+      end
+
+      protected
+
+      attr_reader :attrs
+    end
+
+    def initialize(error_data)
+      super(error_data.map do |data|
+        Error.new(data)
+      end)
+    end
+
+    def full_messages
+      map(&:title)
+    end
+
+    def [](source)
+      map do |error|
+        error.error_key == source
+      end
+    end
+
+  end
+end