graphql-activerecord 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea206475115f125b4737f85251ee149550462dc0
-  data.tar.gz: e5c43b72e56875f407ec79d54e08678f765deadd
+  metadata.gz: ba393c0528ebe3d08f24276c21093661c300c273
+  data.tar.gz: 06f269998f7a64044385355e1903c35d1b47d6cf
 SHA512:
-  metadata.gz: 710667348e3cbc1287f5b65b1d999d3f4b303e675bd851360dd5169e87be220e105b0ee6aa4bd0aaf1602d70712f76c64a87e21e00a68b9fc46248c5a1b88563
-  data.tar.gz: dc098d499193ad53caa7fcd80d2042b5daf64ffa62a4b8dee3a04e9b9f4bd89ef7ec0f874dc93953b0e2b243db39f32a2cf1f578515023948b0e253fe9a068bd
+  metadata.gz: de38713b1668f9b52f2c6e8d4541ccb98a1b395bc15da96e2525da0c71b7d5385c0c434c6b3f2432592ebcf79410a6e758bbc246d21dcb2cdbdfe2e1e2e17b5b
+  data.tar.gz: 5d4efe47c646569527493e8c59f39cf1e064209d321b344ed974781a030eeb6a6de4f78705eb75cc54b4efafbc9b4ddec96ef3ed71f806236390ba01e5f640ea

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/.gitignore

@@ -0,0 +1,11 @@
+graphql-activerecord-*.gem
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/spec/examples.txt

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.11.2

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,49 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at theorygeek@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 theorygeek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,36 @@
+# GraphQL::Models
+
+TODO: Write this. I promise, one day, I really will write some stuff here to describe this gem.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'graphql-activerecord'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install graphql-activerecord
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+TODO: Write development instructions here
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/graphql-activerecord. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

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

data/bin/_guard-core

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application '_guard-core' 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("guard", "_guard-core")

data/bin/bundler

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' 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("bundler", "bundler")

data/bin/coderay

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' 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("coderay", "coderay")

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "graphql/activerecord"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/guard

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' 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("guard", "guard")

data/bin/htmldiff

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' 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("diff-lcs", "htmldiff")

data/bin/ldiff

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' 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("diff-lcs", "ldiff")

data/bin/listen

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'listen' 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("listen", "listen")

data/bin/pry

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' 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("pry", "pry")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' 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("rake", "rake")

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' 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("rspec-core", "rspec")

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bin/thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' 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("thor", "thor")

data/graphql-activerecord.gemspec

@@ -0,0 +1,32 @@
+# coding: utf-8
+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.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.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.require_paths = ["lib"]
+
+  spec.add_runtime_dependency "activesupport", "~> 4.2"
+  spec.add_runtime_dependency "activerecord", "~> 4.2"
+  spec.add_runtime_dependency "graphql", "~> 0.13.0"
+  spec.add_runtime_dependency "graphql-batch", "~> 0.2.1"
+  spec.add_runtime_dependency 'graphql-relay', '~> 0.9.5'
+
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
+end

data/lib/graphql/activerecord.rb

@@ -1,4 +1,8 @@
+require 'active_support'
+require 'active_record'
 require 'graphql'
+require 'graphql/batch'
+require 'graphql/relay'
 
 require 'graphql/models/monkey_patches/graphql_query_context'
 require 'graphql/models/monkey_patches/graphql_schema_middleware_chain'
@@ -6,9 +10,12 @@ require 'graphql/models/active_record_extension'
 require 'graphql/models/middleware'
 
 # Helpers
+require 'graphql/models/helpers'
+require 'graphql/models/hash_combiner'
 require 'graphql/models/definer'
 require 'graphql/models/association_load_request'
-require 'graphql/models/loader'
+require 'graphql/models/attribute_loader'
+require 'graphql/models/relation_loader'
 
 # Order matters...
 require 'graphql/models/promise_relation_connection'

data/lib/graphql/models/active_record_extension.rb

@@ -20,7 +20,7 @@ module GraphQL
         def_delegators :@hash, :[]=, :include?, :keys
       end
 
-      extend ActiveSupport::Concern
+      extend ::ActiveSupport::Concern
       class_methods do
         def graphql_enum_types
           @_graphql_enum_types ||= EnumTypeHash.new
@@ -64,4 +64,4 @@ module GraphQL
   end
 end
 
-ActiveRecord::Base.send(:include, GraphQL::Models::ActiveRecordExtension)
+::ActiveRecord::Base.send(:include, GraphQL::Models::ActiveRecordExtension)

data/lib/graphql/models/association_load_request.rb

@@ -7,68 +7,25 @@ module GraphQL
         @base_model = base_model
         @association = base_model.association(association_name)
         @context = context
-      end
-
-      ####################################################################
-      # Public members that all load requests should implement
-      ####################################################################
 
-      def load_type
-        case reflection.macro
-        when :belongs_to
-          :id
-        else
-          :relation
+        if reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
+          fail ArgumentError, "You cannot batch-load a has_many :through association. Instead, load each association individually."
         end
       end
 
-      def load_target
-        case reflection.macro
-        when :belongs_to
-          base_model.send(reflection.foreign_key)
-        when :has_many
-          base_model.send(association.reflection.name)
-        else
-          # has_one, need to construct our own relation, because accessing the relation will load the model
-          condition = { reflection.foreign_key => base_model.id }
-
-          if reflection.options.include?(:as)
-            condition[reflection.type] = base_model.class.name
-          end
-
-          target_class.where(condition)
-        end
-      end
-
-      # If the value should be an array, make sure it's an array. If it should be a single value, make sure it's single.
-      # Passed in result could be a single model or an array of models.
-      def ensure_cardinality(result)
-        case reflection.macro
-        when :has_many
-          Array.wrap(result)
-        else
-          result.is_a?(Array) ? result[0] : result
-        end
-      end
-
-      # When the request is fulfilled, this method is called so that it can do whatever caching, etc. is needed
-      def fulfilled(result)
-        association.loaded!
-
-        if reflection.macro == :has_many
-          association.target.slice!(0..-1)
-          association.target.concat(result)
-          result.each do |m|
-            association.set_inverse_instance(m)
-          end
-        else
-          association.target = result
-          association.set_inverse_instance(result) if result
-        end
+      def request
+        AttributeLoader::Request.new(
+          association.scope.where_values_hash,
+          Helpers.orders_to_sql(association.scope.orders)
+        )
       end
 
       def load
-        loader.load(self)
+        loader.load(request).then do |result|
+          result = result.first unless reflection.macro == :has_many
+          Helpers.load_association_with(association, result)
+          result
+        end
       end
 
       #################################################################
@@ -86,7 +43,7 @@ module GraphQL
       private
 
       def loader
-        @loader ||= Loader.for(target_class)
+        @loader ||= AttributeLoader.for(target_class)
       end
 
       def reflection

data/lib/graphql/models/attribute_loader.rb

@@ -0,0 +1,96 @@
+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.
+  class AttributeLoader < GraphQL::Batch::Loader
+    attr_reader :model_class
+
+    def initialize(model_class)
+      @model_class = model_class
+    end
+
+    class Request
+      attr_accessor :attributes, :sorting
+      def initialize(attributes, sorting)
+        @attributes = attributes
+        @sorting = sorting
+      end
+    end
+
+    WHERE_STRIP = /\AWHERE /
+
+    # @param requests An AttributeLoader::Request (or a simple hash) that describes the models to be loaded
+    def perform(requests)
+      # Combine the conditions together, into the minimal set of conditions needed
+      conditions = HashCombiner.combine(requests.map { |r| r.is_a?(Request) ? r.attributes : r })
+
+      # Get the distinct list of sorting conditions that we need to ask for, also
+      sorters = requests.map { |r| r.is_a?(Request) ? r.sorting : nil }.compact.reject(&:blank?).uniq
+
+      # Start constructing the query that we'll execute to get the results
+      table = model_class.arel_table
+
+      # Start building the query, add in the where conditions
+      conditions.map! { |cond| hash_to_condition(table, cond) }
+      query = table.where(conditions.reduce { |memo, cond| memo.or(cond) })
+
+      # Convert the list of sorters into RANK() selections that we'll add to the selection
+      order_selections = sorters.each_with_index.map { |s, idx| order_selection(s, idx) }
+
+      # Add the projections to the query
+      query = order_selections.reduce(query.project(:*)) { |memo, selection| memo.project(selection) }
+
+      # Get the result set
+      results = model_class.find_by_sql(query.to_sql)
+
+      # De-multiplex the result set and fulfill the requests
+      requests.each do |request|
+        # Get the rows that match this request
+        response = match_results(results, request)
+
+        if response.size > 1 && request.is_a?(Request) && request.sorting
+          idx = sorters.index(request.sorting)
+          sort_by = "rank_#{idx}"
+          response = response.sort_by { |row| row[sort_by] }
+        end
+
+        fulfill(request, response)
+      end
+    end
+
+    private
+
+    def order_selection(sorter, idx)
+      arel = model_class.unscoped.order(sorter).arel
+      order_sql = Helpers.orders_to_sql(arel.orders)
+      %{ DENSE_RANK() OVER(ORDER BY #{order_sql}) AS rank_#{idx} }
+    end
+
+    # Converts a hash into arel conditions
+    def hash_to_condition(table, hash)
+      conditions = hash.map do |attr, value|
+        if value.is_a?(Array) && value.size > 1
+          table[attr].in(value)
+        elsif value.is_a?(Array)
+          table[attr].eq(value[0])
+        else
+          table[attr].eq(value)
+        end
+      end
+
+      conditions.reduce { |memo, cond| memo.and(cond) }
+    end
+
+    def match_results(results, request)
+      # Find all of the items in the results that match the request
+      attributes = request.is_a?(Request) ? request.attributes : request
+
+      results.select do |row|
+        attributes.all? { |key, value| is_match(row.send(key), value) }
+      end
+    end
+
+    def is_match(row_value, compare_value)
+      compare_value.is_a?(Array) ? compare_value.include?(row_value) : compare_value == row_value
+    end
+  end
+end

data/lib/graphql/models/definition_helpers.rb

@@ -24,8 +24,30 @@ module GraphQL
           association = current_model.association(path[0])
         end
 
-        request = AssociationLoadRequest.new(current_model, path[0], context)
-        request.load.then do |next_model|
+        # If this is a has_many :through, then we need to load the two associations in sequence
+        # (eg: Company has_many :health_lines, through: :open_enrollments => load open enrollments, then health lines)
+
+        promise = if association.reflection.options[:through]
+          # 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)
+            end
+
+            # Once all of the eventual models are loaded, flatten the results
+            Promise.all(sources).then do |result|
+              result = result.flatten
+              Helpers.load_association_with(association, result)
+            end
+          end
+        else
+          AssociationLoadRequest.new(current_model, path[0], context).load
+        end
+
+        promise.then do |next_model|
           next next_model if next_model.blank?
           cache_model(context, next_model)
 

data/lib/graphql/models/hash_combiner.rb

@@ -0,0 +1,40 @@
+module GraphQL::Models::HashCombiner
+  class << self
+    # Takes a set of hashes that represent conditions, and combines them into the smallest number of hashes
+    def combine(hashes)
+      # Group the hashes by keys. If they are querying different columns, they can't be combined
+      by_keys = hashes.group_by { |h| h.keys }
+      by_keys.map { |keys, values| combine_core(values, keys) }.flatten
+    end
+
+    private
+
+    def combine_core(hashes, keys)
+      return [] if keys.blank?
+
+      # If there's only one key in each of the hashes, then combine that into a single hash with an array
+      if keys.length == 1
+        values = hashes.map { |h| h[keys[0]] }
+        return [{ keys[0] => values.uniq }]
+      end
+
+      # Get the most commonly occuring value in the hash, and remove it from the keys.
+      # Return one hash for each unique value.
+      min_key = keys.min_by { |k| hashes.map { |h| h[k] }.uniq.count }
+      inner_keys = keys.dup
+      inner_keys.delete(min_key)
+
+      # Group the hashes based on the value that they have for that key
+      grouped = hashes.group_by { |h| h[min_key] }
+
+      grouped = grouped.map do |key_value, inner_hashes|
+        combined = combine_core(inner_hashes, inner_keys)
+        merge_with = { min_key => key_value }
+
+        combined.map { |reduced_hash| merge_with.merge(reduced_hash) }
+      end
+
+      grouped.flatten
+    end
+  end
+end

data/lib/graphql/models/helpers.rb

@@ -0,0 +1,32 @@
+module GraphQL::Models
+  module Helpers
+    def self.orders_to_sql(orders)
+      expressions = orders.map do |expr|
+        case expr
+        when Arel::Nodes::SqlLiteral
+          expr.to_s
+        else
+          expr.to_sql
+        end
+      end
+
+      expressions.join(', ')
+    end
+
+    def self.load_association_with(association, result)
+      reflection = association.reflection
+      association.loaded!
+
+      if reflection.macro == :has_many
+        association.target.slice!(0..-1)
+        association.target.concat(result)
+        result.each do |m|
+          association.set_inverse_instance(m)
+        end
+      else
+        association.target = result
+        association.set_inverse_instance(result) if result
+      end
+    end
+  end
+end

data/lib/graphql/models/relation_load_request.rb

@@ -42,9 +42,9 @@ module GraphQL
       end
 
       private
-      
+
       def loader
-        @loader ||= Loader.for(target_class)
+        @loader ||= RelationLoader.for(target_class)
       end
 
     end

data/lib/graphql/models/{loader.rb → relation_loader.rb}

@@ -1,6 +1,6 @@
 module GraphQL
   module Models
-    class Loader < GraphQL::Batch::Loader
+    class RelationLoader < GraphQL::Batch::Loader
       attr_reader :model_class
 
       def initialize(model_class)

data/lib/graphql/models/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Models
-    VERSION = "0.6.7"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,43 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: graphql-batch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: graphql-relay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.5
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 description: Build Relay-compatible GraphQL schemas based on ActiveRecord models
 email:
 - theorygeek@gmail.com
@@ -45,15 +143,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/_guard-core
+- bin/bundler
+- bin/coderay
+- bin/console
+- bin/guard
+- bin/htmldiff
+- bin/ldiff
+- bin/listen
+- bin/pry
+- bin/rake
+- bin/rspec
+- bin/setup
+- bin/thor
+- graphql-activerecord.gemspec
 - lib/graphql/activerecord.rb
 - lib/graphql/models/active_record_extension.rb
 - lib/graphql/models/association_load_request.rb
+- lib/graphql/models/attribute_loader.rb
 - lib/graphql/models/backed_by_model.rb
 - lib/graphql/models/definer.rb
 - lib/graphql/models/definition_helpers.rb
 - lib/graphql/models/definition_helpers/associations.rb
 - lib/graphql/models/definition_helpers/attributes.rb
-- lib/graphql/models/loader.rb
+- lib/graphql/models/hash_combiner.rb
+- lib/graphql/models/helpers.rb
 - lib/graphql/models/middleware.rb
 - lib/graphql/models/monkey_patches/graphql_query_context.rb
 - lib/graphql/models/monkey_patches/graphql_schema_middleware_chain.rb
@@ -68,6 +191,7 @@ files:
 - lib/graphql/models/promise_relation_connection.rb
 - lib/graphql/models/proxy_block.rb
 - lib/graphql/models/relation_load_request.rb
+- lib/graphql/models/relation_loader.rb
 - lib/graphql/models/scalar_types.rb
 - lib/graphql/models/version.rb
 homepage: http://github.com/goco-inc/graphql-activerecord
@@ -82,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="