hunspell-i18n 0.2.1 → 0.2.2

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: create gemspec'
 task :default => :gemspec

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/ext/hunspell_wrap.c

@@ -2,7 +2,6 @@
 #include <hunspell/hunspell.h>
 
 static VALUE rb_cHunspell;
-static VALUE rb_cIconv;
 static VALUE enc_utf8;
 static VALUE enc_iso8859_1;
 
@@ -10,6 +9,10 @@ static void dict_destroy(Hunhandle *handle) {
     Hunspell_destroy(handle);
 }
 
+static VALUE hunspell_alloc(VALUE klass) {
+    return Data_Wrap_Struct(klass, 0, dict_destroy, 0);
+}
+
 /*
  *  call-seq:
  *     Hunspell.new(affix_path, dic_path)
@@ -20,24 +23,15 @@ static void dict_destroy(Hunhandle *handle) {
  *    speller = Hunspell.new("/usr/share/myspell/en_US.aff", "/usr/share/myspell/en_US.dic")
  *
  */
-static VALUE dict_init(VALUE self, VALUE affix_path, VALUE dic_path) {
+static VALUE hunspell_initialize(VALUE self, VALUE affix_path, VALUE dic_path) {
     VALUE affpath = StringValue(affix_path), dpath = StringValue(dic_path);
     Hunhandle *handle = Hunspell_create(RSTRING_PTR(affpath), RSTRING_PTR(dpath));
     if (!handle) {
       rb_raise(rb_eRuntimeError, "Failed to initialize Hunspell handle.");
     }
-    VALUE dict = Data_Wrap_Struct(rb_cHunspell, NULL, dict_destroy, handle);
-    rb_iv_set(self, "dict", dict);
-    return self;
-}
+    DATA_PTR(self) = handle;
 
-static inline Hunhandle* get_handle(VALUE self) {
-    Hunhandle *handle = NULL;
-    Data_Get_Struct(rb_iv_get(self, "dict"), Hunhandle, handle);
-    if (!handle) {
-      rb_raise(rb_eRuntimeError, "Hunspell handle not found.");
-    }
-    return handle;
+    return self;
 }
 
 /*
@@ -47,7 +41,7 @@ static inline Hunhandle* get_handle(VALUE self) {
  *  Returns the encoding of the dictionary.
  */
 static VALUE wrap_encoding(VALUE self) {
-    Hunhandle *handle = get_handle(self);
+    Hunhandle *handle = (Hunhandle *)DATA_PTR(self);
     char *enc = Hunspell_get_dic_encoding(handle);
     return rb_str_new2(enc);
 }
@@ -64,8 +58,7 @@ static VALUE recode_if_needed(VALUE self, VALUE str, int dir) {
         to = enc_utf8;
     }
     if ( rb_str_equal(enc, enc_iso8859_1) == Qfalse && rb_str_equal(enc, enc_utf8) == Qfalse) {
-        rb_funcall(str, rb_intern("force_encoding"), 1, enc_utf8);
-        return rb_funcall(rb_cIconv, rb_intern("conv"), 3, to, from, str);
+        return rb_funcall(str, rb_intern("encode"), 2, to, from);
     } else {
         return str;
     }
@@ -82,7 +75,7 @@ static VALUE wrap_suggest(VALUE self, VALUE word) {
     VALUE res;
     char** slst = NULL;
     int i, count = 0;
-    Hunhandle *handle = get_handle(self);
+    Hunhandle *handle = (Hunhandle *)DATA_PTR(self);
 
     count = Hunspell_suggest(handle, &slst, RSTRING_PTR(str));
 
@@ -107,7 +100,7 @@ static VALUE wrap_suggest(VALUE self, VALUE word) {
  */
 static VALUE wrap_check(VALUE self, VALUE word) {
     VALUE str = recode_if_needed(self, StringValue(word), 0);
-    Hunhandle *handle = get_handle(self);
+    Hunhandle *handle = (Hunhandle *)DATA_PTR(self);
     int rc = Hunspell_spell(handle, RSTRING_PTR(str));
     return rc == 0 ? Qfalse : Qtrue;
 }
@@ -115,13 +108,12 @@ static VALUE wrap_check(VALUE self, VALUE word) {
 
 void Init_hunspell(void) {
     rb_cHunspell = rb_define_class("Hunspell", rb_cObject);
-    rb_define_method(rb_cHunspell, "initialize", dict_init, 2);
+    rb_define_alloc_func(rb_cHunspell, hunspell_alloc);
+    rb_define_method(rb_cHunspell, "initialize", hunspell_initialize, 2);
     //rb_define_method(rb_cHunspell, "check?", wrap_check, 1);
     rb_define_method(rb_cHunspell, "valid?", wrap_check, 1);
     rb_define_method(rb_cHunspell, "suggest", wrap_suggest, 1);
     rb_define_method(rb_cHunspell, "encoding", wrap_encoding, 0);
-    rb_require("iconv");
-    rb_cIconv = rb_const_get(rb_cObject, rb_intern("Iconv"));
     enc_iso8859_1 = rb_str_new2("ISO8859-1");
     enc_utf8 = rb_str_new2("UTF-8");
     rb_global_variable(&enc_iso8859_1);

data/hunspell-i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hunspell-i18n"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Shterenzon"]
-  s.date = "2012-02-10"
+  s.date = "2012-08-15"
   s.description = "Ruby bindings for libhunspell-1.2 with i18n support"
   s.email = "romanbsd@yahoo.com"
   s.extensions = ["ext/extconf.rb"]
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/romanbsd/hunspell"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Ruby bindings for libhunspell-1.2 with i18n support"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,27 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hunspell-i18n
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Roman Shterenzon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-10 00:00:00 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby bindings for libhunspell-1.2 with i18n support
 email: romanbsd@yahoo.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .rspec
 - README.md
 - Rakefile
@@ -33,30 +30,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/romanbsd/hunspell
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libhunspell-1.2 with i18n support
 test_files: []
-