furigana 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbcd137eebeed04164e7f888a408d6bc06892257
-  data.tar.gz: 80e9c71faddc7cf50b096beef50ec686b277f192
+  metadata.gz: 6ff27abadc679f46eaf32b412c9122df44c55b29
+  data.tar.gz: 6c5e06f33c1dded6d583a7bb7878a89ad9973d42
 SHA512:
-  metadata.gz: 221f507c9f155a7a24628cf42824e647dc2100f31bb7149461c0e305563c9c193a2db49ba02b5e6e8b3d178ef933996b943e58fb1809767d7364943d13818d0f
-  data.tar.gz: 58f004781c6b5cb4fc8ae0fe88943648492fad393d4db2048b5440f65db433a9a5893599b4782be88c915815a49eac6175660b83a7a6213bfa87c03898668922
+  metadata.gz: 9fa6a5abd830cf2488924aef22a36ff3744706026d6a8713101118aef9636bf01785464421da019dcf601a268ff75cf531b6caff0df2e3137575829a29c72531
+  data.tar.gz: 3616341a08872b570b8e5fa3e0f7ae95607e0588b2fbd8def30b0b873f5fc41c2f0f3aa507b5eb15db3e64159219f01dd023ee71dde97ae211725e55df0749a2

data/bin/furigana

@@ -1,62 +1,4 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'furigana'
-require 'singleton'
-require 'ostruct'
-require 'optparse'
-
-module Furigana
-  class CLI
-    include Singleton
-
-    def initialize
-      @settings = OpenStruct.new
-      @settings.format = :text
-    end
-
-    def parse_options
-      OptionParser.new do |opts|
-        opts.banner = "Usage: furigana [options] [file]"
-
-        opts.on("--text", "Add furigana and output text (default)") do
-          @settings.format = :text
-        end
-        opts.on("--html", "Add furigana and output HTML") do
-          @settings.format = :html
-        end
-        opts.on("--yomikata", "Output yomikata only") do
-          @settings.format = :yomikata
-        end
-        opts.on("--json", "Add furigana and output JSON") do
-          @settings.format = :json
-        end
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-        opts.on_tail("--version", "Show version") do
-          puts Furigana::VERSION
-          exit
-        end
-      end.parse!
-    end
-
-    def start
-      parse_options
-
-      input = ARGF.read
-      case @settings.format
-      when :text
-        puts Formatter::Text.format(input, Reader.new.reading(input))
-      when :html
-        puts Formatter::HTML.format(input, Reader.new.reading(input))
-      when :yomikata
-        puts Formatter::Yomikata.format(input, Reader.new.reading(input))
-      when :json
-        puts Formatter::JSON.format(input, Reader.new.reading(input))
-      end
-    end
-  end
-end
+require 'furigana/cli'
 
 Furigana::CLI.instance.start

data/lib/furigana.rb

@@ -1,7 +1,3 @@
-require 'diff/lcs'
-require 'nkf'
-require 'json'
-
 require 'furigana/version'
 require 'furigana/mecab'
 require 'furigana/reader'

data/lib/furigana/formatter/base.rb

@@ -1,44 +1,84 @@
-# -*- coding: utf-8 -*-
 module Furigana
   module Formatter
     class Base
-      class << self
-        def format(text, tokens)
-          surface_form, reading = 0, 1
-          new_text = ''
-          tokens_enum = tokens.to_enum
-          begin
-            current_token = tokens_enum.next
-          rescue StopIteration
-            current_token = nil
+      SURFACE_FORM, READING = 0, 1
+
+      def initialize(text, kanji_tokens)
+        @text = text
+        @kanji_tokens = kanji_tokens
+      end
+
+      def render
+        reset
+
+        @text.each_char do |char|
+          if no_more_kanji_tokens?
+            @new_text += char
+            next
+          end
+
+          @substring += char
+
+          if not_a_kanji_group_match? char
+            @new_text += @substring
+            reset_substring
+            next
           end
-          substring, pos = "", 0
-
-          text.each_char do |char|
-            if current_token
-              substring += char
-              if char == current_token[surface_form][pos]
-                if pos == current_token[surface_form].length-1
-                  new_text += replacement(current_token[surface_form], current_token[reading])
-                  begin
-                    current_token = tokens_enum.next
-                  rescue StopIteration
-                    current_token = nil
-                  end
-                  substring, pos = "", 0
-                else
-                  pos += 1
-                end
-              else # not a match
-                new_text += substring
-                substring, pos = "", 0
-              end
-            else # no more tokens
-              new_text += char
-            end
+
+          if kanji_group_match?
+            # replace kanji group with formatting
+            @new_text += replacement(@current_token[SURFACE_FORM], @current_token[READING])
+            @current_token = next_token
+            reset_substring
+          else
+            # kanji token pos advances with char pos
+            increment_kanji_char_pos
           end
-          new_text
         end
+
+        @new_text
+      end
+
+      private
+
+      def reset
+        @new_text = ""
+        reset_substring
+
+        @kanji_tokens_enum = @kanji_tokens.to_enum
+        @current_token = next_token
+      end
+
+      def reset_substring
+        @substring = ""
+        @kanji_char_pos = 0
+      end
+
+      def increment_kanji_char_pos
+        @kanji_char_pos += 1
+      end
+
+      def no_more_kanji_tokens?
+        @current_token.nil?
+      end
+
+      def not_a_kanji_group_match?(char)
+        current_kanji_char = @current_token[SURFACE_FORM][@kanji_char_pos]
+        char != current_kanji_char
+      end
+
+      def kanji_group_match?
+        @kanji_char_pos == (@current_token[SURFACE_FORM].length - 1)
+      end
+
+      def next_token
+        @kanji_tokens_enum.next
+      rescue StopIteration
+        nil
+      end
+
+      def replacement(surface_form, reading)
+        fail NotImplementedError, "#{self.class} must implement `#{__method__}`"
       end
     end
   end

data/lib/furigana/formatter/html.rb

@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 module Furigana
   module Formatter
     class HTML < Formatter::Base
-      class << self
-        def replacement(surface_form, reading)
-          "<ruby><rb>%s</rb><rp>【</rp><rt>%s</rt><rp>】</rp></ruby>" % [surface_form, reading]
-        end
+      def replacement(surface_form, reading)
+        "<ruby><rb>%s</rb><rp>【</rp><rt>%s</rt><rp>】</rp></ruby>" % [surface_form, reading]
       end
     end
   end

data/lib/furigana/formatter/json.rb

@@ -1,10 +1,10 @@
+require 'json'
+
 module Furigana
   module Formatter
     class JSON < Formatter::Base
-      class << self
-        def format(text, tokens)
-          tokens.to_json
-        end
+      def render
+        @kanji_tokens.to_json
       end
     end
   end

data/lib/furigana/formatter/text.rb

@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 module Furigana
   module Formatter
     class Text < Formatter::Base
-      class << self
-        def replacement(surface_form, reading)
-          "%s【%s】" % [surface_form, reading]
-        end
+      def replacement(surface_form, reading)
+        "%s【%s】" % [surface_form, reading]
       end
     end
   end

data/lib/furigana/formatter/yomikata.rb

@@ -1,22 +1,21 @@
-# -*- coding: utf-8 -*-
+require 'nkf'
+
 module Furigana
   module Formatter
     class Yomikata < Formatter::Base
-      class << self
-        def replacement(surface_form, reading)
-          reading
-        end
+      def replacement(surface_form, reading)
+        reading
+      end
 
-        def format(text, tokens)
-          k2h(super)
-        end
+      def render
+        k2h(super)
+      end
 
-        private
+      private
 
-        def k2h(k)
-          return nil if k.nil?
-          NKF.nkf("-h1 -w", k)
-        end
+      def k2h(k)
+        return nil if k.nil?
+        NKF.nkf("-h1 -w", k)
       end
     end
   end

data/lib/furigana/mecab.rb

@@ -1,32 +1,38 @@
-# -*- coding: utf-8 -*-
 require 'open3'
 
 module Furigana
   class Mecab
     class << self
-      def sanitize_text(text)
-        format("%s\n", text.tr("\n", ""))
-      end
-
       def tokenize(text)
         surface_form, reading = 0, 1
         stdout, stderr, status = Open3.capture3("mecab -Ochasen", :stdin_data => sanitize_text(text))
 
-        # Avoid `ArgumentError - invalid byte sequence in UTF-8`
-        lines = if stdout.valid_encoding?
-                  stdout.split("\n")
-                else
-                  stdout.encode!("UTF-8", "UTF-8", :invalid => :replace, :undef => :replace, :replace => "�")
-                  stdout.split("\n")
-                end
+        lines = split_stdout(stdout)
+
+        lines.reduce([]) do |kanji_tokens, line|
+          return kanji_tokens if line == 'EOS'
 
-        lines.inject([]) do |output, line|
           columns = line.split("\t")
-          output << {
+          kanji_tokens << {
             :surface_form => columns[surface_form],
             :reading      => columns[reading]
-          } if columns[surface_form] != 'EOS'
-          output
+          }
+        end
+      end
+
+      private
+
+      def sanitize_text(text)
+        format("%s\n", text.tr("\n", ""))
+      end
+
+      def split_stdout(stdout)
+        # Avoid `ArgumentError - invalid byte sequence in UTF-8`
+        if stdout.valid_encoding?
+          stdout.split("\n")
+        else
+          stdout.encode!("UTF-8", "UTF-8", :invalid => :replace, :undef => :replace, :replace => "�")
+          stdout.split("\n")
         end
       end
     end

data/lib/furigana/reader.rb

@@ -1,10 +1,12 @@
-# -*- coding: utf-8 -*-
+require 'diff/lcs'
+require 'nkf'
+
 module Furigana
   class Reader
     def reading(text)
-      Mecab.tokenize(text).inject([]) do |list, token|
-        with_furigana = add_furigana(token)
-        list += with_furigana if with_furigana
+      Mecab.tokenize(text).reduce([]) do |list, token|
+        with_reading = add_reading(token)
+        list += with_reading if with_reading
         list
       end
     end
@@ -20,11 +22,12 @@ module Furigana
       Diff::LCS.sdiff(k2h(token[:surface_form]), k2h(token[:reading]))
     end
 
-    def add_furigana(token)
+    def add_reading(token)
       states = { kanji_and_yomi: '!', yomi: '+', kana: '=' }
       kanji, yomi = 0, 1
 
       list = []
+
       if /\p{Han}/.match(token[:surface_form])
         on_kanji = false
         diff_token_surface_form_and_reading(token).each do |part|
@@ -41,6 +44,7 @@ module Furigana
           end
         end
       end
+
       list
     end
   end

data/lib/furigana/version.rb

@@ -1,3 +1,3 @@
 module Furigana
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: furigana
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Michael V. O'Brien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,13 +53,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: diff-lcs
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -93,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Add furigana to text