regexp_property_values 1.5.1-java → 1.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4518acf00c9367623e0e052c08972c13801ad749dd1bf4f7df8341cad28a639
-  data.tar.gz: 3d557814376809cede7762b4680ce043714463f3857e04ba8d66d29cfbb212f3
+  metadata.gz: 90678821cd4aa4d97e9354fa51582ac7e23c57c7f84f897338200ba9b17ac67d
+  data.tar.gz: b8d8f3a29eae253c8a58d9f8e3ec7a481c6f6007be83602fec122ab27b472646
 SHA512:
-  metadata.gz: 15d768da9c13f1cd45c871a0eb63b674dc5f86d46a95cd31fe7b3b65a998dbd397fae9af02d14ea6256db2d019020bb6feb277e0b1875f9b20ddac6ace5b20a8
-  data.tar.gz: 47778cf3fbf16427c6c5b27f7ab6a91431227cdae0c2b53ace0e6b0158018a04947975f52895ea985356d988cd7f15784e75d0e289fcbf2e880e07be7c2117be
+  metadata.gz: 2f43330b2f6d16d9ec879b128909477e2fd5e617ae96266f36fd1373c7795af1912d7b88af7c998b87d5df41449855b1b41c5cd3821f3bffd6c0331a3c14db77
+  data.tar.gz: ec20a5e4bbd837d3f5be01333fa0c5969549ad90d55ff50ad5545fcc86383969f7b9e018b5ef33d882e8d0818e904599f089ad3919e4c13774ea404e261f7b20

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.5.2] - 2024-05-20
+
+### Fixed
+- fixed `#matched_characters` for properties containing surrogates
+- improved speed of `#matched_codepoints`
+
 ## [1.5.1] - 2024-01-06
 
 ### Fixed

data/Gemfile

@@ -5,7 +5,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in regexp_property_values.gemspec
 gemspec
 
-gem 'character_set', '~> 1.4.0'
+gem 'character_set', '~> 1.8.0'
 gem 'rake', '~> 13.0'
 gem 'rake-compiler', '~> 1.0'
 gem 'range_compressor', '~> 1.0'

data/README.md

@@ -34,6 +34,8 @@ PV['foobar'].supported_by_current_ruby? # => false
 PV['AHex'].matched_characters # => %w[0 1 2 3 4 5 6 7 8 9 A B C ...]
 PV['AHex'].matched_codepoints # => [48, 49, 50, ...]
 PV['AHex'].matched_ranges # => [48..57, 65..70, 97..102]
