graphql-decorate 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a8fe01c943ec96814efe0e1eff084e8a1a06d07ddfb25bdc957b7b9d7e1359
-  data.tar.gz: 834c64c23ce5db962159773e82f10ad7130322cffba0ef340a3dbd244b0ec8e4
+  metadata.gz: b79924fe9758b0881143f50e7536b02958a88932be59b541545f56ab62fc2571
+  data.tar.gz: c2455d37d70dc7ff45d1fbe4eab2ae304437ad4c04d0f0cb4ef5912447c68308
 SHA512:
-  metadata.gz: 536f14a8113cd9c166667260b743ef2443b1b845a2293d4fc1b006fd9818d819cd90439c6fd186d10c7ba0657eb6bd67840053160a65045edff94a69ace61db4
-  data.tar.gz: a083fe5519d3d5c980e01e9aa72f8e9c4f18d05c0130032a617933aba15410a9b32d7ef0b29dae8445dec018b68fc963b1964bb2534f06481594ab7759587498
+  metadata.gz: fa468e9077d6854f198045c2ad8ebc47bb07c9c63cc2e14d52b3f65693fe12c9dc2466787740c76c92ea98e4617b0c42cc39c72672f3c5dbc777291a259f66e2
+  data.tar.gz: 7372025f4fd3857dff61b875f9da3883030f5f1b43f406a985d76f74ca72c548d2df3cabf915a7979eecc8f66b8a8330849d1b7f1df43405fa4aba575185bc39

data/README.md

@@ -54,7 +54,7 @@ class RectangleDecorator < BaseDecorator
   end
 end
 
-class Rectangle < BaseObject
+class RectangleType < BaseObject
   decorate_with RectangleDecorator
   
   field :area, Int, null: false
@@ -84,8 +84,7 @@ end
 ### Types
 Two methods are made available on your type classes: `decorate_with` and `decorate_metadata`. 
 Every method that yields the underlying object will also yield the current GraphQL `context`. 
-If decoration depends on some context in the current query then you can access it when the field  
-is resolved.
+If decoration depends on some context in the current query then you can access it when the field is resolved.
 
 #### decorate_with
 `decorate_with` accepts a decorator class that will decorate every instance of your type.
@@ -123,17 +122,17 @@ to return `Hash`s.
 ```ruby
 class Rectangle < GraphQL::Schema::Object
   decorate_metadata do |metadata| 
-   metadata.unscoped do |object, _graphql_context| 
-     { 
-       name: object.name
-     }
-   end
+    metadata.unscoped do |object, _graphql_context| 
+      { 
+        name: object.name
+      }
+    end
    
-   metadata.scoped do |object, _graphql_context|
-     {
-       inside_rectangle: true
-     }
-   end
+    metadata.scoped do |object, _graphql_context|
+      {
+        inside_rectangle: true
+      }
+    end
   end
 end
 ```
@@ -148,7 +147,7 @@ You can mix and match these methods to suit your needs. Note that if `unscoped`
 class Rectangle < GraphQL::Schema::Object
   decorate_with RectangleDecorator
   decorate_metadata do |metadata|
-   metadata.scoped do |object, _graphql_context|
+    metadata.scoped do |object, _graphql_context|
       {
         name: object.name
       } 

data/graphql-decorate.gemspec

@@ -4,20 +4,24 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'graphql/decorate/version'
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
-  spec.name          = 'graphql-decorate'
-  spec.version       = GraphQL::Decorate::VERSION
-  spec.authors       = ['Ben Brook']
-  spec.email         = ['bbrook154@gmail.com']
+  spec.name = 'graphql-decorate'
+  spec.version = GraphQL::Decorate::VERSION
+  spec.authors = ['Ben Brook']
+  spec.email = ['bbrook154@gmail.com']
 
-  spec.summary       = 'A decorator integration for the GraphQL gem'
-  spec.homepage      = 'https://www.github.com/TrueCar/graphql-decorate'
-  spec.license       = 'MIT'
+  spec.summary = 'A decorator integration for the GraphQL gem'
+  spec.homepage = 'https://www.github.com/TrueCar/graphql-decorate'
+  spec.license = 'MIT'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added
   # into git.
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
       f.match(%r{^(test|spec|features)/})
     end
@@ -28,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_runtime_dependency 'graphql', '>= 1.3', '< 2'
+  spec.add_runtime_dependency 'graphql', '>= 1.3'
 
   spec.add_development_dependency 'bundler', '>= 2'
   spec.add_development_dependency 'rake', '>= 12.3.3'
@@ -38,3 +42,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.21.2'
   spec.add_development_dependency 'yard', '~> 0.9.26'
 end
+# rubocop:enable Metrics/BlockLength

data/lib/graphql/decorate/undecorated_field.rb

@@ -100,15 +100,23 @@ module GraphQL
       end
 
       def resolved_type_attributes
-        @resolved_type_attributes ||= begin
-          if type_attributes.unresolved_type?
-            if type.respond_to?(:resolve_type)
-              GraphQL::Decorate::TypeAttributes.new(type.resolve_type(value, graphql_context))
-            else
-              graphql_context.schema.resolve_type(type, value, graphql_context)
-            end
-          end
-        end
+        @resolved_type_attributes ||= if type_attributes.unresolved_type?
+                                        if type.respond_to?(:resolve_type)
+                                          GraphQL::Decorate::TypeAttributes.new(type.resolve_type(value,
+                                                                                                  graphql_context))
+                                        else
+                                          resolve_type_attributes_from_schema
+                                        end
+                                      end
+      end
+
+      def resolve_type_attributes_from_schema
+        result = graphql_context.schema.resolve_type(type, value, graphql_context)
+        return result unless result.is_a?(Array) && result.size == 2
+
+        result[0]
+          .authorized_new(result[1], graphql_context)
+          .then(&GraphQL::Decorate::TypeAttributes.method(:new))
       end
     end
   end

data/lib/graphql/decorate/version.rb

@@ -3,6 +3,6 @@
 module GraphQL
   module Decorate
     # Current version number
-    VERSION = '1.0.1'
+    VERSION = '1.0.4'
   end
 end

data/lib/graphql/decorate.rb

@@ -35,13 +35,13 @@ module GraphQL
     # @param schema_defn [GraphQL::Schema] Current schema class
     # @return [nil]
     def self.use(schema_defn)
-      schema_defn.to_graphql.types.each do |_name, type|
+      schema_defn.types.each do |_name, type|
         next unless type.respond_to?(:fields)
 
         type.fields.each do |_name, field|
-          field_type = extract_type(field.type_class.type)
+          field_type = extract_type(field.type)
           type_attributes = GraphQL::Decorate::TypeAttributes.new(field_type)
-          field.type_class.extension(GraphQL::Decorate::FieldExtension) if type_attributes.decoratable?
+          field.extension(GraphQL::Decorate::FieldExtension) if type_attributes.decoratable?
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-decorate
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Ben Brook
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +153,8 @@ files:
 homepage: https://www.github.com/TrueCar/graphql-decorate
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -175,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A decorator integration for the GraphQL gem