graphql-activerecord 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9fee18504557b9f81a457041ead8cd9e7299938
-  data.tar.gz: c81e175d9b1915eca18645c07a16336e44775286
+  metadata.gz: 0898e348a67f2ffea03d24b07bad53f4ee4e303c
+  data.tar.gz: fe1f6ef15222a43dabb77ee545a8fbb22bf5509c
 SHA512:
-  metadata.gz: a268448326e2e63edd0a154ed01e575fd32bdff94c685be3078160220fcc5c52c9e7afbecc05fba59ad50e3044248d210d8e36c7a17c60affa4113045dca7fe1
-  data.tar.gz: 9780ec3ba432f44f5aa5b63109fc45c10916a3f10a9dad4d95c40174e9a8d1764319e56db4e56f10f31cd3ef6a5a345e758b6d2690f512f3ac6608fdc9f419ab
+  metadata.gz: d224b60c12152281cba045789a6c0122740b65368ea14e9327ca794a87db2ba82a1415b8ab63cff0565b04be8cf803004c7ad5c7f3b55d0468d31bf24e68eb82
+  data.tar.gz: 3568541b0befd15885528e980a63a18295764ccc35f47207400d0d48439a3ee42d1121efa143303f3de2fca7941def87c414ca420bb2208c082ef210a5aaf79f

data/.circleci/config.yml

@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    working_directory: /graphql-activerecord
+    docker:
+      - image: ruby:2.3.1
+    steps:
+      - checkout
+
+      # Install dependencies
+      - restore_cache:
+          key: bundler-{{ checksum "graphql-activerecord.gemspec" }}
+      - run: bundle install --path=vendor/gems
+      - save_cache:
+          key: bundler-{{ checksum "graphql-activerecord.gemspec" }}
+          paths:
+            - vendor/gems
+
+      # Tests
+      - run: rubocop
+      - run: rspec

data/.rubocop.yml

@@ -0,0 +1,125 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - bin/**/*
+    - vendor/gems/**/*
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+  Enabled: false
+
+Lint/UnusedBlockArgument:
+  AllowUnusedKeywordArguments: true
+
+Lint/UnusedMethodArgument:
+  AllowUnusedKeywordArguments: true
+  IgnoreEmptyMethods: true
+
+Metrics/BlockLength:
+  CountComments: false
+  Max: 96
+
+Metrics/ClassLength:
+  Max: 337
+
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+Metrics/MethodLength:
+  CountComments: false
+
+Metrics/ModuleLength:
+  CountComments: false
+  Max: 222
+
+Metrics/PerceivedComplexity:
+  Max: 18
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/ExtraSpacing:
+  AllowForAlignment: false
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always
+
+Style/GlobalVars:
+  AllowedVariables: [$redis_pool]
+
+Style/HashSyntax:
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/Lambda:
+  EnforcedStyle: literal
+
+Style/MultilineMethodCallIndentation:
+  Enabled: false
+
+Style/NegatedIf:
+  Enabled: false
+
+Style/NegatedWhile:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/Attr:
+  Enabled: false
+
+Style/SpaceInLambdaLiteral:
+  EnforcedStyle: require_space
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/WordArray:
+  EnforcedStyle: percent
+  MinSize: 5
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+Style/TernaryParentheses:
+  Enabled: false
+
+Style/PredicateName:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/NumericLiterals:
+  MinDigits: 5
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/CaseIndentation:
+  EnforcedStyle: end
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+Style/IndentationWidth:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,48 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-03-12 22:31:48 -0500 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/graphql/models/definition_helpers.rb'
+    - 'lib/graphql/models/definition_helpers/attributes.rb'
+    - 'lib/graphql/models/mutation_helpers/print_input_fields.rb'
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 83
+
+# Offense count: 1
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 201
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 56
+
+# Offense count: 5
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 9
+
+# Offense count: 5
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/graphql/models/association_load_request.rb'
+    - 'lib/graphql/models/mutation_field_map.rb'
+    - 'lib/graphql/models/mutation_helpers/apply_changes.rb'
+    - 'lib/graphql/models/mutation_helpers/validation.rb'
+
+# Offense count: 2
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/graphql/models/definition_helpers.rb'

data/CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog
 
+# 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).
+
 # 0.10.0
 There are a few breaking changes:
 - Added automatic nullability checking for attributes. It’s enabled by default; see the README for more info.
 - The gem now assumes that the object types for your models are called "ModelNameType" instead of "ModelNameGraph",
   to bring it more in line with common practice. You can get the old behavior by adding this to an initializer:
-  
+
 ```ruby
   GraphQL::Models.model_to_graphql_type -> (model_class) { "#{model_class.name}Graph".safe_constantize }
 ```
@@ -13,9 +17,11 @@ There are a few breaking changes:
 - Fixed a bug with the `has_many_connection` helper, which deserves some explanation. This helper constructs a
   connection field that returns an ActiveRecord relation. There isn't an easy way to inject functionality into the resolvers
   that are used by connections (to my knowledge) - eg, by using middleware - so this helper had some GoCo-specific code
-  baked into it, which probably caused odd errors about an undefined constant `GraphSupport` whenever it was used. I can’t
+  baked into it, which probably caused odd errors about an undefined constant `GraphSupport` whenever it was used. ~~I can’t
   quite remove that functionality yet, but I did take it one step closer by having the code first check to see if the constant
-  was defined, and bypass it if it’s not.
+  was defined, and bypass it if it’s not.~~ That code has been removed from the gem now!
+
+- Fixed a bug where the HashCombiner would sometimes not merge hashes together (if their keys were sorted differently)
 
 ## 0.9.0
 - Support for graphql version 1.2.1 and higher, but it no longer works with 0.x versions

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in graphql-activerecord.gemspec

data/Rakefile

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/rubocop

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/bin/ruby-parse

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby-parse' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("parser", "ruby-parse")

data/bin/ruby-rewrite

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby-rewrite' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("parser", "ruby-rewrite")

data/graphql-activerecord.gemspec

@@ -1,22 +1,23 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'graphql/models/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "graphql-activerecord"
-  spec.version       = GraphQL::Models::VERSION
-  spec.authors       = ["Ryan Foster"]
-  spec.email         = ["theorygeek@gmail.com"]
+  spec.name = "graphql-activerecord"
+  spec.version = GraphQL::Models::VERSION
+  spec.authors = ["Ryan Foster"]
+  spec.email = ["theorygeek@gmail.com"]
 
   spec.summary = "ActiveRecord helpers for GraphQL + Relay"
   spec.description = "Build Relay-compatible GraphQL schemas based on ActiveRecord models"
-  spec.homepage =  "http://github.com/goco-inc/graphql-activerecord"
+  spec.homepage = "http://github.com/goco-inc/graphql-activerecord"
   spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", ">= 4.2", '< 5'
@@ -28,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rubocop", '~> 0.47.1'
 end

data/lib/graphql/activerecord.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 require 'active_record'
 require 'graphql'
@@ -34,7 +35,6 @@ require 'graphql/models/mutation_field_map'
 require 'graphql/models/backed_by_model'
 require 'graphql/models/mutator'
 
-
 module GraphQL
   module Models
     class << self
@@ -94,7 +94,7 @@ module GraphQL
 
     def self.get_graphql_type!(model_class)
       type = get_graphql_type(model_class)
-      fail RuntimeError, "Could not locate GraphQL type for model #{model_class}" if type.nil?
+      raise "Could not locate GraphQL type for model #{model_class}" if type.nil?
       type
     end
   end

data/lib/graphql/models/active_record_extension.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     module ActiveRecordExtension
@@ -38,14 +39,14 @@ module GraphQL
           name = "#{self.name}#{attribute.to_s.classify}"
           description = "#{attribute.to_s.titleize} field on #{self.name.titleize}"
 
-          if defined_enums.include?(attribute.to_s)
-            values = defined_enums[attribute.to_s].keys
+          values = if defined_enums.include?(attribute.to_s)
+            defined_enums[attribute.to_s].keys
           else
-            values = Reflection.possible_values(self, attribute)
+            Reflection.possible_values(self, attribute)
           end
 
           if values.nil?
-            fail ArgumentError.new("Could not auto-detect the values for enum #{attribute} on #{self.name}")
+            raise ArgumentError, "Could not auto-detect the values for enum #{attribute} on #{self.name}"
           end
 
           type = GraphQL::EnumType.define do

data/lib/graphql/models/association_load_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     class AssociationLoadRequest
@@ -9,7 +10,7 @@ module GraphQL
         @context = context
 
         if reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
-          fail ArgumentError, "You cannot batch-load a has_many :through association. Instead, load each association individually."
+          raise ArgumentError, "You cannot batch-load a has_many :through association. Instead, load each association individually."
         end
       end
 
@@ -33,7 +34,7 @@ module GraphQL
       #################################################################
 
       def target_class
-        case when reflection.polymorphic?
+        if reflection.polymorphic?
           base_model.send(reflection.foreign_type).constantize
         else
           reflection.klass
@@ -49,7 +50,6 @@ module GraphQL
       def reflection
         association.reflection
       end
-
     end
   end
 end

data/lib/graphql/models/attribute_loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   # Simplified loader that can take a hash of attributes to match, combine them into a single query, and then fulfill
   # then individually. It can also ask the database to order them correctly.

data/lib/graphql/models/backed_by_model.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     class BackedByModel
@@ -44,10 +45,10 @@ module GraphQL
           name: name,
           nullable: nullable,
           description: description,
-          deprecation_reason: deprecation_reason
+          deprecation_reason: deprecation_reason,
         }
 
-        DefinitionHelpers.define_attribute(@graph_type, @base_model_type, @model_type, @path, attribute, @object_to_model, options, nullable, &block)
+        DefinitionHelpers.define_attribute(@graph_type, @base_model_type, @model_type, @path, attribute, @object_to_model, options, @detect_nulls, &block)
       end
 
       # Flattens an associated model into the graph type, allowing to you adds its attributes as if they existed on the parent model.
@@ -63,7 +64,7 @@ module GraphQL
           name: name,
           nullable: nullable,
           description: description,
-          deprecation_reason: deprecation_reason
+          deprecation_reason: deprecation_reason,
         }
 
         DefinitionHelpers.define_has_one(@graph_type, @base_model_type, @model_type, @path, association, @object_to_model, options, @detect_nulls)
@@ -76,7 +77,7 @@ module GraphQL
           name: name,
           nullable: nullable,
           description: description,
-          deprecation_reason: deprecation_reason
+          deprecation_reason: deprecation_reason,
         })
 
         DefinitionHelpers.define_has_many_connection(@graph_type, @base_model_type, @model_type, @path, association, @object_to_model, options, @detect_nulls)
@@ -90,7 +91,7 @@ module GraphQL
           type: type,
           nullable: nullable,
           description: description,
-          deprecation_reason: deprecation_reason
+          deprecation_reason: deprecation_reason,
         }
 
         DefinitionHelpers.define_has_many_array(@graph_type, @base_model_type, @model_type, @path, association, @object_to_model, options, @detect_nulls)
@@ -107,7 +108,7 @@ module GraphQL
           path: @path,
           base_model_type: @base_model_type,
           model_type: @model_type,
-          object_to_base_model: @object_to_model
+          object_to_base_model: @object_to_model,
         })
 
         defined_field

data/lib/graphql/models/database_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     module DatabaseTypes

data/lib/graphql/models/definer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This is a helper class. It lets you build simple DSL's. Methods called against the class are
 # converted into attributes in a hash.
 module GraphQL
@@ -7,12 +8,12 @@ module GraphQL
         @values = {}
         methods.each do |m|
           define_singleton_method(m) do |*args|
-            if args.blank?
-              @values[m] = nil
+            @values[m] = if args.blank?
+              nil
             elsif args.length == 1
-              @values[m] = args[0]
+              args[0]
             else
-              @values[m] = args
+              args
             end
           end
         end

data/lib/graphql/models/definition_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ostruct'
 
 module GraphQL
@@ -10,16 +11,16 @@ module GraphQL
       # Returns a promise that will eventually resolve to the model that is at the end of the path
       def self.load_and_traverse(current_model, path, context)
         cache_model(context, current_model)
-        return Promise.resolve(current_model) if path.length == 0 || current_model.nil?
+        return Promise.resolve(current_model) if path.empty? || current_model.nil?
 
         association = current_model.association(path[0])
 
-        while path.length > 0 && (association.loaded? || attempt_cache_load(current_model, association, context))
+        while !path.empty? && (association.loaded? || attempt_cache_load(current_model, association, context))
           current_model = association.target
           path = path[1..-1]
           cache_model(context, current_model)
 
-          return Promise.resolve(current_model) if path.length == 0 || current_model.nil?
+          return Promise.resolve(current_model) if path.empty? || current_model.nil?
 
           association = current_model.association(path[0])
         end
@@ -31,7 +32,6 @@ module GraphQL
           # First step, load the :through association (ie, the :open_enrollments)
           through = association.reflection.options[:through]
           load_and_traverse(current_model, [through], context).then do |intermediate_models|
-
             # Now, for each of the intermediate models (OpenEnrollment), load the source association (:health_line)
             sources = intermediate_models.map do |im|
               load_and_traverse(im, [association.reflection.source_reflection_name], context)
@@ -107,14 +107,14 @@ module GraphQL
         association.set_inverse_instance(target) unless target.nil?
       end
 
-      def self.traverse_path(base_model, path, context)
+      def self.traverse_path(base_model, path, _context)
         model = base_model
         path.each do |segment|
           return nil unless model
           model = model.public_send(segment)
         end
 
-        return model
+        model
       end
 
       # Stores metadata about GraphQL fields that are available on this model's GraphQL type.

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     module DefinitionHelpers
       def self.define_proxy(graph_type, base_model_type, model_type, path, association, object_to_model, detect_nulls, &block)
         reflection = model_type.reflect_on_association(association)
-        raise ArgumentError.new("Association #{association} wasn't found on model #{model_type.name}") unless reflection
-        raise ArgumentError.new("Cannot proxy to polymorphic association #{association} on model #{model_type.name}") if reflection.polymorphic?
-        raise ArgumentError.new("Cannot proxy to #{reflection.macro} association #{association} on model #{model_type.name}") unless [:has_one, :belongs_to].include?(reflection.macro)
+        raise ArgumentError, "Association #{association} wasn't found on model #{model_type.name}" unless reflection
+        raise ArgumentError, "Cannot proxy to polymorphic association #{association} on model #{model_type.name}" if reflection.polymorphic?
+        raise ArgumentError, "Cannot proxy to #{reflection.macro} association #{association} on model #{model_type.name}" unless [:has_one, :belongs_to].include?(reflection.macro)
 
         return unless block_given?
 
@@ -34,7 +35,7 @@ module GraphQL
           valid_types = Reflection.possible_values(model_type, reflection.foreign_type)
 
           if valid_types.blank?
-            fail ArgumentError.new("Cannot include polymorphic #{reflection.name} association on model #{model_type.name}, because it does not define an inclusion validator on #{reflection.foreign_type}")
+            raise ArgumentError, "Cannot include polymorphic #{reflection.name} association on model #{model_type.name}, because it does not define an inclusion validator on #{reflection.foreign_type}"
           end
 
           graph_types = valid_types.map { |t| GraphQL::Models.get_graphql_type(t) }.compact
@@ -54,8 +55,8 @@ module GraphQL
       def self.define_has_one(graph_type, base_model_type, model_type, path, association, object_to_model, options, detect_nulls)
         reflection = model_type.reflect_on_association(association)
 
-        fail ArgumentError.new("Association #{association} wasn't found on model #{model_type.name}") unless reflection
-        fail ArgumentError.new("Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_one") unless [:has_one, :belongs_to].include?(reflection.macro)
+        raise ArgumentError, "Association #{association} wasn't found on model #{model_type.name}" unless reflection
+        raise ArgumentError, "Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_one" unless [:has_one, :belongs_to].include?(reflection.macro)
 
         # Define the field for the association itself
 
@@ -70,7 +71,7 @@ module GraphQL
           association: association,
           base_model_type: base_model_type,
           model_type: model_type,
-          object_to_base_model: object_to_model
+          object_to_base_model: object_to_model,
         })
 
         graph_type.fields[camel_name.to_s] = GraphQL::Field.define do
@@ -79,7 +80,7 @@ module GraphQL
           description options[:description] if options.include?(:description)
           deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
 
-          resolve -> (model, args, context) do
+          resolve -> (model, _args, context) do
             return nil unless model
             DefinitionHelpers.load_and_traverse(model, [association], context)
           end
@@ -96,7 +97,7 @@ module GraphQL
           association: association,
           base_model_type: base_model_type,
           model_type: model_type,
-          object_to_base_model: object_to_model
+          object_to_base_model: object_to_model,
         })
 
         can_use_optimized = reflection.macro == :belongs_to
@@ -110,7 +111,7 @@ module GraphQL
           type id_field_type
           deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
 
-          resolve -> (model, args, context) do
+          resolve -> (model, _args, context) do
             return nil unless model
 
             if can_use_optimized
@@ -130,8 +131,8 @@ module GraphQL
       def self.define_has_many_array(graph_type, base_model_type, model_type, path, association, object_to_model, options, detect_nulls)
         reflection = model_type.reflect_on_association(association)
 
-        fail ArgumentError.new("Association #{association} wasn't found on model #{model_type.name}") unless reflection
-        fail ArgumentError.new("Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_many_array") unless [:has_many].include?(reflection.macro)
+        raise ArgumentError, "Association #{association} wasn't found on model #{model_type.name}" unless reflection
+        raise ArgumentError, "Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_many_array" unless [:has_many].include?(reflection.macro)
 
         association_type = options[:type] || GraphQL::Models.get_graphql_type!(reflection.klass)
 
@@ -144,7 +145,7 @@ module GraphQL
         # The has_many associations are a little special. Instead of checking for a presence validator, we instead assume
         # that the outer type should be non-null, unless detect_nulls is false. In other words, we prefer an empty
         # array for the association, rather than null.
-        if (options[:nullable] == nil && detect_nulls) || options[:nullable] == false
+        if (options[:nullable].nil? && detect_nulls) || options[:nullable] == false
           association_type = association_type.to_non_null_type
           id_field_type = id_field_type.to_non_null_type
         end
@@ -158,7 +159,7 @@ module GraphQL
           association: association,
           base_model_type: base_model_type,
           model_type: model_type,
-          object_to_base_model: object_to_model
+          object_to_base_model: object_to_model,
         })
 
         graph_type.fields[camel_name.to_s] = GraphQL::Field.define do
@@ -167,7 +168,7 @@ module GraphQL
           description options[:description] if options.include?(:description)
           deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
 
-          resolve -> (model, args, context) do
+          resolve -> (model, _args, context) do
             return nil unless model
             DefinitionHelpers.load_and_traverse(model, [association], context).then do |result|
               Array.wrap(result)
@@ -185,7 +186,7 @@ module GraphQL
           association: association,
           base_model_type: base_model_type,
           model_type: model_type,
-          object_to_base_model: object_to_model
+          object_to_base_model: object_to_model,
         })
 
         graph_type.fields[id_field_name.to_s] = GraphQL::Field.define do
@@ -193,7 +194,7 @@ module GraphQL
           type id_field_type
           deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
 
-          resolve -> (model, args, context) do
+          resolve -> (model, _args, context) do
             return nil unless model
             DefinitionHelpers.load_and_traverse(model, [association], context).then do |result|
               Array.wrap(result).map(&:gid)
@@ -205,12 +206,12 @@ module GraphQL
       def self.define_has_many_connection(graph_type, base_model_type, model_type, path, association, object_to_model, options, detect_nulls)
         reflection = model_type.reflect_on_association(association)
 
-        fail ArgumentError.new("Association #{association} wasn't found on model #{model_type.name}") unless reflection
-        fail ArgumentError.new("Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_many_connection") unless [:has_many].include?(reflection.macro)
+        raise ArgumentError, "Association #{association} wasn't found on model #{model_type.name}" unless reflection
+        raise ArgumentError, "Cannot include #{reflection.macro} association #{association} on model #{model_type.name} with has_many_connection" unless [:has_many].include?(reflection.macro)
 
         connection_type = GraphQL::Models.get_graphql_type!(reflection.klass).connection_type
 
-        if (options[:nullable] == nil && detect_nulls) || options[:nullable] == false
+        if (options[:nullable].nil? && detect_nulls) || options[:nullable] == false
           connection_type = connection_type.to_non_null_type
         end
 
@@ -223,11 +224,11 @@ module GraphQL
           association: association,
           base_model_type: base_model_type,
           model_type: model_type,
-          object_to_base_model: object_to_model
+          object_to_base_model: object_to_model,
         })
 
         GraphQL::Define::AssignConnection.call(graph_type, camel_name, connection_type) do
-          resolve -> (model, args, context) do
+          resolve -> (model, _args, _context) do
             return nil unless model
             model.public_send(association)
           end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     module DefinitionHelpers
@@ -8,7 +9,7 @@ module GraphQL
         # attribute itself.
         nullable = options[:nullable]
 
-        if nullable == nil
+        if nullable.nil?
           nullable = !(detect_nulls && Reflection.is_required(model_class, attribute_or_association))
         end
 
@@ -32,7 +33,7 @@ module GraphQL
           attribute: attribute,
           base_model_class: base_model_class,
           model_class: model_class,
-          object_to_base_model: object_to_model
+          object_to_base_model: object_to_model,
         })
 
         graph_type.fields[field_name.to_s] = GraphQL::Field.define do
@@ -41,7 +42,7 @@ module GraphQL
           description options[:description] if options.include?(:description)
           deprecation_reason options[:deprecation_reason] if options.include?(:deprecation_reason)
 
-          resolve -> (model, args, context) do
+          resolve -> (model, _args, _context) do
             model&.public_send(attribute)
           end
 

data/lib/graphql/models/hash_combiner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models::HashCombiner
   class << self
     # Takes a set of hashes that represent conditions, and combines them into the smallest number of hashes

data/lib/graphql/models/helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   module Helpers
     def self.orders_to_sql(orders)

data/lib/graphql/models/middleware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class GraphQL::Models::Middleware
   attr_accessor :skip_nil_models
 

data/lib/graphql/models/monkey_patches/graphql_query_context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class GraphQL::Query::Context
   def cached_models
     @cached_models ||= Set.new

data/lib/graphql/models/mutation_field_map.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   class MutationFieldMap
     attr_accessor :model_type, :find_by, :null_behavior, :fields, :nested_maps
@@ -6,8 +7,8 @@ module GraphQL::Models
     attr_accessor :name, :association, :has_many, :required, :path
 
     def initialize(model_type, find_by:, null_behavior:)
-      fail ArgumentError.new("model_type must be a model") if model_type && !(model_type <= ActiveRecord::Base)
-      fail ArgumentError.new("null_behavior must be :set_null or :leave_unchanged") unless [:set_null, :leave_unchanged].include?(null_behavior)
+      raise ArgumentError, "model_type must be a model" if model_type && !(model_type <= ActiveRecord::Base)
+      raise ArgumentError, "null_behavior must be :set_null or :leave_unchanged" unless [:set_null, :leave_unchanged].include?(null_behavior)
 
       @fields = []
       @nested_maps = []
@@ -27,7 +28,7 @@ module GraphQL::Models
       attribute = attribute.to_sym if attribute.is_a?(String)
 
       if type.nil? && !model_type
-        fail ArgumentError.new("You must specify a type for attribute #{name}, because its model type is not known until runtime.")
+        raise ArgumentError, "You must specify a type for attribute #{name}, because its model type is not known until runtime."
       end
 
       if type.nil? && (attribute == :id || foreign_keys.include?(attribute))
@@ -51,7 +52,7 @@ module GraphQL::Models
         name: name,
         attribute: attribute,
         type: type,
-        required: required
+        required: required,
       })
     end
 
@@ -62,7 +63,7 @@ module GraphQL::Models
 
       if reflection
         unless [:belongs_to, :has_one].include?(reflection.macro)
-          fail ArgumentError.new("Cannot proxy to #{reflection.macro} association #{association} from #{model_type.name}")
+          raise ArgumentError, "Cannot proxy to #{reflection.macro} association #{association} from #{model_type.name}"
         end
 
         klass = reflection.polymorphic? ? nil : reflection.klass
@@ -83,7 +84,7 @@ module GraphQL::Models
           attribute: field[:attribute],
           type: field[:type],
           required: field[:required],
-          path: [association] + Array.wrap(field[:path])
+          path: [association] + Array.wrap(field[:path]),
         })
       end
 
@@ -95,18 +96,18 @@ module GraphQL::Models
 
     def nested(association, find_by: nil, null_behavior:, name: nil, has_many: false, &block)
       unless model_type
-        fail ArgumentError.new("Cannot use `nested` unless the model type is known at build time.")
+        raise ArgumentError, "Cannot use `nested` unless the model type is known at build time."
       end
 
       association = association.to_sym if association.is_a?(String)
       reflection = model_type.reflect_on_association(association)
 
       unless reflection
-        fail ArgumentError.new("Could not find association #{association} on #{model_type.name}")
+        raise ArgumentError, "Could not find association #{association} on #{model_type.name}"
       end
 
       if reflection.polymorphic?
-        fail ArgumentError.new("Cannot used `nested` with polymorphic association #{association} on #{model_type.name}")
+        raise ArgumentError, "Cannot used `nested` with polymorphic association #{association} on #{model_type.name}"
       end
 
       has_many = reflection.macro == :has_many
@@ -133,7 +134,7 @@ module GraphQL::Models
 
     def detect_field_conflict(name)
       if fields.any? { |f| f[name] == name } || nested_maps.any? { |n| n.name == name }
-        fail ArgumentError.new("The field #{name} is defined more than once.")
+        raise ArgumentError, "The field #{name} is defined more than once."
       end
     end
 

data/lib/graphql/models/mutation_helpers/apply_changes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   module MutationHelpers
     def self.apply_changes(field_map, model, inputs, context)
@@ -40,7 +41,7 @@ module GraphQL::Models
         end
       end
 
-      return changes
+      changes
     end
 
     def self.handle_nested_map(parent_map, parent_model, inputs, context, child_map)
@@ -66,7 +67,7 @@ module GraphQL::Models
         changes.concat(child_changes)
       end
 
-      return changes
+      changes
     end
 
     def self.match_inputs_to_models(model, child_map, next_inputs, changes)
@@ -92,7 +93,7 @@ module GraphQL::Models
           changes.push({ model_instance: child_model, action: :create })
         end
 
-        return [{ child_model: child_model, child_inputs: next_inputs }]
+        [{ child_model: child_model, child_inputs: next_inputs }]
       else
         next_inputs = [] if next_inputs.nil?
 
@@ -108,7 +109,7 @@ module GraphQL::Models
       end
     end
 
-    def self.match_inputs_by_position(model, child_map, next_inputs, changes, associated_models)
+    def self.match_inputs_by_position(_model, _child_map, next_inputs, changes, associated_models)
       count = [associated_models.length, next_inputs.length].max
 
       matches = []
@@ -130,10 +131,10 @@ module GraphQL::Models
         matches.push({ child_model: child_model, child_inputs: inputs, input_path: idx })
       end
 
-      return matches
+      matches
     end
 
-    def self.match_inputs_by_fields(model, child_map, next_inputs, changes, associated_models, find_by)
+    def self.match_inputs_by_fields(_model, child_map, next_inputs, changes, associated_models, find_by)
       # Convert the find_by into the field definitions, so that we properly unmap aliased fields
       find_by_defs = find_by.map { |name| child_map.fields.detect { |f| f[:attribute].to_s == name.to_s } }
       name_to_attr = find_by_defs.map { |f| [f[:name], f[:attribute].to_s] }.to_h
@@ -175,7 +176,7 @@ module GraphQL::Models
         matches.push({ child_model: child_model, child_inputs: inputs, input_path: next_inputs.index(inputs) })
       end
 
-      return matches
+      matches
     end
 
     # Returns the instance of the model that will be changed for this field. If new models are created along the way,
@@ -197,7 +198,7 @@ module GraphQL::Models
         model_to_change = next_model
       end
 
-      return model_to_change
+      model_to_change
     end
 
     def self.apply_field_value(model, field_def, value, context, changes)
@@ -206,7 +207,7 @@ module GraphQL::Models
         target_model = GraphQL::Models.model_from_id.call(value, context)
 
         unless target_model
-          fail GraphQL::ExecutionError.new("The value provided for #{field_def[:name]} does not refer to a valid model.")
+          raise GraphQL::ExecutionError, "The value provided for #{field_def[:name]} does not refer to a valid model."
         end
 
         value = target_model.id
@@ -219,7 +220,7 @@ module GraphQL::Models
           model_instance: model,
           input_path: field_def[:name],
           attribute: field_def[:attribute],
-          action: model.new_record? ? :create : :update
+          action: model.new_record? ? :create : :update,
         })
       end
     end
@@ -250,6 +251,5 @@ module GraphQL::Models
 
       values
     end
-
   end
 end

data/lib/graphql/models/mutation_helpers/authorization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   module MutationHelpers
     def self.authorize_changes(context, all_changes)

data/lib/graphql/models/mutation_helpers/print_input_fields.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   module MutationHelpers
     def self.print_input_fields(field_map, definer, map_name_prefix)
@@ -14,8 +15,8 @@ module GraphQL::Models
 
         if field_map.leave_null_unchanged?
           field_names = field_map.fields.select { |f| !f[:required] }.map { |f| f[:name] }
-          field_names += field_map.nested_maps.reject(&:required).map { |m| m.name }
-          field_names = field_names.sort_by { |s| s }
+          field_names += field_map.nested_maps.reject(&:required).map(&:name)
+          field_names = field_names.sort
 
           unless field_names.empty?
             enum = GraphQL::EnumType.define do

data/lib/graphql/models/mutation_helpers/validation.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module GraphQL::Models
   module MutationHelpers
-    def self.validate_changes(inputs, field_map, root_model, context, all_changes)
+    def self.validate_changes(inputs, field_map, root_model, _context, all_changes)
       invalid_fields = {}
       unknown_errors = []
 
       changed_models = all_changes.group_by { |c| c[:model_instance] }
 
-      changed_models.reject { |m, v| m.valid? }.each do |model, changes|
+      changed_models.reject { |m, _v| m.valid? }.each do |model, changes|
         attrs_to_field = changes
           .select { |c| c[:attribute] && c[:input_path] }
           .map { |c| [c[:attribute], c[:input_path]] }
@@ -29,7 +30,7 @@ module GraphQL::Models
                 modelType: model.class.name,
                 modelRid: model.id,
                 attribute: attribute,
-                message: message
+                message: message,
               })
             end
           end
@@ -37,11 +38,11 @@ module GraphQL::Models
       end
 
       unless invalid_fields.empty? && unknown_errors.empty?
-        fail ValidationError.new(invalid_fields, unknown_errors)
+        raise ValidationError.new(invalid_fields, unknown_errors)
       end
     end
 
-    def self.add_error(attribute, message, path, invalid_fields)
+    def self.add_error(_attribute, message, path, invalid_fields)
       path = Array.wrap(path)
 
       current = invalid_fields
@@ -96,9 +97,7 @@ module GraphQL::Models
         end
       end
 
-      return nil
+      nil
     end
-
-
   end
 end

data/lib/graphql/models/mutation_helpers/validation_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   module MutationHelpers
     class ValidationError < GraphQL::ExecutionError
@@ -13,16 +14,14 @@ module GraphQL::Models
           'message' => "Some of your changes could not be saved.",
           'kind' => "INVALID_ARGUMENTS",
           'invalidArguments' => invalid_arguments,
-          'unknownErrors' => unknown_errors
+          'unknownErrors' => unknown_errors,
         }
 
         if ast_node
-          values.merge!({
-            'locations' => [{
-              "line" => ast_node.line,
-              "column" => ast_node.col,
-            }]
-          })
+          values['locations'] = [{
+            "line" => ast_node.line,
+            "column" => ast_node.col,
+          },]
         end
 
         values

data/lib/graphql/models/mutator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL::Models
   class Mutator
     attr_accessor :field_map, :root_model, :inputs, :context
@@ -10,28 +11,28 @@ module GraphQL::Models
     end
 
     def apply_changes
-      fail StandardError.new("Called apply_changes twice for the same mutator") if @all_changes
+      raise StandardError, "Called apply_changes twice for the same mutator" if @all_changes
       @all_changes = MutationHelpers.apply_changes(field_map, root_model, inputs, context)
       changed_models
     end
 
     def changed_models
-      fail StandardError.new("Need to call apply_changes before #{__method__}") unless @all_changes
+      raise StandardError, "Need to call apply_changes before #{__method__}" unless @all_changes
       @all_changes.map { |c| c[:model_instance] }.uniq
     end
 
     def validate!
-      fail StandardError.new("Need to call apply_changes before #{__method__}") unless @all_changes
+      raise StandardError, "Need to call apply_changes before #{__method__}" unless @all_changes
       MutationHelpers.validate_changes(inputs, field_map, root_model, context, @all_changes)
     end
 
     def authorize!
-      fail StandardError.new("Need to call apply_changes before #{__method__}") unless @all_changes
+      raise StandardError, "Need to call apply_changes before #{__method__}" unless @all_changes
       MutationHelpers.authorize_changes(context, @all_changes)
     end
 
     def save!
-      fail StandardError.new("Need to call apply_changes before #{__method__}") unless @all_changes
+      raise StandardError, "Need to call apply_changes before #{__method__}" unless @all_changes
 
       ActiveRecord::Base.transaction(requires_new: true) do
         changed_models.each do |model|

data/lib/graphql/models/promise_relation_connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     class PromiseRelationConnection < GraphQL::Relay::RelationConnection

data/lib/graphql/models/reflection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Exposes utility methods for getting metadata out of active record models
 module GraphQL::Models
   module Reflection
@@ -10,7 +11,7 @@ module GraphQL::Models
         # Ignore any inclusion validators that are using the 'if' or 'unless' options
         validators = validators.reject { |v| v.options.include?(:if) || v.options.include?(:unless) || v.options[:in].blank? }
         return nil unless validators.any?
-        return validators.map { |v| v.options[:in] }.reduce(:&)
+        validators.map { |v| v.options[:in] }.reduce(:&)
       end
 
       # Determines if the attribute (or association) is required by examining presence validators
@@ -43,13 +44,13 @@ module GraphQL::Models
           active_record_type = model_class.type_for_attribute(attribute.to_s)
 
           if active_record_type.type.nil?
-            fail ArgumentError, "The type for attribute #{attribute} wasn't found on #{model_class.name}"
+            raise ArgumentError, "The type for attribute #{attribute} wasn't found on #{model_class.name}"
           end
 
           result = DatabaseTypes.registered_type(active_record_type.type)
 
           if !result
-            fail RuntimeError, "The type #{active_record_type} is not registered with DatabaseTypes (attribute #{attribute} on #{model_class.name})"
+            raise "The type #{active_record_type} is not registered with DatabaseTypes (attribute #{attribute} on #{model_class.name})"
           end
 
           # Arrays: Rails doesn't have a generalized way to detect arrays, so we use this method to do it:

data/lib/graphql/models/relation_load_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     class RelationLoadRequest
@@ -26,8 +27,7 @@ module GraphQL
       end
 
       # When the request is fulfilled, this method is called so that it can do whatever caching, etc. is needed
-      def fulfilled(result)
-      end
+      def fulfilled(result); end
 
       def load
         loader.load(self)
@@ -46,7 +46,6 @@ module GraphQL
       def loader
         @loader ||= RelationLoader.for(target_class)
       end
-
     end
   end
 end

data/lib/graphql/models/relation_loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GraphQL
   module Models
     class RelationLoader < GraphQL::Batch::Loader
@@ -8,7 +9,6 @@ module GraphQL
       end
 
       def perform(load_requests)
-
         # Group the requests to load by id into a single relation, and we'll fan it back out after
         # we have the results
 
@@ -38,7 +38,7 @@ module GraphQL
         end
 
         # Generate a CASE column that will tell us whether the row matches this particular relation
-        slicing_columns = relations.each_with_index.map do |relation, index|
+        slicing_columns = relations.each_with_index.map do |_relation, index|
           %{ CASE WHEN "#{model_class.table_name}"."#{model_class.primary_key}" IN (#{selection_clauses[index]}) THEN 1 ELSE 0 END AS "in_relation_#{index}" }
         end
 
@@ -64,7 +64,7 @@ module GraphQL
         # Build the query that will select any of the rows that match the selection clauses
         main_relation = model_class
           .where("id in ((#{selection_clauses.join(") UNION (")}))")
-          .select(%{ "#{model_class.table_name}".* })
+          .select(%( "#{model_class.table_name}".* ))
 
         main_relation = slicing_columns.reduce(main_relation) { |relation, memo| relation.select(memo) }
         main_relation = sorting_columns.reduce(main_relation) { |relation, memo| relation.select(memo) }

data/lib/graphql/models/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,6 +140,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.1
 description: Build Relay-compatible GraphQL schemas based on ActiveRecord models
 email:
 - theorygeek@gmail.com
@@ -148,8 +162,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".bundle/config"
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -168,6 +185,9 @@ files:
 - bin/pry
 - bin/rake
 - bin/rspec
+- bin/rubocop
+- bin/ruby-parse
+- bin/ruby-rewrite
 - bin/setup
 - bin/thor
 - graphql-activerecord.gemspec