foma 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/ext/foma.c

@@ -3,6 +3,10 @@
 
 /*:enddoc:*/
 
+#ifndef RSTRING_PTR /* Ruby 1.8 compatibility */
+#define RSTRING_PTR(ptr) RSTRING(ptr)->ptr
+#endif
+
 VALUE mFOMA = Qnil;
 VALUE mFSM = Qnil;
 
@@ -18,8 +22,8 @@ static void foma_fsm_mark(struct foma_fsm *t)
 static void foma_fsm_free(struct foma_fsm *t)
 {
   if (t) {
-    fsm_destroy(t->net);
     apply_clear(t->ah);
+    fsm_destroy(t->net);
     free(t);
   }
 }
@@ -38,24 +42,23 @@ static VALUE foma_fsm_init(VALUE obj, VALUE filename)
 
   t = malloc(sizeof(struct foma_fsm));
 
-  if (!t) {
-    rb_raise(rb_eRuntimeError, "Error allocating memory");
-  }
+  if (!t)
+    rb_raise(rb_eRuntimeError, "error allocating memory");
 
-  file = fopen(RSTRING(filename)->ptr, "rb");
+  file = fopen(RSTRING_PTR(filename), "rb");
 
   if (!file) {
     free(t);
-    rb_raise(rb_eRuntimeError, "Unable to open file %s", RSTRING(filename)->ptr);
+    rb_raise(rb_eRuntimeError, "unable to open file");
   }
 
   fclose(file);
 
-  t->net = fsm_read_binary_file(RSTRING(filename)->ptr);
+  t->net = fsm_read_binary_file(RSTRING_PTR(filename));
 
   if (!t->net) {
     free(t);
-    rb_raise(rb_eRuntimeError, "Unable to read file %s", RSTRING(filename)->ptr);
+    rb_raise(rb_eRuntimeError, "unable to read file");
   }
 
   t->ah = apply_init(t->net);
@@ -66,6 +69,7 @@ static VALUE foma_fsm_init(VALUE obj, VALUE filename)
 
 static VALUE foma_fsm_apply(VALUE self, VALUE string, char *(*applyer)())
 {
+  int enc = rb_enc_find_index("UTF-8");
   struct foma_fsm *t;
   char *result;
 
@@ -73,14 +77,23 @@ static VALUE foma_fsm_apply(VALUE self, VALUE string, char *(*applyer)())
 
   Data_Get_Struct(self, struct foma_fsm, t);
 
-  result = applyer(t->ah, RSTRING(string)->ptr);
+  result = applyer(t->ah, RSTRING_PTR(string));
 
   if (result) {
     if (rb_block_given_p()) {
-      rb_yield(rb_str_new2(result));
-
-      while (result = applyer(t->ah, NULL))
-        rb_yield(rb_str_new2(result));
+      VALUE string = rb_str_new2(result);
+#ifdef HAVE_RUBY_ENCODING_H
+      rb_enc_associate_index(string, enc);
+#endif
+      rb_yield(string);
+
+      while (result = applyer(t->ah, NULL)) {
+        VALUE string = rb_str_new2(result);
+#ifdef HAVE_RUBY_ENCODING_H
+        rb_enc_associate_index(string, enc);
+#endif
+        rb_yield(string);
+      }
     }
 
     return Qtrue;

data/foma.gemspec

@@ -4,31 +4,37 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{foma}
-  s.version = "0.1.0"
+  s.name = "foma"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marius L. J\303\270hndal"]
-  s.date = %q{2011-10-05}
-  s.description = %q{A wrapper for the FOMA finite state library}
-  s.email = %q{mariuslj (at) ifi [dot] uio (dot) no}
+  s.authors = ["Marius L. J\u{f8}hndal"]
+  s.date = "2012-01-26"
+  s.description = "A wrapper for the FOMA finite state library"
+  s.email = "mariuslj (at) ifi [dot] uio (dot) no"
+  s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
     "CHANGELOG",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ext/extconf.rb",
     "ext/foma.c",
     "foma.gemspec",
+    "test/.gitignore",
+    "test/test_foma.bin",
     "test/test_foma.rb"
   ]
-  s.homepage = %q{http://github.com/mlj/ruby-foma}
+  s.homepage = "http://github.com/mlj/ruby-foma"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{foma}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{FOMA finite state library interface}
+  s.rubyforge_project = "foma"
+  s.rubygems_version = "1.8.11"
+  s.summary = "FOMA finite state library interface"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_foma.rb

@@ -1,3 +1,4 @@
+# coding:utf-8
 require 'foma'
 require 'test/unit'
 

metadata

@@ -1,34 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: foma
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Marius L. J\xC3\xB8hndal"
+authors:
+- Marius L. Jøhndal
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-05 00:00:00 +01:00
-default_executable: 
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies: []
-
 description: A wrapper for the FOMA finite state library
 email: mariuslj (at) ifi [dot] uio (dot) no
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - CHANGELOG
+- README.rdoc
 - Rakefile
 - VERSION
 - ext/extconf.rb
@@ -37,40 +29,28 @@ files:
 - test/.gitignore
 - test/test_foma.bin
 - test/test_foma.rb
-- README.rdoc
-has_rdoc: true
 homepage: http://github.com/mlj/ruby-foma
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: foma
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: FOMA finite state library interface
 test_files: []
-