enable gzip compression for rpc responses

.editorconfig

@@ -9,8 +9,16 @@ trim_trailing_whitespace=true
 max_line_length=120
 insert_final_newline=true
 
-[.travis.yml]
+[{.travis.yml,appveyor.yml}]
 indent_style=space
 indent_size=2
 tab_width=8
 end_of_line=lf
+
+[*.stderr]
+indent_style=none
+indent_size=none
+end_of_line=none
+charset=none
+trim_trailing_whitespace=none
+insert_final_newline=none

.gitlab-ci.yml

@@ -0,0 +1,65 @@
+stages:
+  - checkstyle
+  - test
+variables:                         &default-vars
+  GIT_STRATEGY:                    fetch
+  GIT_DEPTH:                       100
+  CARGO_INCREMENTAL:               0
+
+.test_and_build:                   &test_and_build
+  script:
+    - cargo build --all
+    - cargo test --all
+
+.only:                             &only
+  only:
+    - triggers
+    - tags
+    - master
+    - schedules
+    - web
+    - /^[0-9]+$/
+
+.docker-env:                       &docker-env
+  image:                           paritytech/ci-linux:production
+  before_script:
+    - rustup show
+    - cargo --version
+    - sccache -s
+  variables:
+    <<:                            *default-vars
+    CARGO_TARGET_DIR:              "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
+  interruptible:                   true
+  tags:
+    - linux-docker
+
+# check style
+checkstyle-linux-stable:
+  stage:                           checkstyle
+  <<:                              *only
+  <<:                              *docker-env
+  script:
+    - rustup component add rustfmt clippy
+    - cargo fmt --all -- --check
+    - cargo clippy
+  allow_failure:                   true
+
+# test rust stable
+test-linux-stable:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *only
+  <<:                              *test_and_build
+
+test-mac-stable:
+  stage:                           test
+  <<:                              *test_and_build
+  <<:                              *only
+  tags:
+    - osx

Cargo.toml

@@ -1,10 +1,11 @@
 [workspace]
 members = [
 	"core",
+	"core-client",
+	"core-client/transports",
 	"http",
 	"ipc",
-	"macros",
-	"minihttp",
+	"derive",
 	"pubsub",
 	"pubsub/more-examples",
 	"server-utils",

README.md

@@ -3,33 +3,38 @@
 Rust implementation of JSON-RPC 2.0 Specification.
 Transport-agnostic `core` and transport servers for `http`, `ipc`, `websockets` and `tcp`.
 
-[![Build Status][travis-image]][travis-url]
+**New!** Support for [clients](#Client-support).
 
-[travis-image]: https://travis-ci.org/paritytech/jsonrpc.svg?branch=master
-[travis-url]: https://travis-ci.org/paritytech/jsonrpc
-
-[Documentation](http://paritytech.github.io/jsonrpc/)
+[Documentation](https://docs.rs/jsonrpc-core/)
 
 ## Sub-projects
 - [jsonrpc-core](./core) [![crates.io][core-image]][core-url]
+- [jsonrpc-core-client](./core-client) [![crates.io][core-client-image]][core-client-url]
 - [jsonrpc-http-server](./http) [![crates.io][http-server-image]][http-server-url]
-- [jsonrpc-minihttp-server](./minihttp)
-- [jsonrpc-ipc-server](./ipc)
+- [jsonrpc-ipc-server](./ipc) [![crates.io][ipc-server-image]][ipc-server-url]
 - [jsonrpc-tcp-server](./tcp) [![crates.io][tcp-server-image]][tcp-server-url]
-- [jsonrpc-ws-server](./ws)
-- [jsonrpc-stdio-server](./stdio)
-- [jsonrpc-macros](./macros) [![crates.io][macros-image]][macros-url]
+- [jsonrpc-ws-server](./ws) [![crates.io][ws-server-image]][ws-server-url]
+- [jsonrpc-stdio-server](./stdio) [![crates.io][stdio-server-image]][stdio-server-url]
+- [jsonrpc-derive](./derive) [![crates.io][derive-image]][derive-url]
 - [jsonrpc-server-utils](./server-utils) [![crates.io][server-utils-image]][server-utils-url]
 - [jsonrpc-pubsub](./pubsub) [![crates.io][pubsub-image]][pubsub-url]
 
 [core-image]: https://img.shields.io/crates/v/jsonrpc-core.svg
 [core-url]: https://crates.io/crates/jsonrpc-core
+[core-client-image]: https://img.shields.io/crates/v/jsonrpc-core-client.svg
+[core-client-url]: https://crates.io/crates/jsonrpc-core-client
 [http-server-image]: https://img.shields.io/crates/v/jsonrpc-http-server.svg
 [http-server-url]: https://crates.io/crates/jsonrpc-http-server
+[ipc-server-image]: https://img.shields.io/crates/v/jsonrpc-ipc-server.svg
+[ipc-server-url]: https://crates.io/crates/jsonrpc-ipc-server
 [tcp-server-image]: https://img.shields.io/crates/v/jsonrpc-tcp-server.svg
 [tcp-server-url]: https://crates.io/crates/jsonrpc-tcp-server
-[macros-image]: https://img.shields.io/crates/v/jsonrpc-macros.svg
-[macros-url]: https://crates.io/crates/jsonrpc-macros
+[ws-server-image]: https://img.shields.io/crates/v/jsonrpc-ws-server.svg
+[ws-server-url]: https://crates.io/crates/jsonrpc-ws-server
+[stdio-server-image]: https://img.shields.io/crates/v/jsonrpc-stdio-server.svg
+[stdio-server-url]: https://crates.io/crates/jsonrpc-stdio-server
+[derive-image]: https://img.shields.io/crates/v/jsonrpc-derive.svg
+[derive-url]: https://crates.io/crates/jsonrpc-derive
 [server-utils-image]: https://img.shields.io/crates/v/jsonrpc-server-utils.svg
 [server-utils-url]: https://crates.io/crates/jsonrpc-server-utils
 [pubsub-image]: https://img.shields.io/crates/v/jsonrpc-pubsub.svg
@@ -38,48 +43,41 @@ Transport-agnostic `core` and transport servers for `http`, `ipc`, `websockets`
 ## Examples
 
 - [core](./core/examples)
-- [macros](./macros/examples)
+- [derive](./derive/examples)
 - [pubsub](./pubsub/examples)
 
 ### Basic Usage (with HTTP transport)
 
 ```rust
-extern crate jsonrpc_core;
-extern crate jsonrpc_minihttp_server;
-
-use jsonrpc_core::{IoHandler, Value, Params};
-use jsonrpc_minihttp_server::{ServerBuilder};
+use jsonrpc_http_server::jsonrpc_core::{IoHandler, Value, Params};
+use jsonrpc_http_server::ServerBuilder;
 
 fn main() {
-	let mut io = IoHandler::new();
-	io.add_method("say_hello", |_params: Params| {
-		Ok(Value::String("hello".to_string()))
+	let mut io = IoHandler::default();
+	io.add_method("say_hello", |_params: Params| async {
+		Ok(Value::String("hello".to_owned()))
 	});
 
 	let server = ServerBuilder::new(io)
 		.threads(3)
 		.start_http(&"127.0.0.1:3030".parse().unwrap())
 		.unwrap();
 
-	server.wait().unwrap();
+	server.wait();
 }
 ```
 
-### Basic usage with macros
+### Basic usage with derive
 
 ```rust
-extern crate jsonrpc_core;
-#[macro_use]
-extern crate jsonrpc_macros;
-
 use jsonrpc_core::Result;
+use jsonrpc_derive::rpc;
 
-build_rpc_trait! {
-	pub trait Rpc {
-		/// Adds two numbers and returns a result
-		#[rpc(name = "add")]
-		fn add(&self, u64, u64) -> Result<u64>;
-	}
+#[rpc]
+pub trait Rpc {
+	/// Adds two numbers and returns a result
+	#[rpc(name = "add")]
+	fn add(&self, u64, u64) -> Result<u64>;
 }
 
 pub struct RpcImpl;
@@ -89,8 +87,59 @@ impl Rpc for RpcImpl {
 	}
 }
 
-
 fn main() {
 	let mut io = jsonrpc_core::IoHandler::new();
 	io.extend_with(RpcImpl.to_delegate())
 }
+```
+
+### Client support
+
+```rust
+use jsonrpc_core_client::transports::local;
+use jsonrpc_core::{Error, IoHandler, Result};
+use jsonrpc_derive::rpc;
+
+/// Rpc trait
+#[rpc]
+pub trait Rpc {
+	/// Returns a protocol version
+	#[rpc(name = "protocolVersion")]
+	fn protocol_version(&self) -> Result<String>;
+
+	/// Adds two numbers and returns a result
+	#[rpc(name = "add", alias("callAsyncMetaAlias"))]
+	fn add(&self, a: u64, b: u64) -> Result<u64>;
+
+	/// Performs asynchronous operation
+	#[rpc(name = "callAsync")]
+	fn call(&self, a: u64) -> FutureResult<String, Error>;
+}
+
+struct RpcImpl;
+
+impl Rpc for RpcImpl {
+	fn protocol_version(&self) -> Result<String> {
+		Ok("version1".into())
+	}
+
+	fn add(&self, a: u64, b: u64) -> Result<u64> {
+		Ok(a + b)
+	}
+
+	fn call(&self, _: u64) -> FutureResult<String, Error> {
+		future::ok("OK".to_owned())
+	}
+}
+
+fn main() {
+	let mut io = IoHandler::new();
+	io.extend_with(RpcImpl.to_delegate());
+
+	let fut = {
+		let (client, server) = local::connect::<gen_client::Client, _, _>(io);
+		client.add(5, 6).map(|res| println!("5 + 6 = {}", res)).join(server)
+	};
+	fut.wait().unwrap();
+}
+```

_automate/bump_version.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -xeu
+
+VERSION=$1
+PREV_DEPS=$2
+NEW_DEPS=$3
+
+ack "^version = \"" -l | \
+	grep toml | \
+	xargs sed -i "s/^version = \".*/version = \"$VERSION\"/"
+
+ack "{ version = \"$PREV_DEPS" -l | \
+	grep toml | \
+	xargs sed -i "s/{ version = \"$PREV_DEPS/{ version = \"$NEW_DEPS/"
+
+ack " = \"$PREV_DEPS" -l | \
+    grep md | \
+    xargs sed -i "s/ = \"$PREV_DEPS/ = \"$NEW_DEPS/"
+
+cargo check