graphql-active_record 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42c1c4d191558622eb115e0055a19e7d1a7bd3f
-  data.tar.gz: d23d359283a6245a1513838adfcda0833ad8e329
+  metadata.gz: 9bdc7ab9b28d7a7bad0891c742b5b0fb72e7a1bc
+  data.tar.gz: ce12f8396bf35abc87c1b963634f8b935e8a911c
 SHA512:
-  metadata.gz: c45cb2a9e0103b8b88170b655463e7655f6c9b50184a67b4d4c05de4bb61efb96ee3c20d72e263a71fa4cee213306f099b398d38130ab7adbb3ab17356e248da
-  data.tar.gz: edca63d81a3e08e94f712437800551e7e503d5de9474c02c92db0c13f728c3095ab6c8c452e845c0326a5f33a88ab2d8efdbe40629dd1ecb5e1ab8c0e04cafc7
+  metadata.gz: e1e7977bd16d41d5b0cd0cfd820483221d7de8410a82091015903cac9e1765b58837c1b6eb2b592cd5c4d7b002ac523e4c10f36f3562a787ae85e5a949dfe792
+  data.tar.gz: 51f41cc5ab110eb15d3667fb776e4378c531472679d1c1451ef71ea6b8c3f775090b4a554ba9947104f6553781851a24d90feea2fd98e868238e722d787920a7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# version 2.2.2
+fix for non-ActiveRecord models failing on includes
+
 # version 2.2.1
 fix fragments for newer versions `graphql-ruby`
 

data/lib/graphql/active_record_extensions/field.rb

@@ -80,11 +80,14 @@ module GraphQL
 
             nested = map_includes(next_model, node.selections, ctx)
 
-            final_type =  if (model.reflections[singular] || model.reflections[singular.to_sym]).present?
+            singular_reflection = model.reflections[singular] || model.reflections[singular.to_sym]
+            plural_reflection = model.reflections[plural] || model.reflections[plural.to_sym]
+
+            final_type =  if valid_association(singular_reflection)
                             # this is for has_one relationships
                             singular
 
-                          elsif (model.reflections[plural] || model.reflections[plural.to_sym]).present?
+                          elsif valid_association(plural_reflection)
                             # this is for has_many relationships
                             plural
 
@@ -142,6 +145,19 @@ module GraphQL
           [node.name, node]
         end
       end
+
+      ##
+      # Method to check whether a reflection is valid.
+      # Some things, like PowerEnum, have reflections but do not work properly
+      # because they do not have an association_class. So ignore them.
+      #
+      # @param reflection [ActiveRecord::Associations::* | any | nil] Inputted Association
+      # @return [boolean] Whether or not the association is valid
+      def self.valid_association(reflection)
+        return false if reflection.blank?
+        return false unless reflection.respond_to?(:association_class)
+        return (reflection.association_class < ActiveRecord::Associations::Association)
+      end
     end
   end
 end

data/lib/graphql/active_record_extensions/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module ActiveRecordExtensions
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-active_record
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Brett Jurgens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -232,9 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Active Record Helpers for graphql-ruby
 test_files: []
-has_rdoc: