opencc-rb 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36111587c88ebb5bad5627397aec98d5a5100863ba55c6da2decf5c6740e0008
-  data.tar.gz: 58d1302032b5612973a48d13df89ca86bdfefb619e6b70261fa587ac137c5680
+  metadata.gz: d68ddb8428b8039e56ea9784495cf60534822013694fdda4c1e94815169fb614
+  data.tar.gz: d3bb445106db7e37f3347f263bc2bb083ee4eaa11f8336dcb5ca36263ba8a3e5
 SHA512:
-  metadata.gz: a589ef598d17e5506844398be9c91e0b67053cbcfa5bad8731a926a0c016f849ca5ebac405921c98ed08b76d29704b4033f37394e477e3c3f79104d8c429826e
-  data.tar.gz: 89dc71b414e3515009836a0ee5f3940289cb794a610a6ecca0ed3a5b4580a94e122d0db71c63d2f60f83e46d69b22520cc203eb54370ba05479792b3a958a89a
+  metadata.gz: b04c2067f6dad9761b3d27113e1dae9760b085734208735a5983046c0fa1d52a98179eb285eaa09b0ff8730bc41b5539223af021840878fada02b73cd2aa7500
+  data.tar.gz: 219a38feecfc811789f86e35390c3b2fe394d9d03b1ae114b17458e7a36d38674b2c34582c8037347ebf55440ede174cb0c25deaedc49b7091892a3c1dff00ac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opencc-rb (1.0.5)
+    opencc-rb (1.0.6)
 
 GEM
   remote: https://rubygems.org/
@@ -21,4 +21,4 @@ DEPENDENCIES
   rake-compiler
 
 BUNDLED WITH
-   2.2.16
+   2.2.22

data/README.md

@@ -92,14 +92,11 @@ OpenCC.jp2t("芸術 欠航 飲料缶") # => "藝術 缺航 飲料罐"
 OpenCC.tw2t("想到自己一緊張就口吃，我就沒胃口吃飯") # => "想到自己一緊張就口吃，我就沒胃口喫飯"
 
 # Or
-converter = OpenCC[:s2t]
-converter = OpenCC.new(:s2t)
+# You *must* call close when you're finished
 converter = OpenCC::Converter.new(:s2t)
 converter.convert("汉字") # => '漢字'
 converter.close # => true
-converter.closed? # => true
 converter.close # => false
-converter.convert("汉字") # => nil
 ```
 
 ## Development

data/ext/opencc/opencc.c

@@ -1,38 +1,89 @@
 #include "opencc.h"
 
-VALUE rb_mOpenCC;
-VALUE rb_mOpenCC_Mixin;
+#define OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD "s2t.json"
 
-static VALUE rb_opencc_open(VALUE self, VALUE rb_cfg) {
-  const char *cfg = OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD;
-  opencc_t ptr;
+VALUE mOpenCC;
+VALUE cConverter;
 
-  if (TYPE(rb_cfg) == T_STRING && RSTRING_LEN(rb_cfg) > 0) {
-    cfg = RSTRING_PTR(rb_cfg);
+typedef struct {
+  opencc_t opencc;
+} opencc_converter_t;
+
+static void opencc_converter_t_dfree(void* _ptr) {
+  opencc_converter_t* ptr = (opencc_converter_t*)_ptr;
+  if (ptr->opencc != NULL && ptr->opencc != (opencc_t) - 1) {
+    opencc_close(ptr->opencc);
+  }
+  free(ptr);
+}
+
+static size_t opencc_converter_t_dsize(const void* _ptr) {
+  return sizeof(opencc_converter_t);
+}
+
+static const rb_data_type_t opencc_converter_data_type = {
+  .wrap_struct_name = "opencc converter object",
+  .function = {
+    .dfree = opencc_converter_t_dfree,
+    .dsize = opencc_converter_t_dsize,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+VALUE opencc_converter_t_alloc(VALUE self) {
+  opencc_converter_t *ptr = malloc(sizeof(opencc_converter_t));
+
+  return TypedData_Wrap_Struct(self, &opencc_converter_data_type, ptr);
+}
+
+static VALUE opencc_converter_t_initialize(int argc, VALUE* argv, VALUE self) {
+  opencc_converter_t *ptr;
+  const char *cfg = NULL;
+
+  if (argv[0] != Qnil) {
+    switch (TYPE(argv[0])) {
+      case T_SYMBOL:
+        cfg = RSTRING_PTR(rb_sym_to_s(argv[0]));
+        break;
+      case T_STRING:
+        cfg = RSTRING_PTR(argv[0]);
+        break;
+    }
   }
 
-  ptr = opencc_open(cfg);
+  TypedData_Get_Struct(self, opencc_converter_t, &opencc_converter_data_type, ptr);
+
+  ptr->opencc = opencc_open(cfg);
 
   // On error the return value will be (opencc_t) -1.
-  if (ptr == (opencc_t) - 1) {
-    return Qnil;
-  } else {
-    return LONG2FIX((long)ptr);
+  if (ptr->opencc == (opencc_t) - 1) {
+    free(ptr);
+    rb_raise(rb_eException, "%s", "(opencc_open) failed to allocate instance of opencc");
   }
+  return self;
 }
 
-static VALUE rb_opencc_convert(VALUE self, VALUE rb_opencc, VALUE rb_str) {
-  opencc_t ptr = (opencc_t) FIX2LONG(rb_opencc);
-  char * buff = opencc_convert_utf8(ptr, RSTRING_PTR(rb_str), RSTRING_LEN(rb_str));
-  VALUE converted = rb_utf8_str_new_cstr(buff);
-  opencc_convert_utf8_free(buff);
-  return converted;
+static VALUE opencc_converter_t_convert(VALUE self, VALUE input) {
+  opencc_converter_t *ptr;
+  TypedData_Get_Struct(self, opencc_converter_t, &opencc_converter_data_type, ptr);
+
+  if (ptr->opencc != NULL) {
+    char * buff = opencc_convert_utf8(ptr->opencc, RSTRING_PTR(input), RSTRING_LEN(input));
+    VALUE result = rb_utf8_str_new_cstr(buff);
+    opencc_convert_utf8_free(buff);
+    return result;
+  } else {
+    rb_warn("%s", "opencc has been closed");
+    return Qnil;
+  }
 }
 
-static VALUE rb_opencc_close(VALUE self, VALUE rb_opencc) {
-  opencc_t ptr = (opencc_t) FIX2LONG(rb_opencc);
+static VALUE opencc_converter_t_close(VALUE self) {
+  opencc_converter_t *ptr;
+  TypedData_Get_Struct(self, opencc_converter_t, &opencc_converter_data_type, ptr);
 
-  if (opencc_close(ptr) == 0) {
+  if (ptr->opencc != NULL && opencc_close(ptr->opencc) == 0) {
+    ptr->opencc = NULL;
     return Qtrue;
   } else {
     return Qfalse;
@@ -40,10 +91,11 @@ static VALUE rb_opencc_close(VALUE self, VALUE rb_opencc) {
 }
 
 void Init_opencc(void) {
-  rb_mOpenCC = rb_define_module("OpenCC");
-  rb_mOpenCC_Mixin = rb_define_module_under(rb_mOpenCC, "Mixin");
+  mOpenCC = rb_define_module("OpenCC");
+  cConverter = rb_define_class_under(mOpenCC, "Converter", rb_cObject);
 
-  rb_define_private_method(rb_mOpenCC_Mixin, "opencc_open", rb_opencc_open, 1);
-  rb_define_private_method(rb_mOpenCC_Mixin, "opencc_close", rb_opencc_close, 1);
-  rb_define_private_method(rb_mOpenCC_Mixin, "opencc_convert", rb_opencc_convert, 2);
+  rb_define_alloc_func(cConverter, opencc_converter_t_alloc);
+  rb_define_method(cConverter, "initialize", opencc_converter_t_initialize, -1);
+  rb_define_method(cConverter, "convert", opencc_converter_t_convert, 1);
+  rb_define_method(cConverter, "close", opencc_converter_t_close, 0);
 }

data/ext/opencc/opencc.h

@@ -4,8 +4,4 @@
 #include <ruby.h>
 #include <opencc/opencc.h>
 
-static VALUE rb_opencc_open(VALUE self, VALUE rb_cfg);
-static VALUE rb_opencc_convert(VALUE self, VALUE rb_occid, VALUE rb_str);
-static VALUE rb_opencc_close(VALUE self, VALUE rb_occid);
-
 #endif /* RUBY_OPENCC_H */

data/lib/opencc.rb

@@ -1,28 +1,31 @@
 require "opencc/version"
 require "opencc/opencc"
-require "opencc/converter"
 
 module OpenCC
   CONFIGS = %w[ s2t t2s s2tw tw2s s2hk hk2s s2twp tw2sp hk2t t2hk t2jp jp2t tw2t ]
-  DEFAULT_CONFIG = "s2t"
 
   class << self
     def with(config, &block)
-      Converter.with(config, &block)
-    end
-
-    def [](config)
-      config && new(config)
-    end
-
-    def new(config = nil)
-      Converter.new(config)
+      converter = Converter.new(config)
+      
+      begin
+        if block.arity == 0
+          converter.instance_eval(&block)
+        else
+          yield converter
+        end
+      ensure
+        converter && converter.close
+      end
     end
 
     CONFIGS.each do |config|
       define_method :"#{config}" do |input|
-        with(config) do |converter|
+        begin
+          converter = Converter.new(config)
           converter.convert(input)
+        ensure
+          converter && converter.close
         end
       end
     end

data/lib/opencc/version.rb

@@ -1,3 +1,3 @@
 module OpenCC
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencc-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - zsj
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies: []
 description: This gem is for conversions between Traditional Chinese, Simplified Chinese
   and Japanese Kanji (Shinjitai). It supports character-level and phrase-level conversion,
@@ -35,7 +35,6 @@ files:
 - ext/opencc/opencc.c
 - ext/opencc/opencc.h
 - lib/opencc.rb
-- lib/opencc/converter.rb
 - lib/opencc/version.rb
 - opencc.gemspec
 homepage: https://github.com/songjiz/opencc-rb
@@ -59,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: This gem is for conversions between Traditional Chinese, Simplified Chinese

data/lib/opencc/converter.rb

@@ -1,70 +0,0 @@
-module OpenCC
-  class Converter
-    include OpenCC::Mixin
-
-    class << self
-      def with(config, &block)
-        converter = new(config)
-        if block.arity == 0
-          converter.instance_eval(&block)
-        else
-          yield converter
-        end
-      ensure
-        converter.close
-      end
-    end
-    
-    attr_reader :config
-
-    # *<tt>:config</tt> - The config file name without .json suffix, default "s2t"
-    def initialize(config = nil)
-      @config = (config || OpenCC::DEFAULT_CONFIG).to_s
-
-      if !OpenCC::CONFIGS.include?(@config)
-        raise ArgumentError, "Unsupported configuration name #{@config.inspect}, expected one of #{OpenCC::CONFIGS.join(', ')}"
-      end
-
-      @mutex  = Mutex.new
-      @closed = false
-    end
-
-    def convert(input)
-      synchronize do
-        return if closed?
-        
-        @__opencc__ ||= opencc_open(config_file_name)
-        
-        if @__opencc__.nil?
-          raise RuntimeError, "OpenCC failed to load (#{config_file_name})"
-        end
-        
-        opencc_convert(@__opencc__, input.force_encoding(Encoding::UTF_8))
-      end
-    end
-
-    def close
-      synchronize do
-        return false if closed?
-        return false if @__opencc__.nil?
-        return false if !opencc_close(@__opencc__)
-
-        @__opencc__ = nil
-        @closed = true
-      end
-    end
-
-    def closed?
-      @closed
-    end
-
-    private
-      def synchronize(&block)
-        @mutex.synchronize(&block)
-      end
-
-      def config_file_name
-        "#{@config}.json"
-      end
-  end
-end