sanzang 1.0.3 → 1.0.4

data/MANUAL.rdoc

@@ -293,14 +293,9 @@ messages will still be displayed in the console's native IBM-437 encoding.
 
     $ sanzang t -E UTF-16LE -i in.txt -o out.txt TABLE.txt
 
-If the "-E" option is not specified, then \Sanzang will use the default
-encoding inherited from the environment. For example, a GNU/Linux user running
-\Sanzang in a UTF-8 terminal will by default have all text data read and
-written to in the UTF-8 encoding. The one *exception* to this is for
-environments using the IBM-437 encoding (typically an old Windows command
-shell). In this case, \Sanzang will take pity on you and automatically switch
-to UTF-8 by default, as if you had specified the option "-E" with value
-"UTF-8".
+If the "-E" option is not specified, then \Sanzang will use the default data
+encoding for that environment. The data encoding can be seen by running
+\sanzang with the "--version" or "--platform" options.
 
 == Responsible Use
 

data/README.rdoc

@@ -34,19 +34,12 @@ automatically download and install \Sanzang onto your computer.
     # gem install sanzang
 
 After this, you should be able to run the _sanzang_ command. Run the following
-command to verify your installation and print platform information.
+command to verify your installation and print version information.
 
-    # sanzang -P
+    # sanzang -V
 
-This command should show a summary of your platform for running \Sanzang.
+This command should show a summary of your \Sanzang version and environment.
 
-    Ruby platform: x86_64-linux
-    Ruby version: 2.0.0
-    External encoding: UTF-8
-    Internal encoding: none
-    Fork implemented: true
-    Parallel version: 0.6.4
-    Processors found: 4
-    Sanzang version: 1.0.0
+    sanzang 1.0.4 [ruby_1.9.3] [x86_64-linux] [UTF-8]
 
 You now have \Sanzang installed on your computer.

data/lib/sanzang.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -23,10 +23,11 @@
 module Sanzang
 end
 
+require_relative File.join("sanzang", "batch_translator")
+require_relative File.join("sanzang", "platform")
 require_relative File.join("sanzang", "text_formatter")
 require_relative File.join("sanzang", "translation_table")
 require_relative File.join("sanzang", "translator")
-require_relative File.join("sanzang", "batch_translator")
 require_relative File.join("sanzang", "version")
 
 # The Sanzang::Command module contains Unix style commands utilizing the

data/lib/sanzang/batch_translator.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -18,6 +18,7 @@
 
 require "parallel"
 
+require_relative "platform"
 require_relative "translator"
 
 module Sanzang
@@ -28,18 +29,6 @@ module Sanzang
   #
   class BatchTranslator < Translator
 
-    # Evaluates to true if this Ruby can execute the fork(2) system call.
-    #
-    def forking?
-      Process.respond_to?(:fork)
-    end
-
-    # The number of logical processors detected on the current system.
-    #
-    def processor_count
-      Parallel.processor_count
-    end
-
     # Translate a batch of files. The main parameter is an array, each element
     # of which should be a two-dimensional array with the first element being
     # the input file path, and the second element being the output file path.
@@ -47,8 +36,10 @@ module Sanzang
     # return value is an array containing all the output file paths.
     #
     def translate_batch(fpath_pairs, verbose = true, jobs = nil)
-      if not forking?
+      if not Sanzang::Platform.unix_processes?
         jobs = 0
+      elsif not jobs
+        jobs = Sanzang::Platform.processor_count
       end
       Parallel.map(fpath_pairs, :in_processes => jobs) do |f1,f2|
         translate_io(f1, f2)

data/lib/sanzang/command/batch.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -18,6 +18,7 @@
 
 require "optparse"
 
+require_relative File.join("..", "platform")
 require_relative File.join("..", "translation_table")
 require_relative File.join("..", "batch_translator")
 require_relative File.join("..", "version")
@@ -35,7 +36,7 @@ module Sanzang::Command
     #
     def initialize
       @name = "sanzang batch"
-      @encoding = nil
+      @encoding = Sanzang::Platform.data_encoding
       @outdir = nil
       @jobs = nil
       @verbose = false
@@ -56,8 +57,6 @@ module Sanzang::Command
         return 1
       end
 
-      set_data_encoding
-
       translator = nil
       File.open(args[0], "rb", encoding: @encoding) do |table_file|
         table = Sanzang::TranslationTable.new(table_file.read)
@@ -79,20 +78,11 @@ module Sanzang::Command
       return 1
     end
 
-    private
+    # Name of the command
+    #              
+    attr_reader :name
 
-    # Set the encoding for text data if it is not already set
-    #
-    def set_data_encoding
-      if @encoding == nil
-        if Encoding.default_external.to_s =~ /ASCII|IBM/
-          $stderr.puts "Encoding: UTF-8"
-          @encoding = Encoding::UTF_8
-        else
-          @encoding = Encoding.default_external
-        end
-      end
-    end
+    private
 
     # Return an OptionParser object for this command
     #
@@ -116,10 +106,7 @@ module Sanzang::Command
           @encoding = Encoding.find(v)
         end
         op.on("-L", "--list-encodings", "list possible encodings") do |v|
-          encodings = Encoding.list.sort do |x,y|
-            x.to_s.upcase <=> y.to_s.upcase
-          end
-          puts encodings
+          Sanzang::Platform.valid_encodings.each {|e| puts e.to_s }
           exit 0
         end
         op.on("-j", "--jobs=N", "allow N concurrent processes") do |v|
@@ -131,9 +118,5 @@ module Sanzang::Command
       end
     end
 
-    # Name of the command
-    #
-    attr_reader :name
-
   end
 end

data/lib/sanzang/command/reflow.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -18,6 +18,7 @@
 
 require "optparse"
 
+require_relative File.join("..", "platform")
 require_relative File.join("..", "text_formatter")
 require_relative File.join("..", "version")
 
@@ -36,27 +37,12 @@ module Sanzang::Command
     #
     def initialize
       @name = "sanzang reflow"
-      @encoding = nil
+      @encoding = Sanzang::Platform.data_encoding
       @infile = nil
       @outfile = nil
       @verbose = false
     end
 
-    # Get a list of all acceptable text encodings.
-    #
-    def valid_encodings
-      all_enc = Encoding.list.collect {|e| e.to_s }.sort do |x,y|
-        x.upcase <=> y.upcase
-      end
-      all_enc.find_all do |e|
-        begin
-          Encoding::Converter.search_convpath(e, Encoding::UTF_8)
-        rescue Encoding::ConverterNotFoundError
-          e == "UTF-8" ? true : false
-        end
-      end
-    end
-
     # Run the reflow command with the given arguments. The parameter _args_
     # would typically be an array of command options and parameters. Calling
     # this with the "-h" or "--help" option will print full usage information
@@ -71,8 +57,6 @@ module Sanzang::Command
         return 1
       end
 
-      set_data_encoding
-
       begin
         fin = @infile ? File.open(@infile, "r") : $stdin
         fin.binmode.set_encoding(@encoding)
@@ -101,20 +85,11 @@ module Sanzang::Command
       return 1
     end
 
-    private
-
-    # Initialize the encoding for text data if it is not already set
+    # The name of the command
     #
-    def set_data_encoding
-      if @encoding == nil
-        if Encoding.default_external.to_s =~ /ASCII|IBM/
-          $stderr.puts "Encoding: UTF-8"
-          @encoding = Encoding::UTF_8
-        else
-          @encoding = Encoding.default_external
-        end
-      end
-    end
+    attr_reader :name
+
+    private
 
     # An OptionParser for the command
     #
@@ -122,10 +97,12 @@ module Sanzang::Command
       OptionParser.new do |op|
         op.banner = "Usage: #{@name} [options]\n"
 
-        op.banner << "\nReformat text file contents into lines based on "
-        op.banner << "spacing, punctuation, etc.\n"
-        op.banner << "\nExamples:\n"
-        op.banner << "    #{@name} -i in/mytext.txt -o out/mytext.txt\n"
+        op.banner << "\nReformat text into lines based on spacing, "
+        op.banner << "punctuation, etc. This should work\nfor the CJK "
+        op.banner << "languages (Chinese, Japanese, and Korean). By default, "
+        op.banner << "text is read\nfrom STDIN and written to STDOUT."
+        op.banner << "\n"
+
         op.banner << "\nOptions:\n"
 
         op.on("-h", "--help", "show this help message and exit") do |v|
@@ -136,7 +113,7 @@ module Sanzang::Command
           @encoding = Encoding.find(v)
         end
         op.on("-L", "--list-encodings", "list possible encodings") do |v|
-          puts valid_encodings
+          Sanzang::Platform.valid_encodings.each {|e| puts e.to_s }
           exit 0
         end
         op.on("-i", "--infile=FILE", "read input text from FILE") do |v|
@@ -151,9 +128,5 @@ module Sanzang::Command
       end
     end
 
-    # The name of the command
-    #
-    attr_reader :name
-
   end
 end

data/lib/sanzang/command/sanzang_cmd.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -23,6 +23,7 @@ require_relative "reflow"
 require_relative "translate"
 require_relative "batch"
 
+require_relative File.join("..", "platform")
 require_relative File.join("..", "version")
 
 module Sanzang::Command
@@ -77,22 +78,30 @@ module Sanzang::Command
     # A string giving a listing of platform information
     #
     def platform_info
-      info = "Ruby platform: #{RUBY_PLATFORM}\n"
-      info << "Ruby version: #{RUBY_VERSION}\n"
-      info << "External encoding: #{Encoding.default_external}\n"
-      info << "Internal encoding: #{Encoding.default_internal or 'none'}\n"
-      info << "Fork implemented: #{Process.respond_to?(:fork)}\n"
-      info << "Parallel version: #{Parallel::VERSION}\n"
-      info << "Processors found: #{Parallel.processor_count}\n"
-      info << "Sanzang version: #{Sanzang::VERSION}\n"
+      info = "host_arch = #{Sanzang::Platform.machine_arch}\n"
+      info << "host_os = #{Sanzang::Platform.os_name}\n"
+      info << "host_processors = #{Sanzang::Platform.processor_count}\n"
+      info << "ruby_encoding_ext = #{Encoding.default_external}\n"
+      info << "ruby_encoding_int = #{Encoding.default_internal or 'none'}\n"
+      info << "ruby_multiproc = #{Sanzang::Platform.unix_processes?}\n"
+      info << "ruby_platform = #{RUBY_PLATFORM}\n"
+      info << "ruby_version = #{RUBY_VERSION}\n"
+      info << "sanzang_encoding = #{Sanzang::Platform.data_encoding}\n"
+      info << "sanzang_parallel = #{Parallel::VERSION}\n"
+      info << "sanzang_version = #{Sanzang::VERSION}\n"
     end
 
     # This is a string giving a brief one-line summary of version information
     #
     def version_info
-      "sanzang #{Sanzang::VERSION} [ruby_#{RUBY_VERSION}] [#{RUBY_PLATFORM}]"
+      "sanzang #{Sanzang::VERSION} [ruby_#{RUBY_VERSION}] [#{RUBY_PLATFORM}]" \
+        + " [#{Sanzang::Platform.data_encoding}]"
     end
 
+    # Name of the command
+    #
+    attr_reader :name
+
     private
 
     # An OptionParser object for parsing command options and parameters
@@ -100,16 +109,17 @@ module Sanzang::Command
     def option_parser
       OptionParser.new do |op|
         op.banner = "Usage: #{@name} [options]\n"
-        op.banner << "Usage: #{@name} <command> [options] [args]\n\n"
+        op.banner << "Usage: #{@name} <command> [options] [args]\n"
 
-        op.banner << "Use \"--help\" with commands for usage information.\n"
+        op.banner << "\nUse \"-h\" or \"--help\" with sanzang commands for "
+        op.banner << "usage information.\n"
 
         op.banner << "\nSanzang commands:\n"
-        op.banner << "    batch       translate many files in parallel\n"
+        op.banner << "    batch       translate many files in parallel\n"    
         op.banner << "    reflow      format CJK text for translation\n"
         op.banner << "    translate   standard single text translation\n"
-        op.banner << "\nOptions:\n"
 
+        op.banner << "\nOptions:\n"
         op.on("-h", "--help", "show this help message and exit") do |v|
           puts op
           exit 0
@@ -125,9 +135,5 @@ module Sanzang::Command
       end
     end
 
-    # Name of the command
-    #
-    attr_reader :name
-
   end
 end

data/lib/sanzang/command/translate.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -18,6 +18,7 @@
 
 require "optparse"
 
+require_relative File.join("..", "platform")
 require_relative File.join("..", "translation_table")
 require_relative File.join("..", "translator")
 require_relative File.join("..", "version")
