json_api_client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ed96e8dad9bdeec5923280be1cd87e1f1d41b2
-  data.tar.gz: 6a3e93637e3b6dd1f744962088766e6a9d785891
+  metadata.gz: 97343e5f4ab100e19f26bc047874835f90d8e76a
+  data.tar.gz: 6009f0ddb1f43af631e3b10a6e0bd9bd5cf7c9c7
 SHA512:
-  metadata.gz: 3b435a4a8989ea0fd2b5571728feb3a175c2e7ad300c51769c245c7b4775dd5318ce9e087602d08d988ce6524339a63d43cb8ff0dc467c1a4bd3f17fd429a5f2
-  data.tar.gz: 994419ad14dcb898d9a7dd753834ac582398ea841f3671d5b8f234d908d536d400a3a601ea2fcf566b4b839be5fd2421123277742bb7082bee36b4fba4724252
+  metadata.gz: f35608521648cf8337507f466831598a4bb77e5254f60c18a0bbeeac854c8832eeb5b7d8faf63b356e953d1bb4f11958339c98e9d453e69dab21d50c3b0e211d
+  data.tar.gz: e3a07f87d572b36eab928742f87688d38dc02bbb2f65e62ee8e30f71fc125a6c1c5715f32e17e62a6d0a5bc63ab7f4386d76ccbecdfb9ed6719ae5b670accc72

data/README.md

@@ -381,6 +381,23 @@ module MyApi
 end
 ```
 
+##### Specifying an HTTP Proxy
+
+All resources have a class method ```connection_options``` used to pass options to the JsonApiClient::Connection initializer.
+
+```ruby
+MyApi::Base.connection_options[:proxy] = 'http://proxy.example.com'
+MyApi::Base.connection do |connection|
+  # ...
+end
+
+module MyApi
+  class User < Base
+    # will use the customized connection with proxy
+  end
+end
+```
+
 ### Custom Parser
 
 You can configure your API client to use a custom parser that implements the `parse` class method.  It should return a `JsonApiClient::ResultSet` instance. You can use it by setting the parser attribute on your model:

data/lib/json_api_client/connection.rb

@@ -5,8 +5,9 @@ module JsonApiClient
 
     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))
-      @faraday = Faraday.new(site) do |builder|
+      @faraday = Faraday.new(site, connection_options) do |builder|
         builder.request :json
         builder.use Middleware::JsonRequest
         builder.use Middleware::Status

data/lib/json_api_client/resource.rb

@@ -410,8 +410,9 @@ module JsonApiClient
       return nil unless relationship_definitions = relationships[method]
 
       # look in included data
-      data = last_result_set.included.data_for(method, relationship_definitions)
-      return data if data
+      if relationship_definitions.key?("data")
+        return last_result_set.included.data_for(method, relationship_definitions)
+      end
 
       if association = association_for(method)
         # look for a defined relationship url

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport