dry-graphql 2.0.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618c4f369cc683525eb9d74c8e81a7e8b1ac7fc6cb763a7448f81ff52e087f20
-  data.tar.gz: abaea2ed78505c65f80c7ae49ab65c89ada626e08d02006f2d70c1e7c67beeb1
+  metadata.gz: 50b33624e7670ba0827d9a279a1bafd83843bc2bd30de4f5cad7f3c8e1479bca
+  data.tar.gz: 8cbe479cbb31730a82cd1ea2a87141b3833267c39f14bf1e98fbd0a622b90097
 SHA512:
-  metadata.gz: 40a5a3990b840d749ef6109ae2d86cb431f24bcb4fe5e4282a0018048c845e9581ec48c9b0ab4f99fbe4becd112ef2985704de19fc45e59838035c3cab790e26
-  data.tar.gz: 8942a11ea9aca2f3c00fddeb3051247a15546f21c6708a753abe9e20f8cabf14065bf8c0213f332577c47e27902674fb6701c053307ab42cd20377e9b5e77acd
+  metadata.gz: b6e83d9f2135ed50f15eebe41ed9fd19373221405ea6fdf8a9ecb8ace6d551657ce2942ef8246427e8b2227f53df628afe23867a1f6e07c01239dc1495ca8e0d
+  data.tar.gz: f43d96f254186e5e67c096908c740a17b5831c24f6cdc2904641259b2aa922e37f2b1bdbf507a9153c13a388e9cd2e39640cdef319eb62b36fe1cfbe961f850b

data/.rubocop_todo.yml

@@ -1,39 +1,48 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-21 16:52:46 -0400 using RuboCop version 0.75.0.
+# on 2021-06-10 20:11:40 UTC using RuboCop version 1.16.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'dry-graphql.gemspec'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/dry/graphql_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 44
+  Max: 45
 
 # Offense count: 1
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 151
 
-# Offense count: 2
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 14
+  Max: 15
 
 # Offense count: 2
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 12
 
 # Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
     - 'lib/dry-graphql.rb'
-
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 105

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.2

data/dry-graphql.gemspec

@@ -35,10 +35,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'dry-struct', '~> 1.0'
   spec.add_runtime_dependency 'dry-types', '~> 1.1'
-  spec.add_runtime_dependency 'graphql', '~> 1.9.0'
+  spec.add_runtime_dependency 'graphql', '~> 1.10'
 
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.2.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/dry/graphql/schema_builder.rb

@@ -17,6 +17,7 @@ module Dry
       attr_reader :field, :type, :options, :schema, :name, :parent
 
       class TypeMappingError < StandardError; end
+
       class NameGenerationError < StandardError; end
 
       def initialize(name: nil, type: nil, schema: nil, parent: nil, options: {})
@@ -28,7 +29,7 @@ module Dry
       end
 
       def with(opts)
-        self.class.new({
+        self.class.new(**{
           name: @name, type: @type, schema: @schema, options: @options,
           parent: self
         }.merge(opts))
@@ -44,9 +45,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 +166,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 +184,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_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.2.2'
   end
 end

data/lib/dry/graphql.rb

@@ -7,20 +7,27 @@ 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(obj)
+      return obj.graphql_name if obj.respond_to?(:graphql_name)
+
+      obj.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(self)
         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
 
         opts = { name: graphql_name, type: schema_hash, schema: graphql_schema, options: options }
-        @graphql_type ||= SchemaBuilder.new(opts).graphql_type
+        @graphql_type ||= SchemaBuilder.new(**opts).graphql_type
       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.2.2
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tool-versions"
 - ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
@@ -151,7 +152,7 @@ homepage: https://github.com/adhawk/dry-graphql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Integrate dry-types/dry-struct with graphql-ruby
 test_files: []