Merge pull request #2 from tomhoule/cli

Compile on stable

Author: tomhoule

.travis.yml

@@ -6,5 +6,6 @@ rust:
 cache: cargo
 script:
   - cargo test --verbose
-  - cd graphql_query_derive && cargo test --verbose
-  - cd ../examples/github && cargo build
+  - cargo test --verbose --manifest-path=./graphql_query_derive/Cargo.toml
+  - cargo build --manifest-path=./examples/github/Cargo.toml
+  - cargo build --manifest-path=./graphql_client_cli/Cargo.toml

Cargo.toml

@@ -16,4 +16,5 @@ members = [
     ".",
     "examples/github",
     "graphql_query_derive",
+    "graphql_client_cli",
 ]

graphql_client_cli/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "graphql_client_cli"
+version = "0.1.0"
+authors = ["Tom Houlé <tom@tomhoule.com>"]
+
+[dependencies]
+failure = "*"
+reqwest = "*"
+graphql_client = { path = ".." }
+structopt = "*"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"

graphql_client_cli/README.md

@@ -0,0 +1 @@
+https://developer.deutschebahn.com/free1bahnql/graphql

graphql_client_cli/src/introspection_query.graphql

@@ -0,0 +1,99 @@
+query IntrospectionQuery {
+  __schema {
+    queryType {
+      name
+    }
+    mutationType {
+      name
+    }
+    subscriptionType {
+      name
+    }
+    types {
+      ...FullType
+    }
+    directives {
+      name
+      description
+      locations
+      args {
+        ...InputValue
+      }
+    }
+  }
+}
+
+fragment FullType on __Type {
+  kind
+  name
+  description
+  fields(includeDeprecated: true) {
+    name
+    description
+    args {
+      ...InputValue
+    }
+    type {
+      ...TypeRef
+    }
+    isDeprecated
+    deprecationReason
+  }
+  inputFields {
+    ...InputValue
+  }
+  interfaces {
+    ...TypeRef
+  }
+  enumValues(includeDeprecated: true) {
+    name
+    description
+    isDeprecated
+    deprecationReason
+  }
+  possibleTypes {
+    ...TypeRef
+  }
+}
+
+fragment InputValue on __InputValue {
+  name
+  description
+  type {
+    ...TypeRef
+  }
+  defaultValue
+}
+
+fragment TypeRef on __Type {
+  kind
+  name
+  ofType {
+    kind
+    name
+    ofType {
+      kind
+      name
+      ofType {
+        kind
+        name
+        ofType {
+          kind
+          name
+          ofType {
+            kind
+            name
+            ofType {
+              kind
+              name
+              ofType {
+                kind
+                name
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

graphql_client_cli/src/introspection_schema.graphql

@@ -0,0 +1,101 @@
+schema {
+    query: Query
+}
+
+type Query {
+  __schema: __Schema
+}
+
+type __Schema {
+  types: [__Type!]!
+  queryType: __Type!
+  mutationType: __Type
+  subscriptionType: __Type
+  directives: [__Directive!]!
+}
+
+type __Type {
+  kind: __TypeKind!
+  name: String
+  description: String
+
+  # OBJECT and INTERFACE only
+  fields(includeDeprecated: Boolean = false): [__Field!]
+
+  # OBJECT only
+  interfaces: [__Type!]
+
+  # INTERFACE and UNION only
+  possibleTypes: [__Type!]
+
+  # ENUM only
+  enumValues(includeDeprecated: Boolean = false): [__EnumValue!]
+
+  # INPUT_OBJECT only
+  inputFields: [__InputValue!]
+
+  # NON_NULL and LIST only
+  ofType: __Type
+}
+
+type __Field {
+  name: String!
+  description: String
+  args: [__InputValue!]!
+  type: __Type!
+  isDeprecated: Boolean!
+  deprecationReason: String
+}
+
+type __InputValue {
+  name: String!
+  description: String
+  type: __Type!
+  defaultValue: String
+}
+
+type __EnumValue {
+  name: String!
+  description: String
+  isDeprecated: Boolean!
+  deprecationReason: String
+}
+
+enum __TypeKind {
+  SCALAR
+  OBJECT
+  INTERFACE
+  UNION
+  ENUM
+  INPUT_OBJECT
+  LIST
+  NON_NULL
+}
+
+type __Directive {
+  name: String!
+  description: String
+  locations: [__DirectiveLocation!]!
+  args: [__InputValue!]!
+}
+
+enum __DirectiveLocation {
+  QUERY
+  MUTATION
+  SUBSCRIPTION
+  FIELD
+  FRAGMENT_DEFINITION
+  FRAGMENT_SPREAD
+  INLINE_FRAGMENT
+  SCHEMA
+  SCALAR
+  OBJECT
+  FIELD_DEFINITION
+  ARGUMENT_DEFINITION
+  INTERFACE
+  UNION
+  ENUM
+  ENUM_VALUE
+  INPUT_OBJECT
+  INPUT_FIELD_DEFINITION
+}

graphql_client_cli/src/main.rs

@@ -0,0 +1,95 @@
+extern crate failure;
+extern crate reqwest;
+#[macro_use]
+extern crate structopt;
+#[macro_use]
+extern crate graphql_client;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde;
+extern crate serde_json;
+
+use std::path::PathBuf;
+use structopt::StructOpt;
+
+const INTROSPECTION_QUERY: &'static str = include_str!("introspection_query.graphql");
+
+#[derive(GraphQLQuery)]
+#[GraphQLQuery(
+    schema_path = "src/introspection_schema.graphql", query_path = "src/introspection_query.graphql"
+)]
+struct IntrospectionQuery;
+
+#[derive(StructOpt)]
+enum Cli {
+    #[structopt(name = "introspect-schema")]
+    IntrospectSchema {
+        /// The URL of a GraphQL endpoint to introspect.
+        schema_location: String,
+        /// Where to write the JSON for the introspected schema.
+        #[structopt(parse(from_os_str))]
+        #[structopt(long = "output")]
+        output: Option<PathBuf>,
+    },
+    #[structopt(name = "generate")]
+    Generate {
+        // should be a glob
+        paths: String,
+        #[structopt(parse(from_os_str))]
+        schema: PathBuf,
+        #[structopt(parse(from_os_str))]
+        output: PathBuf,
+    },
+}
+
+fn main() -> Result<(), failure::Error> {
+    let cli = Cli::from_args();
+    match cli {
+        Cli::IntrospectSchema {
+            schema_location,
+            output,
+        } => introspect_schema(schema_location, output),
+        Cli::Generate {
+            paths: _,
+            schema: _,
+            output: _,
+        } => unimplemented!(),
+    }
+}
+
+fn introspect_schema(location: String, output: Option<PathBuf>) -> Result<(), failure::Error> {
+    use reqwest::header::*;
+    use reqwest::mime;
+    use std::io::Write;
+
+    let mut out: Box<Write> = match output {
+        Some(path) => Box::new(::std::fs::File::create(path)?),
+        None => Box::new(::std::io::stdout()),
+    };
+
+    let request_body: graphql_client::GraphQLQueryBody<()> = graphql_client::GraphQLQueryBody {
+        variables: (),
+        query: INTROSPECTION_QUERY,
+    };
+
+    let client = reqwest::Client::new();
+    let mut res = client
+        .post(&location)
+        .header(Accept(vec![qitem(mime::APPLICATION_JSON)]))
+        .json(&request_body)
+        .send()?;
+
+    if res.status().is_success() {
+    } else if res.status().is_server_error() {
+        println!("server error!");
+    } else {
+        println!("Something else happened. Status: {:?}", res.status());
+    }
+
+    let json: graphql_client::GraphQLResponse<introspection_query::ResponseData> = res.json()?;
+    let json = serde_json::to_string(&json)?;
+
+    write!(out, "{}", json)?;
+
+    Ok(())
+}

graphql_query_derive/Cargo.toml

@@ -10,7 +10,7 @@ proc-macro = true
 failure = "*"
 quote = "^0.6"
 syn = "*"
-proc-macro2 = { version = "*", features = ["nightly"] }
+proc-macro2 = { version = "*" }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

graphql_query_derive/src/enums.rs

@@ -34,18 +34,18 @@ impl GqlEnum {
                 fn serialize<S: serde::Serializer>(&self, ser: S) -> Result<S::Ok, S::Error> {
                     ser.serialize_str(match *self {
                         #(#constructors => #variant_str,)*
-                        #name::Other(ref s) => s.as_str(),
+                        #name::Other(ref s) => &s,
                     })
                 }
             }
 
             impl<'de> ::serde::Deserialize<'de> for #name {
                 fn deserialize<D: ::serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-                    let s = <&'de str>::deserialize(deserializer)?;
+                    let s = <String>::deserialize(deserializer)?;
 
-                    match s {
+                    match s.as_str() {
                         #(#variant_str => Ok(#constructors),)*
-                        _ => Ok(#name::Other(s.to_string())),
+                        _ => Ok(#name::Other(s)),
                     }
                 }
             }

graphql_query_derive/src/field_type.rs

@@ -97,9 +97,10 @@ fn from_json_type_inner(inner: &introspection_response::TypeRef, non_null: bool)
         Some(__TypeKind::NON_NULL) => {
             from_json_type_inner(&inner.of_type.expect("inner type is missing"), true)
         }
-        Some(__TypeKind::LIST) => {
-            FieldType::Vector(Box::new(from_json_type_inner(&inner.of_type.expect("inner type is missing"), false)))
-        }
+        Some(__TypeKind::LIST) => FieldType::Vector(Box::new(from_json_type_inner(
+            &inner.of_type.expect("inner type is missing"),
+            false,
+        ))),
         Some(_) => FieldType::Named(Ident::new(
             &inner.name.expect("type name"),
             Span::call_site(),