autocorrect-rb 2.1.2.beta1-arm64-darwin → 2.1.2.beta4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d783c8f798207868dd343de68b239e5e5c51317c39cda2e71aafc90bd18cf3b3
-  data.tar.gz: e20d333ce6aad66377d598edf9187ae263a953e02bcc9fe94f5fb5e1dcfd2af2
+  metadata.gz: 49f2cc6ec1cacd4ae9f78c8eb49eb79e6f601ea61ef9bb3f92bfefbb19157720
+  data.tar.gz: 04b62477401cfe22a1a7679f30a8787273b449f53296d2804bc7c9ce49a5104b
 SHA512:
-  metadata.gz: be27eda0b92c3f5c35eb57a7fc9af8785e64cbf744931f79ddda44183f6ef99ba0472c70f43b245c481f8d2f30cbbc6c058de76d1b91b7eea75a33764fcb2e2b
-  data.tar.gz: 6f9e44526a52a1865e20ec6a1a2bba898b946929b540fec405ffa6818c912bffcdd997ddcc7c1152a2a3425c78ce5ec48a49cb8433b8bdc9ee01da2aa5c43fa5
+  metadata.gz: b7a82ee2c926636b218df74b271bb83c458410e2decbade5eefb90726abd20d1de7b95ecc9c429a71d1f106a75fe3ab0cc70e05fef287f4aead9cbd77ee60cc6
+  data.tar.gz: 7468ce5e0a0733d05b234db4b7db769be1a889839d33b9a51edd3eb85b3146235690c2ed7dffc6ad0661bc2e9695b9fb5b3b99ca3b439dfc7161c2c873ffff16

data/Rakefile

@@ -7,6 +7,7 @@ rescue LoadError
 end
 
 require "bundler/gem_tasks"
+require "rubygems/package_task"
 require "rake/testtask"
 require "rake/extensiontask"
 require "bundler"
@@ -19,16 +20,22 @@ CROSS_PLATFORMS = %w[
   x86_64-linux
 ]
 
-spec = Bundler.load_gemspec("autocorrect-rb.gemspec")
-
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+spec = Bundler.load_gemspec("autocorrect-rb.gemspec")
+
+# Make a autocorrect-rb-0.0.0.gem
+# Disable release gem for platform: ruby, because autocorrect rust source build is complex.
+# Gem::PackageTask.new(spec).define
+
+# Make a native gem, eg. autocorrect-rb-0.0.0-x86_64-linux.gem
 Rake::ExtensionTask.new("autocorrect", spec) do |ext|
-  # ext.lib_dir = "lib/autocorrect"
+  # Compile output autocorrect.so into lib/autocorrect/autocorrect.so
+  ext.lib_dir = "lib/autocorrect"
   ext.source_pattern = "*.{rs,toml}"
   ext.cross_compile = true
   ext.cross_platform = CROSS_PLATFORMS
@@ -65,6 +72,5 @@ task :bench do
   end
 end
 
-task build: :compile
 task test: :compile
-task default: %i[compile test]
+task default: %i[test]

data/ext/autocorrect/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+edition = "2021"
+name = "autocorrect-rb"
+version = "2.1.1"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+crate-type = ["cdylib"]
+name = "autocorrect"
+
+[dependencies]
+autocorrect = {path = "../../../autocorrect", version = ">=1.0.0"}
+magnus = "0.3"

data/ext/autocorrect/extconf.rb

@@ -1,4 +1,4 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("autocorrect")
+create_rust_makefile("autocorrect/autocorrect")

data/ext/autocorrect/src/lib.rs

