graphiti_gql 0.2.30 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a02dc0813b461497979a165c77f9116922559c46a54ba26a5130e31832c4bcef
-  data.tar.gz: 60a27d5d31c31a39d062d1a65a2c0278ce3ea6f3cba3c4900ed1332525a54460
+  metadata.gz: ba3f305f68fc23193bb245eff566feb18eaec47a775c5f0fdab8177707b564f8
+  data.tar.gz: 3f96b0cee52d9aa3c3968f125487d26f85f6bdb7acc13c2d457a2bc4feb65e11
 SHA512:
-  metadata.gz: e2a9a66b5dd624962bfffdc733115f8cf0363846db434bf9dfbe76374cd94dd0b9411ccf2aa93ce543a144ad0505e9f8d1e39bcb34b5593a7f870e17d7f13440
-  data.tar.gz: eb5004a261e6b7b815eb16ab548591c27beda1231e0875103c75d059c885ed2311b7d8c2b4d1a651d08905facdb8478b328eb5f78ec0fb812dab8cfc5f175583
+  metadata.gz: c05e7c4dc7b7908a1b3f43b40cba6b5bcf6bbda4c2b26be4555783a4d27018e249e22d1e3feb8e1d0df09e35b62fc0f98759f4d0e9b16edc9725199dd79d19dc
+  data.tar.gz: '049cb6c5201efa3a6921c5e964dbb7064dc70a7d5930c480bcf59b9466d839779a11c41a7d66cc7434d778ed200a94c0fc75a6736ff4b38817d453788cfc8318'

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/lib/graphiti_gql/loaders/belongs_to.rb

@@ -20,7 +20,7 @@ module GraphitiGql
         ids.compact!
         return if ids.empty?
 
-        if @params[:simpleid]
+        if @params[:simpleid] && !to_polymorphic_resource?
           if @sideload.type == :polymorphic_belongs_to
             ids.each do |id|
               child = @sideload.children.values.find { |c| c.group_name == id[:type].to_sym }
@@ -55,8 +55,9 @@ module GraphitiGql
           end
           values = futures.map(&:value)
           ids.each do |id|
-            val = values.find { |v| v[:type] == id[:type] }
-            fulfill(id, val[:data][0])
+            records_for_type = values.find { |v| v[:type] == id[:type] }
+            corresponding = records_for_type[:data].find { |r| r.id == id[:id] }
+            fulfill(id, corresponding)
           end
         else
           resource = Schema.registry.get(@sideload.resource.class)[:resource]
@@ -74,6 +75,12 @@ module GraphitiGql
           end
         end
       end
+
+      private
+
+      def to_polymorphic_resource?
+        @sideload.resource.polymorphic? && @sideload.type != :polymorphic_belongs_to
+      end
     end
   end
 end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.30"
+  VERSION = "0.2.31"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.31
 platform: ruby
 authors:
 - Lee Richmond
@@ -126,7 +126,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,94 +0,0 @@
-PATH
-  remote: .
-  specs:
-    graphiti_gql (0.2.29)
-      activemodel (> 6.0, < 8.0)
-      graphiti (~> 1.3.9)
-      graphql (~> 2.0)
-      graphql-batch (~> 0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
-    dry-container (0.10.1)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    graphiti (1.3.9)
-      activesupport (>= 5.2)
-      concurrent-ruby (~> 1.0)
-      dry-types (>= 0.15.0, < 2.0)
-      graphiti_errors (~> 1.1.0)
-      jsonapi-renderer (~> 0.2, >= 0.2.2)
-      jsonapi-serializable (~> 0.3.0)
-    graphiti_errors (1.1.2)
-      jsonapi-serializable (~> 0.1)
-    graphql (2.0.12)
-    graphql-batch (0.5.1)
-      graphql (>= 1.10, < 3)
-      promise.rb (~> 0.7.2)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    jsonapi-renderer (0.2.2)
-    jsonapi-serializable (0.3.1)
-      jsonapi-renderer (~> 0.2.0)
-    method_source (1.0.0)
-    minitest (5.16.2)
-    promise.rb (0.7.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (10.5.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  bundler (~> 2.3)
-  graphiti_gql!
-  pry
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.3.12