cbeta 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d32d9bafbfe3851c5f515c8efc2a6911a00a48c
-  data.tar.gz: 65eb0b40419c9ffcd583a98971e263d17b36a85d
+  metadata.gz: bb15f5b135465307d5d432fd1760a26f2e5ce2b2
+  data.tar.gz: afba7a55bc4cfcae52a9238c55664163361aa1df
 SHA512:
-  metadata.gz: c58d630e10c54298c3db15e1c6d154be4b7c3bab835ac495040d2563b20e389f343a341805b472316020782105b924f560166a3dc31d3ffe9c2ffa5a8906a1fa
-  data.tar.gz: a27562a6385befad6767ffcb0ac933fd06b5ee504ef581b6ff1b272683adc8353298ad2f034be845644b3ddb03ec2ff0b91250f7a553cbf41562c068c3b8b119
+  metadata.gz: 567a960b85aa16bd7ca3f60084d82c2953ceaaf63260c7640ee53172e1af118742f5b3e24d2f9767cc504e54cd20f1fd6ad0892bf2c9af01cf023612fb3965b0
+  data.tar.gz: e27de657de8b2bbeb09ab052d1786188ff510ff35b75197b00c050b371f1fcff4fbd33045d17c2043866f6302ebe6f1f5c27a8dde61cc400cc0a726acbff855e

data/lib/cbeta/p5a_to_epub.rb

@@ -67,10 +67,7 @@ class CBETA::P5aToEPUB
   # @param output_paath [String] 輸出 EPUB 檔路徑
   def convert_file(input_path, output_path)
     return false unless input_path.end_with? '.xml'
-    
-    FileUtils.remove_dir(@temp_folder, force=true)
-    FileUtils::mkdir_p @temp_folder
-    
+      
     @book_id = File.basename(input_path, ".xml")
     
     sutra_init
@@ -142,6 +139,11 @@ class CBETA::P5aToEPUB
 
   private
   
+  def clear_temp_folder
+    FileUtils.remove_dir(@temp_folder, force=true)
+    FileUtils::mkdir_p @temp_folder
+  end
+  
   def copy_static_files(src, dest)
     dest = File.join(@temp_folder, dest)
     FileUtils.copy(src, dest)
@@ -731,6 +733,8 @@ eos
   end
   
   def sutra_init
+    clear_temp_folder
+    
     s = NAV_TEMPLATE % '<ol></ol>'
     @nav_doc = Nokogiri::XML(s)
     

data/lib/cbeta/p5a_to_text.rb

@@ -23,10 +23,18 @@ class CBETA::P5aToText
   # @param xml_root [String] 來源 CBETA XML P5a 路徑
   # @param output_root [String] 輸出 Text 路徑
   # @param format [String] 輸出格式，例：'app'
-  def initialize(xml_root, output_root, format=nil)
+  # @option opts [String] :format 輸出格式，例：'app'，預設是 normal
+  # @option opts [String] :encoding 輸出編碼，預設 'UTF-8'
+  def initialize(xml_root, output_root, opts={})
     @xml_root = xml_root
     @output_root = output_root
-    @format = format
+    
+    @settings = {
+      format: nil,
+      encoding: 'UTF-8'
+    }
+    @settings.merge!(opts)
+    
     @cbeta = CBETA.new
     @gaijis = CBETA::Gaiji.new
   end
@@ -127,13 +135,13 @@ class CBETA::P5aToText
 
   def handle_byline(e)
     r = traverse(e)
-    r += @format=='app' ? "\t" : "\n"
+    r += @settings[:format]=='app' ? "\t" : "\n"
     r
   end
 
   def handle_cell(e)
     r = traverse(e)
-    r += @format=='app' ? "\t" : "\n"
+    r += @settings[:format]=='app' ? "\t" : "\n"
     r
   end
 
@@ -157,13 +165,13 @@ class CBETA::P5aToText
 
   def handle_docNumber(e)
     r = traverse(e)
-    r += @format == 'app' ? "\t" : "\n"
+    r += @settings[:format] == 'app' ? "\t" : "\n"
     r
   end
 
   def handle_figure(e)
     r = traverse(e)
-    r += @format == 'app' ? "\t" : "\n"
+    r += @settings[:format] == 'app' ? "\t" : "\n"
     r
   end
 
@@ -212,24 +220,24 @@ class CBETA::P5aToText
 
   def handle_head(e)
     r = traverse(e)
-    r += @format == 'app' ? "\t" : "\n"
+    r += @settings[:format] == 'app' ? "\t" : "\n"
     r
   end
 
   def handle_item(e)
     r = traverse(e)
-    r += @format == 'app' ? "\t" : "\n"
+    r += @settings[:format] == 'app' ? "\t" : "\n"
   end
 
   def handle_juan(e)
     r = traverse(e)
-    r += @format == 'app' ? "\t" : "\n"
+    r += @settings[:format] == 'app' ? "\t" : "\n"
     r
   end
 
   def handle_l(e)
     r = traverse(e)
-    if @format == 'app'
+    if @settings[:format] == 'app'
       r += "\t"
     else
       r += "\n" unless @lg_type == 'abnormal'
@@ -239,7 +247,7 @@ class CBETA::P5aToText
 
   def handle_lb(e)
     r = ''
-    if @format == 'app'
+    if @settings[:format] == 'app'
       r += "\n#{e['n']}║"
     end
     unless @next_line_buf.empty?
@@ -264,7 +272,7 @@ class CBETA::P5aToText
 
   def handle_list(e)
     r = ''
-    r += "\n" unless @format == 'app'
+    r += "\n" unless @settings[:format] == 'app'
     r + traverse(e)
   end
 
@@ -334,7 +342,7 @@ class CBETA::P5aToText
 
   def handle_p(e)
     r = traverse(e)
-    r += @format == 'app' ? "\t" : "\n"
+    r += @settings[:format] == 'app' ? "\t" : "\n"
     r
   end
 
@@ -510,15 +518,18 @@ class CBETA::P5aToText
         end
       end
       text = frag.content
-      text = appify(text) if @format == 'app'
+      text = appify(text) if @settings[:format] == 'app'
 
+      ed2 = ed.sub(/^【(.*?)】$/, '\1')
       if ed == @orig
-        fn = "#{ed}-orig.txt"
+        fn = "#{ed2}-orig.txt"
       else
-        fn = "#{ed}.txt"
+        fn = "#{ed2}.txt"
       end
       output_path = File.join(folder, fn)
-      File.write(output_path, text)
+      fo = File.open(output_path, 'w', encoding: @settings[:encoding])
+      fo.write(text)
+      fo.close
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ray Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for use Chinese Buddhist Text resources made by CBETA (http://www.cbeta.org).
 email: zhoubx@gmail.com