fragment-alpha-sdk 0.1.8 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a4d3cb2aa95e912261ccb28b7bc7a9b406e16e87beec88eea1f49706c3ffe0
-  data.tar.gz: 3e13aefb9c50d3301a048f28a4e5220bab037e223aad43fd508cb9c687896526
+  metadata.gz: 7e8f99cd2f06c14ecf62e7013f975abc3246c7807b3f76a8b778fccaf547e55c
+  data.tar.gz: 7733c9007935bbce62ead495ac49afb354e64a3eab845c1b346ec353b3938958
 SHA512:
-  metadata.gz: 137cb1729e102a1aa668a4e7076435146701d99fd3f274cfef777580c3adb79f115bec45af56453eb46ad2ed3efe89e153d419e0da37fdd1bd6d96673e923865
-  data.tar.gz: 817d73d5ac8a07b940d0ddd5bb760a3417dac4ba80995604b82c82bcd68a152a46cb43945d7ba1fb794ee788d55bca2672bca5893deed1a317f7afe571955fec
+  metadata.gz: e4290cb21848714c3a7b36ce18d7039a86fd79892c46ebeef200675ccae88f20b04c8f773ccfefb690e68fa222fde6f74578136fc5fe38a6dc08fd01a91767b5
+  data.tar.gz: db6b63a08a2f9e25075314c222b1ca82c3c87354fca7d184546e75244946935b3951ae26989b7d6a1f2844c83803586b5304deace462e0a087266fc984ed8dec

data/lib/fragment_client.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 # frozen_string_literal: true
 
 require 'faraday'
@@ -7,25 +7,29 @@ require 'json'
 require 'graphql/client'
 require 'graphql/client/http'
 require 'sorbet-runtime'
+require 'uri'
 
 # A support module for the client
 module FragmentGraphQl
   extend T::Sig
-  HTTP = T.let(GraphQL::Client.const_get(:HTTP).new('https://api.fragment.dev/graphql') do
+
+  CustomHTTP = Class.new(GraphQL::Client::HTTP) do
     extend T::Sig
     sig { params(context: T.untyped).returns(T::Hash[T.untyped, T.untyped]) }
     def headers(context)
       { 'Authorization' => format('Bearer %s', context[:access_token]) }
     end
-  end, GraphQL::Client::HTTP)
+  end
+
+  HTTP = T.let(CustomHTTP.new('https://api.fragment.dev/graphql'), GraphQL::Client::HTTP)
 
-  Schema = T.let(GraphQL::Client.load_schema("#{__dir__}/fragment.schema.json"), T.untyped)
+  FragmentSchema = 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: FragmentSchema, execute: HTTP), GraphQL::Client)
 
-  Queries = T.let(Client.parse(
-                    File.read("#{__dir__}/queries.graphql")
-                  ), T.untyped)
+  FragmentQueries = T.let(Client.parse(
+                            File.read("#{__dir__}/queries.graphql")
+                          ), T.untyped)
 end
 
 # A client for Fragment
@@ -34,26 +38,41 @@ class FragmentClient
 
   sig do
     params(client_id: String, client_secret: String, extra_queries_filename: T.nilable(String),
-           execute: GraphQL::Client::HTTP).void
+           execute: T.nilable(GraphQL::Client::HTTP), api_url: T.nilable(String),
+           oauth_url: T.nilable(String), oauth_scope: T.nilable(String)).void
   end
-  def initialize(client_id, client_secret, extra_queries_filename: nil, execute: FragmentGraphQl::HTTP)
-    set_instance_variables(execute, client_id, client_secret)
-    define_method_from_queries(FragmentGraphQl::Queries)
+  def initialize(client_id, client_secret, extra_queries_filename: nil, execute: nil, api_url: nil,
+                 oauth_url: 'https://auth.fragment.dev/oauth2/token', oauth_scope: 'https://api.fragment.dev/*')
+    @oauth_scope = T.let(oauth_scope, String)
+    @oauth_url = T.let(URI.parse(oauth_url), URI)
+    @client_id = T.let(client_id, String)
+    @client_secret = T.let(client_secret, String)
+
+    execute ||= api_url ? FragmentGraphQl::CustomHTTP.new(URI.parse(api_url)) : FragmentGraphQl::HTTP
+    @execute = T.let(execute, GraphQL::Client::HTTP)
+
+    @client = T.let(GraphQL::Client.new(schema: FragmentGraphQl::FragmentSchema, execute: @execute), GraphQL::Client)
+    @conn = T.let(create_conn, Faraday::Connection)
+    # TODO: the token may need to be refreshed if the client is around for a long time
+    @token = T.let(create_token, String)
+
+    define_method_from_queries(FragmentGraphQl::FragmentQueries)
     return if extra_queries_filename.nil?
 
-    queries = FragmentGraphQl::Client.parse(
+    queries = @client.parse(
       File.read(extra_queries_filename)
     )
     define_method_from_queries(queries)
   end
 
-  def set_instance_variables(execute, client_id, client_secret)
-    @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)
+
+  sig { params(query: T.untyped, variables: T.untyped).returns(T.untyped) }
+  def query(query, variables)
+    @client.query(query, variables: variables, context: { access_token: @token })
   end
 
+  private
+
   def define_method_from_queries(queries)
     queries.constants.each do |qry|
       name = qry.to_s.gsub(/[a-z]([A-Z])/) do |m|
@@ -65,27 +84,22 @@ class FragmentClient
     end
   end
 
-  def create_conn(client_id, client_secret)
-    T.let(Faraday.new('https://auth.fragment.dev') do |f|
+  sig { returns(Faraday::Connection) }
+  def create_conn
+    T.let(Faraday.new(@oauth_url) do |f|
       f.request :url_encoded
-      f.request :authorization, :basic, client_id, client_secret
+      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)
-    @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)
+  sig { returns(String) }
+  def create_token
     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)
+      response = @conn.post do |req|
+        req.body = format('grant_type=client_credentials&scope=%<scope>s&client_id=%<id>s', scope: @oauth_scope,
+                                                                                            id: @client_id)
       end
     rescue Faraday::ClientError => e
       raise StandardError, format("oauth Authentication failed: '%s'", e.to_s)

data/lib/queries.graphql

@@ -1,13 +1,23 @@
 mutation StoreSchema($schema: SchemaInput!) {
   storeSchema(schema: $schema) {
-    schema {
-      key
-      name
-      version {
-        created
-        version
+    ... on StoreSchemaResult {
+      schema {
+        key
+        name
+        version {
+          created
+          version
+        }
       }
     }
+    ... on BadRequestError {
+      code
+      message
+    }
+    ... on InternalError {
+      code
+      message
+    }
   }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fragment-alpha-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.11
 platform: ruby
 authors:
 - fragment
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-description: 
+description:
 email: snoble@fragment.dev
 executables: []
 extensions: []
@@ -66,7 +66,7 @@ homepage: https://fragment.dev
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: an alpha version for the fragment client sdk
 test_files: []