jsonapi-consumer 1.0.1 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489b57d413d656c7108af99f5b9c088c71136b9b087c0ef17536c177e5639c5b
-  data.tar.gz: 2c2729ab661f1c483b2f8766fbe3581a3b032eea13185fd3926aa908b928d2aa
+  metadata.gz: 49c9b2b9167f01b4d33a5ce21891370d71f87557fe7fa0bb2f2787ec56e981e9
+  data.tar.gz: 2cad24d981f207c6efa580cf1129ef99d11660565a93c8f28a7bd322725ffcc8
 SHA512:
-  metadata.gz: 7a78edbddca4e3ffdc55cdde1e2eeac50833d7fb9d9863eb43f4455aa22b6bde8f2a6d7c7ef5990565986e04718a90d5fa120cbe1db1f0bf6724e37a1e5edea4
-  data.tar.gz: 95a6c0d2619fa6fd8c309cdfd09e6d8e31944c82fb62f4ea9644c328fe390406d07399b693241ae49fbe86627b7b514272c214b86919a800cfc89be9e429d7c3
+  metadata.gz: 5a06900376b2b40d5f4adc8c74e23264d929b1b0c59a62b69b0a649cd2410c5a8b468f6c322134df2954495822ef6227924ec0ae259469d2fcf66731049e626c
+  data.tar.gz: 5cb4f6c0e2f999633fcb4b79f8071249fb244b4d7c57ff1fc6d75d663d0f631392eb58ff0e43394a44db267652a8596f443155d427136044c13a968575b91e27

data/README.md

@@ -2,7 +2,7 @@
 
 An ActiveModel-compliant consumer framework for communicating with JSONAPI-based APIs.
 
-[![CircleCI](https://circleci.com/gh/jsmestad/jsonapi-consumer.svg?style=svg)](https://circleci.com/gh/jsmestad/jsonapi-consumer)
+[![CircleCI](https://circleci.com/gh/jsmestad/jsonapi-consumer/tree/master.svg?style=svg)](https://circleci.com/gh/jsmestad/jsonapi-consumer/tree/master)
 
 ## Installation
 

data/jsonapi-consumer.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faraday_middleware"
   spec.add_runtime_dependency "addressable", '~> 2.5.2'
   spec.add_runtime_dependency "activemodel", '>= 3.2'
+  spec.add_runtime_dependency "request_store", '>= 1.4'
 
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "mocha"

data/lib/jsonapi/consumer/connection.rb

@@ -29,7 +29,7 @@ module JSONAPI::Consumer
     end
 
     def run(request_method, path, params = {}, headers = {})
-      faraday.send(request_method, path, params, headers)
+      faraday.public_send(request_method, path, params, headers)
     end
 
   end

data/lib/jsonapi/consumer/errors.rb

@@ -2,55 +2,45 @@ module JSONAPI::Consumer
   module Errors
     class ApiError < StandardError
       attr_reader :env
-      def initialize(env)
+      def initialize(message, env=nil)
+        super(message)
         @env = env
       end
     end
 
-    class ClientError < ApiError
-    end
-
-    class AccessDenied < ClientError
-    end
-
-    class NotAuthorized < ClientError
-    end
-
-    class ConnectionError < ApiError
-    end
+    class ClientError < ApiError; end
+    class AccessDenied < ClientError; end
+    class NotAuthorized < ClientError; end
+    class ConnectionError < ApiError; end
 
     class ServerError < ApiError
-      def message
-        "Internal server error"
+      def initialize(message, env=nil)
+        super("Internal server error", env)
       end
     end
 
     class Conflict < ServerError
-      def message
-        "Resource already exists"
+      def initialize(message, env=nil)
+        super("Resource already exists", env)
       end
     end
 
     class NotFound < ServerError
       attr_reader :uri
-      def initialize(uri)
+
+      def initialize(message, uri=nil)
+        super("Couldn't find resource at: #{uri.to_s}")
         @uri = uri
       end
-      def message
-        "Couldn't find resource at: #{uri.to_s}"
-      end
     end
 
     class UnexpectedStatus < ServerError
       attr_reader :code, :uri
       def initialize(code, uri)
+        super("Unexpected response status: #{code} from: #{uri.to_s}")
         @code = code
         @uri = uri
       end
-      def message
-        "Unexpected response status: #{code} from: #{uri.to_s}"
-      end
     end
-
   end
 end

data/lib/jsonapi/consumer/helpers/dynamic_attributes.rb

@@ -11,7 +11,7 @@ module JSONAPI::Consumer
 
         return @attributes unless attrs.present?
         attrs.each do |key, value|
-          send("#{key}=", value)
+          public_send("#{key}=", value)
         end
       end
 
@@ -44,7 +44,7 @@ module JSONAPI::Consumer
               attributes[method]
             end
           end
-          return send(method)
+          return public_send(method)
         end
 
         normalized_method = safe_key_formatter.unformat(method.to_s)

data/lib/jsonapi/consumer/middleware/status.rb

@@ -12,7 +12,7 @@ module JSONAPI::Consumer
           end
         end
       rescue Faraday::ConnectionFailed, Faraday::TimeoutError
-        raise Errors::ConnectionError, environment
+        raise Errors::ConnectionError.new(nil, environment)
       end
 
       protected
@@ -21,17 +21,17 @@ module JSONAPI::Consumer
         case code
         when 200..399
         when 401
-          raise Errors::NotAuthorized, env
+          raise Errors::NotAuthorized.new(nil, env)
         when 403
-          raise Errors::AccessDenied, env
+          raise Errors::AccessDenied.new(nil, env)
         when 404
-          raise Errors::NotFound, env[:url]
+          raise Errors::NotFound.new(nil, env[:url])
         when 409
-          raise Errors::Conflict, env
+          raise Errors::Conflict.new(nil, env)
         when 400..499
           # some other error
         when 500..599
-          raise Errors::ServerError, env
+          raise Errors::ServerError.new(nil, env)
         else
           raise Errors::UnexpectedStatus.new(code, env[:url])
         end

data/lib/jsonapi/consumer/query/builder.rb

@@ -102,7 +102,7 @@ module JSONAPI::Consumer
       end
 
       def method_missing(method_name, *args, &block)
-        to_a.send(method_name, *args, &block)
+        to_a.public_send(method_name, *args, &block)
       end
 
       private

data/lib/jsonapi/consumer/query/requestor.rb

@@ -39,7 +39,7 @@ module JSONAPI::Consumer
       def custom(method_name, options, params)
         path = resource_path(params)
         params.delete(klass.primary_key)
-        path = File.join(path, method_name.to_s)
+        path = File.join(path, klass.route_formatter.format(method_name.to_s))
 
         request(options.fetch(:request_method, :get), path, params)
       end

data/lib/jsonapi/consumer/resource.rb

@@ -1,4 +1,3 @@
-
 module JSONAPI::Consumer
   class Resource
     extend ActiveModel::Naming
@@ -142,10 +141,11 @@ module JSONAPI::Consumer
       # @param headers [Hash] The headers to send along
       # @param block [Block] The block where headers will be set for
       def with_headers(headers)
+        existing_headers = self.custom_headers
         self._custom_headers = headers
         yield
       ensure
-        self._custom_headers = {}
+        self._custom_headers = existing_headers
       end
 
       # The current custom headers to send with any request made by this
@@ -317,11 +317,11 @@ module JSONAPI::Consumer
       end
 
       def _custom_headers=(headers)
-        _header_store.replace(headers)
+        RequestStore.store["jsonapi-consumer-#{resource_name}"] = headers
       end
 
       def _header_store
-        Thread.current["json_api_client-#{resource_name}"] ||= {}
+        RequestStore.store["jsonapi-consumer-#{resource_name}"] ||= {}
       end
 
       def _build_connection(rebuild = false)

data/lib/jsonapi/consumer/version.rb

@@ -1,5 +1,5 @@
 module Jsonapi
   module Consumer
-    VERSION = "1.0.1"
+    VERSION = "2.0.0.pre"
   end
 end

data/lib/jsonapi/consumer.rb

@@ -8,6 +8,7 @@ require "forwardable"
 require "faraday"
 require "faraday_middleware"
 require "addressable/uri"
+require "request_store"
 
 module JSONAPI
   module Consumer
@@ -67,4 +68,4 @@ module JSONAPI
     autoload :Schema, 'jsonapi/consumer/schema'
     autoload :Utils, 'jsonapi/consumer/utils'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-consumer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Justin Smestad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -171,9 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6