ve 0.0.3 → 0.0.4

data/lib/providers/mecab_ipadic.rb

@@ -41,10 +41,6 @@ class Ve
         end
 
         Ve::Parse::MecabIpadic.new(text, output)
-      rescue => e
-        # TODO: No good to catch all errors like this
-        # I need a backtrace when something unexpected fails
-        Ve::Parse::MecabIpadic.new(text, [])
       end
 
       private
@@ -255,12 +251,16 @@ class Ve
                   also_attach_to_lemma = true
                 end
               when SETSUBI
-                if token[:pos3] == TOKUSHU && token[:lemma] == SA
-                  attach_to_previous = true
-                  update_pos = true
-                  pos = Ve::PartOfSpeech::Noun
-                else
+                if token[:pos3] == JINMEI
                   pos = Ve::PartOfSpeech::Suffix
+                else
+                  if token[:pos3] == TOKUSHU && token[:lemma] == SA
+                    update_pos = true
+                    pos = Ve::PartOfSpeech::Noun
+                  else
+                    also_attach_to_lemma = true
+                  end
+                  attach_to_previous = true
                 end
               when SETSUZOKUSHITEKI
                 pos = Ve::PartOfSpeech::Conjunction
@@ -341,7 +341,7 @@ class Ve
 
               words << word
             end
-            
+
             previous = token
           end
         rescue StopIteration

data/lib/ve.rb

@@ -8,14 +8,13 @@ require 'languages/japanese'
 require 'pp'
 
 class Ve
-  
   class Manager
     @@config_for = {}
-    
+
     def self.set_default_config_for(klass, config = {})
       @@config_for[klass] = config
     end
-    
+
     def self.provider_for(language, function)
       provider = @@provider_for[language.to_sym][function.to_sym]
       if provider.is_a?(Class)
@@ -26,6 +25,14 @@ class Ve
       provider
     end
 
+    def self.languages
+      @@provider_for.keys
+    end
+
+    def self.functions_for_language(language)
+      @@provider_for[language.to_sym].keys
+    end
+
     # TODO: Make a difference between what features are available locally
     # and what requires contacting external Ves
     def self.register(klass, language)
@@ -41,9 +48,9 @@ class Ve
       end
     end
   end
-  
+
   # TODO: Put into separate files
-  class LocalInterface    
+  class LocalInterface
     def initialize(language, config = {})
       @language = language
     end
@@ -54,12 +61,12 @@ class Ve
       parse.send(function.to_sym)
     end
   end
-  
+
   class HTTPInterface
     require 'net/http'
     require 'uri'
     require 'json'
-    
+
     def initialize(language, config = {})
       @language = language
       @base_url = config[:url]
@@ -71,7 +78,7 @@ class Ve
       response = Net::HTTP.post_form(uri, {:text => args[0]})
       data = JSON.parse(response.body)
       result = []
-      
+
       data.each do |obj|
         # TODO: Support transliterations
         case obj['_class']
@@ -79,31 +86,31 @@ class Ve
           result << Ve::Word.new(obj['word'], obj['lemma'], obj['part_of_speech'], obj['tokens'], obj['extra'], obj['info'])
         end
       end
-      
+
       result
     end
   end
-  
+
   @@interface = Ve::LocalInterface
   @@interface_for = {}
   @@config = {}
-  
+
   # End-users only interact with this class, so it must provide a sexy interface
   # to all functionality in the providers and parse objects
-  
+
   # Basic, non-sexy, local interface only
   def self.get(text, language, function, *args)
     provider = Ve::Manager.provider_for(language, function, *args)
     parse = provider.parse(text, args)
     parse.send(function.to_sym)
   end
-  
+
   # Early sexy verision
   def self.in(language)
     unless @@interface_for[language]
       @@interface_for[language] = @@interface.new(language, @@config)
     end
-    
+
     @@interface_for[language]
   end
 
@@ -111,7 +118,6 @@ class Ve
     @@interface = interface
     @@config = config
   end
-  
 end
 
 # TODO: Autoload this shit

data/lib/word.rb

@@ -1,20 +1,20 @@
 class Ve
   class Word
-    
+
     attr_accessor :word, :lemma, :part_of_speech, :tokens, :extra, :info
-    
+
     # TODO: More elegance
     def initialize(word, lemma, part_of_speech, tokens, extra = {}, info = {})
       @word = word.dup
       @lemma = lemma.dup
       @part_of_speech = part_of_speech
       @tokens = tokens
-      
+
       # TODO: I don't like this, it's too unstructured
       @extra = extra
       @info = info
     end
-    
+
     # TODO: the main part of a word, for example 重要 in 重要な
     def main_part
     end
@@ -22,22 +22,29 @@ class Ve
     def base_form
       @lemma
     end
-    
+
     def inflected?
       @word != @lemma
     end
 
-    def as_json
-      {
-        :_class => 'Word',
+    def as_json(verbose = true)
+      hash = {
         :word => @word,
         :lemma => @lemma,
         :part_of_speech => @part_of_speech.name,
-        :tokens => @tokens,
-        :extra => @extra,
-        :info => @info
+        :extra => @extra
       }
+
+      if verbose
+        hash.merge!({
+          :_class => 'Word',
+          :tokens => @tokens,
+          :info => @info
+        })
+      end
+
+      hash
     end
-    
+
   end
 end

data/sinatra/server.rb

@@ -1,3 +1,5 @@
+# Encoding: UTF-8
+
 require 'rubygems'
 require 'bundler/setup'
 require 'sinatra'
@@ -12,6 +14,29 @@ use Rack::Cors do
   end
 end
 
+get '/' do
+  content_type 'application/json', :charset => 'utf-8'
+
+  howto = {
+    "meta" => {"status" => 200},
+    "usage" => "/:language/:function?text=X",
+    "languages" => {}
+  }
+
+  Ve::Manager.languages.each do |lang|
+    lang_functions = {"#{lang}" => [], }
+
+    Ve::Manager.functions_for_language(lang).each do |func|
+      functional = Ve::Manager.provider_for(lang, func).works?
+      lang_functions[lang.to_s] << {"name" => func.to_s, "functional" => functional}
+    end
+
+    howto["languages"].merge!(lang_functions)
+  end
+
+  howto.to_json
+end
+
 get '/:language/:function' do
   run
 end
@@ -26,11 +51,19 @@ def run
 #  Ve.source = Ve::Local # Default
 #  Ve.source = Ve::Remote.new(:url => 'http://ve.kimtaro.com/', :access_token => 'XYZ')
 #  result = Ve.get(params[:text], params[:language], params[:function].to_sym)
-  result = Ve.in(params[:language]).words(params[:text])
+
+  if !Ve::Manager.functions_for_language(params[:language]).include?(params[:function].to_sym)
+    status 404
+    content_type 'application/json', :charset => 'utf-8'
+    return '{"meta": {"status": 404}}'
+  end
+
+  result = Ve.in(params[:language]).send(params[:function], params[:text])
+  verbose = params[:verbose] == 'true'
 
   case params[:function].to_sym
   when :words
-    json = JSON.generate(result.collect(&:as_json))
+    json = JSON.generate(result.collect { |w| w.as_json(verbose) })
   else
     json = result
   end

data/tests/japanese_transliterators_test.rb

@@ -8,11 +8,11 @@ class JapaneseTransliteratorsTest < MiniTest::Unit::TestCase
   HIRAGANA = "ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんゔゕゖ"
   HALFWIDTH = "!\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ "
   FULLWIDTH = "！＂＃＄％＆＇（）＊＋，－．／０１２３４５６７８９：；＜＝＞？＠ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ［＼］＾＿｀ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ｛｜｝～　"
-  
+
   def setup
     @trans = Ve::Provider::JapaneseTransliterators.new
   end
-  
+
   def test_should_be_able_to_start
     assert @trans.works?
   end
@@ -25,7 +25,7 @@ class JapaneseTransliteratorsTest < MiniTest::Unit::TestCase
     assert_equal 'shinbun',   @trans.parse('しんぶん').transliterate_from_hira_to_latn
     assert_equal 'appa',      @trans.parse('あっぱ').transliterate_from_hira_to_latn
   end
-  
+
   def test_transliterate_from_latn_to_hrkt
     assert_equal('かなです',   @trans.parse('kanadesu').transliterate_from_latn_to_hrkt)
     assert_equal('こそあど',   @trans.parse('kosoado').transliterate_from_latn_to_hrkt)
@@ -53,6 +53,9 @@ class JapaneseTransliteratorsTest < MiniTest::Unit::TestCase
 
     # Non-Japanese
     assert_equal('てぃs いs そめ えんgりsh', @trans.parse('this is some english').transliterate_from_latn_to_hrkt)
+
+    assert_equal('ばっは', @trans.parse('bahha').transliterate_from_latn_to_hrkt)
+    assert_equal('すたっふ', @trans.parse('sutaffu').transliterate_from_latn_to_hrkt)
   end
 
   def test_transliterate_from_hira_to_kana
@@ -66,11 +69,11 @@ class JapaneseTransliteratorsTest < MiniTest::Unit::TestCase
   def test_transliterate_from_hrkt_to_latn
     assert_equal 'hiraganakatakana', @trans.parse('ひらがなカタカナ').transliterate_from_hrkt_to_latn
   end
-  
+
   def test_transliterate_from_fullwidth_to_halfwidth
     assert_equal HALFWIDTH, @trans.parse(FULLWIDTH).transliterate_from_fullwidth_to_halfwidth
   end
-  
+
   def test_transliterate_from_halfwidth_to_fullwidth
     assert_equal FULLWIDTH, @trans.parse(HALFWIDTH).transliterate_from_halfwidth_to_fullwidth
   end

data/tests/mecab_ipadic_parse_test.rb

@@ -756,6 +756,18 @@ EOR
 は	助詞,係助詞,*,*,*,*,は,ハ,ワ,,
 ない	助動詞,*,*,*,特殊・ナイ,基本形,ない,ナイ,ナイ,,
 EOS
+EOR
+
+    # いじめっ子
+    assert_parses_into_words(Ve::Parse::MecabIpadic, {:words => ["いじめっ子"],
+                             :lemmas => ["いじめっ子"],
+                             :pos => [Ve::PartOfSpeech::Noun],
+                             :extra => [{:reading=>"イジメッコ", :transcription=>"イジメッコ", :grammar=>nil}],
+                             :tokens => [0..1]},
+                             'いじめっ子', <<-EOR.split("\n"))
+いじめ	名詞,一般,*,*,*,*,いじめ,イジメ,イジメ
+っ子	名詞,接尾,一般,*,*,*,っ子,ッコ,ッコ
+EOS
 EOR
 
     # TODO: xした should parse as adjective?

data/tests/test_helper.rb

@@ -6,7 +6,6 @@ require 'minitest/autorun'
 require 'mocha'
 
 class MiniTest::Unit::TestCase
-
   private
 
   def assert_parses_into_words(parse_klass, expected, text, raw)

data/tests/ve_test.rb

@@ -20,5 +20,4 @@ class VeTest < MiniTest::Unit::TestCase
     Ve.config(Ve::HTTPInterface, :url => 'http://localhost:4567')
     assert_equal ['日本語', 'です'], Ve.in(:ja).words('日本語です').collect(&:word)
   end
-
 end

data/ve.gemspec

@@ -1,20 +1,22 @@
+# -*- coding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 've'
-  s.version     = '0.0.3'
+  s.version     = '0.0.4'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Kim Ahlström"]
-  s.email       = ["kim.ahlstrom@gmail.com"]
-  s.homepage    = "http://github.com/kimtaro/ve"
+  s.authors     = ['Kim Ahlström']
+  s.email       = ['kim.ahlstrom@gmail.com']
+  s.license     = 'MIT'
+  s.homepage    = 'http://github.com/kimtaro/ve'
   s.summary     = 'Ve is a linguistic framework for programmers'
   s.description = 'Ve is a linguistic framework for programmers.'
-  
+
   # The list of files to be contained in the gem
   s.files         = `git ls-files`.split("\n")
   # s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   # s.extensions    = `git ls-files ext/extconf.rb`.split("\n")
-  
+
   s.require_paths = ['lib']
 
   # For C extensions
-  # s.extensions = "ext/extconf.rb"
+  # s.extensions = 'ext/extconf.rb'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ve
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kim Ahlström
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies: []
 description: Ve is a linguistic framework for programmers.
 email:
@@ -17,12 +17,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - Rakefile
 - Readme.md
+- java/.gitignore
+- java/build.gradle
+- java/gradle/wrapper/gradle-wrapper.jar
+- java/gradle/wrapper/gradle-wrapper.properties
+- java/gradlew
+- java/gradlew.bat
+- java/pom.xml
+- java/readme.md
+- java/settings.gradle
+- java/src/main/java/ve/Grammar.java
+- java/src/main/java/ve/Parse.java
+- java/src/main/java/ve/Pos.java
+- java/src/main/java/ve/Word.java
+- java/src/test/java/ve/VeTest.java
 - js/test.html
 - js/ve.js
 - lib/language.rb
@@ -47,7 +62,8 @@ files:
 - tests/ve_test.rb
 - ve.gemspec
 homepage: http://github.com/kimtaro/ve
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -55,17 +71,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ve is a linguistic framework for programmers