Rename (#27)

bokuweb · web-flow · commit 3d6f36ef88cb · 2020-01-24T19:44:43.000+09:00
* rename

* fix: readme

* fix: README
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -8,19 +8,26 @@
 
 [![GitHub Actions Status](https://github.com/bokuweb/docx-rs/workflows/Continuous%20Integration/badge.svg)](https://github.com/bokuweb/docx-rs/actions)
 
+## install
+
+```
+[dependencies]
+docx-rs = "0.2.0"
+```
+
 ## Example
 
 ```rust
-use docx_core::*;
+use docx_rs::*;
 
 pub fn hello() -> Result<(), DocxError> {
-  let path = std::path::Path::new("./hello.docx");
-  let file = std::fs::File::create(&path).unwrap();
-  Docx::new()
-    .add_paragraph(Paragraph::new().add_run(Run::new().add_text("Hello")))
-    .build()
-    .pack(file)?;
-  Ok(())
+    let path = std::path::Path::new("./hello.docx");
+    let file = std::fs::File::create(&path).unwrap();
+    Docx::new()
+        .add_paragraph(Paragraph::new().add_run(Run::new().add_text("Hello")))
+        .build()
+        .pack(file)?;
+    Ok(())
 }
 ```
 
diff --git a/docx-core/Cargo.toml b/docx-core/Cargo.toml
@@ -1,8 +1,21 @@
 [package]
-name = "docx-core"
-version = "0.1.0"
+name = "docx-rs"
+version = "0.2.0"
 authors = ["bokuweb <bokuweb12@gmail.com>"]
+repository = "https://github.com/bokuweb/docx-rs"
 edition = "2018"
+license = "MIT"
+readme = "../README.md"
+description = "A .docx file generater with Rust/WebAssembly."
+keywords = [
+  "office",
+  "word",
+  "docx",
+]
+
+[lib]
+name = "docx_rs"
+path = "src/lib.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,4 +26,5 @@ thiserror = "1.0"
 zip = { version = "0.5", default-features = false }
 
 [dev-dependencies]
-pretty_assertions = "*"
+pretty_assertions = "0.6.1"
+
diff --git a/docx-core/examples/alignment.rs b/docx-core/examples/alignment.rs
@@ -1,4 +1,4 @@
-use docx_core::*;
+use docx_rs::*;
 
 pub fn main() -> Result<(), DocxError> {
     let path = std::path::Path::new("./alignment.docx");
diff --git a/docx-core/examples/comment.rs b/docx-core/examples/comment.rs
@@ -1,4 +1,4 @@
-use docx_core::*;
+use docx_rs::*;
 
 pub fn main() -> Result<(), DocxError> {
     let path = std::path::Path::new("./comment.docx");
diff --git a/docx-core/examples/hello.rs b/docx-core/examples/hello.rs
@@ -1,4 +1,4 @@
-use docx_core::*;
+use docx_rs::*;
 
 pub fn main() -> Result<(), DocxError> {
     let path = std::path::Path::new("./output/hello.docx");
diff --git a/docx-core/examples/history.rs b/docx-core/examples/history.rs
@@ -1,4 +1,4 @@
-use docx_core::*;
+use docx_rs::*;
 
 pub fn main() -> Result<(), DocxError> {
     let path = std::path::Path::new("./history.docx");
diff --git a/docx-core/examples/indent.rs b/docx-core/examples/indent.rs
@@ -1,4 +1,4 @@
-use docx_core::*;
+use docx_rs::*;
 
 pub const DUMMY: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
 
diff --git a/docx-core/examples/numbering.rs b/docx-core/examples/numbering.rs
@@ -1,4 +1,5 @@
-use docx_core::*;
+use docx_rs::*;
+
 
 pub fn main() -> Result<(), DocxError> {
     let path = std::path::Path::new("./numbering.docx");
diff --git a/docx-core/examples/table.rs b/docx-core/examples/table.rs
@@ -1,4 +1,4 @@
-use docx_core::*;
+use docx_rs::*;
 
 pub fn main() -> Result<(), DocxError> {
     let path = std::path::Path::new("./table.docx");
diff --git a/docx-core/tests/lib.rs b/docx-core/tests/lib.rs
@@ -1,6 +1,6 @@
-extern crate docx_core;
+extern crate docx_rs;
 
-use docx_core::*;
+use docx_rs::*;
 
 pub const DUMMY: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
 
diff --git a/docx-wasm/Cargo.toml b/docx-wasm/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "docx-rs"
+name = "docx-wasm"
 version = "0.1.0"
 authors = ["bokuweb <bokuweb12@gmail.com>"]
 edition = "2018"
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 wasm-bindgen = "0.2.50"
-docx-core = { path = "../docx-core" }
+docx-rs= { path = "../docx-core" }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.2"
diff --git a/docx-wasm/src/adaptors/special_indent.rs b/docx-wasm/src/adaptors/special_indent.rs
@@ -1,18 +1,14 @@
-use docx_core;
+use docx_rs;
 
 pub fn create_special_indent(
-    special_indent_kind: Option<docx_core::SpecialIndentKind>,
+    special_indent_kind: Option<docx_rs::SpecialIndentKind>,
     special_indent_size: Option<usize>,
-) -> Option<docx_core::SpecialIndentType> {
+) -> Option<docx_rs::SpecialIndentType> {
     if let Some(kind) = special_indent_kind {
         let size = special_indent_size.unwrap_or_else(|| 0);
         match kind {
-            docx_core::SpecialIndentKind::FirstLine => {
-                Some(docx_core::SpecialIndentType::FirstLine(size))
-            }
-            docx_core::SpecialIndentKind::Hanging => {
-                Some(docx_core::SpecialIndentType::Hanging(size))
-            }
+            docx_rs::SpecialIndentKind::FirstLine => Some(docx_rs::SpecialIndentType::FirstLine(size)),
+            docx_rs::SpecialIndentKind::Hanging => Some(docx_rs::SpecialIndentType::Hanging(size)),
         }
     } else {
         None
diff --git a/docx-wasm/src/comment.rs b/docx-wasm/src/comment.rs
@@ -1,18 +1,18 @@
 use super::*;
-use docx_core;
+use docx_rs;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 #[derive(Debug)]
-pub struct Comment(docx_core::Comment);
+pub struct Comment(docx_rs::Comment);
 
 #[wasm_bindgen(js_name = createComment)]
 pub fn create_comment(id: usize) -> Comment {
-    Comment(docx_core::Comment::new(id))
+    Comment(docx_rs::Comment::new(id))
 }
 
 impl Comment {
-    pub fn take(self) -> docx_core::Comment {
+    pub fn take(self) -> docx_rs::Comment {
         self.0
     }
 }
diff --git a/docx-wasm/src/delete.rs b/docx-wasm/src/delete.rs
@@ -1,18 +1,18 @@
 use super::*;
-use docx_core;
+use docx_rs;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 #[derive(Debug)]
-pub struct Delete(docx_core::Delete);
+pub struct Delete(docx_rs::Delete);
 
 #[wasm_bindgen(js_name = createDelete)]
 pub fn create_delete(run: Run) -> Delete {
-    Delete(docx_core::Delete::new(run.take()))
+    Delete(docx_rs::Delete::new(run.take()))
 }
 
 impl Delete {
-    pub fn take(self) -> docx_core::Delete {
+    pub fn take(self) -> docx_rs::Delete {
         self.0
     }
 }
diff --git a/docx-wasm/src/doc.rs b/docx-wasm/src/doc.rs
@@ -1,15 +1,15 @@
 use super::*;
-use docx_core;
+use docx_rs;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 #[derive(Debug)]
-pub struct Docx(docx_core::Docx);
+pub struct Docx(docx_rs::Docx);
 
 #[wasm_bindgen]
 #[allow(non_snake_case)]
 pub fn createDocx() -> Docx {
-    Docx(docx_core::Docx::new())
+    Docx(docx_rs::Docx::new())
 }
 
 #[wasm_bindgen]
diff --git a/docx-wasm/src/insert.rs b/docx-wasm/src/insert.rs
@@ -1,18 +1,18 @@
 use super::*;
-use docx_core;
+use docx_rs;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 #[derive(Debug)]
-pub struct Insert(docx_core::Insert);
+pub struct Insert(docx_rs::Insert);
 
 #[wasm_bindgen(js_name = createInsert)]
 pub fn create_insert(run: Run) -> Insert {
-    Insert(docx_core::Insert::new(run.take()))
+    Insert(docx_rs::Insert::new(run.take()))
 }
 
 impl Insert {
-    pub fn take(self) -> docx_core::Insert {
+    pub fn take(self) -> docx_rs::Insert {
         self.0
     }
 }
diff --git a/docx-wasm/src/level.rs b/docx-wasm/src/level.rs
@@ -1,22 +1,22 @@
 use super::*;
-use docx_core;
+use docx_rs;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 #[derive(Debug)]
-pub struct Level(docx_core::Level);
+pub struct Level(docx_rs::Level);
 
 #[wasm_bindgen(js_name = createLevel)]
 pub fn create_level(id: usize, start: usize, format: &str, text: &str, jc: &str) -> Level {
-    let start = docx_core::Start::new(start);
-    let format = docx_core::NumberFormat::new(format);
-    let text = docx_core::LevelText::new(text);
-    let jc = docx_core::LevelJc::new(jc);
-    Level(docx_core::Level::new(id, start, format, text, jc))
+    let start = docx_rs::Start::new(start);
+    let format = docx_rs::NumberFormat::new(format);
+    let text = docx_rs::LevelText::new(text);
+    let jc = docx_rs::LevelJc::new(jc);
+    Level(docx_rs::Level::new(id, start, format, text, jc))
 }
 
 impl Level {
-    pub fn take(self) -> docx_core::Level {
+    pub fn take(self) -> docx_rs::Level {
         self.0
     }
 }
@@ -26,7 +26,7 @@ impl Level {
     pub fn indent(
         mut self,
         left: usize,
-        special_indent_kind: Option<docx_core::SpecialIndentKind>,
+        special_indent_kind: Option<docx_rs::SpecialIndentKind>,
         special_indent_size: Option<usize>,
     ) -> Self {
         let special_indent = create_special_indent(special_indent_kind, special_indent_size);
diff --git a/docx-wasm/src/lib.rs b/docx-wasm/src/lib.rs
@@ -1,7 +1,7 @@
 mod adaptors;
 mod comment;
 mod delete;
-mod docx;
+mod doc;
 mod insert;
 mod level;
 mod numbering;
@@ -14,8 +14,7 @@ mod table_row;
 pub use adaptors::*;
 pub use comment::*;
 pub use delete::*;
-pub use docx::*;
-pub use docx_core;
+pub use doc::*;
 pub use insert::*;
 pub use level::*;
 pub use numbering::*;
diff --git a/docx-wasm/src/numbering.rs b/docx-wasm/src/numbering.rs
@@ -1,18 +1,18 @@
 use super::*;
-use docx_core;
+use docx_rs;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 #[derive(Debug)]
-pub struct Numbering(docx_core::Numbering);
+pub struct Numbering(docx_rs::Numbering);
 
 #[wasm_bindgen(js_name = createNumbering)]
 pub fn create_numbering(id: usize) -> Numbering {
-    Numbering(docx_core::Numbering::new(id))
+    Numbering(docx_rs::Numbering::new(id))
 }
 
 impl Numbering {
-    pub fn take(self) -> docx_core::Numbering {
+    pub fn take(self) -> docx_rs::Numbering {
         self.0
     }
 }
diff --git a/docx-wasm/src/paragraph.rs b/docx-wasm/src/paragraph.rs
diff --git a/docx-wasm/src/run.rs b/docx-wasm/src/run.rs
diff --git a/docx-wasm/src/table.rs b/docx-wasm/src/table.rs
diff --git a/docx-wasm/src/table_cell.rs b/docx-wasm/src/table_cell.rs
diff --git a/docx-wasm/src/table_row.rs b/docx-wasm/src/table_row.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use docx_core::*;`
	`1`	`+use docx_rs::*;`
`2`	`2`
`3`	`3`	`pub fn main() -> Result<(), DocxError> {`
`4`	`4`	`let path = std::path::Path::new("./alignment.docx");`