ruby-bsdconv 9.1.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 54a67adad3a37bdadd7c228cf646c550639c3699
-  data.tar.gz: 390d6efe3f26711152c6470a863f23f09c032a8f
-!binary "U0hBNTEy":
-  metadata.gz: ecac181bd594764a69ddcd7d404bfd620f4fa6cbaa905e33c073e3f3981afcd2718c16b3783c9af2a36b6c18339463353da7bfc9dd35f44a74f6ab11ed2c0a9c
-  data.tar.gz: eb2479c38dd3afebd4b374cc16d19344dcf25eb3554d05c36014fb987a51527b86bb09958fd16d916ea839f06120fb89af208cd7eed5553cf9a1dfd28e8db395
+SHA1:
+  metadata.gz: f2b05eed033029fa06160d0f3a36ab6e41d5bf99
+  data.tar.gz: e98db25abc50cfd0ea3e6266c714f3f0d9f0eecf
+SHA512:
+  metadata.gz: 95ebfc61ac166317a0bd57f4545369df61375cd73557a9aa8a1dbc5252213d95c7180895fb9cd89a2789dd8ea2447f9e9875bdcc5e6e53e4692898adf5cbf6c4
+  data.tar.gz: 5f532a41a2064a6a157514e205c867103be6479728850aed95b39c0ed345994bfe1c5f0d46c05e1b712bec7b551fc22273004724357e7e1e0706b59bd2d850c6

data/Rakefile

@@ -9,7 +9,7 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'ruby-bsdconv'
-    s.version = '9.1.1'
+    s.version = '10.0.0'
     s.extensions  = 'ext/ruby-bsdconv/extconf.rb'
     s.authors     = ['Buganini Q']
     s.homepage    = 'https://github.com/buganini/ruby-bsdconv'

data/ext/ruby-bsdconv/bsdconv.c

@@ -17,10 +17,6 @@
 
 void Init_bsdconv();
 static VALUE m_new(VALUE, VALUE);
-static VALUE m_insert_phase(VALUE, VALUE, VALUE, VALUE);
-static VALUE m_insert_codec(VALUE, VALUE, VALUE, VALUE);
-static VALUE m_replace_phase(VALUE, VALUE, VALUE, VALUE);
-static VALUE m_replace_codec(VALUE, VALUE, VALUE, VALUE);
 static VALUE m_conv(VALUE, VALUE);
 static VALUE m_init(VALUE);
 static VALUE m_ctl(VALUE, VALUE, VALUE, VALUE);
@@ -31,6 +27,10 @@ static VALUE m_info(VALUE);
 static VALUE m_nil(VALUE);
 static VALUE m_inspect(VALUE);
 
+static VALUE f_insert_phase(VALUE, VALUE, VALUE, VALUE, VALUE);
+static VALUE f_insert_codec(VALUE, VALUE, VALUE, VALUE, VALUE);
+static VALUE f_replace_phase(VALUE, VALUE, VALUE, VALUE, VALUE);
+static VALUE f_replace_codec(VALUE, VALUE, VALUE, VALUE, VALUE);
 static VALUE f_error(VALUE);
 static VALUE f_codecs_list(VALUE, VALUE);
 static VALUE f_codec_check(VALUE, VALUE, VALUE);
@@ -42,10 +42,6 @@ VALUE Bsdconv_file;
 void Init_bsdconv(){
 	VALUE Bsdconv = rb_define_class("Bsdconv", rb_cObject);
 	rb_define_singleton_method(Bsdconv, "new", m_new, 1);
-	rb_define_method(Bsdconv, "insert_phase", m_insert_phase, 3);
-	rb_define_method(Bsdconv, "insert_codec", m_insert_codec, 3);
-	rb_define_method(Bsdconv, "replace_phase", m_replace_phase, 3);
-	rb_define_method(Bsdconv, "replace_codec", m_replace_codec, 3);
 	rb_define_method(Bsdconv, "conv", m_conv, 1);
 	rb_define_method(Bsdconv, "init", m_init, 0);
 	rb_define_method(Bsdconv, "ctl", m_ctl, 3);
@@ -64,6 +60,10 @@ void Init_bsdconv(){
 	rb_define_const(Bsdconv, "CTL_SET_TRIM_WIDTH", INT2NUM(BSDCONV_SET_TRIM_WIDTH));
 	rb_define_const(Bsdconv, "CTL_ATTACH_OUTPUT_FILE", INT2NUM(BSDCONV_ATTACH_OUTPUT_FILE));
 
+	rb_define_singleton_method(Bsdconv, "insert_phase", f_insert_phase, 4);
+	rb_define_singleton_method(Bsdconv, "insert_codec", f_insert_codec, 4);
+	rb_define_singleton_method(Bsdconv, "replace_phase", f_replace_phase, 4);
+	rb_define_singleton_method(Bsdconv, "replace_codec", f_replace_codec, 4);
 	rb_define_singleton_method(Bsdconv, "error", f_error, 0);
 	rb_define_singleton_method(Bsdconv, "codecs_list", f_codecs_list, 1);
 	rb_define_singleton_method(Bsdconv, "codec_check", f_codec_check, 2);
@@ -84,30 +84,6 @@ static VALUE m_new(VALUE class, VALUE conversion){
 	return Data_Wrap_Struct(class, 0, bsdconv_destroy, ins);
 }
 
-static VALUE m_insert_phase(VALUE self, VALUE conversion, VALUE phase_type, VALUE phasen){
-	struct bsdconv_instance *ins;
-	Data_Get_Struct(self, struct bsdconv_instance, ins);
-	return INT2NUM(bsdconv_insert_phase(ins, RSTRING_PTR(conversion), NUM2INT(phase_type), NUM2INT(phasen)));
-}
-
-static VALUE m_insert_codec(VALUE self, VALUE conversion, VALUE phasen, VALUE codecn){
-	struct bsdconv_instance *ins;
-	Data_Get_Struct(self, struct bsdconv_instance, ins);
-	return INT2NUM(bsdconv_insert_phase(ins, RSTRING_PTR(conversion), NUM2INT(phasen), NUM2INT(codecn)));
-}
-
-static VALUE m_replace_phase(VALUE self, VALUE conversion, VALUE phase_type, VALUE phasen){
-	struct bsdconv_instance *ins;
-	Data_Get_Struct(self, struct bsdconv_instance, ins);
-	return INT2NUM(bsdconv_insert_phase(ins, RSTRING_PTR(conversion), NUM2INT(phase_type), NUM2INT(phasen)));
-}
-
-static VALUE m_replace_codec(VALUE self, VALUE conversion, VALUE phasen, VALUE codecn){
-	struct bsdconv_instance *ins;
-	Data_Get_Struct(self, struct bsdconv_instance, ins);
-	return INT2NUM(bsdconv_insert_phase(ins, RSTRING_PTR(conversion), NUM2INT(phasen), NUM2INT(codecn)));
-}
-
 static VALUE m_conv(VALUE self, VALUE str){
 	VALUE ret;
 	struct bsdconv_instance *ins;
@@ -263,6 +239,34 @@ static VALUE m_inspect(VALUE self){
 	return ret;
 }
 
+static VALUE f_insert_phase(VALUE self, VALUE conversion, VALUE codec, VALUE phase_type, VALUE phasen){
+	char *s=bsdconv_insert_phase(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phase_type), NUM2INT(phasen));
+	char *ret=rb_str_new2(s);
+	bsdconv_free(s);
+	return ret;
+}
+
+static VALUE f_insert_codec(VALUE self, VALUE conversion, VALUE codec, VALUE phasen, VALUE codecn){
+	char *s=bsdconv_insert_codec(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phasen), NUM2INT(codecn));
+	char *ret=rb_str_new2(s);
+	bsdconv_free(s);
+	return ret;
+}
+
+static VALUE f_replace_phase(VALUE self, VALUE conversion, VALUE codec, VALUE phase_type, VALUE phasen){
+	char *s=bsdconv_replace_phase(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phase_type), NUM2INT(phasen));
+	char *ret=rb_str_new2(s);
+	bsdconv_free(s);
+	return ret;
+}
+
+static VALUE f_replace_codec(VALUE self, VALUE conversion, VALUE codec, VALUE phasen, VALUE codecn){
+	char *s=bsdconv_replace_codec(RSTRING_PTR(conversion), RSTRING_PTR(codec), NUM2INT(phasen), NUM2INT(codecn));
+	char *ret=rb_str_new2(s);
+	bsdconv_free(s);
+	return ret;
+}
+
 static VALUE f_error(VALUE self){
 	VALUE ret;
 	char *s=bsdconv_error();

data/ruby-bsdconv.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-bsdconv"
-  s.version = "9.1.1"
+  s.version = "10.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Buganini Q"]
-  s.date = "2013-03-02"
+  s.date = "2013-04-24"
   s.description = "ruby wrapper for bsdconv. bsdconv is a BSD licensed charset/encoding converter library with more functionalities than libiconv"
   s.extensions = ["ext/ruby-bsdconv/extconf.rb"]
   s.files = [

data/test/test_basic.rb

@@ -9,5 +9,21 @@ class TestBasic < Test::Unit::TestCase
     c.init
     assert_equal '許功蓋',
       c.conv_chunk("\263\134\245\134\273\134").force_encoding('utf-8')
+
+    sin="utf-8:utf-8,ascii"
+    sout=Bsdconv.insert_phase(sin, "upper", Bsdconv::INTER, 1)
+    assert_equal "UTF-8:UPPER:UTF-8,ASCII", sout
+
+    sin=sout
+    sout=Bsdconv.replace_phase(sin, "full", Bsdconv::INTER, 1)
+    assert_equal "UTF-8:FULL:UTF-8,ASCII", sout
+
+    sin=sout
+    sout=Bsdconv.replace_codec(sin, "big5", 2, 1)
+    assert_equal "UTF-8:FULL:UTF-8,BIG5", sout
+
+    sin=sout
+    sout=Bsdconv.insert_codec(sin, "ascii", 0, 1)
+    assert_equal "UTF-8,ASCII:FULL:UTF-8,BIG5", sout
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bsdconv
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 10.0.0
 platform: ruby
 authors:
 - Buganini Q
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies: []
 description: ruby wrapper for bsdconv. bsdconv is a BSD licensed charset/encoding
   converter library with more functionalities than libiconv
@@ -38,12 +38,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []