colordom 0.9.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c8de04d1de01b313514ca8971f57b4050125165d3966c1c9bd5e3e26c978ec
-  data.tar.gz: b0c2eb60501eeaf6b232dd2401961a006bad283dabf669ab6954230dc0aebefb
+  metadata.gz: 4d4eda839bf50d6aff4cbd90d41dd831a8d3046e8cc9b304289a206efbbf5e21
+  data.tar.gz: 9d4193855a4d1f4ff25db136905065b93650839dc744e08ee38b5efa1ae69b25
 SHA512:
-  metadata.gz: c2e2e2465599fc75642c82a1fa568cd757b17ef63a8057dbe1a26d67732e04dc65ea58a190e763e168a97d1aaee570eb46536590341c5bca2c1bca50bfd432d9
-  data.tar.gz: 05e690df2658a015342ce12446bee56c028133d94afdf67469e08ff5349958f00852fb32541fc01beac4ef2316c751dd1027c94c66110c85d3015796088179bb
+  metadata.gz: 01cf25d70191c3035fdc0f82fec4aa26d3016daa61ffc7c915c35d19b95c957fc33f6c94aed28a8db9b7b25e6eac57785fa7ffa4ff195809064395083ebc20c7
+  data.tar.gz: 4f7ba672b294f2f2679611e6cec332143f366d71ef9f72bdc1c2500bc49b783fa673cb3ee10d1671009339eaef9282b45e45c5431631ce82a7cefa6d64239036

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,14 @@ 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 {
@@ -129,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))?;
@@ -148,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.9.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colordom
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="