aozora2html 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5866db44c93055109ebd1523d14adbc54430b4
-  data.tar.gz: 024cf855007a18c9b4592fa1576cc50394b52f3b
+  metadata.gz: f5986973cf323ca85a48b74c8537a0c43ff4c9b5
+  data.tar.gz: ed11bf0bffd8773090e0c336e9d25818156e42ff
 SHA512:
-  metadata.gz: d022e52edd4ad4d8d329e6b9aa3421505e60942bdc80b558bf2691a1e871b7053b10fae60b1b6493d5d6670ff4554822f2996056e86de695e4cb0430a01b4d60
-  data.tar.gz: 67f47a64d1df309ffcef401e9faef8b466a56fbb00a26d8b17afcac0bdc78d95264167af01b6d249f58f3661279262fe3ab849bc4b8e47c88277d29762c8204e
+  metadata.gz: 303a38cddb21e188905acc4e2e537582d9f621415ffa460964dfd775484113b435a1cba103d7c9612c5a5773e3cdd48bd8162c1ca3d7a25b7e9436a09d4e6dc3
+  data.tar.gz: 0b5ce96681fb726ad975d7926e78c203b5dc9001f652b3f43fa09ea9b9b590143f55438fd038ce3bdc96800501a7c02de83a01f603aee86fc9b3a15005608abd

data/CHANGELOG.md

@@ -1,10 +1,22 @@
+<a name="0.5.0"></a>
+## 0.5.0
+
+### Bug Fixes
+
+* Windowsで動かなかったのを修正した (#10)
+* Aozora2HtmlTestでAozora2Htmlインスタンスを必ずcloseするように修正した
+
+### Features
+
+* `--use-jisx0213`オプションでアクセント文字も数値実体参照として表示できるようにした
+
 <a name="0.4.0"></a>
 ## 0.4.0
 
 ### Features
 
 * 第1引数にファイル名ではなく`http://...`といったURLを与えた場合、そのURLのファイルをダウンロードしHTMLに変換するようにした
-* 第1引数が省略された場合、結果をファイルではなく標準出力に出力するようにした
+* 第2引数が省略された場合、結果をファイルではなく標準出力に出力するようにした
 
 <a name="0.3.0"></a>
 ## 0.3.0

data/bin/aozora2html

@@ -40,6 +40,7 @@ end
 
 if options["use-jisx0213"]
   Embed_Gaiji_tag.use_jisx0213 = true
+  Accent_tag.use_jisx0213 = true
 end
 
 if ARGV.size < 1 || ARGV.size > 2

data/lib/accent_tag.rb

@@ -0,0 +1,23 @@
+class Accent_tag
+  alias_method :to_s_orig, :to_s
+
+  def self.use_jisx0213=(val)
+    @use_jisx0213 = val
+  end
+
+  def self.use_jisx0213
+    @use_jisx0213
+  end
+
+  def jisx0213_to_unicode(code)
+    Aozora2Html::JIS2UCS[code]
+  end
+
+  def to_s
+    if Accent_tag.use_jisx0213
+      jisx0213_to_unicode(@code.sub(%r|.*/|,"").to_sym)
+    else
+      to_s_orig
+    end
+  end
+end

data/lib/aozora2html.rb

@@ -3,6 +3,7 @@ require "aozora2html/zip"
 require "aozora2html/jis2ucs"
 require 't2hs'
 require 'embed_gaiji_tag'
+require 'accent_tag'
 
 ## already defined in t2hs.rb
 class Aozora2Html

data/lib/aozora2html/version.rb

@@ -1,3 +1,3 @@
 class Aozora2Html
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/t2hs.rb

@@ -810,7 +810,7 @@ class Aozora2Html
     "�s��������"=>["subscript","sub"]
   }
   def initialize (input, output)
-    @stream = Jstream.new(File.open(input,"r:Shift_JIS"))
+    @stream = Jstream.new(File.open(input,"rb:Shift_JIS"))
     @buffer = []; @ruby_buf = [""]; @ruby_char_type = nil
     @out = File.open(output,"w"); @section = :head; @header = []; @style_stack = []
     @chuuki_table = {}; @images = []; @indent_stack = []; @tag_stack = []

data/test/test_aozora2html.rb

@@ -12,10 +12,13 @@ class Aozora2HtmlTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       input = File.join(dir,'dummy.txt')
       output = File.join(dir,'dummy2.txt')
-      File.write(input, "テスト\r\n")
+      File.binwrite(input, "テスト\r\n")
       parser = Aozora2Html.new(input, output)
-
-      assert_equal Aozora2Html, parser.class
+      begin
+        assert_equal Aozora2Html, parser.class
+      ensure
+        parser.close
+      end
     end
   end
 
@@ -23,25 +26,29 @@ class Aozora2HtmlTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       input = File.join(dir,'dummy.txt')
       output = File.join(dir,'dummy2.txt')
-      File.write(input, "a\r\nb\r\nc\r\n")
+      File.binwrite(input, "a\r\nb\r\nc\r\n")
       parser = Aozora2Html.new(input, output)
 
-      assert_equal 0, parser.scount
-      ch = parser.read_char
-      assert_equal "a",ch
-      assert_equal 1, parser.scount
-      ch = parser.read_char
-      assert_equal "\r\n",ch
-      assert_equal 1, parser.scount
-      ch = parser.read_char
-      assert_equal "b",ch
-      assert_equal 2, parser.scount
-      ch = parser.read_char
-      assert_equal "\r\n",ch
-      assert_equal 2, parser.scount
-      ch = parser.read_char
-      assert_equal "c",ch
-      assert_equal 3, parser.scount
+      begin
+        assert_equal 0, parser.scount
+        ch = parser.read_char
+        assert_equal "a",ch
+        assert_equal 1, parser.scount
+        ch = parser.read_char
+        assert_equal "\r\n",ch
+        assert_equal 1, parser.scount
+        ch = parser.read_char
+        assert_equal "b",ch
+        assert_equal 2, parser.scount
+        ch = parser.read_char
+        assert_equal "\r\n",ch
+        assert_equal 2, parser.scount
+        ch = parser.read_char
+        assert_equal "c",ch
+        assert_equal 3, parser.scount
+      ensure
+        parser.close
+      end
     end
   end
 
@@ -49,11 +56,14 @@ class Aozora2HtmlTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       input = File.join(dir,'dummy.txt')
       output = File.join(dir,'dummy2.txt')
-      File.write(input, "ab\r\nc\r\n")
+      File.binwrite(input, "ab\r\nc\r\n")
       parser = Aozora2Html.new(input, output)
-
-      parsed = parser.read_line
-      assert_equal "ab", parsed
+      begin
+        parsed = parser.read_line
+        assert_equal "ab", parsed
+      ensure
+        parser.close
+      end
     end
   end
 
@@ -61,25 +71,29 @@ class Aozora2HtmlTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       input = File.join(dir,'dummy.txt')
       output = File.join(dir,'dummy2.txt')
-      File.write(input, "ab\r\nc\r\n")
+      File.binwrite(input, "ab\r\nc\r\n")
       parser = Aozora2Html.new(input, output)
 
-      assert_equal :kanji, parser.char_type(Embed_Gaiji_tag.new(nil,"foo","1-2-3","name"))
-      assert_equal :kanji, parser.char_type(UnEmbed_Gaiji_tag.new(nil,"foo"))
-      assert_equal :hankaku, parser.char_type(Accent_tag.new(nil,123,"abc"))
-      assert_equal :else, parser.char_type(Okurigana_tag.new(nil,"abc"))
-      assert_equal :else, parser.char_type(Inline_keigakomi_tag.new(nil,"abc"))
-      assert_equal :katakana, parser.char_type(Dakuten_katakana_tag.new(nil,1,"abc"))
+      begin
+        assert_equal :kanji, parser.char_type(Embed_Gaiji_tag.new(nil,"foo","1-2-3","name"))
+        assert_equal :kanji, parser.char_type(UnEmbed_Gaiji_tag.new(nil,"foo"))
+        assert_equal :hankaku, parser.char_type(Accent_tag.new(nil,123,"abc"))
+        assert_equal :else, parser.char_type(Okurigana_tag.new(nil,"abc"))
+        assert_equal :else, parser.char_type(Inline_keigakomi_tag.new(nil,"abc"))
+        assert_equal :katakana, parser.char_type(Dakuten_katakana_tag.new(nil,1,"abc"))
 
-      assert_equal :hiragana, parser.char_type("あ".encode("shift_jis"))
-      assert_equal :hiragana, parser.char_type("っ".encode("shift_jis"))
-      assert_equal :katakana, parser.char_type("ヴ".encode("shift_jis"))
-      assert_equal :katakana, parser.char_type("ー".encode("shift_jis"))
-      assert_equal :zenkaku, parser.char_type("ｗ".encode("shift_jis"))
-      assert_equal :hankaku, parser.char_type("z".encode("shift_jis"))
-      assert_equal :kanji, parser.char_type("漢".encode("shift_jis"))
-      assert_equal :hankaku_terminate, parser.char_type("!".encode("shift_jis"))
-      assert_equal :else, parser.char_type("？".encode("shift_jis"))
+        assert_equal :hiragana, parser.char_type("あ".encode("shift_jis"))
+        assert_equal :hiragana, parser.char_type("っ".encode("shift_jis"))
+        assert_equal :katakana, parser.char_type("ヴ".encode("shift_jis"))
+        assert_equal :katakana, parser.char_type("ー".encode("shift_jis"))
+        assert_equal :zenkaku, parser.char_type("ｗ".encode("shift_jis"))
+        assert_equal :hankaku, parser.char_type("z".encode("shift_jis"))
+        assert_equal :kanji, parser.char_type("漢".encode("shift_jis"))
+        assert_equal :hankaku_terminate, parser.char_type("!".encode("shift_jis"))
+        assert_equal :else, parser.char_type("？".encode("shift_jis"))
+      ensure
+        parser.close
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aozora2html
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - aozorahack team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -126,6 +126,7 @@ files:
 - Rakefile
 - aozora2html.gemspec
 - bin/aozora2html
+- lib/accent_tag.rb
 - lib/aozora2html.rb
 - lib/aozora2html/jis2ucs.rb
 - lib/aozora2html/version.rb