dry-graphql 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618c4f369cc683525eb9d74c8e81a7e8b1ac7fc6cb763a7448f81ff52e087f20
-  data.tar.gz: abaea2ed78505c65f80c7ae49ab65c89ada626e08d02006f2d70c1e7c67beeb1
+  metadata.gz: 226af16add8ce3765bae17b9dcaef61b91f71784e646c7f6cb8457ed176adf27
+  data.tar.gz: 1c4e7811f12b9c1d623566ff0328efcb18b4f7c77dff9c0c0ffcc96f884a7cf4
 SHA512:
-  metadata.gz: 40a5a3990b840d749ef6109ae2d86cb431f24bcb4fe5e4282a0018048c845e9581ec48c9b0ab4f99fbe4becd112ef2985704de19fc45e59838035c3cab790e26
-  data.tar.gz: 8942a11ea9aca2f3c00fddeb3051247a15546f21c6708a753abe9e20f8cabf14065bf8c0213f332577c47e27902674fb6701c053307ab42cd20377e9b5e77acd
+  metadata.gz: 0db281d7c9a7b15c3e1fd554901ba7d35de47e109f0643221173184716d2bc5755874c03818b9e9803dad3b2058aceba9d6c61fb62954d16923e3cf2de98418f
+  data.tar.gz: 9cb411b43afe2ddb7ac3ffb96ae844645f91fa9939f8e8f209e70157d115b1d488dcd1c6f78f2599a3e898a0c7cb01894832d81e18c89ef349122711864ce44b

data/lib/dry/graphql.rb

@@ -7,14 +7,19 @@ require 'dry/graphql/schema_builder'
 module Dry
   # Module containing GraphQL enhancements
   module GraphQL
+    # Generates a graphql_name from a class name
+    def self.generate_graphql_name(name)
+      name.to_s.capitalize.gsub('DryGraphQLGeneratedTypeForUser', '').gsub('::', '__')
+    end
+
     # Extends Dry::Struct functionality
     module Struct
       def graphql_type(options = {})
         return @graphql_type if @graphql_type
 
-        graphql_name = name.to_s.gsub('::', '__')
+        graphql_name = Dry::GraphQL.generate_graphql_name(name)
         graphql_schema = SchemaBuilder.build_graphql_schema_class(name)
-        graphql_schema.graphql_name(name)
+        graphql_schema.graphql_name(graphql_name)
         schema_hash = schema.each_with_object({}) do |type, memo|
           memo[type.name] = type.type
         end

data/lib/dry/graphql/schema_builder.rb

@@ -44,9 +44,8 @@ module Dry
 
       def self.build_graphql_schema_class(name)
         Dry::Core::ClassBuilder.new(
-          name: name,
-          parent: ::Dry::GraphQL::BaseObject,
-          namespace: Dry::GraphQL::GeneratedTypes
+          name: "DryGraphQLGeneratedTypeFor#{name}",
+          parent: ::Dry::GraphQL::BaseObject
         ).call
       end
 
@@ -166,7 +165,7 @@ module Dry
       def map_schema(type)
         graphql_name = generate_name
         graphql_schema = self.class.build_graphql_schema_class(graphql_name)
-        graphql_schema.graphql_name
+        graphql_schema.graphql_name(graphql_name)
         type_to_map = if type.respond_to?(:schema) && type.method(:schema).arity.zero?
                         type.schema
                       elsif type.respond_to?(:attributes)
@@ -184,7 +183,7 @@ module Dry
         loop do
           break if cursor.nil?
 
-          sanitized_name = cursor.name.to_s.capitalize.gsub('::', '__')
+          sanitized_name = Dry::GraphQL.generate_graphql_name(cursor.name)
           name_tree.unshift(sanitized_name)
           cursor = cursor.parent
         end

data/lib/dry/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module GraphQL
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct