ots 0.5.3 → 0.5.4

data/CHANGELOG

@@ -1,3 +1,16 @@
+=== 0.5.4 (2012-02-03)
+
+* move extension into subdirectory.
+* added OTS#set_dictionary_path to avoid compile time path resolution.
+
+=== 0.5.3 (2012-01-27)
+
+* cleanup dependencies.
+
+=== 0.5.2 (2012-01-25)
+
+* added OTS::Grader
+
 === 0.5.1 (2012-01-11)
 
 * GC bugfix: hang on to encoding index rather than rb_encoding pointer.

data/ext/{extconf.rb → ots/extconf.rb}

@@ -15,8 +15,7 @@ if glib_ldflags.empty?
   glib_ldflags = libs.split(/\s+/).map {|lib| "-l#{lib}"}.join(' ')
 end
 
-dir      = File.expand_path(File.dirname(__FILE__) + '/../dictionaries')
-$CFLAGS  = glib_cflags   + %Q{ -Ilibots -I/usr/include/libxml2 -DDICTIONARY_DIR='"#{dir}/"'}
+$CFLAGS  = glib_cflags   + %Q{ -Ilibots -I/usr/include/libxml2}
 $LDFLAGS = glib_ldflags  + %Q{ -Llibots}
 
 find_library('glib-2.0', 'main') or raise "unable to find glib-2.0"

data/ext/{libots → ots/libots}/dictionary.c

@@ -28,6 +28,8 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 
+extern char *DICTIONARY_DIR;
+
 
 /* loads the xml dictionary file to memory*/
 

data/ext/{ots.c → ots/ots.c}

@@ -4,6 +4,7 @@
 #include <errno.h>
 
 static VALUE mOTS, cArticle;
+char *DICTIONARY_DIR;
 
 static void article_free(OtsArticle *article) {
     if (article)
@@ -174,6 +175,16 @@ VALUE ots_languages(VALUE self) {
     return languages;
 }
 
+VALUE ots_set_dictionary_path(VALUE self, VALUE path) {
+    char *string = CSTRING(path);
+    if (DICTIONARY_DIR)
+        free(DICTIONARY_DIR);
+
+    DICTIONARY_DIR = (char *)malloc(strlen(string) + 2);
+    sprintf(DICTIONARY_DIR, "%s/", string);
+    return Qnil;
+}
+
 /* init */
 
 void Init_ots(void) {
@@ -185,10 +196,12 @@ void Init_ots(void) {
     rb_define_method(cArticle, "topics",     RUBY_METHOD_FUNC(article_topics),      0);
     rb_define_method(cArticle, "keywords",   RUBY_METHOD_FUNC(article_keywords),    0);
 
-    rb_define_module_function(mOTS, "parse",     RUBY_METHOD_FUNC(ots_parse),      -1);
-    rb_define_module_function(mOTS, "languages", RUBY_METHOD_FUNC(ots_languages),   0);
+    rb_define_module_function(mOTS, "parse",                RUBY_METHOD_FUNC(ots_parse),              -1);
+    rb_define_module_function(mOTS, "languages",            RUBY_METHOD_FUNC(ots_languages),           0);
+    rb_define_module_function(mOTS, "set_dictionary_path",  RUBY_METHOD_FUNC(ots_set_dictionary_path), 1);
 
     rb_define_alloc_func(cArticle, article_allocate);
 
     rb_define_const(mOTS, "VERSION", rb_str_new2(RUBY_OTS_VERSION));
+    DICTIONARY_DIR = 0;
 }

data/ext/ots/version.h

@@ -0,0 +1,2 @@
+#pragma once
+#define RUBY_OTS_VERSION            "0.5.4"

data/lib/ots.rb

@@ -0,0 +1,8 @@
+require 'ots/ots'
+
+module OTS
+  DICTIONARY_PATH = File.absolute_path(File.dirname(__FILE__) + '/../dictionaries')
+  # set the dictionary path, so the c extension can read files.
+  # we can set this at compile time but bundler sometimes compiles the extension inside a temp directory.
+  set_dictionary_path DICTIONARY_PATH
+end

data/lib/ots/grader.rb

@@ -1,7 +1,6 @@
 require 'nokogiri'
 
 module OTS
-  DICTIONARY_PATH = File.absolute_path(File.dirname(__FILE__) + '/../../dictionaries')
   class Grader
     def initialize options = {}
       path = options[:path] || File.join(DICTIONARY_PATH, options.fetch(:language, 'en').to_s + '.xml')

data/test/test_grader.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+require 'helper'
+require 'ots/grader'
+
+describe 'OTS::Grader' do
+  it 'should load the dictionary & return stop words' do
+    assert OTS::Grader.new(language: 'en').stop_words
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Bharanee Rathna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 +11:00
+date: 2012-02-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,31 +49,33 @@ email:
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- ext/ots/extconf.rb
 extra_rdoc_files: []
 
 files: 
-- ext/ots.c
-- ext/libots/text.c
-- ext/libots/grader-tf.c
-- ext/libots/stemmer.c
-- ext/libots/article.c
-- ext/libots/grader-tc.c
-- ext/libots/html.c
-- ext/libots/grader.c
-- ext/libots/relations.c
-- ext/libots/parser.c
-- ext/libots/dictionary.c
-- ext/libots/highlighter.c
-- ext/libots/wordlist.c
-- ext/ots.h
-- ext/version.h
-- ext/libots/grader-tc.h
-- ext/libots/libots.h
-- ext/extconf.rb
+- ext/ots/ots.c
+- ext/ots/libots/text.c
+- ext/ots/libots/grader-tf.c
+- ext/ots/libots/stemmer.c
+- ext/ots/libots/article.c
+- ext/ots/libots/grader-tc.c
+- ext/ots/libots/html.c
+- ext/ots/libots/grader.c
+- ext/ots/libots/relations.c
+- ext/ots/libots/parser.c
+- ext/ots/libots/dictionary.c
+- ext/ots/libots/highlighter.c
+- ext/ots/libots/wordlist.c
+- ext/ots/ots.h
+- ext/ots/version.h
+- ext/ots/libots/grader-tc.h
+- ext/ots/libots/libots.h
+- ext/ots/extconf.rb
 - test/test_article.rb
 - test/test_ots.rb
 - test/helper.rb
+- test/test_grader.rb
+- lib/ots.rb
 - lib/ots/grader.rb
 - README.md
 - CHANGELOG
@@ -123,6 +125,7 @@ rdoc_options: []
 
 require_paths: 
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/ext/version.h

@@ -1,2 +0,0 @@
-#pragma once
-#define RUBY_OTS_VERSION            "0.5.3"