ruby-sfst 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.3.0. fixes for Ruby 1.9
 v0.2.0. update to SFST 1.3
 v0.1.1. overflow and g++ 4.3 fixes
 v0.1.0. initial release

data/README.rdoc

@@ -2,26 +2,51 @@
 
 A wrapper for the Stuttgart Finite State Transducer Tools (SFST).
 
-The wrapper is based on SFST 1.3.
+The wrapper is based on SFST 1.3. See
+http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html for
+details on how to obtain SFST and how to write SFST transducers.
 
 == Installation
 
   gem install ruby-sfst
 
-== License
+== Usage
 
-As it includes the SFST code directly, the wrapper inherits the GPL2 
-license of the SFST project.
+If you have the following compiled as <tt>test.a</tt>
 
-== Usage
+    ALPHABET = [a-z]
+    $test$ = ({bar}:{foo} | {baz}:{foo})
+    $test$
+
+it can be used like this:
+
+    fst = SFST::RegularTransducer.new("test.a")
+    fst.analyse('foo')
+    # => ['bar', 'baz']
+    fst.accepted_analysis?('foo')
+    # => true
+    fst.generate('bar')
+    # => ['foo']
+    fst.accepted_generating?('bar')
+    # => true
+    fst.generate_language { |f| p f }
+    # [["b", "f"], ["a", "o"], ["z", "o"]]
+    # [["b", "f"], ["a", "o"], ["r", "o"]]
 
-See http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html
-for details on how to write SFST transducers.
+You can also compile an SFST file. This requires the SFST tools to be
+installed and available on the current search path.
+
+    SFST::compile("test.fst", "test.a", :compact => true)
 
 Currently, <tt>ruby-sfst</tt> only supports simple compilation, analysis
-and generation using regular and compact transducers. It also only 
+and generation using regular and compact transducers. It also only
 supports UTF-8.
 
 == Development
 
 The project is hosted on github on http://github.com/mlj/ruby-sfst.
+
+== License
+
+As it includes the SFST code directly, the wrapper inherits the GPL2
+license of the SFST project.

data/Rakefile

@@ -1,22 +1,15 @@
-require 'rubygems'
-require 'rake'
- 
 begin
-  require 'echoe'
- 
-  Echoe.new('ruby-sfst', '0.2.0') do |p|
-    p.summary = "A wrapper for the Stuttgart Finite State Transducer Tools (SFST)."
-    p.author = 'Marius L. Jøhndal'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |p|
+    p.name = "ruby-sfst"
+    p.summary = "Stuttgart Finite State Transducer Tools interface"
+    p.description = "A wrapper for the Stuttgart Finite State Transducer Tools (SFST)."
+    p.authors = ['Marius L. Jøhndal']
     p.email = "mariuslj (at) ifi [dot] uio (dot) no"
-    p.url = "http://github.com/mlj/ruby-sfst"
-    p.ignore_pattern = ["*.gemspec"]
-    p.rdoc_pattern = ["README.rdoc", "lib/*.rb"]
-    p.rubyforge_name = "sfst"
+    p.homepage = "http://github.com/mlj/ruby-sfst"
+    p.rubyforge_project = "sfst"
   end
- 
-rescue LoadError => boom
-  puts "You are missing a dependency required for meta-operations on this gem."
-  puts "#{boom.to_s.capitalize}."
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
- 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/VERSION

@@ -0,0 +1 @@
+0.3.0

data/ext/sfst_machine/.gitignore

@@ -0,0 +1,3 @@
+*.so
+*.o
+Makefile

data/ext/sfst_machine/sfst_machine.cc

@@ -5,6 +5,11 @@
 #include "make-compact.h"
 
 /*:enddoc:*/
+
+#ifndef RSTRING_PTR /* Ruby 1.8 compatibility */
+#define RSTRING_PTR(ptr) RSTRING(ptr)->ptr
+#endif
+
 extern Transducer *Result;
 extern FILE *yyin;
 int yyparse(void);
@@ -56,12 +61,12 @@ static VALUE compile(char *from_filename, char *to_filename, bool compact) // :n
 
 static VALUE compile_regular(VALUE obj, VALUE from_filename, VALUE to_filename)
 {
-  return compile(RSTRING(from_filename)->ptr, RSTRING(to_filename)->ptr, false);
+  return compile(RSTRING_PTR(from_filename), RSTRING_PTR(to_filename), false);
 }
 
 static VALUE compile_compact(VALUE obj, VALUE from_filename, VALUE to_filename)
 {
-  return compile(RSTRING(from_filename)->ptr, RSTRING(to_filename)->ptr, true);
+  return compile(RSTRING_PTR(from_filename), RSTRING_PTR(to_filename), true);
 }
 
 static void compact_transducer_free(CompactTransducer *t)
@@ -86,10 +91,10 @@ static VALUE compact_transducer_init(VALUE obj, VALUE filename)
   FILE *file;
   CompactTransducer *t;
 
-  file = fopen(RSTRING(filename)->ptr, "rb");
+  file = fopen(RSTRING_PTR(filename), "rb");
 
   if (!file) {
-    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s", RSTRING(filename)->ptr);
+    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s", RSTRING_PTR(filename));
   }
 
   try {
@@ -97,7 +102,7 @@ static VALUE compact_transducer_init(VALUE obj, VALUE filename)
     fclose(file);
   }
   catch (const char *p) {
-    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s: %s", RSTRING(filename)->ptr, p);
+    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s: %s", RSTRING_PTR(filename), p);
   }
 
   DATA_PTR(obj) = t;
@@ -114,7 +119,7 @@ static VALUE compact_transducer_analyze(VALUE self, VALUE string)
   Data_Get_Struct(self, CompactTransducer, t);
 
   std::vector<CAnalysis> analyses;
-  t->analyze_string(RSTRING(string)->ptr, analyses);
+  t->analyze_string(RSTRING_PTR(string), analyses);
 
   for (size_t k = 0; k < analyses.size(); k++) {
     accepted = Qtrue;
@@ -151,10 +156,10 @@ static VALUE regular_transducer_init(VALUE obj, VALUE filename)
   FILE *file;
   Transducer *t;
 
-  file = fopen(RSTRING(filename)->ptr, "rb");
+  file = fopen(RSTRING_PTR(filename), "rb");
 
   if (!file) {
-    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s", RSTRING(filename)->ptr);
+    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s", RSTRING_PTR(filename));
   }
 
   try {
@@ -162,7 +167,7 @@ static VALUE regular_transducer_init(VALUE obj, VALUE filename)
     fclose(file);
   }
   catch (const char *p) {
-    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s: %s", RSTRING(filename)->ptr, p);
+    rb_raise(rb_eRuntimeError, "Unable to open SFST file %s: %s", RSTRING_PTR(filename), p);
   }
 
   DATA_PTR(obj) = t;
@@ -353,7 +358,7 @@ static bool _regular_transducer_yield(Transducer *t, Node *node, VALUE result_ar
 static VALUE _regular_transducer_analyze_or_generate(Transducer *t, VALUE string, bool generate)
 {
   Transducer *a2, *a3;
-  Transducer a1(RSTRING(string)->ptr, &(t->alphabet), false);
+  Transducer a1(RSTRING_PTR(string), &(t->alphabet), false);
   if (generate) {
     a2 = &(a1 || *t);
     a3 = &(a2->upper_level());

data/lib/.gitignore

@@ -0,0 +1 @@
+*.so

data/ruby-sfst.gemspec

@@ -1,36 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{ruby-sfst}
-  s.version = "0.2.0"
+  s.name = "ruby-sfst"
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  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{2009-02-09}
-  s.description = %q{A wrapper for the Stuttgart Finite State Transducer Tools (SFST).}
-  s.email = %q{mariuslj (at) ifi [dot] uio (dot) no}
+  s.date = "2011-11-04"
+  s.description = "A wrapper for the Stuttgart Finite State Transducer Tools (SFST)."
+  s.email = "mariuslj (at) ifi [dot] uio (dot) no"
   s.extensions = ["ext/sfst_machine/extconf.rb"]
-  s.extra_rdoc_files = ["README.rdoc", "lib/sfst.rb"]
-  s.files = ["README.rdoc", "Rakefile", "Manifest", "test/test_sfst.rb", "test/test_sfst.fst", "CHANGELOG", "ext/sfst_machine/fst-compiler.h", "ext/sfst_machine/utf8.C", "ext/sfst_machine/operators.C", "ext/sfst_machine/utf8-scanner.ll", "ext/sfst_machine/determinise.C", "ext/sfst_machine/interface.C", "ext/sfst_machine/compact.h", "ext/sfst_machine/sgi.h", "ext/sfst_machine/basic.h", "ext/sfst_machine/fst.h", "ext/sfst_machine/make-compact.h", "ext/sfst_machine/fst-compiler.yy", "ext/sfst_machine/mem.h", "ext/sfst_machine/compact.C", "ext/sfst_machine/basic.C", "ext/sfst_machine/interface.h", "ext/sfst_machine/sfst_machine.cc", "ext/sfst_machine/extconf.rb", "ext/sfst_machine/alphabet.C", "ext/sfst_machine/fst.C", "ext/sfst_machine/alphabet.h", "ext/sfst_machine/make-compact.C", "ext/sfst_machine/fst-compiler.C", "ext/sfst_machine/utf8.h", "ext/sfst_machine/utf8-scanner.C", "lib/sfst.rb", "ruby-sfst.gemspec"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/mlj/ruby-sfst}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ruby-sfst", "--main", "README.rdoc"]
-  s.require_paths = ["lib", "ext"]
-  s.rubyforge_project = %q{sfst}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{A wrapper for the Stuttgart Finite State Transducer Tools (SFST).}
-  s.test_files = ["test/test_sfst.rb"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGELOG",
+    "Manifest",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ext/sfst_machine/.gitignore",
+    "ext/sfst_machine/alphabet.C",
+    "ext/sfst_machine/alphabet.h",
+    "ext/sfst_machine/basic.C",
+    "ext/sfst_machine/basic.h",
+    "ext/sfst_machine/compact.C",
+    "ext/sfst_machine/compact.h",
+    "ext/sfst_machine/determinise.C",
+    "ext/sfst_machine/extconf.rb",
+    "ext/sfst_machine/fst-compiler.C",
+    "ext/sfst_machine/fst-compiler.h",
+    "ext/sfst_machine/fst-compiler.yy",
+    "ext/sfst_machine/fst.C",
+    "ext/sfst_machine/fst.h",
+    "ext/sfst_machine/interface.C",
+    "ext/sfst_machine/interface.h",
+    "ext/sfst_machine/make-compact.C",
+    "ext/sfst_machine/make-compact.h",
+    "ext/sfst_machine/mem.h",
+    "ext/sfst_machine/operators.C",
+    "ext/sfst_machine/sfst_machine.cc",
+    "ext/sfst_machine/sgi.h",
+    "ext/sfst_machine/utf8-scanner.C",
+    "ext/sfst_machine/utf8-scanner.ll",
+    "ext/sfst_machine/utf8.C",
+    "ext/sfst_machine/utf8.h",
+    "lib/.gitignore",
+    "lib/sfst.rb",
+    "test/.gitignore",
+    "test/test_sfst.fst",
+    "test/test_sfst.rb"
+  ]
+  s.homepage = "http://github.com/mlj/ruby-sfst"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "sfst"
+  s.rubygems_version = "1.8.11"
+  s.summary = "Stuttgart Finite State Transducer Tools interface"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end
+

data/test/.gitignore

@@ -0,0 +1 @@
+*.a

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-sfst
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Marius L. J\xC3\xB8hndal"
@@ -9,19 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+date: 2011-11-04 00:00:00 Z
+dependencies: []
+
 description: A wrapper for the Stuttgart Finite State Transducer Tools (SFST).
 email: mariuslj (at) ifi [dot] uio (dot) no
 executables: []
@@ -30,72 +26,76 @@ extensions:
 - ext/sfst_machine/extconf.rb
 extra_rdoc_files: 
 - README.rdoc
-- lib/sfst.rb
 files: 
+- CHANGELOG
+- Manifest
 - README.rdoc
 - Rakefile
-- Manifest
-- test/test_sfst.rb
-- test/test_sfst.fst
-- CHANGELOG
-- ext/sfst_machine/fst-compiler.h
-- ext/sfst_machine/utf8.C
-- ext/sfst_machine/operators.C
-- ext/sfst_machine/utf8-scanner.ll
-- ext/sfst_machine/determinise.C
-- ext/sfst_machine/interface.C
-- ext/sfst_machine/compact.h
-- ext/sfst_machine/sgi.h
+- VERSION
+- ext/sfst_machine/.gitignore
+- ext/sfst_machine/alphabet.C
+- ext/sfst_machine/alphabet.h
+- ext/sfst_machine/basic.C
 - ext/sfst_machine/basic.h
-- ext/sfst_machine/fst.h
-- ext/sfst_machine/make-compact.h
-- ext/sfst_machine/fst-compiler.yy
-- ext/sfst_machine/mem.h
 - ext/sfst_machine/compact.C
-- ext/sfst_machine/basic.C
-- ext/sfst_machine/interface.h
-- ext/sfst_machine/sfst_machine.cc
+- ext/sfst_machine/compact.h
+- ext/sfst_machine/determinise.C
 - ext/sfst_machine/extconf.rb
-- ext/sfst_machine/alphabet.C
+- ext/sfst_machine/fst-compiler.C
+- ext/sfst_machine/fst-compiler.h
+- ext/sfst_machine/fst-compiler.yy
 - ext/sfst_machine/fst.C
-- ext/sfst_machine/alphabet.h
+- ext/sfst_machine/fst.h
+- ext/sfst_machine/interface.C
+- ext/sfst_machine/interface.h
 - ext/sfst_machine/make-compact.C
-- ext/sfst_machine/fst-compiler.C
-- ext/sfst_machine/utf8.h
+- ext/sfst_machine/make-compact.h
+- ext/sfst_machine/mem.h
+- ext/sfst_machine/operators.C
+- ext/sfst_machine/sfst_machine.cc
+- ext/sfst_machine/sgi.h
 - ext/sfst_machine/utf8-scanner.C
+- ext/sfst_machine/utf8-scanner.ll
+- ext/sfst_machine/utf8.C
+- ext/sfst_machine/utf8.h
+- lib/.gitignore
 - lib/sfst.rb
 - ruby-sfst.gemspec
-has_rdoc: true
+- test/.gitignore
+- test/test_sfst.fst
+- test/test_sfst.rb
 homepage: http://github.com/mlj/ruby-sfst
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Ruby-sfst
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: sfst
-rubygems_version: 1.3.1
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 2
-summary: A wrapper for the Stuttgart Finite State Transducer Tools (SFST).
-test_files: 
-- test/test_sfst.rb
+specification_version: 3
+summary: Stuttgart Finite State Transducer Tools interface
+test_files: []
+