graphiti 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77a0b8b5d8df9c67801e64943896e8ab1641626c7819548839f07ec498242fb7
-  data.tar.gz: 33c1ee5fe14d815a9d1bb4bf2763d468d613a22ac7f8417a827ddb19623d2de8
+  metadata.gz: 501d03b06258694566979a6f54104d8da41a44ab6dadec078e7b84ef047de364
+  data.tar.gz: cb85e65ffb73f9294cd0173eee9a0f2e8239697dac1a83adbe58a2faf9c6cbe9
 SHA512:
-  metadata.gz: a75fed69be79eba1cc5b892c55a6b452683164666fb96597e119b36100b7de98dd2671615ea6bba208e75e084697b03ec1b35850a8cefe431c5dd2edfe6a9c93
-  data.tar.gz: 169cb3b32f2ce23767e4a158da84d5b0b307ed3ee6c834b059237b59ca6b711b727c4449a6ed7fa8055a33e561bca0a258a007753a2c65359fa47b11cc20abee
+  metadata.gz: 917d60f26882a2efbcebcf80279aa624b795628d6ad6fdc201dd8c4511e3a7caf6979fbf24c870aa176827dfe7daeffef0a1b5e5e73cec8d83bec98761ad1a9f
+  data.tar.gz: 1028dc0fe60eb8b4b54f119ccb12308390ff849c48047f6597e4149dbf6123aae296299d231fde9fa3469c023d7caa86b9e5ce334dc079547932ba886512e38e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.3
+
+Fixes:
+
+- [#130](https://github.com/graphiti-api/graphiti/pull/130) Run query
+  blocks in resource context.
+
 ## 1.0.2
 
 Fixes:
@@ -13,6 +20,11 @@ Fixes:
 
 ### master (unreleased)
 
+Misc:
+
+- [#123](https://github.com/graphiti-api/graphiti/pull/123) Throw
+  better error when polymorphic type not found.
+
 <!-- ### [version (YYYY-MM-DD)](diff_link) -->
 <!-- Breaking changes:-->
 <!-- Features:-->

data/gemfiles/rails_6.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.0.0.beta2"
 gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.4"
 gem "database_cleaner"
 gem "kaminari", "~> 0.17"
 

data/lib/graphiti/errors.rb

@@ -561,6 +561,28 @@ module Graphiti
       end
     end
 
+    class PolymorphicSideloadTypeNotFound < Base
+      def initialize(sideload, name)
+        @sideload = sideload
+        @name = name
+      end
+
+      def message
+        <<~MSG
+          #{@sideload.parent_resource}: Tried to find a Resource with type '#{@name.inspect}', but did not find one!
+
+          This is because either a Resource with that type doesn't exist, or it's not registered on the sideload. The below example shows how to register a Resource with this sideload. Make sure one of the registered Resources has type '#{@name.inspect}'
+
+          polymorphic_belongs_to #{@sideload.name.inspect} do
+            group_by(#{@sideload.grouper.field_name.inspect}) do
+              on(:foo)
+              on(:foo).belongs_to :foo, resource: FooResource # (long-hand example)
+            end
+          end
+        MSG
+      end
+    end
+
     class PolymorphicSideloadChildNotFound < Base
       def initialize(sideload, name)
         @sideload = sideload

data/lib/graphiti/scoping/default_filter.rb

@@ -38,7 +38,7 @@ module Graphiti
     def apply
       resource.default_filters.each_pair do |name, opts|
         next if overridden?(name)
-        @scope = opts[:filter].call(@scope, resource.context)
+        @scope = resource.instance_exec(@scope, resource.context, &opts[:filter])
       end
 
       @scope

data/lib/graphiti/scoping/filter.rb

@@ -23,7 +23,7 @@ module Graphiti
 
     def filter_scope(filter, operator, value)
       if (custom_scope = filter.values[0][:operators][operator])
-        custom_scope.call(@scope, value, resource.context)
+        @resource.instance_exec(@scope, value, resource.context, &custom_scope)
       else
         filter_via_adapter(filter, operator, value)
       end

data/lib/graphiti/scoping/paginate.rb

@@ -38,7 +38,7 @@ module Graphiti
 
     # Apply the custom pagination proc
     def apply_custom_scope
-      custom_scope.call(@scope, number, size, resource.context)
+      resource.instance_exec(@scope, number, size, resource.context, &custom_scope)
     end
 
     private

data/lib/graphiti/scoping/sort.rb

@@ -29,7 +29,7 @@ module Graphiti
             attribute, sort[:only], direction
         else
           @scope = if sort[:proc]
-            sort[:proc].call(@scope, direction)
+            resource.instance_exec(@scope, direction, &sort[:proc])
           else
             resource.adapter.order(@scope, attribute, direction)
           end

data/lib/graphiti/sideload/polymorphic_belongs_to.rb

@@ -99,6 +99,15 @@ class Graphiti::Sideload::PolymorphicBelongsTo < Graphiti::Sideload::BelongsTo
     end
   end
 
+  def child_for_type!(type)
+    if (child = child_for_type(type))
+      child
+    else
+      err = ::Graphiti::Errors::PolymorphicSideloadTypeNotFound
+      raise err.new(self, type)
+    end
+  end
+
   def resolve(parents, query, graph_parent)
     parents.group_by(&grouper.field_name).each_pair do |group_name, group|
       next if group_name.nil? || grouper.ignore?(group_name)

data/lib/graphiti/util/relationship_payload.rb

@@ -47,7 +47,7 @@ module Graphiti
 
         # For polymorphic *sideloads*, grab the correct child sideload
         if sideload.resource.type != type && sideload.type == :polymorphic_belongs_to
-          sideload = sideload.child_for_type(type)
+          sideload = sideload.child_for_type!(type)
         end
 
         # For polymorphic *resources*, grab the correct child resource

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable