ruby-bsdconv 10.0.0 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b05eed033029fa06160d0f3a36ab6e41d5bf99
-  data.tar.gz: e98db25abc50cfd0ea3e6266c714f3f0d9f0eecf
+  metadata.gz: 0066bb97b35708c2537ce5e757ba9bbcdb507a44
+  data.tar.gz: 7e09436a715d04d719d71a9f52c4a29a35f5cc00
 SHA512:
-  metadata.gz: 95ebfc61ac166317a0bd57f4545369df61375cd73557a9aa8a1dbc5252213d95c7180895fb9cd89a2789dd8ea2447f9e9875bdcc5e6e53e4692898adf5cbf6c4
-  data.tar.gz: 5f532a41a2064a6a157514e205c867103be6479728850aed95b39c0ed345994bfe1c5f0d46c05e1b712bec7b551fc22273004724357e7e1e0706b59bd2d850c6
+  metadata.gz: 3da4b1f5d9743358fda293bca924e022dfaa394104c6465873063ccdf3e326a4aa4c795911e002549981e1df9ab41257a66ed6178bb20c7f5581bf9434763748
+  data.tar.gz: f0cb64891797a31c7b225dd1b148cc17616f2604e28b3802c43f0115f837ee6f2e19ea19e34275ed88385fb014f37f2d0d47c65b709363a6ed04715fbe2c00e8

data/README

@@ -1 +1,3 @@
+https://rubygems.org/gems/ruby-bsdconv
+
 see example/* for examples

data/Rakefile

@@ -9,10 +9,12 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'ruby-bsdconv'
-    s.version = '10.0.0'
+    s.version = '11.1.0'
     s.extensions  = 'ext/ruby-bsdconv/extconf.rb'
     s.authors     = ['Buganini Q']
+    s.email       = 'buganini@gmail.com'
     s.homepage    = 'https://github.com/buganini/ruby-bsdconv'
+    s.license     = 'BSD'
     s.summary     = 'ruby wrapper for bsdconv'
     s.description =
       "#{s.summary}. bsdconv is a BSD licensed charset/encoding converter" \

data/example/example.rb

@@ -14,4 +14,4 @@ while $stdin.gets
 end
 puts c.conv_chunk_last('')
 
-p c.info
+p c.counter

data/ext/ruby-bsdconv/bsdconv.c

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2011-2013 Kuan-Chung Chiu <buganini@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 #include <ruby.h>
 #ifdef HAVE_RUBY_IO_H		/* Ruby 1.9 and later */
 #include "ruby/io.h"
@@ -23,7 +38,8 @@ static VALUE m_ctl(VALUE, VALUE, VALUE, VALUE);
 static VALUE m_conv_chunk(VALUE, VALUE);
 static VALUE m_conv_chunk_last(VALUE, VALUE);
 static VALUE m_conv_file(VALUE, VALUE, VALUE);
-static VALUE m_info(VALUE);
+static VALUE m_counter(int, VALUE *, VALUE);
+static VALUE m_counter_reset(int, VALUE *, VALUE);
 static VALUE m_nil(VALUE);
 static VALUE m_inspect(VALUE);
 
@@ -48,7 +64,8 @@ void Init_bsdconv(){
 	rb_define_method(Bsdconv, "conv_chunk", m_conv_chunk, 1);
 	rb_define_method(Bsdconv, "conv_chunk_last", m_conv_chunk_last, 1);
 	rb_define_method(Bsdconv, "conv_file", m_conv_file, 2);
-	rb_define_method(Bsdconv, "info", m_info, 0);
+	rb_define_method(Bsdconv, "counter", m_counter, -1);
+	rb_define_method(Bsdconv, "counter_reset", m_counter_reset, -1);
 	rb_define_method(Bsdconv, "inspect", m_inspect, 0);
 
 	rb_define_const(Bsdconv, "FROM", INT2NUM(FROM));
@@ -93,6 +110,7 @@ static VALUE m_conv(VALUE self, VALUE str){
 	ins->input.data=RSTRING_PTR(str);
 	ins->input.len=RSTRING_LEN(str);
 	ins->input.flags=0;
+	ins->input.next=NULL;
 	ins->flush=1;
 	bsdconv(ins);
 	ret=rb_str_new(ins->output.data, ins->output.len);
@@ -130,6 +148,7 @@ static VALUE m_conv_chunk(VALUE self, VALUE str){
 	ins->input.data=RSTRING_PTR(str);
 	ins->input.len=RSTRING_LEN(str);
 	ins->input.flags=0;
+	ins->input.next=NULL;
 	bsdconv(ins);
 	ret=rb_str_new(ins->output.data, ins->output.len);
 	bsdconv_free(ins->output.data);
@@ -144,6 +163,7 @@ static VALUE m_conv_chunk_last(VALUE self, VALUE str){
 	ins->input.data=RSTRING_PTR(str);
 	ins->input.len=RSTRING_LEN(str);
 	ins->input.flags=0;
+	ins->input.next=NULL;
 	bsdconv(ins);
 	ret=rb_str_new(ins->output.data, ins->output.len);
 	bsdconv_free(ins->output.data);
@@ -190,6 +210,7 @@ static VALUE m_conv_file(VALUE self, VALUE ifile, VALUE ofile){
 		ins->input.data=in;
 		ins->input.len=fread(in, 1, IBUFLEN, inf);
 		ins->input.flags|=F_FREE;
+		ins->input.next=NULL;
 		if(ins->input.len==0){
 			ins->flush=1;
 		}
@@ -207,18 +228,33 @@ static VALUE m_conv_file(VALUE self, VALUE ifile, VALUE ofile){
 	return Qtrue;
 }
 
-static VALUE m_info(VALUE self){
+static VALUE m_counter(int argc, VALUE *argv, VALUE self){
+	struct bsdconv_instance *ins;
+	Data_Get_Struct(self, struct bsdconv_instance, ins);
+	if(argc!=0){
+		bsdconv_counter_t *v=bsdconv_counter(ins, RSTRING_PTR(argv[0]));
+		return INT2NUM(*v);
+	}else{
+		VALUE ret=rb_hash_new();
+		struct bsdconv_counter_entry *p=ins->counter;
+		while(p){
+			rb_hash_aset(ret, rb_str_new2(p->key), INT2FIX(p->val));
+			p=p->next;
+		}
+		return ret;
+	}
+}
+
+static VALUE m_counter_reset(int argc, VALUE *argv, VALUE self){
 	VALUE ret;
 	struct bsdconv_instance *ins;
 	Data_Get_Struct(self, struct bsdconv_instance, ins);
-	ret=rb_hash_new();
-	rb_hash_aset(ret, rb_str_new2("ierr"), INT2FIX(ins->ierr));
-	rb_hash_aset(ret, rb_str_new2("oerr"), INT2FIX(ins->oerr));
-	rb_hash_aset(ret, rb_str_new2("score"), rb_float_new(ins->score));
-	rb_hash_aset(ret, rb_str_new2("full"), INT2FIX(ins->full));
-	rb_hash_aset(ret, rb_str_new2("half"), INT2FIX(ins->half));
-	rb_hash_aset(ret, rb_str_new2("ambi"), INT2FIX(ins->ambi));
-	return ret;
+	if(argc!=0){
+		bsdconv_counter_reset(ins, RSTRING_PTR(argv[0]));
+	}else{
+		bsdconv_counter_reset(ins, NULL);
+	}
+	return Qtrue;
 }
 
 static VALUE m_inspect(VALUE self){

data/ruby-bsdconv.gemspec

@@ -1,13 +1,15 @@
 # -*- encoding: utf-8 -*-
+# stub: ruby-bsdconv 11.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby-bsdconv"
-  s.version = "10.0.0"
+  s.version = "11.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Buganini Q"]
-  s.date = "2013-04-24"
+  s.date = "2013-09-16"
   s.description = "ruby wrapper for bsdconv. bsdconv is a BSD licensed charset/encoding converter library with more functionalities than libiconv"
+  s.email = "buganini@gmail.com"
   s.extensions = ["ext/ruby-bsdconv/extconf.rb"]
   s.files = [
   ".gitignore",
@@ -22,8 +24,9 @@ Gem::Specification.new do |s|
   "task/gemgem.rb",
   "test/test_basic.rb"]
   s.homepage = "https://github.com/buganini/ruby-bsdconv"
+  s.licenses = ["BSD"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0"
+  s.rubygems_version = "2.1.3"
   s.summary = "ruby wrapper for bsdconv"
   s.test_files = ["test/test_basic.rb"]
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bsdconv
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 11.1.0
 platform: ruby
 authors:
 - Buganini Q
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-09-16 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
-email: 
+email: buganini@gmail.com
 executables: []
 extensions:
 - ext/ruby-bsdconv/extconf.rb
@@ -30,7 +30,8 @@ files:
 - task/gemgem.rb
 - test/test_basic.rb
 homepage: https://github.com/buganini/ruby-bsdconv
-licenses: []
+licenses:
+- BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -48,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for bsdconv