graphql 1.8.0.pre3 → 1.8.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a150383d3c4ffcaf126e675d8e844f93c4d2244
-  data.tar.gz: 76b98bf791afc9ca8cd0eb9caf9798005d058169
+  metadata.gz: ef7a7ef6e77dbf150ac668f99f293298e3764e9d
+  data.tar.gz: 702a3a337b3c53a813bd699637a93c985f7f5bf0
 SHA512:
-  metadata.gz: 4850a2d2c7872936c2ef09e016e6da4d6afba9bc554f76f08cc7f747d38e336e183ce201f184053364c468241b25442483ac83eab4e9bb63da2a74f19a67a202
-  data.tar.gz: 853775ca411cab71eae69b917071ebb0c03c61d1a4557d38ff8fb4410b05da3e34dad381098ba41417b03e39114d6e1ba36aab441fc3297fffb356d0222d1b73
+  metadata.gz: b9e377b6787dda4fe97be9687545adb6f0fd9625df8f3233ee069ff70d96e660b3768bb58ef5b7ddbb330df3322dbe1aba23b13af53cd661dc69fe8e5d61a9e4
+  data.tar.gz: 628e7b0c786292b2009ce08b799c8c9db340a289ca3d3ac59b1cc9f454639cd321a327cefb9e77954311a1bd5994ffdd4ed5bd5f0715bbd38b5118345b861dfa

data/lib/graphql/railtie.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
-require_relative './upgrader/member'
-require_relative './upgrader/schema'
 
 module GraphQL
   class Railtie < Rails::Railtie
     rake_tasks do
+      # Defer this so that you only need the `parser` gem when you _run_ the upgrader
+      def load_upgraders
+        require_relative './upgrader/member'
+        require_relative './upgrader/schema'
+      end
+
       namespace :graphql do
         task :upgrade, [:dir] do |t, args|
           unless (dir = args[:dir])
@@ -82,7 +86,7 @@ module GraphQL
 
           task :schema, [:schema_file] do |t, args|
             schema_file = args.schema_file
-
+            load_upgraders
             upgrader = GraphQL::Upgrader::Schema.new File.read(schema_file)
 
             puts "- Transforming schema #{schema_file}"
@@ -91,7 +95,7 @@ module GraphQL
 
           task :member, [:member_file] do |t, args|
             member_file = args.member_file
-
+            load_upgraders
             upgrader = GraphQL::Upgrader::Member.new File.read(member_file)
             next unless upgrader.upgradeable?
 

data/lib/graphql/schema/enum.rb

@@ -33,20 +33,15 @@ module GraphQL
         def value(graphql_name, description = nil, value: nil, deprecation_reason: nil)
           graphql_name = graphql_name.to_s
           value ||= graphql_name
-          own_values << Value.new(graphql_name, description, value, deprecation_reason)
+          own_values[graphql_name] = Value.new(graphql_name, description, value, deprecation_reason)
           nil
         end
 
-        # @return [Array<GraphQL::Schema::Enum::Value>]
+        # @return [Hash<String => GraphQL::Schema::Enum::Value>] Possible values of this enum, keyed by name
         def values
-          all_values = own_values
-          inherited_values = superclass <= GraphQL::Schema::Enum ? superclass.values : []
-          inherited_values.each do |inherited_v|
-            if all_values.none? { |v| v.name == inherited_v.name }
-              all_values << inherited_v
-            end
-          end
-          all_values
+          inherited_values = superclass <= GraphQL::Schema::Enum ? superclass.values : {}
+          # Local values take precedence over inherited ones
+          inherited_values.merge(own_values)
         end
 
         # @return [GraphQL::EnumType]
@@ -55,7 +50,7 @@ module GraphQL
           enum_type.name = graphql_name
           enum_type.description = description
           enum_type.introspection = introspection
-          values.each do |val|
+          values.each do |name, val|
             enum_value = GraphQL::EnumType::EnumValue.new
             enum_value.name = val.name
             enum_value.description = val.description
@@ -69,7 +64,7 @@ module GraphQL
         private
 
         def own_values
-          @own_values ||= []
+          @own_values ||= {}
         end
       end
     end

data/lib/graphql/schema/field.rb

@@ -11,9 +11,12 @@ module GraphQL
       attr_reader :name
 
       # @return [String]
-      attr_reader :description
+      attr_accessor :description
 
-      def initialize(name, return_type_expr = nil, desc = nil, null: nil, field: nil, function: nil, description: nil, deprecation_reason: nil, method: nil, connection: nil, max_page_size: nil, resolve: nil, introspection: false, extras: [], &args_block)
+      # @return [Hash{String => GraphQL::Schema::Argument}]
+      attr_reader :arguments
+
+      def initialize(name, return_type_expr = nil, desc = nil, null: nil, field: nil, function: nil, description: nil, deprecation_reason: nil, method: nil, connection: nil, max_page_size: nil, resolve: nil, introspection: false, extras: [], &definition_block)
         if !(field || function)
           if return_type_expr.nil?
             raise ArgumentError, "missing positional argument `type`"
@@ -37,11 +40,29 @@ module GraphQL
         @method = method
         @return_type_expr = return_type_expr
         @return_type_null = null
-        @args_block = args_block
         @connection = connection
         @max_page_size = max_page_size
         @introspection = introspection
         @extras = extras
+        @arguments = {}
+
+        if definition_block
+          instance_eval(&definition_block)
+        end
+      end
+
+      # This is the `argument(...)` DSL for class-based field definitons
+      def argument(*args)
+        arg_defn = self.class.argument_class.new(*args)
+        arguments[arg_defn.name] = arg_defn
+      end
+
+      def description(text = nil)
+        if text
+          @description = text
+        else
+          @description
+        end
       end
 
       # @return [GraphQL::Field]
@@ -93,17 +114,20 @@ module GraphQL
         field_defn.connection_max_page_size = @max_page_size
         field_defn.introspection = @introspection
 
-        field_proxy = FieldProxy.new(field_defn, argument_class: self.class.argument_class)
         # apply this first, so it can be overriden below
         if connection
-          field_proxy.argument :after, "String", "Returns the elements in the list that come after the specified global ID.", required: false
-          field_proxy.argument :before, "String", "Returns the elements in the list that come before the specified global ID.", required: false
-          field_proxy.argument :first, "Int", "Returns the first _n_ elements from the list.", required: false
-          field_proxy.argument :last, "Int", "Returns the last _n_ elements from the list.", required: false
+          # TODO: this could be a bit weird, because these fields won't be present
+          # after initialization, only in the `to_graphql` response.
+          # This calculation _could_ be moved up if need be.
+          argument :after, "String", "Returns the elements in the list that come after the specified global ID.", required: false
+          argument :before, "String", "Returns the elements in the list that come before the specified global ID.", required: false
+          argument :first, "Int", "Returns the first _n_ elements from the list.", required: false
+          argument :last, "Int", "Returns the last _n_ elements from the list.", required: false
         end
 
-        if @args_block
-          field_proxy.instance_eval(&@args_block)
+        @arguments.each do |name, defn|
+          arg_graphql = defn.to_graphql
+          field_defn.arguments[arg_graphql.name] = arg_graphql
         end
 
         field_defn
@@ -120,32 +144,6 @@ module GraphQL
           end
         end
       end
-
-
-      # This object exists only to be `instance_eval`'d
-      # when the `field(...)` method is called with a block.
-      # This object receives that block.
-      class FieldProxy
-        def initialize(field, argument_class:)
-          @field = field
-          @argument_class = argument_class
-        end
-
-        # This is the `argument(...)` DSL for class-based field definitons
-        def argument(*args)
-          arg = @argument_class.new(*args)
-          graphql_arg = arg.graphql_definition
-          @field.arguments[graphql_arg.name] = graphql_arg
-        end
-
-        def description(text)
-          if @field.description
-            fail "You're overriding the description of #{@field.name} in the provided block!"
-          else
-            @field.description = text
-          end
-        end
-      end
     end
   end
 end

data/lib/graphql/schema/field/dynamic_resolve.rb

@@ -6,6 +6,7 @@ module GraphQL
       class DynamicResolve
         def initialize(method_name:, connection:, extras:)
           @method_name = method_name
+          @method_sym = method_name.to_sym
           @connection = connection
           @extras = extras
         end
@@ -15,8 +16,9 @@ module GraphQL
             public_send_field(obj, @method_name, args, ctx)
           elsif obj.object.respond_to?(@method_name)
             public_send_field(obj.object, @method_name, args, ctx)
-          elsif obj.is_a?(Hash)
-            obj[@method_name]
+          elsif obj.object.is_a?(Hash)
+            inner_object = obj.object
+            inner_object[@method_name] || inner_object[@method_sym]
           else
             raise <<-ERR
 Failed to implement #{ctx.irep_node.owner_type.name}.#{ctx.field.name}, tried:

data/lib/graphql/schema/input_object.rb

@@ -19,34 +19,30 @@ module GraphQL
 
         def argument(*args)
           argument = GraphQL::Schema::Argument.new(*args)
-          own_arguments << argument
           arg_name = argument.graphql_definition.name
+          own_arguments[arg_name] = argument
           # Add a method access
           define_method(Member::BuildType.underscore(arg_name)) do
             @arguments.public_send(arg_name)
           end
         end
 
+        # @return [Hash<String => GraphQL::Schema::Argument] Input fields on this input object, keyed by name.
         def arguments
-          all_arguments = own_arguments
-          inherited_arguments = (superclass <= GraphQL::Schema::InputObject ? superclass.arguments : [])
-          inherited_arguments.each do |inherited_a|
-            if all_arguments.none? { |a| a.name == inherited_a.name }
-              all_arguments << inherited_a
-            end
-          end
-          all_arguments
+          inherited_arguments = (superclass <= GraphQL::Schema::InputObject ? superclass.arguments : {})
+          # Local definitions override inherited ones
+          inherited_arguments.merge(own_arguments)
         end
 
         def own_arguments
-          @own_arguments ||= []
+          @own_arguments ||= {}
         end
 
         def to_graphql
           type_defn = GraphQL::InputObjectType.new
           type_defn.name = graphql_name
           type_defn.description = description
-          arguments.each do |arg|
+          arguments.each do |name, arg|
             type_defn.arguments[arg.graphql_definition.name] = arg.graphql_definition
           end
           # Make a reference to a classic-style Arguments class

data/lib/graphql/schema/interface.rb

@@ -20,7 +20,7 @@ module GraphQL
           type_defn = GraphQL::InterfaceType.new
           type_defn.name = graphql_name
           type_defn.description = description
-          fields.each do |field_inst|
+          fields.each do |field_name, field_inst|
             field_defn = field_inst.graphql_definition
             type_defn.fields[field_defn.name] = field_defn
           end

data/lib/graphql/schema/member/build_type.rb

@@ -4,6 +4,8 @@ module GraphQL
     class Member
       # @api private
       module BuildType
+        LIST_TYPE_ERROR = "Use an array of [T] or [T, null: true] for list types; other arrays are not supported"
+
         module_function
         # @param type_expr [String, Class, GraphQL::BaseType]
         # @return [GraphQL::BaseType]
@@ -46,12 +48,21 @@ module GraphQL
           when GraphQL::BaseType, GraphQL::Schema::LateBoundType
             type_expr
           when Array
-            if type_expr.length != 1
-              raise "Use an array of length = 1 for list types; other arrays are not supported"
+            case type_expr.length
+            when 1
+              list_type = true
+              # List members are required by default
+              parse_type(type_expr.first, null: false)
+            when 2
+              inner_type, nullable_option = type_expr
+              if nullable_option.keys != [:null] || nullable_option.values != [true]
+                raise ArgumentError, LIST_TYPE_ERROR
+              end
+              list_type = true
+              parse_type(inner_type, null: true)
+            else
+              raise ArgumentError, LIST_TYPE_ERROR
             end
-            list_type = true
-            # List members are required by default
-            parse_type(type_expr.first, null: false)
           when Class
             if Class < GraphQL::Schema::Member
               type_expr.graphql_definition

data/lib/graphql/schema/member/has_fields.rb

@@ -13,25 +13,18 @@ module GraphQL
           nil
         end
 
-        # @return [Array<GraphQL::Schema::Field>] Fields on this object, including inherited fields
+        # @return [Hash<String => GraphQL::Schema::Field>] Fields on this object, keyed by name, including inherited fields
         def fields
-          all_fields = own_fields
-          inherited_fields = (superclass.is_a?(HasFields) ? superclass.fields : [])
-          # Remove any inherited fields which were overridden on this class:
-          inherited_fields.each do |inherited_f|
-            if all_fields.none? {|f| f.name == inherited_f.name}
-              all_fields << inherited_f
-            end
-          end
-          all_fields
+          inherited_fields = (superclass.is_a?(HasFields) ? superclass.fields : {})
+          # Local overrides take precedence over inherited fields
+          inherited_fields.merge(own_fields)
         end
 
         # Register this field with the class, overriding a previous one if needed
         # @param field_defn [GraphQL::Schema::Field]
         # @return [void]
         def add_field(field_defn)
-          own_fields.reject! {|f| f.name == field_defn.name}
-          own_fields << field_defn
+          own_fields[field_defn.name] = field_defn
           nil
         end
 
@@ -48,7 +41,7 @@ module GraphQL
 
         # @return [Array<GraphQL::Schema::Field>] Fields defined on this class _specifically_, not parent classes
         def own_fields
-          @own_fields ||= []
+          @own_fields ||= {}
         end
       end
     end

data/lib/graphql/schema/object.rb

@@ -17,7 +17,7 @@ module GraphQL
           new_interfaces.each do |int|
             if int.is_a?(Class) && int < GraphQL::Schema::Interface
               # Add the graphql field defns
-              int.fields.each do |field|
+              int.fields.each do |_name, field|
                 add_field(field)
               end
               # And call the implemented hook
@@ -47,7 +47,7 @@ module GraphQL
           obj_type.interfaces = interfaces
           obj_type.introspection = introspection
 
-          fields.each do |field_inst|
+          fields.each do |field_name, field_inst|
             field_defn = field_inst.to_graphql
             obj_type.fields[field_defn.name] = field_defn
           end

data/lib/graphql/upgrader/member.rb

@@ -95,12 +95,18 @@ module GraphQL
     # Remove newlines -- normalize the text for processing
     class RemoveNewlinesTransform
       def apply(input_text)
-        input_text.gsub(/(?<field>(?:field|connection|argument).*?,)\n(\s*)(?<next_line>(:?"|field)(.*))/) do
-          field = $~[:field].chomp
-          next_line = $~[:next_line]
-
-          "#{field} #{next_line}"
+        keep_looking = true
+        while keep_looking do
+          keep_looking = false
+          input_text = input_text.gsub(/(?<field>(?:field|connection|argument).*?,)\n(\s*)(?<next_line>.*)/) do
+            keep_looking = true
+            field = $~[:field].chomp
+            next_line = $~[:next_line]
+
+            "#{field} #{next_line}"
+          end
         end
+        input_text
       end
     end
 
@@ -141,7 +147,7 @@ module GraphQL
         ) do
           field = $~[:field]
           block_contents = $~[:block_contents]
-          kwarg_value = $~[:kwarg_value]
+          kwarg_value = $~[:kwarg_value].strip
 
           "#{field}, #{@kwarg}: #{kwarg_value} do#{block_contents}"
         end
@@ -155,6 +161,28 @@ module GraphQL
       end
     end
 
+    # Find a keyword whose value is a string or symbol,
+    # and if the value is equivalent to the field name,
+    # remove the keyword altogether.
+    class RemoveRedundantKwargTransform < Transform
+      def initialize(kwarg:)
+        @kwarg = kwarg
+        @finder_pattern = /(field|connection|argument) :(?<name>[a-zA-Z_0-9]*).*#{@kwarg}: ['":](?<kwarg_value>[a-zA-Z_0-9]+)['"]?/
+      end
+
+      def apply(input_text)
+        if input_text =~ @finder_pattern
+          field_name = $~[:name]
+          kwarg_value = $~[:kwarg_value]
+          if field_name == kwarg_value
+            # It's redundant, remove it
+            input_text = input_text.sub(/, #{@kwarg}: ['":]#{kwarg_value}['"]?/, "")
+          end
+        end
+        input_text
+      end
+    end
+
     # Take camelized field names and convert them to underscore case.
     # (They'll be automatically camelized later.)
     class UnderscoreizeFieldNameTransform < Transform
@@ -196,7 +224,13 @@ module GraphQL
 
           input_text.match(/(?<field_type>input_field|field|connection|argument) :(?<name>[a-zA-Z_0-9_]*)/)
           field_name = $~[:name]
-          field_ast = Parser::CurrentRuby.parse(input_text)
+          begin
+            field_ast = Parser::CurrentRuby.parse(input_text)
+          rescue Parser::SyntaxError
+            puts "Error text:"
+            puts input_text
+            raise
+          end
           processor = ResolveProcProcessor.new
           processor.process(field_ast)
           proc_body = input_text[processor.proc_start..processor.proc_end]
@@ -288,9 +322,14 @@ module GraphQL
         ) do
           indent = $~[:indent]
           interfaces = $~[:interfaces].split(',').map(&:strip).reject(&:empty?)
-          interfaces.map do |interface|
-            "#{indent}implements #{interface}"
-          end.join
+          # Preserve leading newlines before the `interfaces ...`
+          # call, but don't re-insert them between `implements` calls.
+          extra_leading_newlines = "\n" * (indent[/^\n*/].length - 1)
+          indent = indent.sub(/^\n*/m, "")
+          interfaces_calls = interfaces
+            .map { |interface| "\n#{indent}implements #{interface}" }
+            .join
+          extra_leading_newlines + interfaces_calls
         end
       end
     end
@@ -298,23 +337,27 @@ module GraphQL
     class UpdateMethodSignatureTransform < Transform
       def apply(input_text)
         input_text.scan(/(?:input_field|field|connection|argument) .*$/).each do |field|
-          matches = /(?<field_type>input_field|field|connection|argument) :(?<name>[a-zA-Z_0-9_]*)?, (?<return_type>[^,]*)(?<remainder>.*)/.match(field)
+          matches = /(?<field_type>input_field|field|connection|argument) :(?<name>[a-zA-Z_0-9_]*)?, (?<return_type>([A-Za-z\[\]\.\!_0-9]|::|-> ?\{ ?| ?\})+)(?<remainder>( |,|$).*)/.match(field)
           if matches
             name = matches[:name]
             return_type = matches[:return_type]
             remainder = matches[:remainder]
             field_type = matches[:field_type]
-
-            # This is a small bug in the regex. Ideally the `do` part would only be in the remainder.
-            with_block = remainder.gsub!(/\ do$/, '') || return_type.gsub!(/\ do$/, '')
+            with_block = remainder.gsub!(/\ do$/, '')
 
             remainder.gsub! /,$/, ''
             remainder.gsub! /^,/, ''
             remainder.chomp!
 
-            has_bang = !(return_type.gsub! '!', '')
-            return_type = normalize_type_expression(return_type)
-            return_type = return_type.gsub ',', ''
+            if return_type
+              non_nullable = return_type.gsub! '!', ''
+              nullable = !non_nullable
+              return_type = normalize_type_expression(return_type)
+              return_type = return_type.gsub ',', ''
+            else
+              non_nullable = nil
+              nullable = nil
+            end
 
             input_text.sub!(field) do
               is_argument = ['argument', 'input_field'].include?(field_type)
@@ -325,15 +368,15 @@ module GraphQL
               end
 
               if is_argument
-                if has_bang
+                if nullable
                   f += ', required: false'
-                else
+                elsif non_nullable
                   f += ', required: true'
                 end
               else
-                if has_bang
+                if nullable
                   f += ', null: true'
-                else
+                elsif non_nullable
                   f += ', null: false'
                 end
               end
@@ -363,17 +406,29 @@ module GraphQL
 
     # Remove redundant newlines, which may have trailing spaces
     # Remove double newline after `do`
+    # Remove double newline before `end`
     class RemoveExcessWhitespaceTransform < Transform
       def apply(input_text)
         input_text
-          .gsub(/\n{3,}/m, "\n")
-          .gsub(/do\n\n/m, "do\n")
+          .gsub(/\n{3,}/m, "\n\n")
+          .gsub(/do\n{2,}/m, "do\n")
+          .gsub(/\n{2,}(\s*)end/m, "\n\\1end")
+      end
+    end
+
+    # Skip this file if you see any `field`
+    # helpers with `null: true` or `null: false` keywords,
+    # because it's already been transformed
+    class SkipOnNullKeyword
+      def skip?(input_text)
+        input_text =~ /field.*null: (true|false)/
       end
     end
 
     class Member
-      def initialize(member, type_transforms: DEFAULT_TYPE_TRANSFORMS, field_transforms: DEFAULT_FIELD_TRANSFORMS, clean_up_transforms: DEFAULT_CLEAN_UP_TRANSFORMS)
+      def initialize(member, skip: SkipOnNullKeyword, type_transforms: DEFAULT_TYPE_TRANSFORMS, field_transforms: DEFAULT_FIELD_TRANSFORMS, clean_up_transforms: DEFAULT_CLEAN_UP_TRANSFORMS)
         @member = member
+        @skip = skip
         @type_transforms = type_transforms
         @field_transforms = field_transforms
         @clean_up_transforms = clean_up_transforms
@@ -390,7 +445,11 @@ module GraphQL
         PositionalTypeArgTransform,
         ConfigurationToKwargTransform.new(kwarg: "property"),
         ConfigurationToKwargTransform.new(kwarg: "description"),
+        ConfigurationToKwargTransform.new(kwarg: "deprecation_reason"),
+        ConfigurationToKwargTransform.new(kwarg: "hash_key"),
         PropertyToMethodTransform,
+        RemoveRedundantKwargTransform.new(kwarg: "hash_key"),
+        RemoveRedundantKwargTransform.new(kwarg: "method"),
         UnderscoreizeFieldNameTransform,
         ResolveProcToMethodTransform,
         UpdateMethodSignatureTransform,
@@ -402,8 +461,14 @@ module GraphQL
       ]
 
       def upgrade
+        type_source = @member.dup
+        should_skip = @skip.new.skip?(type_source)
+        # return the unmodified code
+        if should_skip
+          return type_source
+        end
         # Transforms on type defn code:
-        type_source = apply_transforms(@member.dup, @type_transforms)
+        type_source = apply_transforms(type_source, @type_transforms)
         # Transforms on each field:
         field_sources = find_fields(type_source)
         field_sources.each do |field_source|
@@ -464,6 +529,10 @@ module GraphQL
         # - use `gsub` after performing the transformation.
         field_sources.uniq!
         field_sources
+      rescue Parser::SyntaxError
+        puts "Error Source:"
+        puts type_source
+        raise
       end
 
       class FieldFinder < Parser::AST::Processor

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.8.0.pre3"
+  VERSION = "1.8.0.pre4"
 end

data/spec/fixtures/upgrader/blame_range.original.rb

@@ -8,7 +8,7 @@ module Platform
 
       scopeless_tokens_as_minimum
 
-      # Test multiline interfaces
+
       interfaces [
         Interfaces::A,
         Interfaces::B,

data/spec/fixtures/upgrader/blame_range.transformed.rb

@@ -7,7 +7,6 @@ module Platform
 
       scopeless_tokens_as_minimum
 
-      # Test multiline interfaces
       implements Interfaces::A
       implements Interfaces::B
 

data/spec/fixtures/upgrader/type_x.original.rb

@@ -12,11 +12,14 @@ module Platform
       interfaces [GraphQL::Relay::Node.interface]
 
       field :f1, !Objects::O1, "The x being y."
-      field :f2, !Enums::E1, "x for the y.", property: :field_2
+      field :f2, !Enums::E1, "x for the y.",
+        property: :field_2
       field :f3, Enums::E2, "x for y."
       field :details, types.String, "Details."
 
       field :f4, !Objects::O2, "x as a y inside the z." do
+        argument :a1, !Inputs::I1
+
         resolve ->(obj_x, arguments, context) do
           Class1.new(
             a: Class2.new(
@@ -30,6 +33,21 @@ module Platform
           )
         end
       end
+
+      field :f5, -> { !types.String } do
+        description "The thing"
+        property :custom_property
+        visibility :custom_value
+      end
+
+      field :f6, -> { !types.String } do
+        description "The thing"
+        property :custom_property
+        visibility :custom_value
+      end
+
+      field :f7, field: SomeField
+      field :f8, function: SomeFunction
     end
   end
 end

data/spec/fixtures/upgrader/type_x.transformed.rb

@@ -16,9 +16,11 @@ module Platform
       field :f3, Enums::E2, "x for y.", null: true
       field :details, String, "Details.", null: true
 
-      field :f4, Objects::O2, "x as a y inside the z.", null: false
+      field :f4, Objects::O2, "x as a y inside the z.", null: false do
+        argument :a1, Inputs::I1, required: true
+      end
 
-      def f4
+      def f4(**arguments)
         Class1.new(
           a: Class2.new(
             b: @object.b_1,
@@ -30,6 +32,13 @@ module Platform
           )
         )
       end
+
+      field :f5, String, visibility: :custom_value, method: :custom_property, description: "The thing", null: false
+
+      field :f6, String, visibility: :custom_value, method: :custom_property, description: "The thing", null: false
+
+      field :f7, field: SomeField
+      field :f8, function: SomeFunction
     end
   end
 end

data/spec/graphql/query/context_spec.rb

@@ -256,8 +256,9 @@ TABLE
       }'
       res = Jazz::Schema.execute(query_str, context: { magic_key: :ignored, normal_key: "normal_value" })
       expected_values = ["custom_method", "magic_value", "normal_value"]
+      expected_values_with_nil = expected_values + [nil]
       assert_equal expected_values, res["data"]["inspectContext"]
-      assert_equal expected_values, res["data"]["find"]["inspectContext"]
+      assert_equal expected_values_with_nil, res["data"]["find"]["inspectContext"]
     end
   end
 end

data/spec/graphql/schema/enum_spec.rb

@@ -21,7 +21,7 @@ describe GraphQL::Schema::Enum do
       # values were inherited without modifying the parent
       assert_equal 6, enum.values.size
       assert_equal 7, new_enum.values.size
-      perc_value = new_enum.values.find { |v| v.name == "PERCUSSION" }
+      perc_value = new_enum.values["PERCUSSION"]
       assert_equal "new description", perc_value.description
     end
   end

data/spec/graphql/schema/field_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 describe GraphQL::Schema::Field do
   describe "graphql definition" do
     let(:object_class) { Jazz::Query }
-    let(:field) { object_class.fields.find { |f| f.name == "inspect_input" } }
+    let(:field) { object_class.fields["inspect_input"] }
 
     it "uses the argument class" do
       arg_defn = field.graphql_definition.arguments.values.first
@@ -15,18 +15,18 @@ describe GraphQL::Schema::Field do
       assert_equal 'inspectInput', field.graphql_definition.name
     end
 
-    describe "description in block" do
-      it "will raise if description is defined both in the argument and in the block" do
-        assert_raises RuntimeError, "You're overriding the description of shouldRaise in the provided block!" do
-          Class.new(Jazz::BaseObject) do
-            graphql_name "JustAName"
+    it "accepts a block for definition" do
+      object = Class.new(Jazz::BaseObject) do
+        graphql_name "JustAName"
 
-            field :should_raise, Jazz::Key, "this should not raise", null: true do
-              description "This should raise"
-            end
-          end.to_graphql
+        field :test, String, null: true do
+          argument :test, String, required: true
+          description "A Description."
         end
-      end
+      end.to_graphql
+
+      assert_equal "test", object.fields["test"].arguments["test"].name
+      assert_equal "A Description.", object.fields["test"].description
     end
   end
 end

data/spec/graphql/schema/object_spec.rb

@@ -24,9 +24,9 @@ describe GraphQL::Schema::Object do
       # inherited interfaces are present
       assert_equal 2, new_object_class.interfaces.size
       # The new field is present
-      assert new_object_class.fields.find { |f| f.name == "newField" }
+      assert new_object_class.fields.key?("newField")
       # The overridden field is present:
-      name_field = new_object_class.fields.find { |f| f.name == "name" }
+      name_field = new_object_class.fields["name"]
       assert_equal "The new description", name_field.description
     end
 
@@ -42,6 +42,23 @@ describe GraphQL::Schema::Object do
     end
   end
 
+  describe "wrapping a Hash" do
+    it "automatically looks up symbol and string keys" do
+      query_str = <<-GRAPHQL
+      {
+        hashyEnsemble {
+          name
+          musicians { name }
+        }
+      }
+      GRAPHQL
+      res = Jazz::Schema.execute(query_str)
+      ensemble = res["data"]["hashyEnsemble"]
+      assert_equal "The Grateful Dead", ensemble["name"]
+      assert_equal ["Jerry Garcia"], ensemble["musicians"].map { |m| m["name"] }
+    end
+  end
+
   describe ".to_graphql_type" do
     let(:obj_type) { Jazz::Ensemble.to_graphql }
     it "returns a matching GraphQL::ObjectType" do

data/spec/graphql/upgrader/member_spec.rb

@@ -17,17 +17,52 @@ describe GraphQL::Upgrader::Member do
     end
   end
 
-  it 'upgrades the property definition to method' do
-    old = %{field :name, String, property: :name}
-    new = %{field :name, String, method: :name, null: true}
+  describe "property / method upgrade" do
+    it 'upgrades the property definition to method' do
+      old = %{field :name, String, property: :full_name}
+      new = %{field :name, String, method: :full_name, null: true}
 
-    assert_equal new, upgrade(old)
+      assert_equal new, upgrade(old)
+    end
+
+    it 'upgrades the property definition in a block to method' do
+      old = %{field :name, String do\n  property :full_name\nend}
+      new = %{field :name, String, method: :full_name, null: true}
+      assert_equal new, upgrade(old)
+    end
+
+    it "removes property when redundant" do
+      old = %{field :name, String do\n  property "name" \nend}
+      new = %{field :name, String, null: true}
+      assert_equal new, upgrade(old)
+
+      old = %{field :name, String, property: :name}
+      new = %{field :name, String, null: true}
+      assert_equal new, upgrade(old)
+
+    end
   end
 
-  it 'upgrades the property definition in a block to method' do
-    old = %{field :name, String do\n  property :name\nend}
-    new = %{field :name, String, method: :name, null: true}
-    assert_equal new, upgrade(old)
+  describe "hash_key" do
+    it "it moves configuration to kwarg"  do
+      old = %{field :name, String do\n  hash_key :full_name\nend}
+      new = %{field :name, String, hash_key: :full_name, null: true}
+      assert_equal new, upgrade(old)
+    end
+
+    it "removes it if it's redundant" do
+      old = %{field :name, String do\n  hash_key :name\nend}
+      new = %{field :name, String, null: true}
+      assert_equal new, upgrade(old)
+
+      old = %{field :name, String, hash_key: :name}
+      new = %{field :name, String, null: true}
+      assert_equal new, upgrade(old)
+
+      old = %{field :name, String do\n  hash_key "name"\nend}
+      new = %{field :name, String, null: true}
+      assert_equal new, upgrade(old)
+    end
   end
 
   describe 'name' do
@@ -224,8 +259,8 @@ describe GraphQL::Upgrader::Member do
       new = %{field :name, String, null: false}
       assert_equal new, upgrade(old)
 
-      old = %{field :name, !types.String, "description", method: :name}
-      new = %{field :name, String, "description", method: :name, null: false}
+      old = %{field :name, !types.String, "description", method: :name_full}
+      new = %{field :name, String, "description", method: :name_full, null: false}
       assert_equal new, upgrade(old)
 
       old = %{field :name, -> { !types.String }}
@@ -347,8 +382,7 @@ describe GraphQL::Upgrader::Member do
           property: :example_field?
       }
       new = %{
-        field :is_example_field, Boolean, null: true
-          method: :example_field?
+        field :is_example_field, Boolean, method: :example_field?, null: true
       }
 
       assert_equal new, upgrade(old)
@@ -362,8 +396,7 @@ describe GraphQL::Upgrader::Member do
           property: :example_connections
       }
       new = %{
-        field :example_connection, ExampleConnectionType, null: true, connection: true
-          method: :example_connections
+        field :example_connection, ExampleConnectionType, method: :example_connections, null: true, connection: true
       }
 
       assert_equal new, upgrade(old)
@@ -416,19 +449,26 @@ describe GraphQL::Upgrader::Member do
       }
 
       type_transforms.unshift(ActiveRecordTypeToClassTransform)
-      upgrader = GraphQL::Upgrader::Member.new(original_text, type_transforms: type_transforms)
+      field_transforms = GraphQL::Upgrader::Member::DEFAULT_FIELD_TRANSFORMS
+      field_transforms.unshift(GraphQL::Upgrader::ConfigurationToKwargTransform.new(kwarg: "visibility"))
+      upgrader = GraphQL::Upgrader::Member.new(original_text, type_transforms: type_transforms, field_transforms: field_transforms)
       upgrader.upgrade
     end
 
     original_files = Dir.glob("spec/fixtures/upgrader/*.original.rb")
     original_files.each do |original_file|
       transformed_file = original_file.sub(".original.", ".transformed.")
+      original_text = File.read(original_file)
+      expected_text = File.read(transformed_file)
       it "transforms #{original_file} -> #{transformed_file}" do
-        original_text = File.read(original_file)
-        expected_text = File.read(transformed_file)
         transformed_text = custom_upgrade(original_text)
         assert_equal(expected_text, transformed_text)
       end
+
+      it "is idempotent on #{transformed_file}" do
+        retransformed_text = custom_upgrade(expected_text)
+        assert_equal(expected_text, retransformed_text)
+      end
     end
   end
 end

data/spec/support/jazz.rb

@@ -201,13 +201,15 @@ module Jazz
       description "An object played in order to produce music"
     end
     field :favorite_key, Key, null: true
-    field :inspect_context, [String], null: false
+    # Test lists with nullable members:
+    field :inspect_context, [String, null: true], null: false
 
     def inspect_context
       [
         @context.custom_method,
         @context[:magic_key],
-        @context[:normal_key]
+        @context[:normal_key],
+        nil,
       ]
     end
   end
@@ -272,6 +274,7 @@ module Jazz
     # For asserting that the object is initialized once:
     field :object_id, Integer, null: false
     field :inspect_context, [String], null: false
+    field :hashyEnsemble, Ensemble, null: false
 
     def ensembles
       Models.data["Ensemble"]
@@ -317,6 +320,17 @@ module Jazz
         @context[:normal_key]
       ]
     end
+
+    def hashy_ensemble
+      # Both string and symbol keys are supported:
+
+      {
+          name: "The Grateful Dead",
+          "musicians" => [
+            OpenStruct.new(name: "Jerry Garcia"),
+          ],
+      }
+    end
   end
 
   class EnsembleInput < GraphQL::Schema::InputObject

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre3
+  version: 1.8.0.pre4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips