Add InfluxDbWriteable procedural derive macro (#23)

* cargo workspace

* introduce InfluxDbWriteable

* basic derive stuff

* first writeable derive attempt

* add test for the ci to run

* add derive feature in travis

* update version to 0.0.5

* fix some stuff

* fix failing doc test

* no default features, run tests with all features

* typo

* remove some warnings

* cargo fmt

* cargo readme

* cargo readme is incompetent

* Fix build hopefully

* Debug CI

* Debug Ci 2

* Debug Ci 3

* Debug Ci 4

* Debug Ci 5

* Stop using cargo-travis

* Do stuff

* tidy up

* Test both crates

* remove an `&`

* travis närvt

* first attempt at tags

* specify the attributes

* add usefull derives to Timestamp

* the world is a brocken

* that merge went well .....

* Refactor Tests

* fix derp

* Painstakingly fix tests and make chrono a required dependency

* Fix lint warning

* Update README

* More fixes

* apply @Empty2k12's suggestions && fix compile issue with no features

* proper difference between field and tag

* introduce krate method

* progress

* add field / tag test

* cosmetic updates

* fixed

* fix clippy and fmt

Co-authored-by: Gero Gerke <[email protected]>

Author: msrd0

.travis.yml

@@ -51,8 +51,13 @@ matrix:
           script:
               - bash auxiliary/check_readme_consistency.sh
 
-script: |
-    export RUST_BACKTRACE=1 &&
-    cargo build &&
-    cargo test --all-features &&
-    cargo doc --no-deps
+script:
+    - export RUST_BACKTRACE=1
+    - cd influxdb
+    - cargo build
+    - cargo test --all --all-features
+    - cargo doc --no-deps
+    - cd ../influxdb_derive
+    - cargo build
+    - cargo test --all --all-features
+    - cargo doc --no-deps

Cargo.toml

@@ -1,36 +1,8 @@
-[package]
-name = "influxdb"
-version = "0.0.6"
-authors = ["Gero Gerke <[email protected]>"]
-edition = "2018"
-description = "InfluxDB Driver for Rust"
-keywords = ["influxdb", "database", "influx"]
-license = "MIT"
-readme = "README.md"
-include = ["src/**/*", "tests/**/*", "Cargo.toml", "LICENSE"]
-repository = "https://github.com/Empty2k12/influxdb-rust"
+# -*- eval: (cargo-minor-mode 1) -*-
 
-[badges]
-travis-ci = { repository = "Empty2k12/influxdb-rust", branch = "master" }
+[workspace]
+members = ["influxdb", "influxdb_derive"]
 
-[dependencies]
-chrono = { version = "0.4.10", optional = true }
-failure = "0.1.6"
-futures = "0.3.4"
-reqwest = { version = "0.10.1", features = ["json"] }
-serde = { version = "1.0.104", features = ["derive"], optional = true }
-serde_json = { version = "1.0.46", optional = true }
-regex = "1.3.4"
-lazy_static = "1.4.0"
-
-# This is a temporary work around to fix a Failure-derive compilation error
-# Should be removed when https://github.com/Empty2k12/influxdb-rust/issues/48 is being done
-quote = "=1.0.2"
-
-[features]
-use-serde = ["serde", "serde_json"]
-chrono_timestamps = ["chrono"]
-default = ["use-serde"]
-
-[dev-dependencies]
-tokio = { version =  "0.2.11", features = ["macros"] }
+[patch.crates-io]
+influxdb = { path = "./influxdb" }
+influxdb_derive = { path = "./influxdb_derive" }

README.md

@@ -39,13 +39,12 @@ Pull requests are always welcome. See [Contributing](https://github.com/Empty2k1
 -   Optional Serde Support for Deserialization
 -   Running multiple queries in one request (e.g. `SELECT * FROM weather_berlin; SELECT * FROM weather_london`)
 -   Authenticated and Unauthenticated Connections
--   Optional conversion between `Timestamp` and `Chrono::DateTime<Utc>` via `chrono_timestamps` compilation feature
 -   `async`/`await` support
+-   `#[derive(InfluxDbWriteable)]` Derive Macro for Writing / Reading into Structs
 
 ### Planned Features
 
 -   Read Query Builder instead of supplying raw queries
--   `#[derive(InfluxDbReadable)]` and `#[derive(InfluxDbWriteable)]` proc macros
 
 ## Quickstart
 
@@ -59,6 +58,7 @@ For an example with using Serde deserialization, please refer to [serde_integrat
 
 ```rust
 use influxdb::{Client, Query, Timestamp};
+use influxdb::InfluxDbWriteable;
 
 // Create a Client with URL `http://localhost:8086`
 // and database name `test`
@@ -67,7 +67,7 @@ let client = Client::new("http://localhost:8086", "test");
 // Let's write something to InfluxDB. First we're creating a
 // WriteQuery to write some data.
 // This creates a query which writes a new measurement into a series called `weather`
-let write_query = Query::write_query(Timestamp::Now, "weather")
+let write_query = Timestamp::Now.into_query("weather")
     .add_field("temperature", 82);
 
 // Submit the query to InfluxDB.

auxiliary/check_readme_consistency.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/bash
+#!/bin/bash
 
-cargo readme > README.md.expected
+cargo readme -r influxdb -t ../README.tpl > README.md.expected
 
 diff README.md README.md.expected
 
@@ -9,6 +9,6 @@ then
     echo 'README.md is up to date!'
     exit 0
 else
-    echo 'README.md out of date. Run "cargo readme > README.md" and commit again.'
+    echo 'README.md out of date. Run "cargo readme -r influxdb -t ../README.tpl > README.md" and commit again.'
     exit 1
-fi
+fi

influxdb/Cargo.toml

@@ -0,0 +1,35 @@
+# -*- eval: (cargo-minor-mode 1) -*-
+
+[package]
+name = "influxdb"
+version = "0.0.6"
+authors = ["Gero Gerke <[email protected]>"]
+edition = "2018"
+description = "InfluxDB Driver for Rust"
+keywords = ["influxdb", "database", "influx"]
+license = "MIT"
+readme = "README.md"
+include = ["src/**/*", "tests/**/*", "Cargo.toml", "LICENSE"]
+repository = "https://github.com/Empty2k12/influxdb-rust"
+
+[badges]
+travis-ci = { repository = "Empty2k12/influxdb-rust", branch = "master" }
+
+[dependencies]
+chrono = { version = "0.4.10", features = ["serde"] } 
+failure = "0.1.6"
+futures = "0.3.4"
+influxdb_derive = { version = "0.0.1", optional = true }
+reqwest = { version = "0.10.1", features = ["json"] }
+serde = { version = "1.0.104", features = ["derive"], optional = true }
+serde_json = { version = "1.0.46", optional = true }
+regex = "1.3.4"
+lazy_static = "1.4.0"
+
+[features]
+use-serde = ["serde", "serde_json"]
+default = ["use-serde"]
+derive = ["influxdb_derive"]
+
+[dev-dependencies]
+tokio = { version =  "0.2.11", features = ["macros"] }

influxdb/LICENSE

@@ -0,0 +1 @@
+../LICENSE

influxdb/README.md

@@ -0,0 +1 @@
+../README.md

src/client/mod.rs renamed to influxdb/src/client/mod.rs

@@ -162,11 +162,13 @@ impl Client {
     ///
     /// ```rust,no_run
     /// use influxdb::{Client, Query, Timestamp};
+    /// use influxdb::InfluxDbWriteable;
     ///
     /// # #[tokio::main]
     /// # async fn main() -> Result<(), failure::Error> {
     /// let client = Client::new("http://localhost:8086", "test");
-    /// let query = Query::write_query(Timestamp::Now, "weather")
+    /// let query = Timestamp::Now
+    ///     .into_query("weather")
     ///     .add_field("temperature", 82);
     /// let results = client.query(&query).await?;
     /// # Ok(())