sanzang 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e45b8e0b9f093af18eaa9f9cc4b2c670ea0eb044
-  data.tar.gz: cc4cbc73c335dd6d5e3294c3f6826bdb52877398
+  metadata.gz: e46c28d14de2815bbd9dfaf3fa7cb9ed89555385
+  data.tar.gz: 5808fe326032855a17222e714daca783808872cc
 SHA512:
-  metadata.gz: ec8dbbc4bfeb9b6c1ec02e284e2274eb8941d7195cbb49bedf3080256d5239da5632350adeee111f776127a954c0ff555419895339557c8bcc633d82459da835
-  data.tar.gz: 3c941b3b382d93e9cc8036aeb6616d572e7f1e6f251e73c622e8212e655b5faf56e507a35d2bb335e92e1b52310263591534665dd14793dcba63c87ba8883386
+  metadata.gz: f2c2312ff05514cf05a340c177e57ee271a941a6ec9124b61a04e71dcd38d1d0c1f40cbea21de2f178a03f66cd4ca5107f980e69b7f7a48f3cbddbd186fa37d7
+  data.tar.gz: 2592b320420505a7337c404689babfb6dbf909fe76654aa8e51a85f65781b246af74a356fcbc7eb15ba2516ed2bcc5c688a700c27584cc92d4b0564a9b7a7e9d

data/lib/sanzang/command/batch.rb

@@ -38,6 +38,7 @@ module Sanzang::Command
       @encoding = nil
       @outdir = nil
       @jobs = nil
+      @verbose = false
     end
 
     # Run the batch command with the given arguments. The parameter _args_
@@ -68,11 +69,13 @@ module Sanzang::Command
       return 0
     rescue SystemExit => err
       return err.status
-    rescue Errno::EPIPE => err
+    rescue Errno::EPIPE
       return 0
     rescue Exception => err
-      $stderr.puts err.backtrace
-      $stderr.puts "\nERROR: #{err.inspect}\n\n"
+      if @verbose
+        $stderr.puts err.backtrace
+      end
+      $stderr.puts err.inspect
       return 1
     end
 
@@ -122,6 +125,9 @@ module Sanzang::Command
         op.on("-j", "--jobs=N", "allow N concurrent processes") do |v|
           @jobs = v.to_i
         end
+        op.on("-v", "--verbose", "verbose mode for debugging") do |v|
+          @verbose = true
+        end
       end
     end
 

data/lib/sanzang/command/reflow.rb

@@ -32,15 +32,18 @@ module Sanzang::Command
   #
   class Reflow
 
-    # Create a new instance of the reflow command
+    # Create a new instance of the reflow command.
     #
     def initialize
       @name = "sanzang reflow"
       @encoding = Encoding.default_external
       @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
@@ -88,11 +91,13 @@ module Sanzang::Command
       return 0
     rescue SystemExit => err
       return err.status
-    rescue Errno::EPIPE => err
+    rescue Errno::EPIPE
       return 0
     rescue Exception => err
-      $stderr.puts err.backtrace
-      $stderr.puts "\nERROR: #{err.inspect}\n\n"
+      if @verbose
+        $stderr.puts err.backtrace
+      end
+      $stderr.puts err.inspect
       return 1
     end
 
@@ -140,6 +145,9 @@ module Sanzang::Command
         op.on("-o", "--outfile=FILE", "write output text to FILE") do |v|
           @outfile = v
         end
+        op.on("-v", "--verbose", "verbose mode for debugging") do |v|
+          @verbose = true
+        end
       end
     end
 

data/lib/sanzang/command/sanzang_cmd.rb

@@ -67,9 +67,10 @@ module Sanzang::Command
       return 1
     rescue SystemExit => err
       return err.status
+    rescue Errno::EPIPE 
+      return 0
     rescue Exception => err
-      $stderr.puts err.backtrace
-      $stderr.puts "ERROR: #{err.inspect}"
+      $stderr.puts err.inspect
       return 1
     end
 

data/lib/sanzang/command/translate.rb

@@ -37,6 +37,22 @@ module Sanzang::Command
       @encoding = nil
       @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_
@@ -79,11 +95,13 @@ module Sanzang::Command
       return 0
     rescue SystemExit => err
       return err.status
-    rescue Errno::EPIPE => err
+    rescue Errno::EPIPE
       return 0
     rescue Exception => err
-      $stderr.puts err.backtrace
-      $stderr.puts "\nERROR: #{err.inspect}\n\n"
+      if @verbose
+        $stderr.puts err.backtrace
+      end
+      $stderr.puts err.inspect
       return 1
     end
 
@@ -124,10 +142,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
+          puts valid_encodings
           exit 0
         end
         op.on("-i", "--infile=FILE", "read input text from FILE") do |v|
@@ -136,6 +151,9 @@ module Sanzang::Command
         op.on("-o", "--outfile=FILE", "write output text to FILE") do |v|
           @outfile = v
         end
+        op.on("-v", "--verbose", "verbose mode for debugging") do |v|
+          @verbose = true
+        end
       end
     end
 

data/lib/sanzang/translation_table.rb

@@ -42,11 +42,12 @@ module Sanzang
     #
     def initialize(rules)
       contents = rules.kind_of?(String) ? rules : rules.read
+      contents.encode!(Encoding::UTF_8)
       @encoding = contents.encoding
 
-      left = "~|".encode(@encoding)
-      right = "|~".encode(@encoding)
-      separator = "|".encode(@encoding)
+      left = "~|"
+      right = "|~"
+      separator = "|"
 
       @records = contents.gsub("\r", "").split("\n").collect do |rec|
         rec.strip.gsub(left, "").gsub(right, "").split(separator)

data/lib/sanzang/translator.rb

@@ -48,9 +48,9 @@ module Sanzang
     end
 
     # Use the TranslationTable of the Translator to create translations for
-    # each destination language column of the translation table. These
-    # result is a simple Array of String objects, with each String object
-    # corresponding to a destination language column in the TranslationTable.
+    # each destination language column of the translation table. The result is
+    # a simple Array of String objects, with each String object corresponding
+    # to a destination language column in the TranslationTable.
     #
     def translate(source_text)
       text_collection = [source_text]
@@ -70,10 +70,13 @@ module Sanzang
     # This is the normal text listing output of the Sanzang Translator.
     #
     def gen_listing(source_text)
+      source_encoding = source_text.encoding
+      source_text.encode!(Encoding::UTF_8)
+
       newline = source_text.include?("\r") ? "\r\n" : "\n"
       texts = translate(source_text).collect {|t| t = t.split(newline) }
-      listing = "".encode(source_text.encoding)
 
+      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]}" \
@@ -81,7 +84,7 @@ module Sanzang
         end
         listing << newline
       end
-      listing
+      listing.encode!(source_encoding)
     end
 
     # Read a text from _input_ and write its translation listing to _output_.

data/lib/sanzang/version.rb

@@ -20,6 +20,6 @@ module Sanzang
 
   # Current version number of Sanzang
   #
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanzang
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Lapis Lazuli Texts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple rule-based machine translation system.