apollo-tracing 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5427c1c7ad4c390d7ea73e5089b4291cbb6012c6
-  data.tar.gz: 06cb235d0c59d3e0fae40e7ac7b1a09b2deb4709
+  metadata.gz: 4a960c73048ee514c57f79eea687b29deb99f2ba
+  data.tar.gz: 2527d9e1d18f34b2c4ad5933ba6e1481e266a27a
 SHA512:
-  metadata.gz: 8a69276f3105a1e7deff72b05e5adad500848a3160118672fb3708016a591eacea074c23b73cf8150a7781c4e501980d42ba2d5ef7dafc712463d8d9515a5fdb
-  data.tar.gz: f9b06d4e3d7b14a56f96a01c48640ec92f04a9042c1ebb5254a8781117f98280f5816c79ea3c8826b8748a626590deed35c2dfdbff85780c3a7a53a2e7628f64
+  metadata.gz: 73b4eb90dd6fadf694bfd2297f060b8b05ce271693f151e604f4002bf3048b4e65ca8c337d02db0e40c2daa1dccebfce0c1d61095665a2f9ee5a8c3945f12bdb
+  data.tar.gz: 007f850db2181defd143a79ebcb0d7eb7dcdbeafb483f6293a941576f13ccd72272ca307af42b55377d704037686772461ca8aec753da9ea4bae3306114ac6d1

data/CHANGELOG.md

@@ -8,13 +8,17 @@ one of the following labels: `Added`, `Changed`, `Deprecated`,
 to manage the versions of this gem so
 that you can set version constraints properly.
 
-#### [Unreleased](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.1.0...HEAD)
+#### [Unreleased](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.2.0...HEAD)
 
 * WIP
 
-#### [v1.1.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.0.0..v1.1.0) – 2017-10-25
+#### [v1.2.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.1.0...v1.2.0) – 2017-10-26
 
-* `Added`: Apollo Engine Proxy version [2017.10-408-g497e1410](https://www.apollographql.com/docs/engine/proxy-release-notes.html). ([#2](https://github.com/uniiverse/apollo-tracing-ruby/pull/2))
+* `Added`: `ApolloTracing.start_proxy` accepts a JSON string. [#3](https://github.com/uniiverse/apollo-tracing-ruby/pull/3)
+
+#### [v1.1.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.0.0...v1.1.0) – 2017-10-25
+
+* `Added`: Apollo Engine Proxy version [2017.10-408-g497e1410](https://www.apollographql.com/docs/engine/proxy-release-notes.html). [#2](https://github.com/uniiverse/apollo-tracing-ruby/pull/2)
 
 #### [v1.0.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v0.1.1...v1.0.0) – 2017-10-17
 

data/README.md

@@ -167,7 +167,7 @@ Here is the general architecture overview of a sidecar mode – Proxy runs next
  -----------------    response    -----------------    response    -----------------
                                           |
                                           |
-                     GraphQL tracing data |
+                          GraphQL tracing | from response
                                           |
                                           ˅
                                   -----------------
@@ -190,7 +190,7 @@ To configure the Proxy create a Proxy config file:
     "http": { "url": "http://localhost:3000/graphql" }
   }],
   "frontends": [{
-    "host": "127.0.0.1", "port": 3001, "endpoint": "/graphql"
+    "host": "localhost", "port": 3001, "endpoint": "/graphql"
   }]
 }
 ```
@@ -203,7 +203,7 @@ To configure the Proxy create a Proxy config file:
 To run the Proxy as a child process, which will be automatically terminated if the Application proccess stoped, add the following line to the `config.ru` file:
 
 <pre>
-# config.ru – this file is used by Rack-based servers to start the application.
+# config.ru – this file is used by Rack-based servers to start the application
 require File.expand_path('../config/environment',  __FILE__)
 
 <b>ApolloTracing.start_proxy('config/apollo-engine-proxy.json')</b>
@@ -213,7 +213,7 @@ run Your::Application
 For example, if you use [rails](https://github.com/rails/rails) with [puma](https://github.com/puma/puma) application server and run it like:
 
 ```
-bundle exec puma -w 2 -t 16 -p 3001
+bundle exec puma -w 2 -t 16 -p 3000
 ```
 
 The proccess tree may look like:

data/lib/apollo_tracing.rb

@@ -4,8 +4,13 @@ require "graphql"
 require "apollo_tracing/version"
 
 class ApolloTracing
-  def self.start_proxy(config_filepath = 'config/apollo-engine.json')
-    config_json = File.read(config_filepath)
+  def self.start_proxy(config_filepath_or_json = 'config/apollo-engine.json')
+    config_json =
+      if File.exist?(config_filepath_or_json)
+        File.read(config_filepath_or_json)
+      else
+        config_filepath_or_json
+      end
     binary_path =
       if RUBY_PLATFORM.include?('darwin')
         File.expand_path('../../bin/engineproxy_darwin_amd64', __FILE__)

data/lib/apollo_tracing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ApolloTracing
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/apollo_tracing_spec.rb

@@ -11,6 +11,13 @@ RSpec.describe ApolloTracing do
       expect { Process.getpgid(pid) }.not_to raise_error
       ApolloTracing.stop_proxy
     end
+
+    it 'runs a proxy with a given JSON instead of a file path' do
+      config_json = File.read('spec/fixtures/apollo-engine-proxy.json')
+      pid = ApolloTracing.start_proxy(config_json)
+      expect { Process.getpgid(pid) }.not_to raise_error
+      ApolloTracing.stop_proxy
+    end
   end
 
   describe '.stop_proxy' do

data/spec/fixtures/apollo-engine-proxy.json

@@ -1,10 +1,10 @@
 {
   "apiKey": "service:YOUR_ENGINE_API_KEY",
-  "logging": { "level": "DEBUG" },
+  "logging": { "level": "INFO" },
   "origins": [{
     "http": { "url": "http://localhost:3000/graphql" }
   }],
   "frontends": [{
-    "host": "127.0.0.1", "port": 3001, "endpoint": "/graphql"
+    "host": "localhost", "port": 3001, "endpoint": "/graphql"
   }]
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-tracing
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Reginald Suh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql