unf_ext 0.0.8.2.beta-x86-mingw32 → 0.0.9-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88f030d41a7a335fd8d58f11beebd252aec89f27c5410cead50292b00882e70
-  data.tar.gz: 5dc64a7fee43301b48be6693ec9d5c4856ee28f0356bde203f3ee793af283b41
+  metadata.gz: 0b8c714f79595d30e51cfd4a5aa3b7aa35fbcdbc65e12cdcd2583c2e60ba7b45
+  data.tar.gz: ac5bcb45c22d3d95451cfef2ae5d3f79593fd28092a823125f0dbb2b53549a1c
 SHA512:
-  metadata.gz: 430acd9b43918de00346c6c15ecdcde63923b390c1d6904b6f341c9fe7271f83eafb996b12cac0eca4a1979a5d66aa35bd84137c98607f6791c994274535c520
-  data.tar.gz: 7daddb45e188ea5608055bb0c9618f914fafa477ab11881a46f118f1ab703ffe6dd623de59d7738f92a846ad12f23046eb6f35b00bf122554b1327d1197d5999
+  metadata.gz: a1060824ec201a7f8fbeb7bd0c69992fe32afe40365937f4e04625768f7395fc47838cb8d2e3dafbfda9341f13fa5859375f7314343da53a5698d7d5ed59ae33
+  data.tar.gz: 9fa37db63a24970bbd0c68b5bd7e9edb5c41abbdf35147bc0dc1d777d6a76074e30a34b0f19c5300a110d92aeca6c510fce99e3db7d40f2c142dc5a312256d6a

data/.github/workflows/unf_ext.yml

@@ -11,28 +11,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0, windows-2019 ]
-        ruby: [ 2.6, 2.7, "3.0", 3.1, head ]
+        os: [ ubuntu-22.04, macos-12, windows-2022 ]
+        ruby: [ 2.7, "3.0", 3.1, 3.2, head ]
         include:
-          - { os: windows-2019, ruby: mingw }
+          - { os: windows-2022, ruby: ucrt  }
+          - { os: windows-2022, ruby: mswin }
         exclude:
-          - { os: windows-2019, ruby: head }
+          - { os: windows-2022, ruby: head }
 
     steps:
       - name: repo checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: load ruby cross-compilation toolkit
-        uses: MSP-Greg/setup-ruby-pkgs@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          mingw: _upgrade_
-
-      - name:  bundle install
-        shell: pwsh
-        run: |
-          bundle config set --local path .bundle/vendor
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: compile
         timeout-minutes: 5

data/.gitignore

@@ -1,7 +1,7 @@
 *.gem
 *.rbc
 *.so
-.bundle
+*.bundle
 .config
 .yardoc
 Gemfile.lock

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## 0.0.8.2 (2022-04-13)
+# Changelog
+
+## [0.0.9](https://github.com/knu/ruby-unf_ext/tree/v0.0.9) (2023-11-11)
+
+[Full Changelog](https://github.com/knu/ruby-unf_ext/compare/v0.0.8.2...v0.0.9)
+
+- Use the newer TypedData extension API [\#72](https://github.com/knu/ruby-unf_ext/pull/72) ([casperisfine](https://github.com/casperisfine))
+- Update Actions - updates OS's, add Ruby 3,2, etc [\#71](https://github.com/knu/ruby-unf_ext/pull/71) ([MSP-Greg](https://github.com/MSP-Greg))
+- Add cross compilation for Ruby 3.2 [\#69](https://github.com/knu/ruby-unf_ext/pull/69) ([johnnyshields](https://github.com/johnnyshields))
+
+## 0.0.8.2 (2022-05-26)
 
 - Add x64-mingw-ucrt native gem support for RubyInstaller 3.1.
 

data/ext/unf_ext/extconf.rb

@@ -6,6 +6,11 @@ else
   have_library('stdc++')
 
   case RbConfig::CONFIG['host_os']
+  when /mswin/
+    # Avoid `error C7555: use of designated initializers requires at least '/std:c++20'`
+    $CFLAGS << ' ' << '-std:c++20'
+    $CPPFLAGS << ' ' << '-std:c++20'
+    $CXXFLAGS << ' ' << '-std:c++20'
   when /solaris(!?2.11)/
     # Do a little trickery here to enable C++ standard on Solaris 11 if found.
     # This also forces 64bit compilation mode.

data/ext/unf_ext/unf.cc

@@ -8,7 +8,7 @@
 extern "C" {
   VALUE unf_allocate(VALUE klass);
   VALUE unf_initialize(VALUE self);
-  void unf_delete(UNF::Normalizer* ptr);
+  void unf_delete(void* ptr);
   VALUE unf_normalize(VALUE self, VALUE source, VALUE normalization_form);
 
   ID FORM_NFD;
@@ -30,10 +30,17 @@ extern "C" {
     FORM_NFKC= rb_intern("nfkc");
   }
 
+  static const rb_data_type_t unf_normalizer_data_type = {
+    .wrap_struct_name = "UNF::Normalizer",
+    .function = {
+      .dfree = unf_delete
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+  };
 
   VALUE unf_allocate(VALUE klass) {
     UNF::Normalizer* ptr;
-    VALUE obj = Data_Make_Struct(klass, UNF::Normalizer, NULL, unf_delete, ptr);
+    VALUE obj = TypedData_Make_Struct(klass, UNF::Normalizer, &unf_normalizer_data_type, ptr);
     new ((void*)ptr) UNF::Normalizer;
     return obj;
   }
@@ -42,14 +49,15 @@ extern "C" {
     return self;
   }
 
-  void unf_delete(UNF::Normalizer* ptr) {
+  void unf_delete(void *data) {
+    UNF::Normalizer* ptr = (UNF::Normalizer*)data;
     ptr->~Normalizer();
     ruby_xfree(ptr);
   }
 
   VALUE unf_normalize(VALUE self, VALUE source, VALUE normalization_form) {
     UNF::Normalizer* ptr;
-    Data_Get_Struct(self, UNF::Normalizer, ptr);
+    TypedData_Get_Struct(self, UNF::Normalizer, &unf_normalizer_data_type, ptr);
 
     const char* src = StringValueCStr(source);
     const char* rlt;

data/lib/unf_ext/version.rb

@@ -1,5 +1,5 @@
 module UNF
   class Normalizer
-    VERSION = "0.0.8.2.beta"
+    VERSION = "0.0.9"
   end
 end

data/unf_ext.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("test-unit")
   gem.add_development_dependency("rdoc", ["> 2.4.2"])
   gem.add_development_dependency("bundler", [">= 1.2"])
-  gem.add_development_dependency("rake-compiler", [">= 1.1.1"])
-  gem.add_development_dependency("rake-compiler-dock", [">= 1.2.1"])
+  gem.add_development_dependency("rake-compiler", [">= 1.2.1"])
+  gem.add_development_dependency("rake-compiler-dock", [">= 1.3.0"])
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: unf_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.8.2.beta
+  version: 0.0.9
 platform: x86-mingw32
 authors:
 - Takeru Ohta
 - Akinori MUSHA
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,28 +73,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
 description: Unicode Normalization Form support library for CRuby
 email:
 - knu@idaemons.org
@@ -126,6 +126,7 @@ files:
 - lib/2.7/unf_ext.so
 - lib/3.0/unf_ext.so
 - lib/3.1/unf_ext.so
+- lib/3.2/unf_ext.so
 - lib/unf_ext.rb
 - lib/unf_ext/version.rb
 - test/helper.rb
@@ -136,7 +137,7 @@ homepage: https://github.com/knu/ruby-unf_ext
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +148,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.2.dev
+      version: 3.3.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.4
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Unicode Normalization Form support library for CRuby
 test_files: