fragment-alpha-sdk 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 123eb6ee84493101bbe1b79713f786d25ec62f30adfe298684f698d60058cca4
-  data.tar.gz: 1ab1324fe497737d22abd0d0c4e9a49456ae30897fb4057d20183545b57d1262
+  metadata.gz: 8bebeaf8a7e6c7a422cfcc85e6a060a270ed461c8119bfb76c69582d4362841d
+  data.tar.gz: 0b17b4bad7ccd4af2043ada105c53c6c1d1d3b2be8e7cfe467e416ee35fa78d7
 SHA512:
-  metadata.gz: 0d38fdf8f38acfbec7a8561f1cae835cf8727e2fb724ec28cfeadc9878559eb5d1e1cff0d9384ac43e74ded16b22af255c2487fb4ef27cd7b7d0db26a78b30eb
-  data.tar.gz: a576073d63e2faa3e0ccda0263d41addc835a9f0404791570283b9f71acd1e2cd7b4ad9ea5c40d02e881635544888ab67ab6cb9e5373eca8a03a39629c7a1f33
+  metadata.gz: 0b3656f69339faec7845b37d3b42252a3a25b62f30a95154acf577a3fe2dfbf87ea5bd78c65140420956333be07687ec66a7b810b733efbf719cf3b5710f70e0
+  data.tar.gz: 91e9f7916930ad8c24d39e56b8c767474809ff9933bdcf3ba83fae7b03968c756805a9a4ecde9e2f4ef740b0110b14cdda31f92bc8c8e4237525691a0377a0a5

data/lib/fragment_client.rb

@@ -11,17 +11,17 @@ require 'sorbet-runtime'
 # A support module for the client
 module FragmentGraphQl
   extend T::Sig
-  http = GraphQL::Client.const_get(:HTTP).new('https://api.fragment.dev/graphql') do
+  HTTP = T.let(GraphQL::Client.const_get(:HTTP).new('https://api.fragment.dev/graphql') do
     extend T::Sig
     sig { params(context: T.untyped).returns(T::Hash[T.untyped, T.untyped]) }
     def headers(context)
       { 'Authorization' => 'Bearer %s' % context[:access_token] }
     end
-  end
+  end, GraphQL::Client::HTTP)
 
   Schema = T.let(GraphQL::Client.load_schema("#{__dir__}/fragment.schema.json"), T.untyped)
 
-  Client = T.let(GraphQL::Client.new(schema: Schema, execute: http), GraphQL::Client)
+  Client = T.let(GraphQL::Client.new(schema: Schema, execute: HTTP), GraphQL::Client)
 
   Queries = T.let(Client.parse(
                     File.read("#{__dir__}/queries.graphql")
@@ -32,9 +32,14 @@ end
 class FragmentClient
   extend T::Sig
 
-  sig {  params(client_id: String, client_secret: String, extra_queries_filename: T.nilable(String)).void }
-  def initialize(client_id, client_secret, extra_queries_filename: nil)
+  sig do
+    params(client_id: String, client_secret: String, extra_queries_filename: T.nilable(String),
+           execute: GraphQL::Client::HTTP).void
+  end
+  def initialize(client_id, client_secret, extra_queries_filename: nil, execute: FragmentGraphQl::HTTP)
+    @client = T.let(GraphQL::Client.new(schema: FragmentGraphQl::Schema, execute: execute), GraphQL::Client)
     conn = create_conn(client_id, client_secret)
+    # TODO: the token may need to be refreshed if the client is around for a long time
     @token = T.let(get_token(conn, client_id), String)
     FragmentGraphQl::Queries.constants.each do |q|
       name = q.to_s.gsub(/[a-z]([A-Z])/) do |m|
@@ -51,12 +56,16 @@ class FragmentClient
       File.read(extra_queries_filename)
     )
     queries.constants.each do |q|
-      name = q.to_s.gsub(/[a-z]([A-Z])/) do |m|
-        format('%<lower>s_%<upper>s', lower: m[0], upper: m[1].downcase)
-      end.gsub(/^[A-Z]/, &:downcase)
-      define_singleton_method(name) do |v|
-        query(queries.const_get(q), v)
-      end
+      define_method_from_query(q, queries)
+    end
+  end
+
+  def define_method_from_query(q, queries)
+    name = q.to_s.gsub(/[a-z]([A-Z])/) do |m|
+      format('%<lower>s_%<upper>s', lower: m[0], upper: m[1].downcase)
+    end.gsub(/^[A-Z]/, &:downcase)
+    define_singleton_method(name) do |v|
+      query(queries.const_get(q), v)
     end
   end
 
@@ -65,22 +74,26 @@ class FragmentClient
       f.request :url_encoded
       f.request :authorization, :basic, client_id, client_secret
       f.adapter :net_http
+      f.response :raise_error
     end, Faraday::Connection)
   end
 
   sig { params(query: T.untyped, variables: T.untyped).returns(T.untyped) }
   def query(query, variables)
-    FragmentGraphQl::Client.query(query, variables: variables, context: { access_token: @token })
+    @client.query(query, variables: variables, context: { access_token: @token })
   end
 
   private
 
   sig { params(conn: Faraday::Connection, client_id: String).returns(String) }
   def get_token(conn, client_id)
-    response = conn.post('/oauth2/token') do |req|
-      req.body = format('grant_type=client_credentials&scope=https://api.fragment.dev/*&client_id=%s', client_id)
+    begin
+      response = conn.post('/oauth2/token') do |req|
+        req.body = format('grant_type=client_credentials&scope=https://api.fragment.dev/*&client_id=%s', client_id)
+      end
+    rescue Faraday::ClientError => e
+      raise StandardError, "oauth Authentication failed: '%s'" % e.to_s
     end
-
     T.let(JSON.parse(response.body)['access_token'], String)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fragment-alpha-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - fragment