@@ -0,0 +1,125 @@
+use magnus::{define_class, function, Error, Object};
+
+#[derive(Debug, Clone)]
+pub struct LineResult {
+    line: usize,
+    col: usize,
+    new: String,
+    old: String,
+    severity: usize,
+}
+
+impl LineResult {
+    pub fn line(&self) -> usize {
+        self.line
+    }
+
+    pub fn col(&self) -> usize {
+        self.col
+    }
+
+    pub fn get_new(&self) -> String {
+        self.new.clone()
+    }
+
+    pub fn old(&self) -> String {
+        self.old.clone()
+    }
+
+    pub fn severity(&self) -> usize {
+        self.severity
+    }
+
+    pub fn inspect(&self) -> String {
+        format!("{:?}", self)
+    }
+
+    pub fn to_hash(&self) -> Result<magnus::RHash, Error> {
+        let hash = magnus::RHash::new();
+        hash.aset("line", self.line())?;
+        hash.aset("col", self.col())?;
+        hash.aset("new", self.get_new())?;
+        hash.aset("old", self.old())?;
+        hash.aset("severity", self.severity())?;
+        Ok(hash)
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct LintResult {
+    pub filepath: String,
+    pub lines: Vec<LineResult>,
+    pub error: String,
+}
+
+impl LintResult {
+    pub fn filepath(&self) -> String {
+        self.filepath.clone()
+    }
+
+    pub fn lines(&self) -> Vec<LineResult> {
+        self.lines.clone()
+    }
+
+    pub fn error(&self) -> String {
+        self.error.clone()
+    }
+
+    pub fn inspect(&self) -> String {
+        format!("{:?}", self)
+    }
+
+    pub fn to_hash(&self) -> Result<magnus::RHash, Error> {
+        let hash = magnus::RHash::new();
+        hash.aset("filepath", self.filepath())?;
+        hash.aset(
+            "lines",
+            self.lines()
+                .iter()
+                .map(|l| l.to_hash().unwrap())
+                .collect::<Vec<magnus::RHash>>(),
+        )?;
+        hash.aset("error", self.error())?;
+        Ok(hash)
+    }
+}
+
+pub fn format(input: String) -> String {
+    autocorrect::format(&input)
+}
+
+pub fn format_for(input: String, filename_or_ext: String) -> String {
+    autocorrect::format_for(&input, &filename_or_ext).out
+}
+
+pub fn lint_for(input: String, filename_or_ext: String) -> magnus::RHash {
+    let result = autocorrect::lint_for(&input, &filename_or_ext);
+
+    LintResult {
+        filepath: filename_or_ext,
+        lines: result
+            .lines
+            .iter()
+            .map(|l| LineResult {
+                line: l.line,
+                col: l.col,
+                new: l.new.clone(),
+                old: l.old.clone(),
+                severity: l.severity.clone() as usize,
+            })
+            .collect::<_>(),
+        error: result.error,
+    }
+    .to_hash()
+    .unwrap()
+}
+
+#[magnus::init(name = "autocorrect")]
+fn init() -> Result<(), Error> {
+    let class = define_class("AutoCorrect", Default::default())?;
+    class.define_singleton_method("format", function!(format, 1))?;
+    class.define_singleton_method("format_for", function!(format_for, 2))?;
+    class.define_singleton_method("lint_for", function!(lint_for, 2))?;
+
+    Ok(())
+}

data/lib/autocorrect-rb.rb

@@ -3,10 +3,5 @@ begin
   ruby_version = /(\d+\.\d+)/.match(::RUBY_VERSION)
   require_relative "autocorrect/#{ruby_version}/autocorrect"
 rescue LoadError
-  # fall back to the extension compiled upon installation.
-  # use "require" instead of "require_relative" because non-native gems will place C extension files
-  # in Gem::BasicSpecification#extension_dir after compilation (during normal installation), which
-  # is in $LOAD_PATH but not necessarily relative to this file
-  # (see https://github.com/sparklemotion/nokogiri/issues/2300 for more)
   require "autocorrect/autocorrect"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autocorrect-rb
 version: !ruby/object:Gem::Version
-  version: 2.1.2.beta1
+  version: 2.1.2.beta4
 platform: arm64-darwin
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -34,11 +34,13 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- ext/autocorrect/Cargo.toml
 - ext/autocorrect/extconf.rb
-- lib/2.7/autocorrect.bundle
-- lib/3.0/autocorrect.bundle
-- lib/3.1/autocorrect.bundle
+- ext/autocorrect/src/lib.rs
 - lib/autocorrect-rb.rb
+- lib/autocorrect/2.7/autocorrect.bundle
+- lib/autocorrect/3.0/autocorrect.bundle
+- lib/autocorrect/3.1/autocorrect.bundle
 homepage: https://github.com/huacnlee/autocorrect
 licenses:
 - MIT