aozora2html 0.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6cfff2de9e1f983ece8fd82d5dd91dcfe108341
-  data.tar.gz: d5e51269b8342a2e4c73d5043b691246daf46539
+SHA256:
+  metadata.gz: 635bbe67e2511af4a4f8ccc8a820bdb87991d75d88fa9aa7ca9a90f2f67d7785
+  data.tar.gz: ac7c5d1f77f0c4b89d24f93e6117107d3ee4ac5890aef5e082368f0fa7e8e318
 SHA512:
-  metadata.gz: 3dacc3786ae5dc1aaeaf2584a13950412699889f4ec8c9cdce81e3236cf8fde9bfc789b3f1d817477dfc0bf44883180178676352d66cf5e147b715387b085dbb
-  data.tar.gz: 386bc597c40cd6db861759894448b82dc0b16aa53fb79be334efdf2cb67ba27c71b5d548eec6291a005e9fbaca1a1c7cb5d9571532f10da119e36166ab97a83f
+  metadata.gz: a939ef551dd506ae1f7ca4d608fbbe747aa7b4ada56a07fd83385c330fade541353d80f66fa8f4ed5d1342cd01d65af74c6c973ed2979c1dce12dcc7b10830a2
+  data.tar.gz: 5c982a53cdffc60bad3c98406b74f640af4c1896fed6b42398a91025788962b4d2377950d40a0b25e4553fd92f94ac69c4ed8ac34fa21918cd0cb2148a1b0def

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+# Check if Ruby codes pass tests.
+#
+# Reference:
+#   - https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Test
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Build and test with Rake
+      shell: bash
+      run: |
+        gem install bundler --no-document
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/.gitignore

@@ -1,4 +1,9 @@
-*~
-#*#
+*#
 *.bak
-pkg
+*~
+/*.gem
+/.ruby-version
+/.yardoc/
+/Gemfile.lock
+/doc/
+/pkg/

data/.rubocop.yml

@@ -0,0 +1,227 @@
+inherit_gem:
+  meowcop:
+    - config/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.1
+
+# EnforcedStyle: with_first_parameter => 0 offense
+# EnforcedStyle: with_fixed_indentation => 17 offenses
+Layout/AlignParameters:
+  EnforcedStyle: with_first_parameter
+  Enabled: true
+
+# EnforcedStyle: empty_lines => 80 offenses
+# EnforcedStyle: no_empty_lines => 0 offense
+Layout/EmptyLinesAroundBlockBody:
+  EnforcedStyle: no_empty_lines
+  Enabled: true
+
+# EnforcedStyleInsidePipes: space => 39 offenses
+# EnforcedStyleInsidePipes: no_space => 0 offense
+Layout/SpaceAroundBlockParameters:
+  EnforcedStyleInsidePipes: no_space
+  Enabled: true
+
+# EnforcedStyle: space => 42 offenses
+# EnforcedStyle: no_space => 4 offenses
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+  Enabled: true
+
+# EnforcedStyle: space => 98 offenses
+# EnforcedStyle: no_space => 0 offense
+Layout/SpaceInsideStringInterpolation:
+  EnforcedStyle: no_space
+  Enabled: true
+
+# EnforcedStyle: percent_q => 0 offense
+# EnforcedStyle: bare_percent => 30 offenses
+Style/BarePercentLiterals:
+  EnforcedStyle: percent_q
+  Enabled: true
+
+# EnforcedStyle: nested => 2 offenses
+# EnforcedStyle: compact => 81 offenses
+Style/ClassAndModuleChildren:
+  EnforcedStyle: nested
+  Enabled: true
+
+# EnforcedStyle: compact => 24 offenses
+# EnforcedStyle: expanded => 0 offense
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+  Enabled: true
+
+# EnforcedStyle: when_needed => 10 offenses
+# EnforcedStyle: always => 57 offenses
+# EnforcedStyle: never => 32 offenses
+Style/Encoding:
+  EnforcedStyle: when_needed
+  Enabled: true
+
+# EnforcedStyle: for => 13 offenses
+# EnforcedStyle: each => 0 offense
+Style/For:
+  EnforcedStyle: each
+  Enabled: true
+
+# EnforcedStyle: require_parentheses => 0 offense
+# EnforcedStyle: require_no_parentheses => 112 offenses
+# EnforcedStyle: require_no_parentheses_except_multiline => 112 offenses
+Style/MethodDefParentheses:
+  EnforcedStyle: require_parentheses
+  Enabled: true
+
+# EnforcedStyle: snake_case => 0 offense
+# EnforcedStyle: camelCase => 268 offenses
+Style/MethodName:
+  EnforcedStyle: snake_case
+  Enabled: true
+
+# EnforcedStyle: compact => 25 offenses
+# EnforcedStyle: exploded => 0 offense
+Style/RaiseArgs:
+  EnforcedStyle: exploded
+  Enabled: true
+
+# EnforcedStyle: only_raise => 0 offense
+# EnforcedStyle: only_fail => 26 offenses
+# EnforcedStyle: semantic => 25 offenses
+Style/SignalException:
+  EnforcedStyle: only_raise
+  Enabled: true
+
+# EnforcedStyle: snake_case => 0 offense
+# EnforcedStyle: camelCase => 126 offenses
+Style/VariableName:
+  EnforcedStyle: snake_case
+  Enabled: true
+
+# EnforcedStyle: snake_case => 11 offenses
+# EnforcedStyle: normalcase => 0 offense
+# EnforcedStyle: non_integer => 11 offenses
+Style/VariableNumber:
+  EnforcedStyle: normalcase
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: false
+
+Layout/SpaceAfterComma:
+  Enabled: false
+
+Layout/SpaceAroundOperators:
+  Enabled: false
+
+Layout/SpaceInsideBlockBraces:
+  Enabled: false
+
+Style/UnneededPercentQ:
+  Enabled: false
+
+Style/PercentQLiterals:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/IfInsideElse:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/ClassCheck:
+  Enabled: false
+
+Style/RedundantBegin:
+  Enabled: false
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/LineEndConcatenation:
+  Enabled: false
+
+Style/MethodCallWithoutArgsParentheses:
+  Enabled: false
+
+Style/GlobalVars:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/ZeroLengthPredicate:
+  Enabled: false
+
+Layout/TrailingBlankLines:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: true
+  Max: 260.05
+
+Metrics/BlockLength:
+  Enabled: true
+  Max: 150
+
+Metrics/BlockNesting:
+  Enabled: true
+  Max: 10
+
+Metrics/ClassLength:
+  Enabled: true
+  Max: 2000
+
+Metrics/CyclomaticComplexity:
+  Enabled: true
+  Max: 100
+
+Metrics/LineLength:
+  Enabled: true
+  Max: 500
+
+Metrics/MethodLength:
+  Enabled: true
+  Max: 200
+
+Metrics/ModuleLength:
+  Enabled: true
+  Max: 100
+
+Metrics/ParameterLists:
+  Enabled: true
+  Max: 10
+
+Metrics/PerceivedComplexity:
+  Enabled: true
+  Max: 100
+
+
+###
+Performance/RedundantMatch:
+  Enabled: false
+Performance/StringReplacement:
+  Enabled: false
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+
+### あとで直す
+Lint/StringConversionInInterpolation:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false

data/.travis.yml

@@ -5,3 +5,8 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.1
+
+branches:
+  only:
+    - master

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+<a name="0.9.1"></a>
+## 0.9.1
+
+### Features
+
+* 内部構造を改造した
+     * lib/t2hs.rbをUTF-8化した
+
+<a name="0.9.0"></a>
+## 0.9.0
+
+### Features
+
+* 内部構造を大改造した
+     * lib/t2hs.rb内で定義されているクラスをRubyの命名規則に合わせて変更し、外部ファイルにした
+     * `Aozora2Html.new(input, output)`の引数`input`,`output`でIOも受け取れるようにした
+     * `bin/aozora2html`にあったmonkey patchingも`lib/`以下に移動させた
+
+<a name="0.7.1"></a>
+## 0.7.1
+
+### Bug Fixes
+
+* `--use-unicode`オプションをつけていない時の外字処理を修正した
+* くの字点が正しく処理されない場合があるのを修正した
+
+<a name="0.7.0"></a>
+## 0.7.0
+
+### Features
+
+* `--css-files`オプションを追加して、CSSを変更できるようにした
+
 <a name="0.6.1"></a>
 ## 0.6.1
 

data/LICENSE

@@ -0,0 +1,116 @@
+CC0 1.0 Universal
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited
+to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display, communicate,
+  and translate a Work;
+
+  ii. moral rights retained by the original author(s) and/or performer(s);
+
+  iii. publicity and privacy rights pertaining to a person's image or likeness
+  depicted in a Work;
+
+  iv. rights protecting against unfair competition in regards to a Work,
+  subject to the limitations in paragraph 4(a), below;
+
+  v. rights protecting the extraction, dissemination, use and reuse of data in
+  a Work;
+
+  vi. database rights (such as those arising under Directive 96/9/EC of the
+  European Parliament and of the Council of 11 March 1996 on the legal
+  protection of databases, and under any national implementation thereof,
+  including any amended or successor version of such directive); and
+
+  vii. other similar, equivalent or corresponding rights throughout the world
+  based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+  a. No trademark or patent rights held by Affirmer are waived, abandoned,
+  surrendered, licensed or otherwise affected by this document.
+
+  b. Affirmer offers the Work as-is and makes no representations or warranties
+  of any kind concerning the Work, express, implied, statutory or otherwise,
+  including without limitation warranties of title, merchantability, fitness
+  for a particular purpose, non infringement, or the absence of latent or
+  other defects, accuracy, or the present or absence of errors, whether or not
+  discoverable, all to the greatest extent permissible under applicable law.
+
+  c. Affirmer disclaims responsibility for clearing rights of other persons
+  that may apply to the Work or any use thereof, including without limitation
+  any person's Copyright and Related Rights in the Work. Further, Affirmer
+  disclaims responsibility for obtaining any necessary consents, permissions
+  or other rights required for any use of the Work.
+
+  d. Affirmer understands and acknowledges that Creative Commons is not a
+  party to this document and has no duty or obligation with respect to this
+  CC0 or use of the Work.
+
+For more information, please see
+<http://creativecommons.org/publicdomain/zero/1.0/>

data/README.md

@@ -1,8 +1,11 @@
 # Aozora2Html
 
-[![Build Status](https://travis-ci.org/aozorahack/aozora2html.svg?branch=master)](https://travis-ci.org/aozorahack/aozora2html) [![Gem Version](https://badge.fury.io/rb/aozora2html.svg)](https://badge.fury.io/rb/aozora2html) [![Build Status](https://ci.appveyor.com/api/projects/status/9ds6wksavm50ha9v/branch/master?svg=true)](https://ci.appveyor.com/project/takahashim/aozora2html/branch/master) [![Code Climate](https://codeclimate.com/github/aozorahack/aozora2html/badges/gpa.svg)](https://codeclimate.com/github/aozorahack/aozora2html)
+[![Build Status](https://travis-ci.org/aozorahack/aozora2html.svg?branch=master)](https://travis-ci.org/aozorahack/aozora2html)
+[![Build Status](https://github.com/aozorahack/aozora2html/workflows/Test/badge.svg)](https://github.com/aozorahack/aozora2html/actions)
+[![Gem Version](https://badge.fury.io/rb/aozora2html.svg)](https://badge.fury.io/rb/aozora2html)
+[![Code Climate](https://codeclimate.com/github/aozorahack/aozora2html/badges/gpa.svg)](https://codeclimate.com/github/aozorahack/aozora2html)
 
-青空文庫の「組版案内」( http://kumihan.aozora.gr.jp/ )で配布されているtxt2html内にあるt2hs.rbを改造するプロジェクトです。
+青空文庫の[「組版案内」](http://kumihan.aozora.gr.jp/)で配布されている `txt2html`内にある`t2hs.rb`を改造するプロジェクトです。
 
 ## 動作環境
 
@@ -12,13 +15,13 @@ Ruby 2.0以上が推奨ですが、1.9でも動くはずです。
 
 RubyGemsとしてインストール可能になっています。
 
-```
+```shell-session
 $ gem install aozora2html
 ```
 
 ソースからインストールするときは以下のようにします。
 
-```
+```shell-session
 $ gem install bundler
 $ rake install
 ```
@@ -27,27 +30,27 @@ $ rake install
 
 コマンドは`aozora2html`です。以下のように実行します。
 
-```
+```shell-session
 $ aozora2html foo.txt foo.html
 ```
 
-こうすると、青空文庫記法で書かれたfoo.txtをfoo.htmlに変換します。
+こうすると、青空文庫記法で書かれた`foo.txt`を`foo.html`に変換します。
 
 また、青空文庫サイトで配布している、中にテキストファイルが同梱されているzip形式のファイルも変換できます。
 
-```
+```shell-session
 $ aozora2html foo.zip foo.html
 ```
 
 第1引数にURLを指定すると、そのURLのファイルをダウンロードして変換します。
 
-```
+```shell-session
 $ aozora2html http://example.jp/foo/bar.zip foo.html
 ```
 
 第2引数を省略すると、ファイルではなく標準出力に変換結果を出力します。
 
-```
+```shell-session
 $ aozora2html foo.txt
 ```
 
@@ -58,7 +61,7 @@ $ aozora2html foo.txt
 
 可能な限り数値実体参照を使って表示するには、以下のようにオプションを指定します。
 
-```
+```shell-session
 $ aozora2html --use-jisx0213 --use-unicode foo.txt
 ```
 
@@ -66,7 +69,7 @@ $ aozora2html --use-jisx0213 --use-unicode foo.txt
 
 テストも追加しています。テストは以下のように実行します。
 
-```
+```shell-session
 $ bundle install
 $ rake test
 ```
@@ -79,4 +82,6 @@ $ rake test
 
 CC0
 
+[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png "CC0")](http://creativecommons.org/publicdomain/zero/1.0/deed.ja)
+
 To the extent possible under law, 青空文庫 has waived all copyright and related or neighboring rights to txt2xhtml. This work is published from Japan.

data/aozora2html.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rubyzip"
+  if RUBY_VERSION < "2.4.0"
+    spec.add_dependency "rubyzip", "~> 1.3"
+  else
+    spec.add_dependency "rubyzip", "~> 2.0"
+  end
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "test-unit-rr"
-  # spec.add_development_dependency "test-unit-notify"
-  # spec.add_development_dependency "terminal-notifier"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-test"
 end

data/bin/aozora2html

@@ -3,53 +3,7 @@
 require 'aozora2html'
 require 'optparse'
 require "tempfile"
-
-# override Aozora2Html#push_chars
-#
-# Original Aozora2Html#push_chars does not convert "'" into '''; it's old behaivor
-# of CGI.escapeHTML().
-#
-class Aozora2Html
-  def push_chars(obj)
-    if obj.is_a?(Array)
-      obj.each{|x|
-        push_chars(x)
-      }
-    elsif obj.is_a?(String)
-      if obj.length == 1
-        obj = obj.gsub(/[&\"<>]/, {'&' => '&amp;', '"' => '&quot;', '<' => '&lt;', '>' => '&gt;'})
-      end
-      obj.each_char{|x|
-        push_char(x)
-      }
-    else
-      push_char(obj)
-    end
-  end
-
-  def dispatch_gaiji
-    hook = @stream.peek_char(0)
-    if hook ==  "［".encode("shift_jis")
-      read_char
-      # embed?
-      command,raw = read_to_nest("］".encode("shift_jis"))
-      try_emb = kuten2png(command)
-      if try_emb != command
-        try_emb
-      elsif command.match(/U\+([0-9A-F]{4,5})/)
-        unicode_num = $1
-        ch = Embed_Gaiji_tag.new(self, nil, nil, command)
-        ch.unicode = unicode_num
-        ch
-      else
-        # Unemb
-        escape_gaiji(command)
-      end
-    else
-      "※".encode("shift_jis")
-    end
-  end
-end
+require 'open-uri'
 
 opt = OptionParser.new("Usage: aozora2html [options] <text file> [<html file>]\n")
 opt.on('--gaiji-dir DIR', 'setting gaiji directory')
@@ -68,12 +22,12 @@ if options["css-files"]
 end
 
 if options["use-jisx0213"]
-  Embed_Gaiji_tag.use_jisx0213 = true
-  Accent_tag.use_jisx0213 = true
+  Aozora2Html::Tag::EmbedGaiji.use_jisx0213 = true
+  Aozora2Html::Tag::Accent.use_jisx0213 = true
 end
 
 if options["use-unicode"]
-  Embed_Gaiji_tag.use_unicode = true
+  Aozora2Html::Tag::EmbedGaiji.use_unicode = true
 end
 
 if ARGV.size < 1 || ARGV.size > 2
@@ -88,12 +42,9 @@ Dir.mktmpdir do |dir|
     dest_file = File.join(dir, "output.html")
   end
   if src_file =~ /\Ahttps?:/
-    require 'open-uri'
     down_file = File.join(dir, File.basename(src_file))
     begin
-      open(down_file, "wb") do |f0|
-        open(src_file){|f1| f0.write(f1.read)}
-      end
+      File.write(down_file, URI.parse(src_file).read)
       src_file = down_file
     rescue
       $stderr.print "file not found: #{src_file}\n"
@@ -108,6 +59,7 @@ Dir.mktmpdir do |dir|
   end
 
   if File.extname(src_file) == ".zip"
+    require "aozora2html/zip"
     tmpfile = File.join(dir, "aozora.txt")
     Aozora2Html::Zip.unzip(src_file, tmpfile)
     Aozora2Html.new(tmpfile, dest_file).process