graphql-activerecord 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba393c0528ebe3d08f24276c21093661c300c273
-  data.tar.gz: 06f269998f7a64044385355e1903c35d1b47d6cf
+  metadata.gz: f86267939f32f4c1833c71f8002ddd96c5ce0463
+  data.tar.gz: d644a4fb9cc3ea8e2eb487dd889a59f1d804807d
 SHA512:
-  metadata.gz: de38713b1668f9b52f2c6e8d4541ccb98a1b395bc15da96e2525da0c71b7d5385c0c434c6b3f2432592ebcf79410a6e758bbc246d21dcb2cdbdfe2e1e2e17b5b
-  data.tar.gz: 5d4efe47c646569527493e8c59f39cf1e064209d321b344ed974781a030eeb6a6de4f78705eb75cc54b4efafbc9b4ddec96ef3ed71f806236390ba01e5f640ea
+  metadata.gz: 35aef7c3eb5ac3778258192a4fe7df1d57269d04fc4964a5d85a62d68a49c16df6f7b27ae5e0c6ed4d91caf534f84a11e9d18a69ab8f0be1cb86d8f3b74ea62a
+  data.tar.gz: 36c5cff269cb4a7682b2c144fc491d3c09eea733f39fdfed5a5b38ebc029901420b237b203d98aed0f5c99d49392d05a56663d6b9f9a173690e2e341a3f4a4f9

data/lib/graphql/activerecord.rb

@@ -51,9 +51,14 @@ module GraphQL
       GraphQL::Models::DefinitionHelpers.load_and_traverse(starting_model, path, context)
     end
 
-    def self.load_relation(relation)
-      request = RelationLoadRequest.new(relation)
-      request.load
+    def self.load_relation(relation, fast_query: false)
+      if fast_query
+        request = AttributeLoader::Request.new(relation.where_values_hash, Helpers.orders_to_sql(relation.orders))
+        AttributeLoader.for(relation.klass).load(request)
+      else
+        request = RelationLoadRequest.new(relation)
+        request.load
+      end
     end
 
     def self.field_info(graph_type, field_name)

data/lib/graphql/models/hash_combiner.rb

@@ -10,17 +10,17 @@ module GraphQL::Models::HashCombiner
     private
 
     def combine_core(hashes, keys)
-      return [] if keys.blank?
+      return [] if keys.nil? || keys.empty?
 
       # 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 }]
+        return [{ keys[0] => values.flatten.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 }
+      min_key = keys.min_by { |k| hashes.map { |h| h[k] }.flatten.uniq.count }
       inner_keys = keys.dup
       inner_keys.delete(min_key)
 

data/lib/graphql/models/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord helpers for GraphQL + Relay