@@ -34,27 +35,12 @@ module Sanzang::Command
     #
     def initialize
       @name = "sanzang translate"
-      @encoding = nil
+      @encoding = Sanzang::Platform.data_encoding
       @infile = nil
       @outfile = nil
       @verbose = false
     end
 
-    # Get a list of all acceptable text encodings.
-    #
-    def valid_encodings
-      all_enc = Encoding.list.collect {|e| e.to_s }.sort do |x,y|
-        x.upcase <=> y.upcase
-      end
-      all_enc.find_all do |e|
-        begin
-          Encoding::Converter.search_convpath(e, Encoding::UTF_8)
-        rescue Encoding::ConverterNotFoundError
-          e == "UTF-8" ? true : false
-        end
-      end
-    end
-
     # Run the translate command with the given arguments. The parameter _args_
     # would typically be an array of command options and parameters. Calling
     # this with the "-h" or "--help" option will print full usage information
@@ -69,8 +55,6 @@ module Sanzang::Command
         return 1
       end
 
-      set_data_encoding
-
       translator = nil
       File.open(args[0], "rb", encoding: @encoding) do |table_file|
         table = Sanzang::TranslationTable.new(table_file.read)
@@ -105,20 +89,11 @@ module Sanzang::Command
       return 1
     end
 
-    private
+    # Name of the command
+    #               
+    attr_reader :name 
 
-    # Initialize the encoding for text data if it is not already set
-    #
-    def set_data_encoding
-      if @encoding == nil
-        if Encoding.default_external.to_s =~ /ASCII|IBM/
-          $stderr.puts "Encoding: UTF-8"
-          @encoding = Encoding::UTF_8
-        else
-          @encoding = Encoding.default_external
-        end
-      end
-    end
+    private
 
     # An OptionParser for the command
     #
@@ -128,10 +103,9 @@ module Sanzang::Command
 
         op.banner << "\nTranslate text using simple table rules. Input text "
         op.banner << "is read from STDIN by\ndefault, and the output is "
-        op.banner << "written to STDOUT by default.\n"
+        op.banner << "written to STDOUT by default. The translation table "
+        op.banner << "\nfile is specified as a parameter.\n"
 
-        op.banner << "\nExample:\n"
-        op.banner << "    #{@name} -i text.txt -o text.sz.txt table.txt\n"
         op.banner << "\nOptions:\n"
 
         op.on("-h", "--help", "show this help message and exit") do |v|
@@ -142,7 +116,7 @@ module Sanzang::Command
           @encoding = Encoding.find(v)
         end
         op.on("-L", "--list-encodings", "list possible encodings") do |v|
-          puts valid_encodings
+          Sanzang::Platform.valid_encodings.each {|e| puts e.to_s }
           exit 0
         end
         op.on("-i", "--infile=FILE", "read input text from FILE") do |v|
@@ -157,9 +131,5 @@ module Sanzang::Command
       end
     end
 
-    # Name of the command
-    #
-    attr_reader :name
-
   end
 end

data/lib/sanzang/platform.rb

@@ -0,0 +1,128 @@
+#!/usr/bin/env ruby
+# -*- encoding: UTF-8 -*-
+#--
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+require 'rbconfig'
+
+# The Sanzang::Platform module includes information about the underlying system
+# that is needed by the \Sanzang system. This includes information about the
+# machine architecture and OS, the number of processors available, encodings
+# that are supported, and encodings that are optimal.
+#
+module Sanzang::Platform
+  class << self
+
+    # CPU architecture of the underlying machine
+    #
+    def machine_arch
+      RbConfig::CONFIG["target_cpu"]
+    end
+
+    # Operating system, which may be different from RUBY_PLATFORM
+    #
+    def os_name
+      RbConfig::CONFIG["target_os"]
+    end
+
+    # Does this Ruby VM support Unix-style process handling?
+    #
+    def unix_processes?
+      [:fork, :wait, :kill].each do |f|
+        if not Process.respond_to?(f)
+          return false
+        end
+      end
+      true
+    end
+
+    # Find the number of logical processors seen by the system. This may be
+    # different from the number of physical processors or CPU cores. If the
+    # number of processors cannot be detected, nil is returned. For Windows,
+    # this is detected through an OLE lookup, and for Unix systems, a heuristic
+    # approach is taken. Supported Unix types include:
+    #
+    # * AIX: pmcycles (AIX 5+), lsdev
+    # * BSD: /sbin/sysctl
+    # * Cygwin: /proc/cpuinfo
+    # * Darwin: hwprefs, /usr/sbin/sysctl
+    # * HP-UX: ioscan
+    # * IRIX: sysconf
+    # * Linux: /proc/cpuinfo
+    # * Minix 3+: /proc/cpuinfo
+    # * Solaris: psrinfo
+    # * Tru64 UNIX: psrinfo
+    # * UnixWare: psrinfo
+    #
+    def processor_count
+      if os_name =~ /mingw|mswin/
+        require 'win32ole'
+        result = WIN32OLE.connect("winmgmts://").ExecQuery(
+          "select NumberOfLogicalProcessors from Win32_Processor")
+        result.to_enum.first.NumberOfLogicalProcessors
+      elsif File.readable?("/proc/cpuinfo")
+        IO.read("/proc/cpuinfo").scan(/^processor/).size
+      elsif File.executable?("/usr/bin/hwprefs")
+        IO.popen(%w[/usr/bin/hwprefs thread_count]).read.to_i
+      elsif File.executable?("/usr/sbin/psrinfo")
+        IO.popen("/usr/sbin/psrinfo").read.scan(/^.*on-*line/).size
+      elsif File.executable?("/usr/sbin/ioscan")
+        IO.popen(%w[/usr/sbin/ioscan -kC processor]) do |out|
+          out.read.scan(/^.*processor/).size
+        end
+      elsif File.executable?("/usr/sbin/pmcycles")
+        IO.popen(%w[/usr/sbin/pmcycles -m]).read.count("\n")
+      elsif File.executable?("/usr/sbin/lsdev")
+        IO.popen(%w[/usr/sbin/lsdev -Cc processor -S 1]).read.count("\n")
+      elsif File.executable?("/usr/sbin/sysconf") and os_name =~ /IRIX/i
+        IO.popen(%w[/usr/sbin/sysconf NPROC_ONLN]).read.to_i
+      elsif File.executable?("/usr/sbin/sysctl")
+        IO.popen(%w[/usr/sbin/sysctl -n hw.ncpu]).read.to_i
+      elsif File.executable?("/sbin/sysctl")
+        IO.popen(%w[/sbin/sysctl -n hw.ncpu]).read.to_i
+      else
+        nil
+      end
+    end
+
+    # Text encodings that can be converted to UTF-8. MRI still lacks some
+    # converter implementations for obscure encodings.
+    #
+    def valid_encodings
+      Encoding.list.find_all do |e|
+        begin
+          Encoding::Converter.search_convpath(e, Encoding::UTF_8)
+        rescue Encoding::ConverterNotFoundError
+          e == Encoding::UTF_8 ? true : false
+        end
+      end.sort_by! {|e| e.to_s.upcase }
+    end
+
+    # Default text data encoding on this platform. This is usually the default
+    # external encoding of the Ruby interpreter; however, if the encoding is
+    # an ASCII variant or an old IBM DOS encoding, then it should default to
+    # UTF-8 since these are effectively obsolete, or they are subsets of UTF-8.
+    #
+    def data_encoding
+      if Encoding.default_external.to_s =~ /ASCII|IBM/
+        Encoding::UTF_8
+      else
+        Encoding.default_external
+      end
+    end
+
+  end
+end

data/lib/sanzang/text_formatter.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software

data/lib/sanzang/translation_table.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software

data/lib/sanzang/translator.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -69,7 +69,7 @@ module Sanzang
     # Translator#translate is collated and numbered for reference purposes.
     # This is the normal text listing output of the Sanzang Translator.
     #
-    def gen_listing(source_text)
+    def gen_listing(source_text, pos = 1)
       source_encoding = source_text.encoding
       source_text.encode!(Encoding::UTF_8)
 
@@ -79,7 +79,7 @@ module Sanzang
       listing = ""
       texts[0].length.times do |line_i|
         @table.width.times do |col_i|
-          listing << "[#{line_i + 1}.#{col_i + 1}] #{texts[col_i][line_i]}" \
+          listing << "[#{pos + line_i}.#{col_i + 1}] #{texts[col_i][line_i]}" \
                   << newline
         end
         listing << newline
@@ -90,7 +90,8 @@ module Sanzang
     # Read a text from _input_ and write its translation listing to _output_.
     # If a parameter is a string, it is interpreted as the path to a file, and
     # the relevant file is opened and used. Otherwise, the parameter is treated
-    # as an open IO object.
+    # as an open IO object. I/O is buffered for better performance and to avoid
+    # reading entire texts into memory.
     #
     def translate_io(input, output)
       if input.kind_of?(String)
@@ -103,7 +104,18 @@ module Sanzang
       else
         io_out = output
       end
-      io_out.write(gen_listing(io_in.read))
+
+      buf_size = 96
+      buffer = ""
+      io_in.each do |line|
+        buffer << line
+        if io_in.lineno % buf_size == 0
+          io_out.write(gen_listing(buffer, io_in.lineno - buf_size + 1))
+          buffer = ""
+        end
+      end
+      io_out.write(
+        gen_listing(buffer, io_in.lineno - buffer.rstrip.count("\n")))
     ensure
       io_in.close if input.kind_of?(String) and not io_in.closed?
       io_out.close if output.kind_of?(String) and not io_out.closed?

data/lib/sanzang/version.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: UTF-8 -*-
 #--
-# Copyright (C) 2012 Lapis Lazuli Texts
+# Copyright (C) 2012-2013 Lapis Lazuli Texts
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -20,6 +20,6 @@ module Sanzang
 
   # Current version number of Sanzang
   #
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 
 end

data/test/tc_simple_translation.rb

@@ -60,26 +60,24 @@ class TestSanzang < Test::Unit::TestCase
     assert_equal(stage_2(), text)
   end
 
-  def test_translate_string
-    table = Sanzang::TranslationTable.new(table_string())
-    text = Sanzang::Translator.new(table).gen_listing(stage_2())
-    assert_equal(stage_3(), text)
-  end
-
   def test_translate_file
     table_path = File.join(File.dirname(__FILE__), "utf-8", "table.txt")
     s2_path = File.join(File.dirname(__FILE__), "utf-8", "stage_2.txt")
     s3_path = File.join(File.dirname(__FILE__), "utf-8", "stage_3.txt")
     tab = Sanzang::TranslationTable.new(IO.read(table_path, encoding: "UTF-8"))
     translator = Sanzang::Translator.new(tab)
-    translator.translate_io(s2_path, s3_path)
+    translator.translate_io(s2_path, s3_path) 
   end
 
-  def test_translator_parallel
+  def test_translate_string
     table = Sanzang::TranslationTable.new(table_string())
-    bt = Sanzang::BatchTranslator.new(table)
-    bt.forking?
-    assert(bt.processor_count > 0, "Processor count less than zero")
+    text = Sanzang::Translator.new(table).gen_listing(stage_2())
+    assert_equal(stage_3(), text)
+  end
+
+  def test_translator_parallel
+    procs = Sanzang::Platform.processor_count
+    assert(procs > 0, "Processor count less than zero")
   end
 
   def test_translate_batch

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: sanzang
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Lapis Lazuli Texts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.19
 description: Sanzang is a program built for machine translation of natural languages.
@@ -58,6 +61,7 @@ files:
 - lib/sanzang/translation_table.rb
 - lib/sanzang/batch_translator.rb
 - lib/sanzang/version.rb
+- lib/sanzang/platform.rb
 - lib/sanzang/command/reflow.rb
 - lib/sanzang/command/sanzang_cmd.rb
 - lib/sanzang/command/translate.rb
@@ -70,26 +74,27 @@ files:
 homepage: http://www.lapislazulitexts.com/sanzang/
 licenses:
 - GPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple rule-based machine translation system.
 test_files:
 - test/tc_reflow_encodings.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8b8f836d96d322d790415d013b67a6313007b29c
-  data.tar.gz: c929928a0b63f3e16fe7d4b5dd9c14936b67f6c0
-SHA512:
-  metadata.gz: 69eea67e41a7e29330ab5733be22e3f6299d59dc498c7348bcd7f0f6bbff6b75923bc231c6405d43943430a224e6a9dbe52a53d9ae9ef24d6853863944be5306
-  data.tar.gz: ead0983545667b9d315647f0d862b5b2b2aef960ba961dd9f95a224107084e015b71e240c5c1ed87116ce3963bcc25038c953c936fff4e78fbcbb727712f3367