graphql-activerecord 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10e3d4bc80c946d07858e467a8c0b1dfaf5dce1
-  data.tar.gz: 24dc06e7b2fa34ccadc5c6ad0367cb276358e8d2
+  metadata.gz: ef54c410d9c6025638b8514775613c8e9b9f8209
+  data.tar.gz: 9e9cf95bd507c1a302896cdbfb7949dc962664c2
 SHA512:
-  metadata.gz: fef3385be87b2d02ff298382d934d37f6dc82741947ac1cf9a8532ccdc8df8eaccff2f8ccc808e065a2f8a2b31faae66265ebf794daee6c40bdcedcc3de98934
-  data.tar.gz: 5b06f43ebcb3d7d014937ec764faec65e344fba94b90c3ba9782bb94f27e29a5944e06963aa06f64c67c24b063cf65a8a152ca84d265e3f28684d239c523ab5b
+  metadata.gz: ce0ed228fdd01523a7eff5eca8cea42523ab937d568d5d1b352eca8cf51064213414493dc254071370a83eb12da5d956fd57a1f9f661fa9bf88efa1886fb59de
+  data.tar.gz: c8d22b40c91596a0b87bebbeafec19245b4ad3d340a9b555cb0311394cd923bab2448461f938f041608a9d0c97498ddd028dca4bb53f8f6f4f39a4edd9fd607f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 0.12.4
+Added the `GraphQL::Models.unknown_scalar` option (#45)
+
 # 0.12.3
 - If possible, try to get the description for a field from the column's comment in the database. (#40)
 - Automatically generated union types (for polymorphic associations) used `demodulize` on the class name. If your model is `Name::Spaced`, this fixes a bug where it generates an invalid name. (#42)

data/README.md

@@ -198,6 +198,21 @@ GraphQL::Models::DatabaseTypes.register(:decimal, "DecimalType")
 GraphQL::Models::DatabaseTypes.register(:date, DateType, DateInputType)
 ```
 
+You can also provide a proc, if you want a catch-all, or if it's different for different models:
+```ruby
+GraphQL::Models.unknown_scalar = -> (type, klass, attribute) do
+  case type
+  when :uuid
+    UuidType
+  when :daterange
+    # If you need separate input/output types, use this syntax:
+    GraphQL::Models::DatabaseTypes::TypeStruct.new(DateRangeInputType, DateRangeOutputType)
+  else
+    GraphQL::STRING_TYPE
+  end
+end
+```
+
 #### Nullability of attributes
 The gem will mark a field as non-nullable if:
 - the database column is non-null

data/lib/graphql/activerecord.rb

@@ -38,7 +38,7 @@ require 'graphql/models/mutator'
 module GraphQL
   module Models
     class << self
-      attr_accessor :model_from_id, :authorize, :id_for_model, :model_to_graphql_type
+      attr_accessor :model_from_id, :authorize, :id_for_model, :model_to_graphql_type, :unknown_scalar
     end
 
     # Returns a promise that will traverse the associations and resolve to the model at the end of the path.

data/lib/graphql/models/reflection.rb

@@ -49,8 +49,21 @@ module GraphQL::Models
 
           result = DatabaseTypes.registered_type(active_record_type.type)
 
-          if !result
-            raise "The type #{active_record_type} is not registered with DatabaseTypes (attribute #{attribute} on #{model_class.name})"
+          if result.nil? && GraphQL::Models.unknown_scalar
+            type = GraphQL::Models.unknown_scalar.call(active_record_type.type, model_class, attribute)
+
+            if type.is_a?(GraphQL::BaseType) && (type.unwrap.is_a?(GraphQL::ScalarType) || type.unwrap.is_a?(GraphQL::EnumType))
+              result = DatabaseTypes::TypeStruct.new(type, type)
+            elsif type.is_a?(DatabaseTypes::TypeStruct)
+              result = type
+            else
+              raise "Got unexpected value #{type.inspect} from `unknown_scalar` proc. Expected a GraphQL::ScalarType, GraphQL::EnumType, or GraphQL::Models::DatabaseTypes::TypeStruct."
+            end
+          end
+
+          if result.nil?
+            # rubocop:disable Metrics/LineLength
+            raise "Don't know how to map database type #{active_record_type.type.inspect} to a GraphQL type. Forget to register it with GraphQL::Models::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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport