mrml 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f987f15ef350dd08e029dbd14f802d4c0c379f114734160b1cae0e0ca4e59e
-  data.tar.gz: 774d31d99416e41eed22557f30465c60ee2aebccb1f8e569ab83db51b227a0ca
+  metadata.gz: 810bd284bd8900d15194688f0ed73ea6e78e2053ca38b92ec3184faada04cf51
+  data.tar.gz: 88bb0fcd4587de5080a5ebd265612a26e3baa04b4042c27835f4729cf0d9176e
 SHA512:
-  metadata.gz: 1c35a4541d7807a5ae16be339336375cae98aeee4058132fe436147ae58b154e9c3d3f7a51f555ec2e55680b8ad28b4b16728f91b6e3e03375a9a8ccd68c5627
-  data.tar.gz: aa0c9591730c76b504aa034bd37c2b5e00e172b62f2201ca66751a9c7e082c62581f2b56ad2a35959f86648a37fecec0160fbc9c85172ba3ee2683ff1429a689
+  metadata.gz: 7c484444adc9beda35040b98ae8ab19a3076a821b192cd98c765493e8928ccc8ed7daffcd9829d95a7059086484544620d1fd0a967e728dc41ba93a1c1bab398
+  data.tar.gz: 8fc80117c790d2220af3d8df80c07e272e2766be65ab304898871963a88bab49dcb13ec12df9c6ea76a91a44623a500ff3e76b51994dd2d31d14910ddc77bcaa

data/Cargo.toml

@@ -6,7 +6,8 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-mrml = "0.5.0"
+mrml = "1.2.4"
+serde = { version = "1.0", features = ["derive"] }
 
 [lib]
 name = "mrml"

data/lib/mrml/version.rb

@@ -1,3 +1,3 @@
 module MRML
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/src/lib.rs

@@ -11,7 +11,7 @@ fn to_char(string: String) -> *mut c_char {
   CString::new(string).unwrap().into_raw()
 }
 
-fn to_result(result: Result<String, mrml::Error>) -> *mut c_char {
+fn parse_result(result: Result<String, mrml::prelude::render::Error>) -> *mut c_char {
   if result.is_err() {
     to_char(format!("MRML::Error {:?}", result.unwrap_err()))
   } else {
@@ -19,19 +19,42 @@ fn to_result(result: Result<String, mrml::Error>) -> *mut c_char {
   }
 }
 
+fn parse_option(option: Option<String>) -> *mut c_char {
+  to_char(option.unwrap_or("".to_string()))
+}
+
 #[no_mangle]
 pub extern "C" fn to_title(input: *const c_char) -> *mut c_char {
-  to_result(mrml::to_title(&to_string(input), mrml::Options::default()))
+  let root = mrml::parse(&to_string(input));
+
+  if root.is_err() {
+    to_char(format!("MRML::Error {:?}", root.unwrap_err()))
+  } else {
+    parse_option(root.unwrap().get_title())
+  }
 }
 
 #[no_mangle]
 pub extern "C" fn to_preview(input: *const c_char) -> *mut c_char {
-  to_result(mrml::to_preview(&to_string(input), mrml::Options::default()))
+  let root = mrml::parse(&to_string(input));
+
+  if root.is_err() {
+    to_char(format!("MRML::Error {:?}", root.unwrap_err()))
+  } else {
+    parse_option(root.unwrap().get_preview())
+  }
 }
 
 #[no_mangle]
 pub extern "C" fn to_html(input: *const c_char) -> *mut c_char {
-  to_result(mrml::to_html(&to_string(input), mrml::Options::default()))
+  let root = mrml::parse(&to_string(input));
+  let opts = mrml::prelude::render::Options::default();
+
+  if root.is_err() {
+    to_char(format!("MRML::Error {:?}", root.unwrap_err()))
+  } else {
+    parse_result(root.unwrap().render(&opts))
+  }
 }
 
 #[no_mangle]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrml
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for MRML Rust