+# Note: #matched_characters is slow for large properties and you
+# may not want to use it in time-critical code. It also omits surrogates.
 
 PV['foobar'].matched_ranges # => RegexpPropertyValues::Error
 ```

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "regexp_property_values"
+require "benchmark"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/ext/regexp_property_values/regexp_property_values.c

@@ -2,11 +2,13 @@
 #include "ruby/encoding.h"
 #include "ruby/oniguruma.h" // still in recent rubies f. backwards compatibility
 
-static int prop_name_to_ctype(char *name, rb_encoding *enc)
+static int prop_name_to_ctype(VALUE arg, rb_encoding *enc)
 {
+  char *name;
   UChar *uname;
   int ctype;
 
+  name = StringValueCStr(arg);
   uname = (UChar *)name;
   ctype = ONIGENC_PROPERTY_NAME_TO_CTYPE(enc, uname, uname + strlen(name));
   if (ctype < 0)
@@ -15,13 +17,26 @@ static int prop_name_to_ctype(char *name, rb_encoding *enc)
   return ctype;
 }
 
-VALUE onig_ranges_to_rb(const OnigCodePoint *onig_ranges)
+const OnigCodePoint *get_onig_ranges(VALUE prop_name)
+{
+  int ctype;
+  const OnigCodePoint *ranges;
+  OnigCodePoint sb_out;
+  rb_encoding *enc;
+
+  enc = rb_utf8_encoding();
+  ctype = prop_name_to_ctype(prop_name, enc);
+  ONIGENC_GET_CTYPE_CODE_RANGE(enc, ctype, &sb_out, &ranges);
+  return ranges;
+}
+
+VALUE onig_ranges_to_rb_ranges(const OnigCodePoint *onig_ranges)
 {
   unsigned int range_count, i;
   VALUE result, sub_range;
 
   range_count = onig_ranges[0];
-  result = rb_ary_new2(range_count); // rb_ary_new_capa not avail. in Ruby 2.0
+  result = rb_ary_new_capa(range_count);
 
   for (i = 0; i < range_count; i++)
   {
@@ -34,24 +49,35 @@ VALUE onig_ranges_to_rb(const OnigCodePoint *onig_ranges)
   return result;
 }
 
-VALUE rb_prop_ranges(char *name)
+VALUE onig_ranges_to_rb_integers(const OnigCodePoint *onig_ranges)
 {
-  int ctype;
-  const OnigCodePoint *onig_ranges;
-  OnigCodePoint sb_out;
-  rb_encoding *enc;
-  enc = rb_utf8_encoding();
+  unsigned int range_count, i, beg, end, j;
+  VALUE result;
+
+  range_count = onig_ranges[0];
+  result = rb_ary_new();
 
-  ctype = prop_name_to_ctype(name, enc);
-  ONIGENC_GET_CTYPE_CODE_RANGE(enc, ctype, &sb_out, &onig_ranges);
-  return onig_ranges_to_rb(onig_ranges);
+  for (i = 0; i < range_count; i++)
+  {
+    beg = onig_ranges[(i * 2) + 1];
+    end = onig_ranges[(i * 2) + 2];
+    for (j = beg; j <= end; j++)
+    {
+      rb_ary_push(result, INT2FIX(j));
+    }
+  }
+
+  return result;
 }
 
 VALUE method_matched_ranges(VALUE self, VALUE arg)
 {
-  char *prop_name;
-  prop_name = StringValueCStr(arg);
-  return rb_prop_ranges(prop_name);
+  return onig_ranges_to_rb_ranges(get_onig_ranges(arg));
+}
+
+VALUE method_matched_codepoints(VALUE self, VALUE arg)
+{
+  return onig_ranges_to_rb_integers(get_onig_ranges(arg));
 }
 
 void Init_regexp_property_values()
@@ -63,4 +89,5 @@ void Init_regexp_property_values()
   VALUE module;
   module = rb_define_module("OnigRegexpPropertyHelper");
   rb_define_singleton_method(module, "matched_ranges", method_matched_ranges, 1);
+  rb_define_singleton_method(module, "matched_codepoints", method_matched_codepoints, 1);
 }

data/lib/regexp_property_values/value/ext_adapter.rb

@@ -2,11 +2,17 @@ module RegexpPropertyValues
   class Value
     module ExtAdapter
       def matched_characters
-        matched_codepoints.map { |cp| cp.chr('utf-8') }
+        acc = []
+        matched_codepoints.each do |cp|
+          acc << cp.chr('utf-8') if cp < 0xD800 || cp > 0xDFFF
+        end
+        acc
       end
 
       def matched_codepoints
-        matched_ranges.flat_map(&:to_a)
+        OnigRegexpPropertyHelper.matched_codepoints(name)
+      rescue ArgumentError
+        raise_unsupported_or_unknown_error
       end
 
       def matched_ranges

data/lib/regexp_property_values/version.rb

@@ -1,3 +1,3 @@
 module RegexpPropertyValues
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

data/regexp_property_values.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
 
   s.extensions = %w[ext/regexp_property_values/extconf.rb]
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_property_values
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: java
 authors:
 - Janosch Müller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_compressor
@@ -67,14 +67,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Inspect property values supported by Ruby's regex engine