graphql-client 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c735cc6d34d7372e777934b15cbf86540cf994a
-  data.tar.gz: 329f6769cf02065e726dd26e9006cb1143f3f8df
+  metadata.gz: 3207be7a370ae7995dd3355381f4dfc6d839e100
+  data.tar.gz: 80b877dd6c13310c10217a6a65a375728a6a9cb6
 SHA512:
-  metadata.gz: fd69bd130b837dff72de557d1b0c51e7a4f0b499af231af00d8b2df65a638116021f45660be83c8695aa27bbf808741db5317d4791e68f6bf0db9f059dbf9273
-  data.tar.gz: 20d75c1fa9d08f56a096328cf499e163eea4b7d13bfc9767f8fa743004e87c9a611d32d6533cbc0f28d72770b41635eff526549baf81bd52cc319ed0437ccb4c
+  metadata.gz: 036b98757f630e799ca5f8b111aad802d77f2723bc0cc73dae113c24687189cbfd6ad440224a6ba952902dc401a57a6f7cfa33523c6b764aa83f37e526a3452f
+  data.tar.gz: db865264342c1e9dc7b42d07fbe4ae5d01319514ca884c92bee4aff7e3980436e5fad4a851768f1c97bd371d1ae3a0b7c6460e3c0b895a48bf81dd2d0e3153d8

data/lib/graphql/client.rb

@@ -110,32 +110,37 @@ module GraphQL
 
       definition_dependencies = Set.new
 
-      str = str.gsub(/\.\.\.([a-zA-Z0-9_]+(::[a-zA-Z0-9_]+)+)/) do
+      str = str.gsub(/\.\.\.([a-zA-Z0-9_]+(::[a-zA-Z0-9_]+)*)/) do
         match = Regexp.last_match
         const_name = match[1]
-        begin
-          fragment = ActiveSupport::Inflector.constantize(const_name)
-        rescue NameError
-          fragment = nil
-        end
 
-        case fragment
-        when FragmentDefinition
-          definition_dependencies.merge(fragment.document.definitions)
-          "...#{fragment.definition_name}"
+        if str.match(/fragment\s*#{const_name}/)
+          match[0]
         else
-          if fragment
-            message = "expected #{const_name} to be a #{FragmentDefinition}, but was a #{fragment.class}."
-            if fragment.is_a?(Module) && fragment.constants.any?
-              message += " Did you mean #{fragment}::#{fragment.constants.first}?"
-            end
-          else
-            message = "uninitialized constant #{const_name}"
+          begin
+            fragment = ActiveSupport::Inflector.constantize(const_name)
+          rescue NameError
+            fragment = nil
           end
 
-          error = ValidationError.new(message)
-          error.set_backtrace(["#{filename}:#{lineno + match.pre_match.count("\n") + 1}"] + caller)
-          raise error
+          case fragment
+          when FragmentDefinition
+            definition_dependencies.merge(fragment.document.definitions)
+            "...#{fragment.definition_name}"
+          else
+            if fragment
+              message = "expected #{const_name} to be a #{FragmentDefinition}, but was a #{fragment.class}."
+              if fragment.is_a?(Module) && fragment.constants.any?
+                message += " Did you mean #{fragment}::#{fragment.constants.first}?"
+              end
+            else
+              message = "uninitialized constant #{const_name}"
+            end
+
+            error = ValidationError.new(message)
+            error.set_backtrace(["#{filename}:#{lineno + match.pre_match.count("\n") + 1}"] + caller)
+            raise error
+          end
         end
       end
 

data/lib/graphql/client/definition.rb

@@ -76,7 +76,7 @@ module GraphQL
 
       def type
         # TODO: Fix type indirection
-        @type ||= GraphQL::Client::QueryResult.wrap(self, definition_node, name: "#{name}.type")
+        @type ||= GraphQL::Client::QueryResult.wrap(self, definition_node, document_types[definition_node], name: "#{name}.type")
       end
     end
   end

data/lib/graphql/client/document_types.rb

@@ -31,6 +31,9 @@ module GraphQL
         visitor[GraphQL::Language::Nodes::FragmentDefinition] << ->(node, _parent) do
           fields[node] = type_stack.object_types.last
         end
+        visitor[GraphQL::Language::Nodes::InlineFragment] << ->(node, _parent) do
+          fields[node] = type_stack.object_types.last
+        end
         visitor[GraphQL::Language::Nodes::Field] << ->(node, _parent) do
           fields[node] = type_stack.field_definitions.last.type
         end

data/lib/graphql/client/query_result.rb

@@ -22,41 +22,114 @@ module GraphQL
       # Internal: Get QueryResult class for result of query.
       #
       # Returns subclass of QueryResult or nil.
-      def self.wrap(source_definition, node, name: nil)
-        fields = {}
+      def self.wrap(source_definition, node, type, name: nil)
+        case type
+        when GraphQL::NonNullType
+          NonNullWrapper.new(wrap(source_definition, node, type.of_type, name: name))
+        when GraphQL::ListType
+          ListWrapper.new(wrap(source_definition, node, type.of_type, name: name))
+        when GraphQL::ScalarType
+          ScalarWrapper.new(type)
+        when GraphQL::ObjectType, GraphQL::InterfaceType, GraphQL::UnionType
+          fields = {}
+
+          node.selections.each do |selection|
+            case selection
+            when Language::Nodes::FragmentSpread
+              nil
+            when Language::Nodes::Field
+              field_name = selection.alias || selection.name
+              selection_type = source_definition.document_types[selection]
+              selection_type = GraphQL::STRING_TYPE if field_name == "__typename"
+              field_klass = wrap(source_definition, selection, selection_type, name: "#{name}[:#{field_name}]")
+              fields[field_name] ? fields[field_name] |= field_klass : fields[field_name] = field_klass
+            when Language::Nodes::InlineFragment
+              selection_type = source_definition.document_types[selection]
+              wrap(source_definition, selection, selection_type, name: name).fields.each do |fragment_name, klass|
+                fields[fragment_name.to_s] ? fields[fragment_name.to_s] |= klass : fields[fragment_name.to_s] = klass
+              end
+            end
+          end
 
-        node.selections.each do |selection|
-          case selection
-          when Language::Nodes::FragmentSpread
+          define(name: name, type: type, source_definition: source_definition, source_node: node, fields: fields)
+        else
+          raise TypeError, "unexpected #{type.class}"
+        end
+      end
+
+      class ListWrapper
+        def initialize(type)
+          @of_klass = type
+        end
+
+        def cast(value, errors)
+          case value
+          when Array
+            List.new(value.each_with_index.map { |e, idx|
+              @of_klass.cast(e, errors.filter_by_path(idx))
+            }, errors)
+          else
+            raise ArgumentError, "expected list value to be an Array, but was #{value.class}"
+          end
+        end
+
+        def |(other)
+          if self.class == other.class
+            self.of_klass | other.of_klass
+          else
+            raise TypeError, "expected other to be a #{self.class}"
+          end
+        end
+      end
+
+      class NonNullWrapper
+        attr_reader :of_klass
+
+        def initialize(type)
+          @of_klass = type
+        end
+
+        def cast(value, errors)
+          case value
+          when NilClass
+            # TODO
+            # raise ArgumentError, "expected non-nullable value to be present"
             nil
-          when Language::Nodes::Field
-            field_name = selection.alias || selection.name
-            field_klass = nil
-            if selection.selections.any?
-              field_klass = wrap(source_definition, selection, name: "#{name}[:#{field_name}]")
-            end
-            fields[field_name] ? fields[field_name] |= field_klass : fields[field_name] = field_klass
-          when Language::Nodes::InlineFragment
-            wrap(source_definition, selection, name: name).fields.each do |fragment_name, klass|
-              fields[fragment_name.to_s] ? fields[fragment_name.to_s] |= klass : fields[fragment_name.to_s] = klass
-            end
+          else
+            @of_klass.cast(value, errors)
           end
         end
 
-        define(name: name, source_definition: source_definition, source_node: node, fields: fields)
+        def |(other)
+          if self.class == other.class
+            self.of_klass | other.of_klass
+          else
+            raise TypeError, "expected other to be a #{self.class}"
+          end
+        end
       end
 
       # :nodoc:
-      class Scalar
+      class ScalarWrapper
         def initialize(type)
           @type = type
         end
 
         def cast(value, _errors = nil)
           if value.is_a? Array
-            value.map { |item|  @type.coerce_input(item) }
+            value.map { |item|
+              if @type.respond_to?(:coerce_isolated_input)
+                @type.coerce_isolated_input(item)
+              else
+                @type.coerce_input(item)
+              end
+            }
           else
-            @type.coerce_input(value)
+            if @type.respond_to?(:coerce_isolated_input)
+              @type.coerce_isolated_input(value)
+            else
+              @type.coerce_input(value)
+            end
           end
         end
 
@@ -67,10 +140,7 @@ module GraphQL
       end
 
       # Internal
-      def self.define(name:, source_definition:, source_node:, fields: {})
-        type = source_definition.document_types[source_node]
-        type = type.unwrap if type
-
+      def self.define(name:, type:, source_definition:, source_node:, fields: {})
         Class.new(self) do
           @name = name
           @type = type
@@ -81,13 +151,6 @@ module GraphQL
           field_readers = Set.new
 
           fields.each do |field, klass|
-            if @type.is_a?(GraphQL::ObjectType)
-              field_node = @type.get_field(field.to_s)
-              if field_node && field_node.type.unwrap.is_a?(GraphQL::ScalarType)
-                klass = Scalar.new(field_node.type.unwrap)
-              end
-            end
-
             @fields[field.to_sym] = klass
 
             send :attr_reader, field
@@ -107,18 +170,12 @@ module GraphQL
           end
 
           assigns = @fields.map do |field, klass|
-            if klass
-              <<-RUBY
-                @#{field} = self.class.fields[:#{field}].cast(@data["#{field}"], @errors.filter_by_path("#{field}"))
-              RUBY
-            else
-              <<-RUBY
-                @#{field} = @data["#{field}"]
-              RUBY
-            end
+            <<-RUBY
+              @#{field} = self.class.fields[:#{field}].cast(@data["#{field}"], @errors.filter_by_path("#{field}"))
+            RUBY
           end
 
-          if @type && @type.is_a?(GraphQL::ObjectType)
+          if @type.is_a?(GraphQL::ObjectType)
             assigns.unshift "@__typename = self.class.type.name"
           end
 
@@ -177,12 +234,10 @@ module GraphQL
             raise TypeError, "#{self.source_definition.name} is not included in #{obj.class.source_definition.name}"
           end
           cast(obj.to_h, obj.errors)
-        when Array
-          List.new(obj.each_with_index.map { |e, idx| cast(e, errors.filter_by_path(idx)) }, errors)
         when NilClass
           nil
         else
-          raise TypeError, obj.class.to_s
+          raise TypeError, "expected #{obj.inspect} to be a Hash"
         end
       end
 
@@ -219,7 +274,7 @@ module GraphQL
           end
         end
         # TODO: Picking first source node seems error prone
-        define(name: self.name, source_definition: source_definition, source_node: source_node, fields: new_fields)
+        define(name: self.name, type: self.type, source_definition: source_definition, source_node: source_node, fields: new_fields)
       end
 
       # Public: Return errors associated with data.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport