graphql-activerecord 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0898e348a67f2ffea03d24b07bad53f4ee4e303c
-  data.tar.gz: fe1f6ef15222a43dabb77ee545a8fbb22bf5509c
+  metadata.gz: f253c809829eb5ccf3b269799ddcda31457ed9bd
+  data.tar.gz: e5ab0b719842b6391145d41a7eaf4e08e1de10a8
 SHA512:
-  metadata.gz: d224b60c12152281cba045789a6c0122740b65368ea14e9327ca794a87db2ba82a1415b8ab63cff0565b04be8cf803004c7ad5c7f3b55d0468d31bf24e68eb82
-  data.tar.gz: 3568541b0befd15885528e980a63a18295764ccc35f47207400d0d48439a3ee42d1121efa143303f3de2fca7941def87c414ca420bb2208c082ef210a5aaf79f
+  metadata.gz: 5d08fad7ea034c1d43ca80dad54c2dbec6fec4eef629b9cc6a8f62e307f96c5ea7d9c2442ea6d1118833e64aad1aa3ee9309888c40f6833c1c45f17854b0e120
+  data.tar.gz: d578f4ccb32476553518484b18748cdbb956e242ab3a702d93c43d04e491e8ed0a15c76afb718497e5612f5a1080c54cd5ae10254e14ef48c73b23651b9f9fd2

data/.rubocop.yml

@@ -123,3 +123,6 @@ Style/BracesAroundHashParameters:
 
 Style/IndentationWidth:
   Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+# 0.12.0
+This version is focussed on compatibility with the GraphQL 1.5.10. Changes are relatively minor, and mostly are in response to the udpated way that connections are handled in the graphql gem now.
+
+Breaking Changes:
+The middleware that the gem uses for preloading associations has been replaced with instrumentation. So instead of this:
+```ruby
+Schema.define do
+  # other stuff
+  middleware GraphQL::Models::Middleware.new
+end
+```
+You should do this:
+```ruby
+Schema.define do
+  # other stuff
+  instrument :field, GraphQL::Models::Instrumentation.new
+end
+```
+If you were using the `skip_nil_models` option to force your field resolvers to be invoked even when the model ends up not existing, it is available on instrumentation.
+
 # 0.11.0
 Breaking Bug Fix: Turns out that 0.10.0 was _supposed_ to introduce (non)nullability on attributes, but it didn’t quite work. That’s
 fixed in 0.11.0 (and, I _really_ need to write some tests for this gem).

data/README.md

@@ -142,8 +142,8 @@ GraphQL::Schema.define do
   lazy_resolve(Promise, :sync)
   instrument(:query, GraphQL::Batch::Setup)
 
-  # This middleware should be somewhere near the top of your middleware chain
-  middleware GraphQL::Models::Middleware.new
+  # Set up the graphql-activerecord gem
+  instrument(:field, GraphQL::Models::Instrumentation.new)
 end
 ```
 

data/graphql-activerecord.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", ">= 4.2", '< 5'
   spec.add_runtime_dependency "activerecord", ">= 4.2", '< 5'
-  spec.add_runtime_dependency "graphql", ">= 1.4", '< 2'
+  spec.add_runtime_dependency "graphql", ">= 1.5.10", '< 2'
   spec.add_runtime_dependency "graphql-batch", ">= 0.2.4"
 
   spec.add_development_dependency "bundler", "~> 1.11"

data/lib/graphql/activerecord.rb

@@ -7,7 +7,7 @@ require 'graphql/relay'
 
 require 'graphql/models/monkey_patches/graphql_query_context'
 require 'graphql/models/active_record_extension'
-require 'graphql/models/middleware'
+require 'graphql/models/instrumentation'
 
 # Helpers
 require 'graphql/models/helpers'

data/lib/graphql/models/definition_helpers/associations.rb

@@ -215,7 +215,7 @@ module GraphQL
           connection_type = connection_type.to_non_null_type
         end
 
-        camel_name = options[:name]
+        camel_name = options[:name].to_s
 
         DefinitionHelpers.register_field_metadata(graph_type, camel_name, {
           macro: :has_many_connection,
@@ -227,12 +227,20 @@ module GraphQL
           object_to_base_model: object_to_model,
         })
 
-        GraphQL::Define::AssignConnection.call(graph_type, camel_name, connection_type) do
+        connection_field = graph_type.fields[camel_name] = GraphQL::Field.define do
+          name(camel_name)
+          type(connection_type)
+          description options[:description] if options.include?(:description)
+          deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
+
           resolve -> (model, _args, _context) do
             return nil unless model
             model.public_send(association)
           end
         end
+
+        connection_field.connection = true
+        connection_field
       end
     end
   end

data/lib/graphql/models/instrumentation.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+class GraphQL::Models::Instrumentation
+  # @param skip_nil_models If true, field resolvers (in proxy_to or backed_by_model blocks) will not be invoked if the model is nil.
+  def initialize(skip_nil_models = true)
+    @skip_nil_models = skip_nil_models
+  end
+
+  def instrument(type, field)
+    field_info = GraphQL::Models.field_info(type, field.name)
+    return field unless field_info
+
+    old_resolver = field.resolve_proc
+
+    new_resolver = -> (object, args, ctx) {
+      base_model = field_info.object_to_base_model.call(object)
+      GraphQL::Models.load_association(base_model, field_info.path, ctx).then do |model|
+        next nil if model.nil? && @skip_nil_models
+        old_resolver.call(model, args, ctx)
+      end
+    }
+
+    field.redefine do
+      resolve(new_resolver)
+    end
+  end
+end

data/lib/graphql/models/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GraphQL
   module Models
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.10
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.10
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -203,7 +203,7 @@ files:
 - lib/graphql/models/definition_helpers/attributes.rb
 - lib/graphql/models/hash_combiner.rb
 - lib/graphql/models/helpers.rb
-- lib/graphql/models/middleware.rb
+- lib/graphql/models/instrumentation.rb
 - lib/graphql/models/monkey_patches/graphql_query_context.rb
 - lib/graphql/models/mutation_field_map.rb
 - lib/graphql/models/mutation_helpers/apply_changes.rb

data/lib/graphql/models/middleware.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-class GraphQL::Models::Middleware
-  attr_accessor :skip_nil_models
-
-  def initialize(skip_nil_models = true)
-    @skip_nil_models = skip_nil_models
-  end
-
-  def call(graphql_type, object, field_definition, args, context)
-    # If this field defines a path, load the associations in the path
-    field_info = GraphQL::Models.field_info(graphql_type, field_definition.name)
-    return yield unless field_info
-
-    # Convert the core object into the model
-    base_model = field_info.object_to_base_model.call(object)
-
-    GraphQL::Models.load_association(base_model, field_info.path, context).then do |model|
-      next nil if model.nil? && @skip_nil_models
-
-      next_args = [graphql_type, model, field_definition, args, context]
-      yield(next_args)
-    end
-  end
-end