Merge pull request #199 from epage/split

 chore: Split into multiple crates

Author: epage

.travis.yml

@@ -39,13 +39,12 @@ install:
 - export PATH=$HOME/.cargo/bin:$PATH
 
 script:
-- cargo check --verbose
-- cargo check --verbose --no-default-features
+- cargo check --verbose --all
 - cargo check --verbose --features "cli serde_json object_sorted"
 - rm -rf target/debug/deps/*liquid*  # Avoid skeptic problems
-- cargo test  --verbose --features "cli serde_json"
-- cargo when --channel nightly bench --features "cli serde_json"
-- cargo when --channel stable doc --no-deps --all-features
+- cargo test  --verbose --all
+- cargo when --channel nightly bench --all
+- cargo when --channel stable doc --all --no-deps --all-features
 
 after_success:
 - cargo when --channel stable coveralls

Cargo.toml

@@ -1,10 +1,13 @@
+[workspace]
+members = ["liquid-error", "liquid-value", "liquid-compiler", "liquid-interpreter"]
+
 [package]
 name = "liquid"
 version = "0.15.0"
 authors = ["Johann Hofmann <[email protected]>"]
 description = "The liquid templating language for Rust"
 repository = "https://github.com/cobalt-org/liquid-rust"
-documentation = "https://cobalt-org.github.io/liquid-rust/"
+documentation = "https://docs.rs/liquid"
 readme = "README.md"
 categories = ["template-engine"]
 keywords = ["liquid", "template", "templating", "language", "html"]
@@ -24,7 +27,7 @@ doc = false
 
 [features]
 default = ["extra-filters", "serde"]
-cli = ["clap", "error-chain", "serde_yaml"]
+cli = ["clap", "error-chain", "serde_yaml", "serde_json"]
 extra-filters = []
 # Ensure keys in `Value`s `Object`s to be sorted.
 object_sorted = []
@@ -36,6 +39,10 @@ chrono = "0.4"
 unicode-segmentation = "1.2"
 itertools = "0.7.0"
 url = "1.5"
+liquid-error = { version = "0.15.0", path = "liquid-error" }
+liquid-value = { version = "0.15.0", path = "liquid-value" }
+liquid-compiler = { version = "0.15.0", path = "liquid-compiler" }
+liquid-interpreter = { version = "0.15.0", path = "liquid-interpreter" }
 
 serde = { version = "1.0", optional = true, features = ["derive"] }
 clap = { version = "2.26", optional = true }

README.md

@@ -1,7 +1,13 @@
-liquid-rust [![Travis Status](https://travis-ci.org/cobalt-org/liquid-rust.svg?branch=master)](https://travis-ci.org/cobalt-org/liquid-rust) [![Appveyor Status](https://ci.appveyor.com/api/projects/status/n1nqaitd5uja8tsi/branch/master?svg=true)](https://ci.appveyor.com/project/johannhof/liquid-rust/branch/master) [![Crates Status](https://img.shields.io/crates/v/liquid.svg)](https://crates.io/crates/liquid) [![Coverage Status](https://coveralls.io/repos/github/cobalt-org/liquid-rust/badge.svg?branch=master)](https://coveralls.io/github/cobalt-org/liquid-rust?branch=master) [![Dependency Status](https://dependencyci.com/github/cobalt-org/liquid-rust/badge)](https://dependencyci.com/github/cobalt-org/liquid-rust)
+liquid-rust
 ===========
 
-[Liquid templating](http://liquidmarkup.org/) for Rust
+> [Liquid templating](http://liquidmarkup.org/) for Rust
+
+[![Travis Status](https://travis-ci.org/cobalt-org/liquid-rust.svg?branch=master)](https://travis-ci.org/cobalt-org/liquid-rust)
+[![Appveyor Status](https://ci.appveyor.com/api/projects/status/n1nqaitd5uja8tsi/branch/master?svg=true)](https://ci.appveyor.com/project/johannhof/liquid-rust/branch/master)
+[![Crates Status](https://img.shields.io/crates/v/liquid.svg)](https://crates.io/crates/liquid)
+[![Coverage Status](https://coveralls.io/repos/github/cobalt-org/liquid-rust/badge.svg?branch=master)](https://coveralls.io/github/cobalt-org/liquid-rust?branch=master)
+[![Dependency Status](https://dependencyci.com/github/cobalt-org/liquid-rust/badge)](https://dependencyci.com/github/cobalt-org/liquid-rust)
 
 Usage
 ----------
@@ -28,19 +34,15 @@ let template = liquid::ParserBuilder::with_liquid()
     .build()
     .parse("Liquid! {{num | minus: 2}}").unwrap();
 
-let mut globals = liquid::Object::new();
-globals.insert("num".into(), liquid::Value::scalar(4f64));
+let mut globals = liquid::value::Object::new();
+globals.insert("num".into(), liquid::value::Value::scalar(4f64));
 
 let output = template.render(&globals).unwrap();
 assert_eq!(output, "Liquid! 2".to_string());
 ```
 
 You can find a reference on Liquid syntax [here](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers).
 
-Plugins
---------
-Cache block ( File and Redis ) : https://github.com/FerarDuanSednan/liquid-rust-cache
-
 Extending Liquid
 --------
 

appveyor.yml

@@ -26,11 +26,10 @@ install:
 - cargo -V
 
 test_script:
-- cargo check --verbose
-- cargo check --verbose --no-default-features
+- cargo check --verbose --all
 - cargo check --verbose --features "cli serde_json object_sorted"
 - del target\debug\deps\*liquid*  # Avoid skeptic problems
-- cargo test  --verbose --features "cli serde_json"
+- cargo test  --verbose --all
 
 branches:
   only:

benches/liquid.rs

@@ -20,7 +20,7 @@ fn bench_render_text(b: &mut test::Bencher) {
         .parse(TEXT_ONLY)
         .expect("Benchmark template parsing failed");
 
-    let data = liquid::Object::new();
+    let data = liquid::value::Object::new();
 
     b.iter(|| template.render(&data));
 }
@@ -49,7 +49,7 @@ fn bench_render_variable(b: &mut test::Bencher) {
         .parse(VARIABLE_ONLY)
         .expect("Benchmark template parsing failed");
 
-    let data: liquid::Object =
+    let data: liquid::value::Object =
         serde_yaml::from_str(VARIABLE_ONLY_OBJECT).expect("Benchmark object parsing failed");
 
     b.iter(|| template.render(&data));
@@ -97,7 +97,7 @@ fn bench_render_template(b: &mut test::Bencher) {
         .parse(ITERATE)
         .expect("Benchmark template parsing failed");
 
-    let data: liquid::Object =
+    let data: liquid::value::Object =
         serde_yaml::from_str(ITERATE_OBJECT).expect("Benchmark object parsing failed");
 
     b.iter(|| template.render(&data));

liquid-compiler/CHANGELOG.md

@@ -0,0 +1,23 @@
+[package]
+name = "liquid-compiler"
+version = "0.15.0"
+authors = ["Johann Hofmann <[email protected]>"]
+description = "The liquid templating language for Rust"
+repository = "https://github.com/cobalt-org/liquid-rust/tree/master/liquid-compiler"
+documentation = "https://docs.rs/liquid-compiler"
+readme = "README.md"
+categories = ["template-engine"]
+keywords = ["liquid", "template", "templating", "language", "html"]
+license = "MIT"
+
+[badges]
+travis-ci = { repository = "cobalt-org/liquid-rust" }
+appveyor  = { repository = "johannhof/liquid-rust" }
+
+[dependencies]
+regex = "1.0"
+lazy_static = "1.0"
+# Exposed in API
+liquid-error = { version = "0.15.0", path = "../liquid-error" }
+liquid-value = { version = "0.15.0", path = "../liquid-value" }
+liquid-interpreter = { version = "0.15.0", path = "../liquid-interpreter" }

liquid-compiler/Cargo.toml

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 cobalt-org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

liquid-compiler/LICENSE

@@ -0,0 +1,26 @@
+liquid-compiler
+===========
+
+> [Liquid templating](http://liquidmarkup.org/) for Rust
+
+[![Travis Status](https://travis-ci.org/cobalt-org/liquid-rust.svg?branch=master)](https://travis-ci.org/cobalt-org/liquid-rust)
+[![Appveyor Status](https://ci.appveyor.com/api/projects/status/n1nqaitd5uja8tsi/branch/master?svg=true)](https://ci.appveyor.com/project/johannhof/liquid-rust/branch/master)
+[![Crates Status](https://img.shields.io/crates/v/liquid.svg)](https://crates.io/crates/liquid)
+[![Coverage Status](https://coveralls.io/repos/github/cobalt-org/liquid-rust/badge.svg?branch=master)](https://coveralls.io/github/cobalt-org/liquid-rust?branch=master)
+[![Dependency Status](https://dependencyci.com/github/cobalt-org/liquid-rust/badge)](https://dependencyci.com/github/cobalt-org/liquid-rust)
+
+Usage
+----------
+
+To include liquid in your project add the following to your Cargo.toml:
+
+```toml
+[dependencies]
+liquid-compiler = "0.15"
+```
+
+Now you can use the crate in your code:
+
+```rust
+extern crate liquid_compiler;
+```

liquid-compiler/README.md

@@ -1,8 +1,9 @@
+use liquid_interpreter::Renderable;
+
+use super::error::Result;
 use super::Element;
 use super::LiquidOptions;
-use super::Result;
 use super::Token;
-use interpreter::Renderable;
 
 /// A trait for creating custom custom block-size tags (`{% if something %}{% endif %}`).
 /// This is a simple type alias for a function.
@@ -45,11 +46,11 @@ pub type FnParseBlock = fn(&str, &[Token], &[Element], &LiquidOptions) -> Result
 
 #[derive(Clone)]
 struct FnBlockParser {
-    pub parser: FnParseBlock,
+    parser: FnParseBlock,
 }
 
 impl FnBlockParser {
-    pub fn new(parser: FnParseBlock) -> Self {
+    fn new(parser: FnParseBlock) -> Self {
         Self { parser }
     }
 }