graphql_grpc 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b55859c768e366b0db45e4df7c81bd16921b219493995ebfe5d7345220db240
-  data.tar.gz: 98576c693daaae01f1ec1bdde5e2596c1bd456fbd5b25db56e545ebb0e7bffcc
+  metadata.gz: 55decad51b1fe59ba29cd95b3dd7bf6c93a1417fd8fcc663735d6069d3560090
+  data.tar.gz: 3ca7a9a20df756213f8da850a9b2a36d4b1940eed229ef2305f1aa66608cb7e5
 SHA512:
-  metadata.gz: 319343686545bfe90899e076fed025f07da73c3b2517a3f919dc899f8f1d55eb7c3bc874b945c13ee81272366325646781ae677677a24646d9f795badf8ca912
-  data.tar.gz: 61ef9ae690a6806b0aed52fb86cf2f91700a083b227688fd40eee3ec0df7a6ee2c1544d1cd038d4f5e9858632d4e5741d2157b77e549ab38bd8cda0b4ac1b170
+  metadata.gz: 4cacb192944e825d29bfaf6922706f4fe82b4bc5dd11ba8f9efe1a789554147e30d914b3e4ea35ca4f4b689f6cbbed471d8f2ac21b9dee57452be778d02461ec
+  data.tar.gz: c16e2b65c23e2408bb8d1a5614a15a29a0a5b388a3f32c2e7920781905a031718d4a38886e71dc134e98385c4483e9b05e1266047f3977d72c655e0346499f3d

data/Guardfile

@@ -64,7 +64,7 @@ guard :rspec, cmd: 'bundle exec rspec' do
   watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
   watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
 
-  watch(%r{^lib/graphql_grpc/**/(.+)\.rb}) { |_m| rspec.spec.call('graphql_grpc') }
+  watch(%r{^lib/graphql_grpc/(.+)\.rb}) { |_m| rspec.spec.call('graphql_grpc') }
   watch(%r{^doc/(.+)}) { |_m| rspec.spec.call('graphql_grpc') }
 
   # Turnip features and steps

data/lib/graphql_grpc/resolver.rb

@@ -9,10 +9,15 @@ module GraphqlGrpc
     def call(_type, field, obj, args, ctx)
       if obj
         field_sym = field.name.to_sym
-        value = obj.try(field_sym) || obj[field_sym.to_s] || begin
-          obj[field_sym]
-        rescue TypeError => e
-          nil
+        # Try to access the field as a method, then with Hash notation using
+        # a Symbol and finally as a String.
+
+        value = if obj.is_a?(Hash)
+          # Prefer Hash value over method in case Hash keys conflict
+          # with method names on Hash.
+          obj[field_sym] || obj.try(field_sym)
+        else
+          obj[field_sym.to_s]
         end
         return value.is_a?(Symbol) ? value.to_s : value
       end

data/lib/graphql_grpc/type_library.rb

@@ -34,7 +34,9 @@ module GraphqlGrpc
     #
     # Return an array of all (recursive) types known within this type
     #
-    def sub_types
+    def sub_types(known_types=[])
+      return known_types if known_types.include?(name)
+
       # Iterate through the Google::Protobuf::FieldDescriptor list
       entries.map do |fd|
         # fd.name = 'current_entity_to_update'
@@ -43,12 +45,11 @@ module GraphqlGrpc
         # fd.submsg_name = "com.foo.bar.Baz"
         # fd.subtype = #<Google::Protobuf::Descriptor:0x007fabb3947f08>
         if fd.subtype.class == Google::Protobuf::Descriptor
-          # There is a subtype; recurse
-          [name, fd.submsg_name] + fd.subtype.sub_types
+          [name, fd.subtype.sub_types(known_types + [name])].flatten
         else
           [name, fd.submsg_name]
         end
-      end.flatten.compact
+      end.flatten.compact.uniq
     end
 
     def type_name

data/lib/graphql_grpc/version.rb

@@ -1,3 +1,3 @@
 module GraphqlGrpc
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_grpc
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Zane Claes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport