freeling-analyzer 0.1.1 → 0.1.2

data/Guardfile

@@ -6,6 +6,7 @@ guard :minitest do
   #watch(%r|^test/(.*)\/?test_(.*)\.rb|)
   #watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
   #watch(%r|^test/test_helper\.rb|)    { "test" }
+
   watch(%r{^lib/(.+)\.rb$})     { |m| "test/#{m[1].split("/").last}_test.rb" }
   watch(%r{^test/.+_test\.rb$})
   watch('test/test_helper.rb')  { "test" }

data/README.md

@@ -25,6 +25,7 @@ analyzer.tokens.map { |t| t.lemma }
   the input text to `analyzer` on demand.
 * It just works with the default instalation of FreeLing. Just set the language
   to use and you're good to go.
+* It supports Freeling's [client/server mode](http://nlp.lsi.upc.edu/freeling/doc/userman/html/node84.html). Ex: `FreeLing::Analyzer.new(text, :server_host => 'localhost:50005')` (`analyze` must be running in server mode)
 
 ## Installation
 

data/freeling-analyzer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
                          `analyzer`, a binary tool included in FreeLing's
                          package that allows the user to process a stream of
                          text with FreeLing.}
-  gem.homepage      = "https://github.com/munshkr/freeling-analyzer-ruby"
+  gem.homepage      = "http://munshkr.github.io/freeling-analyzer-ruby"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "yard"
   gem.add_development_dependency "mocha", "~> 0.14.0"
-  gem.add_development_dependency "minitest", "~> 5.0.2"
+  gem.add_development_dependency "minitest", "~> 4.7.4"
   gem.add_development_dependency "guard", "~> 1.8.0"
   gem.add_development_dependency "guard-minitest", "~> 0.5.0"
 

data/lib/freeling/analyzer.rb

@@ -14,12 +14,14 @@ module FreeLing
       @document = document
 
       @options = {
-        :share_path    => freeling_path,
-        :analyze_path  => analyzer_path,
-        :input_format  => :plain,
-        :output_format => :tagged,
-        :memoize       => true,
-        :language      => :es
+        :share_path          => freeling_path,
+        :analyze_path        => analyzer_path,
+        :input_format        => :plain,
+        :output_format       => :tagged,
+        :memoize             => true,
+        :language            => :es,
+        :server_host         => nil,
+        :analyze_client_path => analyzer_client_path
       }.merge(opts)
     end
 
@@ -75,12 +77,16 @@ module FreeLing
 
   private
     def command
-      "#{@options[:analyze_path]} " \
-        "-f #{config_path} " \
-        "--inpf #{@options[:input_format]} " \
-        "--outf #{@options[:output_format]} " \
-        "--nec " \
-        "--noflush"
+      if @options[:server_host].nil?
+        "#{@options[:analyze_path]} " \
+          "-f #{config_path} " \
+          "--inpf #{@options[:input_format]} " \
+          "--outf #{@options[:output_format]} " \
+          "--nec " \
+          "--noflush"
+      else
+        "#{@options[:analyze_client_path]} #{@options[:server_host]}"
+      end
     end
 
     def config_path
@@ -93,7 +99,9 @@ module FreeLing
         @process_wrapper = ProcessWrapper.new(command, output_fd, "FREELINGSHARE" => @options[:share_path])
 
         @process_wrapper.run.each do |line|
-          if not line.empty?
+          if line.empty?
+            yielder << nil
+          else
             yielder << parse_token_line(line)
           end
         end
@@ -126,5 +134,10 @@ module FreeLing
     def analyzer_path
       FreelingDefault.analyzer_path
     end
+
+    def analyzer_client_path
+      FreelingDefault.analyzer_client_path
+    end
+
   end
 end

data/lib/freeling/analyzer/freeling_default.rb

@@ -2,16 +2,23 @@ module FreeLing
   class Analyzer
     class FreelingDefault
 
-      LOCAL_ANALYZE_PATH         = "/usr/local/bin/analyzer"
-      USR_ANALYZE_PATH           = "/usr/bin/analyzer"
-      LOCAL_FREELING_SHARE_PATH  = "/usr/local/share/freeling"
-      USR_FREELING_SHARE_PATH    = "/usr/share/freeling"
+      LOCAL_ANALYZE_PATH        = "/usr/local/bin/analyzer"
+      USR_ANALYZE_PATH          = "/usr/bin/analyzer"
+      LOCAL_ANALYZE_CLIENT_PATH = "/usr/local/bin/analyzer_client"
+      USR_ANALYZE_CLIENT_PATH   = "/usr/bin/analyzer_client"
+      LOCAL_FREELING_SHARE_PATH = "/usr/local/share/freeling"
+      USR_FREELING_SHARE_PATH   = "/usr/share/freeling"
 
       class << self
         def analyzer_path
           self.new.analyzer_path
         end
 
+        def analyzer_client_path
+          self.new.analyzer_client_path
+        end
+
+
         def freeling_path
           self.new.freeling_path
         end
@@ -39,6 +46,17 @@ module FreeLing
         end
       end
 
+      def analyzer_client_path
+        if File.exists? LOCAL_ANALYZE_CLIENT_PATH
+          LOCAL_ANALYZE_CLIENT_PATH
+        elsif File.exists? USR_ANALYZE_CLIENT_PATH
+          USR_ANALYZE_CLIENT_PATH
+        else
+          raise_error(:analyze_client)
+        end
+      end
+
+
       def freeling_path
         if Dir.exists? LOCAL_FREELING_SHARE_PATH
           LOCAL_FREELING_SHARE_PATH

data/lib/freeling/analyzer/version.rb

@@ -1,5 +1,5 @@
 module FreeLing
   class Analyzer
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test/analyzer_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "test_helper"
 
-class AnalyzerTest < MiniTest::Test
+class AnalyzerTest < MiniTest::Unit::TestCase
   def setup
     @a = "El gato come pescado y bebe agua."
     @b = "Yo bajo con el hombre bajo a tocar el bajo bajo la escalera."

data/test/freeling_default_test.rb

@@ -1,11 +1,13 @@
 require 'test_helper'
 
-class FreelingDefaultTest < MiniTest::Test
+class FreelingDefaultTest < MiniTest::Unit::TestCase
   def setup
-    @usr_bin_analyzer     = "/usr/bin/analyzer"
-    @local_bin_analyzer   = "/usr/local/bin/analyzer"
-    @usr_share_freeling   = "/usr/share/freeling"
-    @local_share_freeling = "/usr/local/share/freeling"
+    @usr_bin_analyzer         = "/usr/bin/analyzer"
+    @local_bin_analyzer       = "/usr/local/bin/analyzer"
+    @usr_bin_analyze_client   = "/usr/bin/analyzer_client"
+    @local_bin_analyze_client = "/usr/local/bin/analyzer_client"
+    @usr_share_freeling       = "/usr/share/freeling"
+    @local_share_freeling     = "/usr/local/share/freeling"
   end
 
   def test_freeling_installed_on_usr
@@ -31,8 +33,9 @@ class FreelingDefaultTest < MiniTest::Test
     end
   end
 
-  def test_instanciate_analyzer
+  def test_instantiate_analyzer
     File.stubs("exists?").with(@local_bin_analyzer).returns(true)
+    File.stubs("exists?").with(@local_bin_analyze_client).returns(true)
     Dir.stubs("exists?").with(@local_share_freeling).returns(true)
     document = mock("document")
 

data/test/process_wrapper_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ProcessWrapperTest < MiniTest::Test
+class ProcessWrapperTest < MiniTest::Unit::TestCase
   def setup
     @command = "cat"
     @text = ["Hello", "world!"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freeling-analyzer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 4.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 4.7.4
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ files:
 - test/freeling_default_test.rb
 - test/process_wrapper_test.rb
 - test/test_helper.rb
-homepage: https://github.com/munshkr/freeling-analyzer-ruby
+homepage: http://munshkr.github.io/freeling-analyzer-ruby
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3306996118738224912
+      hash: 3533613494738759404
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3306996118738224912
+      hash: 3533613494738759404
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25