graphql_grpc 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d989878ec186d18927efeceed776b0a295a56397d45b35429a236e1bb1b5de
-  data.tar.gz: 335e7bbc7570f5e984f04c3cf580ba36e1aeda004109d2ec2d0ae652821f3db9
+  metadata.gz: 41e7582c666ad86741095980d91c3b44296e29741b071e45824f7f82ec9fa940
+  data.tar.gz: bd4862634e087c8ddbd1de4796522ec67c428dcbafdb337ca05b5e8c9d5993e4
 SHA512:
-  metadata.gz: 5b6bef286f6df1c4515ed7079c172746b355164bdb1c59aada4b432171c9f165a17c831abc408ed520a4c41bea13cb602d3fb722d8785d89c84309284297c43b
-  data.tar.gz: 07fb3f97a773bab2271f342a4c45e49648d97164e010b937a1a346d4a664b2f6bafa5203ad4f5c9484d3208758ef5fb85d1e8fc8f84d844d0ed5016f8c6b68de
+  metadata.gz: 87d749fe01254f438de4a6978e84fe44c1dc8399a6676f84f31eee5028a4b6ba6fe5dd9510e8d0ee11be218f9065ef5d1654bfa734326bb61ad2c62cc8b6b5ac
+  data.tar.gz: 608b5f6903c15e9b28c3542a5595fcd104c3e3fb88ae4817999aa025881e64a4f4a1001e45faa24fe23cf7bf475784b70b8dc4052fc09fc672f779a093ea4da1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_grpc (0.1.2)
+    graphql_grpc (0.1.3)
       activesupport
       graphql
       grpc
@@ -17,19 +17,31 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
+    atlas-rb (1.0.11)
+      faraday
     bombshell (0.1.6)
     coderay (1.1.2)
-    concurrent-ruby (1.1.2)
+    concurrent-ruby (1.1.3)
     diff-lcs (1.3)
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     formatador (0.2.5)
     google-protobuf (3.6.1)
     googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
+    googleauth (0.6.7)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
     graphql (1.8.11)
-    grpc (1.16.0-universal-darwin)
+    grpc (1.12.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
     guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -50,37 +62,51 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1-x86_64-darwin-17)
+    jaro_winkler (1.5.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
+    jwt (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    method_source (0.9.0)
-    mime-types (2.6.2)
+    memoist (0.16.0)
+    metatron (0.1.1)
+    method_source (0.9.1)
     minitest (5.11.3)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    mustermann (1.0.3)
     nenv (0.3.0)
+    nf-configuration (1.4.2)
+      grpc (~> 1.12.0)
+      rspec (~> 3.2)
+    nf-discovery (0.2.0)
+      grpc (= 1.12)
+      rspec (~> 3.2)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    os (1.0.0)
     parallel (1.12.1)
     parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.0)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    rack (1.6.11)
-    rack-protection (1.5.5)
+    rack (2.0.6)
+    rack-protection (2.0.4)
       rack
     rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    redis (4.0.3)
+    retries (0.0.5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -104,22 +130,32 @@ GEM
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
-    ruby_robot (0.1.9)
+    ruby_robot (0.1.10)
       bombshell
       bundler (~> 1.16)
       grpc
       json-schema
-      sinatra (< 2)
-      sinatra-swagger-exposer
+      sinatra (~> 2.0)
       wirble
+    sdp-search (0.5.6.pre.rc.27)
+      atlas-rb (~> 1.0, >= 1.0.8)
+      grpc (~> 1.12, >= 1.12.0)
+      metatron (~> 0.1, >= 0.1.1)
+      nf-configuration (~> 1)
+      nf-discovery (~> 0)
+      redis
+      retries (~> 0.0.5)
     shellany (0.0.1)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-swagger-exposer (0.4.0)
-      mime-types (~> 2.6.2)
-      sinatra (~> 1.4)
+    signet (0.11.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    sinatra (2.0.4)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.4)
+      tilt (~> 2.0)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
@@ -140,6 +176,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rubocop
   ruby_robot
+  sdp-search
   wirble
 
 BUNDLED WITH

data/lib/graphql_grpc/schema.rb

@@ -20,23 +20,23 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'google/protobuf/empty_pb'
+
 module GraphqlGrpc
   module Schema
+    # TODO: Find better way to detect queries
+    # Currently look for methods named 'get' or with no args
+    def query?(name_sym, rpc_desc)
+      name_sym.to_s.start_with?('get') ||
+        rpc_desc.rpc_desc.input == Google::Protobuf::Empty
+    end
+
     def gql_mutations
-      # TODO: Find better way to detect mutations
-      @function_map.reject do |name_sym, _rpc_des|
-        name_sym.to_s.start_with?('get') ||
-          _rpc_des.rpc_desc.input == Google::Protobuf::Empty
-      end
+      @function_map.reject { |name_sym, rpc_desc| query?(name_sym, rpc_desc) }
     end
 
     def gql_queries
-      # TODO: Find better way to detect queries
-      # Currently look for methods named 'get' or with no args
-      @function_map.select do |name_sym, _rpc_des|
-        name_sym.to_s.start_with?('get') ||
-          _rpc_des.rpc_desc.input == Google::Protobuf::Empty
-      end
+      @function_map.select { |name_sym, rpc_desc| query?(name_sym, rpc_desc) }
     end
 
     def to_schema_types
@@ -56,17 +56,23 @@ module GraphqlGrpc
     end
 
     def to_schema_query
-      "type Query {
-  #{to_function_types(gql_queries)}
-  }"
+      return 'type Query {'\
+             '  # """This gRPC stub does not contain any methods that are mapped to '\
+             'GraphQL queries; this placeholder query field keeps the Query type from '\
+             'being empty which can break tools (GraphiQL) which expect Query to contain '\
+             'at least one field."""'\
+             '
+'\
+             '  grpcPlacholder: Url'\
+             '}' if gql_queries.empty?
+
+      "type Query { #{to_function_types(gql_queries)} }"
     end
 
     def to_schema_mutations
       return '' if gql_mutations.empty?
 
-      "type Mutation {
-  #{to_function_types(gql_mutations)}
-  }"
+      "type Mutation { #{to_function_types(gql_mutations)} }"
     end
 
     def to_gql_schema

data/lib/graphql_grpc/type_library.rb

@@ -230,7 +230,15 @@ module GraphqlGrpc
       # as the argument for a gRPC call that is being mapped to a
       # GraphQL query.
       @descriptors.delete_if do |key, descriptor|
-        descriptor.respond_to?(:sub_types) and descriptor.sub_types.empty?
+
+        if (descriptor.name.start_with?('google.protobuf') &&
+            descriptor.respond_to?(:sub_types) &&
+            descriptor.sub_types.empty?
+        )
+          true
+        else
+          false
+        end
       end
     end
   end

data/lib/graphql_grpc/version.rb

@@ -1,3 +1,3 @@
 module GraphqlGrpc
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_grpc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Zane Claes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport