graphql_grpc 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 593b582c7e454dbcf1849b16d5daa512c4abfa7d3d9b04d151a870725085733a
-  data.tar.gz: 17b255ab2f960b8ec6732896be4040284079ddf0f5d8ad8cca9b9740b418fdae
+SHA1:
+  metadata.gz: 0efccd3cccd29bee78a1fbb8ecd4bcdf284adec9
+  data.tar.gz: 387a5b92c9340125a2a55c7285893b03923d8908
 SHA512:
-  metadata.gz: c29bd0da85d80e02ad9152461751ad67f744b16b2636253d4fc13c5e8929b62b01c5a6b9964139d644ee04145d3b55ed6f3f2cb8b3360ce2be4f66813a0f763a
-  data.tar.gz: 2fd992ef70fa8ca9fa56bdc36795605f9fcd88a4b029bf3d1797d4add4116bb105dccb434ec612b5b536236cd32ebb673a67c793c2de28e9d0910690db866bba
+  metadata.gz: 8bd721c5f59eecdde11f37e968022a26b67d9de207598c885900c4135d8044d2ad489f0e71531e32c4a71640ff273cdd32f8639757bb0ecb7e2cf51d3f78c14a
+  data.tar.gz: 39d04021b1376ca2dfe9af9293a042311c221570d5d8bb3d058378b62b16208fb360221c6acbb76f2b3d196a9adb14ffef13ff98666005ed8d6c64ea48dafa5c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_grpc (0.1.6)
+    graphql_grpc (0.1.7)
       activesupport
       graphql
       grpc
@@ -164,4 +164,4 @@ DEPENDENCIES
   wirble
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/lib/graphql_grpc/arrayify.rb

@@ -39,7 +39,7 @@ module GraphqlGrpc
         input.map { |i| arrayify_hashes(i) }
       when :Hash
         input_types = input.keys.map(&:class).compact.sort.uniq
-        if input_types.inject(true) { |tf, val| val.ancestors.include?(Integer) && tf }
+        if input_types.inject(true) { |tf, val| val.ancestors.include?(numeric_klass) && tf }
           arr = input.to_a.map { |e| { key: e.first, value: e.last } }
           arrayify_hashes(arr)
         else
@@ -49,5 +49,11 @@ module GraphqlGrpc
         input
       end
     end
+
+    def numeric_klass
+      @numeric_klass ||= begin
+        Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0') ? Fixnum : Integer
+      end
+    end
   end
 end

data/lib/graphql_grpc/function.rb

@@ -60,7 +60,10 @@ module GraphqlGrpc
     end
 
     def output_type
-      rpc_desc.output.to_s.split(':').last
+      out_type = begin
+        streaming? ? rpc_desc.output.type : rpc_desc.output
+      end.to_s.split(':').last
+      streaming? ? "[#{out_type}]" : out_type
     end
 
     def to_query_type
@@ -84,12 +87,23 @@ module GraphqlGrpc
 
     def call(params = {}, metadata = {})
       args = [name, arg(params || {}), metadata: metadata]
-      result_hash = @service_stub.send(*args).to_hash
-      arrayify_hashes(result_hash)
+      arrayify_hashes normalize_result @service_stub.send(*args)
     end
 
     private
 
+    def normalize_result(result)
+      if result.is_a?(Enumerator)
+        [].tap { |arr| result.each { |e| arr << e } }
+      else
+        result.to_hash
+      end
+    end
+
+    def streaming?
+      rpc_desc.output.is_a?(GRPC::RpcDesc::Stream)
+    end
+
     # Build arguments to a func
     def arg(params)
       rpc_desc.input.decode_json(params.reject { |k, _v| k == :selections }.to_json)

data/lib/graphql_grpc/resolver.rb

@@ -8,7 +8,8 @@ module GraphqlGrpc
 
     def call(_type, field, obj, args, ctx)
       if obj
-        value = obj[field.name.to_sym]
+        field_sym = field.name.to_sym
+        value = obj.try(field_sym) || obj[field_sym]
         return value.is_a?(Symbol) ? value.to_s : value
       end
       proxy.invoke(field, args, ctx)

data/lib/graphql_grpc/schema.rb

@@ -37,20 +37,18 @@ module GraphqlGrpc
     end
 
     def gql_mutations
-      @function_map.reject do |name_sym, rpc_desc|
-        query?(name_sym, rpc_desc) || streaming_response?(rpc_desc)
-      end
+      @function_map.reject { |name_sym, rpc_desc| query?(name_sym, rpc_desc) }
     end
 
     def gql_queries
-      @function_map.select do |name_sym, rpc_desc|
-        query?(name_sym, rpc_desc) && !streaming_response?(rpc_desc)
-      end
+      @function_map.select { |name_sym, rpc_desc| query?(name_sym, rpc_desc) }
     end
 
     def to_schema_types
       function_output_types = @function_map.values.map do |function|
-        function.rpc_desc.output
+        function.rpc_desc.output.is_a?(
+          GRPC::RpcDesc::Stream
+        ) ? function.rpc_desc.output.type : function.rpc_desc.output
       end.flatten.uniq
       output_types = TypeLibrary.new(function_output_types)
       function_input_types = @function_map.values.map do |function|

data/lib/graphql_grpc/version.rb

@@ -1,3 +1,3 @@
 module GraphqlGrpc
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_grpc
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Zane Claes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem for building GraphQL-to-gRPC gateways (usually using Ruby on Rails).