flexirest 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa38d8d7f9ee0f19744e46cfa7a3d0b22eb9d149dce1f5b025beb0f1bbbc6f1
-  data.tar.gz: b2ae4157a3f0fdb754d0a5e1599051be5658a6b342fd9b3d588b4d79b7ed312a
+  metadata.gz: 034246a4c82d512ced039ae0265091d40688183c762e1094c12f0dca31439a55
+  data.tar.gz: 65545b4903a74eae1140866589f97be1bf664b2df052bc515a243e29844ab543
 SHA512:
-  metadata.gz: 2ada072dd254ce8818178de8dab0f72a676e47c0c39e3bc2419b33c3c81ba64e2e9a428bedc42ddcd95d785a2ae3fcafdcecd52fe4f6935e4dd6e0fdc31d7c83
-  data.tar.gz: eb67f39a6697f1e0e48ae8a11037c275f631334d59df36b243e2d5ae2a20e798c8fd614d4a1bb69a561f84db2452af2b6bae417df903b0c0a99b264d9a0555df
+  metadata.gz: fa7bd3620f69ec7ba0ba6493d86bae8aef4c889e5f3ed536d2bd801c6b62a8f9248bd80338901eff4b0435a2aa26589672ea03ddd6e81a4c1bc99cb66387651b
+  data.tar.gz: e73ba209c5dd7e98a370e8ac2fab285f98cb948b81f56a3cc23f63ad9f3035ba385de0292546943f1ca63d8eca30e9f0795f1ee3f60268b1b8a9bfe2c0a69deb

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.8.8
+
+Fix:
+
+- Use custom type and name for JSON-API fields (thanks to François Ferrandis for the PR).
+- Fix Faraday error classes to match current ones in Faraday (thanks to François Ferrandis for the PR).
+
 ## 1.8.7
 
 Fix:

data/lib/flexirest/connection.rb

@@ -24,7 +24,7 @@ module Flexirest
 
     def make_safe_request(path, &block)
       block.call
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::TimeoutError
       raise Flexirest::TimeoutException.new("Timed out getting #{full_url(path)}")
     rescue Faraday::ConnectionFailed => e1
       if e1.respond_to?(:cause) && e1.cause.is_a?(Net::OpenTimeout)

data/lib/flexirest/json_api_proxy.rb

@@ -292,12 +292,14 @@ module Flexirest
 
         # Retrieve the linked resource id and its pluralized type name
         rel_id = relationships[name]['data']['id']
-        plural_name = name.pluralize
+
+        type_name = relationships[name]['data']['type']
+        plural_type_name = type_name.pluralize
 
         # Traverse through the included object, and find the included
         # linked resource, based on the given id and pluralized type name
         linked_resource = included.select do |i|
-          i['id'] == rel_id && i['type'] == plural_name
+          i['id'] == rel_id && i['type'] == plural_type_name
         end
 
         return linked_resource, rel_id, true
@@ -313,12 +315,15 @@ module Flexirest
 
         # Retrieve the linked resources ids
         rel_ids = relationships[name]['data'].map { |r| r['id'] }
-        plural_name = name.pluralize
+
+        # Index the linked resources' id and types that we need to
+        # retrieve from the included resources
+        relations_to_include = relationships[name]['data'].map { |r| [r['id'], r['type']] }.to_set
 
         # Traverse through the included object, and find the included
         # linked resources, based on the given ids and type name
         linked_resources = included.select do |i|
-          rel_ids.include?(i['id']) && i['type'] == plural_name
+          relations_to_include.include?([i['id'], i['type']])
         end
 
         return linked_resources, rel_ids, true

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.8.7"
+  VERSION = "1.8.8"
 end

data/spec/lib/connection_spec.rb

@@ -186,7 +186,7 @@ describe Flexirest::Connection do
   end
 
   it "should retry once in the event of a connection failed" do
-    stub_request(:get, "www.example.com/foo").to_raise(Faraday::Error::ConnectionFailed.new("Foo"))
+    stub_request(:get, "www.example.com/foo").to_raise(Faraday::ConnectionFailed.new("Foo"))
     expect { @connection.get("/foo") }.to raise_error(Flexirest::BaseException)
   end
 

data/spec/lib/json_api_spec.rb

@@ -15,7 +15,9 @@ end
 class JsonAPIExampleArticle < Flexirest::Base
   proxy :json_api
   has_many :tags, JsonAPIAssociationExampleTag
+  has_one :main_theme, JsonAPIAssociationExampleTag
   has_one :author, JsonAPIAssociationExampleAuthor
+  has_many :co_authors, JsonAPIAssociationExampleAuthor
 
   faker1 = {
     data: {
@@ -74,7 +76,7 @@ class JsonAPIExampleArticle < Flexirest::Base
     },
     included: [
       { id: 1, type: 'tags', attributes: { item: 'item three' },
-        relationships: { 'authors' => { data: [{ id: 1, type: 'tags' }] } } },
+        relationships: { 'authors' => { data: [{ id: 1, type: 'authors' }] } } },
       { id: 1, type: 'authors', attributes: { item: 'item two' } }
     ]
   }
@@ -102,6 +104,20 @@ class JsonAPIExampleArticle < Flexirest::Base
       { id: 2, type: 'tags', attributes: { item: 'item three' } }
     ]
   }
+  faker8 = {
+    data: {
+      id: 1, type: 'articles', attributes: { item: 'item one' },
+      relationships: {
+        'main_theme' => { data: { id: 1, type: 'tags' } },
+        'co_authors' => { data: [{ id: 1, type: 'authors' }, { id: 2, type: 'authors' }] },
+       }
+    },
+    included: [
+      { id: 1, type: 'tags', attributes: { item: 'item one' } },
+      { id: 1, type: 'authors', attributes: { item: 'item one' } },
+      { id: 2, type: 'authors', attributes: { item: 'item two' } },
+    ]
+  }
 
   get(
     :find,
@@ -151,6 +167,13 @@ class JsonAPIExampleArticle < Flexirest::Base
     fake: faker7.to_json,
     fake_content_type: 'application/vnd.api+json'
   )
+
+  get(
+    :custom_relationship_name,
+    '/articles/:id',
+    fake: faker8.to_json,
+    fake_content_type: 'application/vnd.api+json'
+  )
 end
 
 module JsonAPIExample
@@ -324,6 +347,12 @@ describe 'JSON API' do
     it 'should retrieve empty array if the plural relationship type is empty' do
       expect(subject.includes(:tags).no_assocs(1).tags).to be_empty
     end
+
+    it 'should retrieve associations that have a name that differs from their type name' do
+      parsed = subject.includes(:main_theme, :co_authors).custom_relationship_name(1)
+      expect(parsed.main_theme).to be_an_instance_of(JsonAPIAssociationExampleTag)
+      expect(parsed.co_authors).to be_an_instance_of(Flexirest::ResultIterator)
+    end
   end
 
   context 'lazy loading' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler