review 2.3.0 → 2.4.0

data/test/test_webtocprinter.rb

@@ -12,7 +12,7 @@ class WEBTOCPrinterTest < Test::Unit::TestCase
 
   def test_webtocprinter_null
     dummy_book = ReVIEW::Book::Base.load
-    chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
+    # chap = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
     str = WEBTOCPrinter.book_to_string(dummy_book)
     expect = <<-EOB
 <ul class="book-toc">
@@ -30,7 +30,7 @@ CHAPS:
 EOB
     mktmpbookdir 'catalog.yml' => catalog_yml,
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |dir, book, files|
+                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
@@ -53,7 +53,7 @@ CHAPS:
 EOB
     mktmpbookdir 'catalog.yml' => catalog_yml,
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |dir, book, files|
+                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
@@ -86,7 +86,7 @@ EOB
                  'p1.re' => "= This is PART1\n\np111\n",
                  'p2.re' => "= This is PART2\n\np111\n",
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |dir, book, files|
+                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
@@ -134,7 +134,7 @@ EOB
                  'post1.re' => "= POST1\n\npo111\n",
                  'post2.re' => "= POST2\n\npo222\n",
                  'ch1.re' => "= ch. 1\n\n111\n",
-                 'ch2.re' => "= ch. 2\n\n222\n" do |dir, book, files|
+                 'ch2.re' => "= ch. 2\n\n222\n" do |_dir, book, _files|
       str = WEBTOCPrinter.book_to_string(book)
       expect = <<-EOB
 <ul class="book-toc">
@@ -160,5 +160,4 @@ EOB
       assert_equal expect, str
     end
   end
-
 end

data/test/test_yamlloader.rb

@@ -13,23 +13,23 @@ class YAMLLoaderTest < Test::Unit::TestCase
 
   def test_load_file
     Dir.mktmpdir do |dir|
-      yaml_file = File.join(dir, "test.yml")
-      File.open(yaml_file, "w") do |f|
+      yaml_file = File.join(dir, 'test.yml')
+      File.open(yaml_file, 'w') do |f|
         f.write <<EOB
 foo:
   bar: "test"
 EOB
       end
       yaml = @loader.load_file(yaml_file)
-      assert_equal yaml, {"foo" => {"bar"=>"test"}}
+      assert_equal yaml, 'foo' => { 'bar' => 'test' }
     end
   end
 
   def test_load_file_inherit
     Dir.mktmpdir do |dir|
-      yaml_file = File.join(dir, "test.yml")
-      yaml_file2 = File.join(dir, "test2.yml")
-      File.open(yaml_file, "w") do |f|
+      yaml_file = File.join(dir, 'test.yml')
+      yaml_file2 = File.join(dir, 'test2.yml')
+      File.open(yaml_file, 'w') do |f|
         f.write <<EOB
 k0: 2
 k1:
@@ -38,7 +38,7 @@ k1:
 inherit: ["test2.yml"]
 EOB
       end
-      File.open(yaml_file2, "w") do |f|
+      File.open(yaml_file2, 'w') do |f|
         f.write <<EOB
 k1:
   name: "test2"
@@ -48,20 +48,20 @@ k2: "3"
 EOB
       end
       yaml = @loader.load_file(yaml_file)
-      assert_equal({"k0" => 2,
-                    "k1" => {"name"=>"test", "name2"=>"value2",
-                             "array" => [{"name" => "N", "val" => "V"}]},
-                    "k2" => "3"},
+      assert_equal({ 'k0' => 2,
+                     'k1' => { 'name' => 'test', 'name2' => 'value2',
+                               'array' => [{ 'name' => 'N', 'val' => 'V' }] },
+                     'k2' => '3' },
                    yaml)
     end
   end
 
   def test_load_file_inherit2
     Dir.mktmpdir do |dir|
-      yaml_file = File.join(dir, "test.yml")
-      yaml_file2 = File.join(dir, "test2.yml")
-      yaml_file3 = File.join(dir, "test3.yml")
-      File.open(yaml_file, "w") do |f|
+      yaml_file = File.join(dir, 'test.yml')
+      yaml_file2 = File.join(dir, 'test2.yml')
+      yaml_file3 = File.join(dir, 'test3.yml')
+      File.open(yaml_file, 'w') do |f|
         f.write <<EOB
 k0: 2
 k1:
@@ -69,7 +69,7 @@ k1:
 inherit: ["test3.yml", "test2.yml"]
 EOB
       end
-      File.open(yaml_file2, "w") do |f|
+      File.open(yaml_file2, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "value1-2"
@@ -77,7 +77,7 @@ k1:
 k2: "B"
 EOB
       end
-      File.open(yaml_file3, "w") do |f|
+      File.open(yaml_file3, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "value1-3"
@@ -88,10 +88,10 @@ EOB
       end
       yaml = @loader.load_file(yaml_file)
       assert_equal({
-                     "k0" => 2,
-                     "k1" => {"name1"=>"value1-1", "name2"=>"value2-2", "name3"=>"value3-3"},
-                     "k2" => "B",
-                     "k3" => "C",
+                     'k0' => 2,
+                     'k1' => { 'name1' => 'value1-1', 'name2' => 'value2-2', 'name3' => 'value3-3' },
+                     'k2' => 'B',
+                     'k3' => 'C'
                    },
                    yaml)
     end
@@ -99,21 +99,21 @@ EOB
 
   def test_load_file_inherit3
     Dir.mktmpdir do |dir|
-      yaml_file1 = File.join(dir, "test1.yml")
-      yaml_file2 = File.join(dir, "test2.yml")
-      yaml_file3 = File.join(dir, "test3.yml")
-      yaml_file4 = File.join(dir, "test4.yml")
-      yaml_file5 = File.join(dir, "test5.yml")
-      yaml_file6 = File.join(dir, "test6.yml")
-      yaml_file7 = File.join(dir, "test7.yml")
-      File.open(yaml_file7, "w") do |f|
+      yaml_file1 = File.join(dir, 'test1.yml')
+      yaml_file2 = File.join(dir, 'test2.yml')
+      yaml_file3 = File.join(dir, 'test3.yml')
+      yaml_file4 = File.join(dir, 'test4.yml')
+      yaml_file5 = File.join(dir, 'test5.yml')
+      yaml_file6 = File.join(dir, 'test6.yml')
+      yaml_file7 = File.join(dir, 'test7.yml')
+      File.open(yaml_file7, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N7"
 inherit: ["test3.yml", "test6.yml"]
 EOB
       end
-      File.open(yaml_file6, "w") do |f|
+      File.open(yaml_file6, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N6"
@@ -121,7 +121,7 @@ k1:
 inherit: ["test4.yml", "test5.yml"]
 EOB
       end
-      File.open(yaml_file5, "w") do |f|
+      File.open(yaml_file5, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N5"
@@ -129,7 +129,7 @@ k1:
   name3: "N5"
 EOB
       end
-      File.open(yaml_file4, "w") do |f|
+      File.open(yaml_file4, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N4"
@@ -138,7 +138,7 @@ k1:
   name4: "N4"
 EOB
       end
-      File.open(yaml_file3, "w") do |f|
+      File.open(yaml_file3, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N3"
@@ -149,7 +149,7 @@ k1:
 inherit: ["test1.yml", "test2.yml"]
 EOB
       end
-      File.open(yaml_file2, "w") do |f|
+      File.open(yaml_file2, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N2"
@@ -160,7 +160,7 @@ k1:
   name6: "N2"
 EOB
       end
-      File.open(yaml_file1, "w") do |f|
+      File.open(yaml_file1, 'w') do |f|
         f.write <<EOB
 k1:
   name1: "N1"
@@ -174,13 +174,13 @@ EOB
       end
 
       yaml = @loader.load_file(yaml_file7)
-      assert_equal({"k1" => {"name1"=>"N7",
-                             "name2"=>"N6",
-                             "name3"=>"N5",
-                             "name4"=>"N4",
-                             "name5"=>"N3",
-                             "name6"=>"N2",
-                             "name7"=>"N1"}},
+      assert_equal({ 'k1' => { 'name1' => 'N7',
+                               'name2' => 'N6',
+                               'name3' => 'N5',
+                               'name4' => 'N4',
+                               'name5' => 'N3',
+                               'name6' => 'N2',
+                               'name7' => 'N1' } },
                    yaml)
     end
   end

data/test/test_zip_exporter.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'epubmaker'
 require 'epubmaker/zip_exporter'
@@ -13,7 +11,7 @@ class ZipExporterTest < Test::Unit::TestCase
     @epubdir = "#{@tmpdir}/epubdir"
     FileUtils.mkdir_p("#{@epubdir}/META-INF")
     FileUtils.mkdir_p("#{@epubdir}/OEBPS")
-    File.write("#{@epubdir}/mimetype", "application/epub+zip")
+    File.write("#{@epubdir}/mimetype", 'application/epub+zip')
 
     container_xml = <<-EOB
     <?xml version="1.0" encoding="UTF-8"?>
@@ -67,9 +65,9 @@ class ZipExporterTest < Test::Unit::TestCase
       return
     end
 
-    params = {"epubmaker"=>{}}
-    epubfile = File.join(@tmpdir, "test.epub")
-    exporter = ZipExporter.new(@epubdir, params)
+    config = { 'epubmaker' => {} }
+    epubfile = File.join(@tmpdir, 'test.epub')
+    exporter = ZipExporter.new(@epubdir, config)
     exporter.export_zip_extcmd(epubfile)
     assert_true(File.exist?(epubfile))
 
@@ -78,21 +76,18 @@ class ZipExporterTest < Test::Unit::TestCase
         ::Zip::InputStream.open(f) do |fzip|
           ## get first entry
           entry = fzip.get_next_entry
-          assert_equal "mimetype", entry.name
-          assert_equal "application/epub+zip", fzip.read
+          assert_equal 'mimetype', entry.name
+          assert_equal 'application/epub+zip', fzip.read
         end
       end
     end
   end
 
   def test_export_rubyzip
-    if !defined?(Zip)
-      ## skip test
-      return
-    end
-    params = {"epubmaker"=>{}}
-    epubfile = File.join(@tmpdir, "test.epub")
-    exporter = ZipExporter.new(@epubdir, params)
+    return unless defined?(Zip) ## skip test
+    config = { 'epubmaker' => {} }
+    epubfile = File.join(@tmpdir, 'test.epub')
+    exporter = ZipExporter.new(@epubdir, config)
     exporter.export_zip_rubyzip(epubfile)
     assert_true(File.exist?(epubfile))
 
@@ -100,8 +95,8 @@ class ZipExporterTest < Test::Unit::TestCase
       ::Zip::InputStream.open(f) do |fzip|
         ## get first entry
         entry = fzip.get_next_entry
-        assert_equal "mimetype", entry.name
-        assert_equal "application/epub+zip", fzip.read
+        assert_equal 'mimetype', entry.name
+        assert_equal 'application/epub+zip', fzip.read
       end
     end
   end
@@ -109,5 +104,4 @@ class ZipExporterTest < Test::Unit::TestCase
   def teardown
     FileUtils.remove_entry_secure(@tmpdir)
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - kmuto
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Re:VIEW is a digital publishing system for books and ebooks. It supports
   InDesign, EPUB and LaTeX.
 email: kmuto@debian.org
@@ -164,6 +178,7 @@ files:
 - doc/format.ja.md
 - doc/format.md
 - doc/format_idg.ja.md
+- doc/images/review-generate.png
 - doc/makeindex.ja.md
 - doc/makeindex.md
 - doc/pdfmaker.ja.md
@@ -200,7 +215,6 @@ files:
 - lib/review/converter.rb
 - lib/review/epubbuilder.rb
 - lib/review/epubmaker.rb
-- lib/review/ewbbuilder.rb
 - lib/review/exception.rb
 - lib/review/extentions.rb
 - lib/review/extentions/hash.rb
@@ -216,6 +230,7 @@ files:
 - lib/review/latexindex.rb
 - lib/review/latexutils.rb
 - lib/review/lineinput.rb
+- lib/review/logger.rb
 - lib/review/makerhelper.rb
 - lib/review/markdownbuilder.rb
 - lib/review/md2inaobuilder.rb
@@ -247,6 +262,12 @@ files:
 - templates/web/html/layout-xhtml1.html.erb
 - templates/xml/container.xml.erb
 - test/CHAPS
+- test/assets/black.eps
+- test/assets/fit.png
+- test/assets/large.gif
+- test/assets/large.jpg
+- test/assets/large.png
+- test/assets/large.svg
 - test/assets/test.xml.erb
 - test/assets/test_template.tex
 - test/assets/test_template_backmatter.tex
@@ -272,6 +293,31 @@ files:
 - test/sample-book/src/vendor/jumoline/jumoline.dtx
 - test/sample-book/src/vendor/jumoline/jumoline.ins
 - test/sample-book/src/vendor/jumoline/lppl.txt
+- test/syntax-book/Gemfile
+- test/syntax-book/Rakefile
+- test/syntax-book/appA.re
+- test/syntax-book/bib.re
+- test/syntax-book/catalog.yml
+- test/syntax-book/ch01.re
+- test/syntax-book/ch02.re
+- test/syntax-book/ch03.re
+- test/syntax-book/config.yml
+- test/syntax-book/images/ball.png
+- test/syntax-book/images/cover.jpg
+- test/syntax-book/images/fractal.png
+- test/syntax-book/images/img3-1.png
+- test/syntax-book/images/inlineicon.jpg
+- test/syntax-book/images/logic.png
+- test/syntax-book/images/logic2.png
+- test/syntax-book/images/puzzle.jpg
+- test/syntax-book/images/table.jpg
+- test/syntax-book/part2.re
+- test/syntax-book/pre01.re
+- test/syntax-book/review-ext.rb
+- test/syntax-book/sty/jumoline.sty
+- test/syntax-book/sty/reviewmacro.sty
+- test/syntax-book/style.css
+- test/syntax-book/syntax.dic
 - test/test.re
 - test/test_book.rb
 - test/test_book_chapter.rb
@@ -332,12 +378,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'
 test_files:
 - test/CHAPS
+- test/assets/black.eps
+- test/assets/fit.png
+- test/assets/large.gif
+- test/assets/large.jpg
+- test/assets/large.png
+- test/assets/large.svg
 - test/assets/test.xml.erb
 - test/assets/test_template.tex
 - test/assets/test_template_backmatter.tex
@@ -363,6 +415,31 @@ test_files:
 - test/sample-book/src/vendor/jumoline/jumoline.dtx
 - test/sample-book/src/vendor/jumoline/jumoline.ins
 - test/sample-book/src/vendor/jumoline/lppl.txt
+- test/syntax-book/Gemfile
+- test/syntax-book/Rakefile
+- test/syntax-book/appA.re
+- test/syntax-book/bib.re
+- test/syntax-book/catalog.yml
+- test/syntax-book/ch01.re
+- test/syntax-book/ch02.re
+- test/syntax-book/ch03.re
+- test/syntax-book/config.yml
+- test/syntax-book/images/ball.png
+- test/syntax-book/images/cover.jpg
+- test/syntax-book/images/fractal.png
+- test/syntax-book/images/img3-1.png
+- test/syntax-book/images/inlineicon.jpg
+- test/syntax-book/images/logic.png
+- test/syntax-book/images/logic2.png
+- test/syntax-book/images/puzzle.jpg
+- test/syntax-book/images/table.jpg
+- test/syntax-book/part2.re
+- test/syntax-book/pre01.re
+- test/syntax-book/review-ext.rb
+- test/syntax-book/sty/jumoline.sty
+- test/syntax-book/sty/reviewmacro.sty
+- test/syntax-book/style.css
+- test/syntax-book/syntax.dic
 - test/test.re
 - test/test_book.rb
 - test/test_book_chapter.rb