fast_toml 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edba9c5d0e1ea5f7b69477616d60d808fccdd0c5c6a5f4fc7dcaf49a15ec517b
-  data.tar.gz: a2f76f9d410e9c1e799707b1f0ccf8a5849a6c1b85db591b3d12500a57f914d0
+  metadata.gz: 9ce6b2fdd996e28537c28dbaeab6bcb03c678590ab33323308e91d6f5b1d87ca
+  data.tar.gz: 1ae0fb254b3bfe3ccaacb58317a9a97034328e50ab4ea50f8a68409705f3de0e
 SHA512:
-  metadata.gz: edc7fefcdd1f04edf2d05e6d12c1acb8ece2fe38bd12e934428c21d69785fcc9d742c0aefc05a17d3980a2acd551f4cc91954273c6148b4c77302c46f0c34848
-  data.tar.gz: ae883861709028ee1f868514d4ecb588083765372708e40c2cd36c63241be78fcb8137811540bce6e60b6454647cd0f171db395d67a1add8ea2c4efcc9757fb9
+  metadata.gz: b54db7122904b9c138ac7a9651c5d94edd852ce84a02c2450e0c90181d1f2f537a402feea5f657aabdb6aad79567591a3d01525df4120f165d23bcae43b87be5
+  data.tar.gz: a971b475d7968d130af93b33625b6dddb3fd4f38b648d2c98ea237af7558f1929565051342f4401d33301002057b2f930ba08012a55ce8745de25d77fd92437e

data/Cargo.lock

@@ -54,9 +54,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -69,11 +69,20 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "fast_toml"
-version = "0.1.0"
+version = "0.3.0"
 dependencies = [
  "magnus",
+ "rb-sys",
+ "rb-sys-env",
+ "toml",
 ]
 
 [[package]]
@@ -82,6 +91,22 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -166,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.84"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]
@@ -253,6 +278,35 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "shell-words"
 version = "1.1.0"
@@ -276,6 +330,40 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -345,3 +433,12 @@ name = "windows_x86_64_msvc"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]

data/Rakefile

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "minitest/test_task"
-require "rubocop/rake_task"
-require "rb_sys/extensiontask"
+$LOAD_PATH.unshift File.expand_path(__dir__)
+
+require 'bundler/gem_tasks'
+require 'minitest/test_task'
+require 'rubocop/rake_task'
+require 'rb_sys/extensiontask'
 
 Minitest::TestTask.create
-RuboCop::RakeTask.new
 
-task build: :compile
+RuboCop::RakeTask.new
 
-GEMSPEC = Gem::Specification.load("fast_toml.gemspec")
+GEMSPEC = Gem::Specification.load('fast_toml.gemspec')
 
-RbSys::ExtensionTask.new("fast_toml", GEMSPEC) do |ext|
-  ext.lib_dir = "lib/fast_toml"
+RbSys::ExtensionTask.new('fast_toml', GEMSPEC) do |ext|
+  ext.lib_dir = 'lib/fast_toml'
 end
 
+task build: :compile
+
 task default: %i[compile test rubocop]

data/ext/fast_toml/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fast_toml"
-version = "0.1.0"
+version = "0.3.0"
 edition = "2021"
 authors = ["Guilherme Carreiro <karreiro@gmail.com>"]
 license = "MIT"
@@ -10,4 +10,21 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-magnus = { version = "0.6.2" }
+magnus = "0.6.4"
+toml = "0.8.13"
+rb-sys = { version = "0.9.85", features = [
+  "bindgen-rbimpls",
+  "bindgen-deprecated-types",
+  "stable-api-compiled-fallback",
+] }
+
+[dev-dependencies]
+rb-sys = { version = "0.9.85", features = [
+  "link-ruby",
+  "bindgen-rbimpls",
+  "bindgen-deprecated-types",
+  "stable-api-compiled-fallback",
+] }
+
+[build-dependencies]
+rb-sys-env = { version = "0.1.2" }

data/ext/fast_toml/extconf.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mkmf"
-require "rb_sys/mkmf"
+require 'mkmf'
+require 'rb_sys/mkmf'
 
-create_rust_makefile("fast_toml/fast_toml")
+create_rust_makefile('fast_toml/fast_toml')

data/ext/fast_toml/src/lib.rs

@@ -1,15 +1,82 @@
+use magnus::exception::runtime_error;
 use magnus::function;
 use magnus::prelude::*;
-use magnus::Error;
-use magnus::Ruby;
-
-fn hello(subject: String) -> String {
-    format!("Hello from Rust, {subject}!")
-}
+use magnus::value::{InnerValue, Lazy};
+use magnus::RModule;
+use magnus::{IntoValue, RArray, RHash, Ruby};
 
 #[magnus::init]
-fn init(ruby: &Ruby) -> Result<(), Error> {
+fn init(ruby: &Ruby) -> Result<(), magnus::Error> {
     let module = ruby.define_module("FastToml")?;
-    module.define_singleton_method("hello", function!(hello, 1))?;
+    module.define_singleton_method("parse", function!(parse, 1))?;
     Ok(())
 }
+
+fn parse(str: String) -> Result<magnus::Value, magnus::Error> {
+    let toml_value = toml::from_str(&str);
+
+    match toml_value {
+        Ok(toml_value) => {
+            let ruby_value = to_ruby_value(toml_value);
+            Ok(ruby_value)
+        }
+        Err(err) => {
+            let ruby_err = to_ruby_err(err.message());
+            Err(ruby_err)
+        }
+    }
+}
+
+fn to_ruby_err(err_msg: &str) -> magnus::Error {
+    let ruby_api = Ruby::get();
+
+    if let Ok(ruby_api) = ruby_api {
+        let module = fast_toml_module(&ruby_api);
+
+        let err_class = module
+            .define_error("Error", ruby_api.exception_standard_error())
+            .expect("Failed to define or get FastToml::Error");
+
+        return magnus::Error::new(err_class, err_msg.to_string());
+    }
+
+    magnus::Error::new(runtime_error(), "FastToml runtime err")
+}
+
+fn fast_toml_module(ruby_api: &Ruby) -> RModule {
+    Lazy::new(|ruby| {
+        ruby.define_module("FastToml")
+            .expect("Failed to define or get FastToml")
+    })
+    .get_inner_with(ruby_api)
+}
+
+fn to_ruby_value(value: toml::Value) -> magnus::Value {
+    match value {
+        toml::Value::String(string) => string.into_value(),
+        toml::Value::Integer(integer) => integer.into_value(),
+        toml::Value::Float(float) => float.into_value(),
+        toml::Value::Boolean(boolean) => boolean.into_value(),
+        toml::Value::Datetime(date) => date.to_string().into_value(),
+        toml::Value::Array(rust_array) => {
+            let ruby_array = RArray::new();
+
+            for value in rust_array {
+                let value = to_ruby_value(value);
+                ruby_array.push(value).unwrap();
+            }
+
+            ruby_array.into_value()
+        }
+        toml::Value::Table(rust_map) => {
+            let ruby_hash = RHash::new();
+
+            for (key, value) in rust_map {
+                let value = to_ruby_value(value);
+                ruby_hash.aset(key, value).unwrap();
+            }
+
+            ruby_hash.into_value()
+        }
+    }
+}

data/lib/fast_toml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastToml
-  VERSION = "0.1.0"
+  VERSION = '0.3.0'
 end

data/lib/fast_toml.rb

@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "fast_toml/version"
-require_relative "fast_toml/fast_toml"
+require_relative 'fast_toml/version'
+
+begin
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require_relative "fast_toml/#{Regexp.last_match(1)}/fast_toml"
+rescue LoadError
+  require_relative 'fast_toml/fast_toml'
+end
 
 module FastToml
   class Error < StandardError; end
+  # Your code goes here...
 end

data/rakelib/benchmark.rake

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'benchmark'
+require 'benchmark/ips'
+require 'toml'
+require 'toml-rb'
+require 'perfect_toml'
+require 'tomlrb'
+
+TOML_INPUT = <<~TOML
+  [package]
+  name = "fast_toml"
+  version = "0.1.0"
+  edition = "2021"
+  authors = ["Guilherme Carreiro <karreiro@gmail.com>"]
+  license = "MIT"
+  publish = false
+
+  [lib]
+  crate-type = ["cdylib"]
+
+  [dependencies]
+  magnus = "0.6.4"
+  toml = "0.8.13"
+TOML
+
+namespace :benchmark do
+  desc 'Benchmark different TOML parsers (ips)'
+  task ips: :env do
+    Benchmark.ips do |x|
+      x.report('fast_toml')    { FastToml.parse(TOML_INPUT) }
+      x.report('toml')         { TOML::Parser.new(TOML_INPUT).parsed }
+      x.report('toml-rb')      { TomlRB.parse(TOML_INPUT) }
+      x.report('perfect_toml') { PerfectTOML.parse(TOML_INPUT) }
+      x.report('tomlrb')       { Tomlrb.parse(TOML_INPUT) }
+
+      x.compare!
+    end
+  end
+
+  desc 'Benchmark different TOML parsers (ms)'
+  task ms: :env do
+    n = 5_000
+
+    Benchmark.bm(20) do |x|
+      x.report('fast_toml:')    { n.times { FastToml.parse(TOML_INPUT) } }
+      x.report('toml:')         { n.times { TOML::Parser.new(TOML_INPUT).parsed } }
+      x.report('toml-rb:')      { n.times { TomlRB.parse(TOML_INPUT) } }
+      x.report('perfect_toml:') { n.times { PerfectTOML.parse(TOML_INPUT) } }
+      x.report('tomlrb:')       { n.times { Tomlrb.parse(TOML_INPUT) } }
+    end
+  end
+end

data/rakelib/env.rake

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+desc 'Initialize fast_json environment'
+task :env do
+  require 'lib/fast_toml'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_toml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Guilherme Carreiro
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-26 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.97
+        version: 0.9.85
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.97
+        version: 0.9.85
 description: A fast TOML parser.
 email:
 - karreiro@gmail.com
@@ -44,6 +44,8 @@ files:
 - ext/fast_toml/src/lib.rs
 - lib/fast_toml.rb
 - lib/fast_toml/version.rb
+- rakelib/benchmark.rake
+- rakelib/env.rake
 homepage: https://github.com/karreiro/fast_toml
 licenses:
 - MIT
@@ -53,7 +55,7 @@ metadata:
   homepage_uri: https://github.com/karreiro/fast_toml
   source_code_uri: https://github.com/karreiro/fast_toml
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +70,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.11
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: A fast TOML parser.
 test_files: []