colordom 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e3d2955aeca515a0954b711f27a28a5f56f8209d691cd0a0d62342233a3a4c
-  data.tar.gz: ab16a833484169dbbfca29b97fe45a37eae9059d594a134adaa94b45d45787c1
+  metadata.gz: 94afc63c3c09bdb3a95b46e1addc8cd4b01e789dc5608e9cb7ca7c98d895c3a3
+  data.tar.gz: c5d316e57bef0e142773d906f15d84d757b1eddf16016d320859767fee72990c
 SHA512:
-  metadata.gz: 1f007efa2d93083c74aec5f37dca696d6e8d7a0dfe6aaf025e905acb0ef3e68ca7040fc9782e804cb69a6134b90fd3e3652f4b4ecfda7738ae83378e55500ae2
-  data.tar.gz: 7045debdfbcb5bf5e24d012f1bb32124b59345d44a54e171917f849c10d766c0db29f7f85f3a5bf45d21ce932e027595da2f3c15fab42c03d3e685b71f1783c6
+  metadata.gz: 5b62978940b5a5fa4278de9c221b25a4a084dbde3db3acec32d5935e6ef1810ff335884c8f37227aca1a0ef59cdf040125d75536e33fb4281e565414142e2650
+  data.tar.gz: 1455b29e2c473db6876482c027096b66bb3cdbb7f908ab01bbed2a245487164b2cf8578e80ba11b2ab88c60679506af901c8e324010dc0ab5aa4684ab0762e38

data/ext/colordom/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-magnus = "0.5"
+magnus = "0.7"
 image = "0.24"
 dominant_color = "0.3"
 palette_extract = "0.1"

data/ext/colordom/src/lib.rs

@@ -1,8 +1,7 @@
 use std::path::PathBuf;
 
 use magnus::{
-  class, define_module, function, method,
-  prelude::*, gc::register_mark_object, memoize,
+  function, method, prelude::*, value::Lazy, Ruby,
   Error, ExceptionClass, RModule, IntoValueFromNative
 };
 
@@ -10,12 +9,20 @@ use image::{DynamicImage};
 use palette_extract::{Quality, MaxColors, PixelEncoding, PixelFilter};
 use palette::{FromColor, IntoColor, Lab, Pixel, Srgb};
 
+static MODULE: Lazy<RModule> =
+  Lazy::new(|ruby| ruby.class_object().const_get("Colordom").unwrap());
+
+static ERROR: Lazy<ExceptionClass> =
+  Lazy::new(|ruby| ruby.get_inner(&MODULE).const_get("Error").unwrap());
+
 fn colordom_error() -> ExceptionClass {
-  *memoize!(ExceptionClass: {
-    let ex = class::object().const_get::<_, RModule>("Colordom").unwrap().const_get("Error").unwrap();
-    register_mark_object(ex);
-    ex
-  })
+  Ruby::get().unwrap().get_inner(&ERROR)
+}
+
+macro_rules! error {
+  ($ex:ident) => {
+    Error::new(colordom_error(), $ex.to_string())
+  };
 }
 
 #[derive(Clone)]
@@ -58,7 +65,7 @@ impl Image {
   fn new(path: PathBuf) -> Result<Self, Error> {
     match image::open(&path) {
       Ok(img) => Ok(Self { img }),
-      Err(ex) => Err(Error::new(colordom_error(), ex.to_string()))
+      Err(ex) => Err(error!(ex))
     }
   }
 
@@ -123,10 +130,10 @@ impl Image {
 }
 
 #[magnus::init]
-fn init() -> Result<(), Error> {
-  let module = define_module("Colordom")?;
+fn init(ruby: &Ruby) -> Result<(), Error> {
+  let module = ruby.define_module("Colordom")?;
 
-  let colorc = module.define_class("Color", class::object())?;
+  let colorc = module.define_class("Color", ruby.class_object())?;
 
   colorc.define_singleton_method("new", function!(Color::new, 3))?;
   colorc.define_method("r", method!(Color::r, 0))?;
@@ -142,7 +149,7 @@ fn init() -> Result<(), Error> {
   colorc.define_alias("to_rgb", "rgb")?;
   colorc.define_alias("to_hex", "hex")?;
 
-  let imagec = module.define_class("Image", class::object())?;
+  let imagec = module.define_class("Image", ruby.class_object())?;
 
   imagec.define_singleton_method("new", function!(Image::new, 1))?;
   imagec.define_method("histogram", method!(Image::histogram, 1))?;

data/lib/colordom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Colordom
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colordom
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Extract dominant colors from images