mrml 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d24641d7935465df48cb84cf4ec54134e028ccc6939c5f5353d587cc08a83a1
-  data.tar.gz: fbdb527a1fb152b2f18965f9685c61e97f2c53b4004547016909f5b025b061d6
+  metadata.gz: cb8417eb9099012242823d444d1168502a1aba8276e3917760b8c4b7957e4cf0
+  data.tar.gz: 6a6cba475b50378d2e06c184a4a8ec90b56b5db72348e7e1fb352fd9364bb8bf
 SHA512:
-  metadata.gz: 24421c93616103cf85ec54ac19388928a72950722d379bb9c467f17dd2b320568772bab722b39d1c2dfd25e9eb73bda93442df4db083397a3e4dc132fc27f377
-  data.tar.gz: 9103f9892daffb15306ed66439a8948f2ff33ce702b67e6ca65cfd48fb85d7f005fd94ed5aeed5a46a7149813cd7d42062359931a669a6ab8ad6502b3202de18
+  metadata.gz: 8d8487f6ce51e9945ed284ba01dafaf0a0741e1138f31fdb5e81d648302c68781850e8d73879c99653da06167c987727dd77dfd8ee37eb9be4915b38c398a4bb
+  data.tar.gz: 010ee0e3c32f11ca6f2cd526646c8429b9ad22b937a70ba02c2c59e4eef335d4ca67f489b682c0431d51639b52b90738a9b7f3fb382583fb619276470eff09de

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.6"
+serde = { version = "1.0", features = ["derive"] }
 
 [lib]
 name = "mrml"

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mrml.gemspec
 gemspec
-
-gem 'rake', '~> 12.0'
-gem 'minitest', '~> 5.0'

data/lib/mrml/error.rb

@@ -0,0 +1,4 @@
+module MRML
+  class Error < StandardError
+  end
+end

data/lib/mrml/native.rb

@@ -0,0 +1,15 @@
+module MRML
+  module Native
+    extend FFI::Library
+
+    LIBNAME = "mrml.#{FFI::Platform::LIBSUFFIX}".freeze
+    LIBPATH = File.expand_path('..', __dir__).freeze
+
+    ffi_lib File.expand_path(LIBNAME, LIBPATH)
+
+    attach_function :to_title, :to_title, [:string], Result
+    attach_function :to_preview, :to_preview, [:string], Result
+    attach_function :to_html, :to_html, [:string], Result
+    attach_function :free, :free_result, [Result], :void
+  end
+end

data/lib/mrml/result.rb

@@ -0,0 +1,9 @@
+module MRML
+  class Result < FFI::AutoPointer
+    class << self
+      def release(ptr)
+        Native.free(ptr)
+      end
+    end
+  end
+end

data/lib/mrml/version.rb

@@ -1,3 +1,3 @@
 module MRML
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/mrml.rb

@@ -1,33 +1,21 @@
 require 'ffi'
+require 'mrml/result'
+require 'mrml/native'
+require 'mrml/error'
 require 'mrml/version'
 
 module MRML
-  class Error < StandardError
-  end
-
   class << self
-    extend FFI::Library
-
-    ffi_lib File.expand_path("mrml.#{FFI::Platform::LIBSUFFIX}", __dir__)
-
-    attach_function :__to_title, :to_title, [:string], :string
-    attach_function :__to_preview, :to_preview, [:string], :string
-    attach_function :__to_html, :to_html, [:string], :string
-
-    private :__to_title
-    private :__to_preview
-    private :__to_html
-
     def to_title(template)
-      call(:__to_title, template)
+      call(:to_title, template)
     end
 
     def to_preview(template)
-      call(:__to_preview, template)
+      call(:to_preview, template)
     end
 
     def to_html(template)
-      call(:__to_html, template)
+      call(:to_html, template)
     end
 
     private
@@ -35,8 +23,10 @@ module MRML
     def call(method, template)
       return if template.nil?
 
-      result = send(method, template)
-      raise Error, result if result.start_with?('Error')
+      result = Native.send(method, template)
+      result = result.read_string.force_encoding('UTF-8')
+
+      raise Error, result if result.start_with?(Error.name)
 
       result
     end

data/src/lib.rs

@@ -3,36 +3,64 @@ use std::ffi::{CStr, CString};
 
 use mrml;
 
-fn to_string(input: *const c_char) -> String {
-  unsafe {
-    CStr::from_ptr(input).to_string_lossy().into_owned()
+fn to_string(unsafe_string: *const c_char) -> String {
+  unsafe { CStr::from_ptr(unsafe_string) }.to_str().unwrap().to_string()
+}
+
+fn to_char(string: String) -> *mut c_char {
+  CString::new(string).unwrap().into_raw()
+}
+
+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 {
+    to_char(result.unwrap())
   }
 }
 
-fn to_char(str: &str) -> *const c_char {
-  CString::new(str).unwrap().into_raw()
+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) -> *const c_char {
-  match mrml::to_title(&to_string(input), mrml::Options::default()) {
-    Ok(html) => return to_char(&html),
-    Err(err) => return to_char(&format!("Error: {:?}", err)),
+pub extern "C" fn to_title(input: *const c_char) -> *mut c_char {
+  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) -> *const c_char {
-  match mrml::to_preview(&to_string(input), mrml::Options::default()) {
-    Ok(html) => return to_char(&html),
-    Err(err) => return to_char(&format!("Error: {:?}", err)),
+pub extern "C" fn to_preview(input: *const c_char) -> *mut c_char {
+  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) -> *const c_char {
-  match mrml::to_html(&to_string(input), mrml::Options::default()) {
-    Ok(html) => return to_char(&html),
-    Err(err) => return to_char(&format!("Error: {:?}", err)),
+pub extern "C" fn to_html(input: *const c_char) -> *mut c_char {
+  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]
+pub extern "C" fn free_result(string: *mut c_char) {
+  unsafe {
+    if string.is_null() { return }
+    CString::from_raw(string)
+  };
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -100,6 +100,9 @@ files:
 - bin/setup
 - ext/Rakefile
 - lib/mrml.rb
+- lib/mrml/error.rb
+- lib/mrml/native.rb
+- lib/mrml/result.rb
 - lib/mrml/version.rb
 - mrml.gemspec
 - src/lib.rs
@@ -122,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