review 1.2.0 → 1.3.0

data/test/test_lineinput.rb

@@ -183,10 +183,10 @@ class LineInputTest < Test::Unit::TestCase
     data = ''
     li.until_terminator(%r<\A//\}>) {|l| data << l }
     assert_equal "jkl\nmno", data
-    assert_equal 7, li.lineno
+    assert_equal 8, li.lineno
   end
 
-  def test_until_terminator
+  def test_until_terminator2
     io = StringIO.new("abc\ndef\n//}\nghi\n//}")
     li = LineInput.new(io)
 

data/test/test_markdownbuilder.rb

@@ -11,13 +11,13 @@ class MARKDOWNBuilderTest < Test::Unit::TestCase
 
   def setup
     @builder = MARKDOWNBuilder.new()
-    @param = {
+    @config = {
       "secnolevel" => 2,    # for IDGXMLBuilder, HTMLBuilder
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8",
       "stylesheet" => nil,  # for HTMLBuilder
     }
-    ReVIEW.book.param = @param
+    ReVIEW.book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(Book::Base.new(nil), 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)

data/test/test_topbuilder.rb

@@ -11,12 +11,12 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def setup
     @builder = TOPBuilder.new()
-    @param = {
+    @config = {
       "secnolevel" => 2,
       "inencoding" => "UTF-8",
       "outencoding" => "UTF-8"
     }
-    ReVIEW.book.param = @param
+    ReVIEW.book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(nil, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -36,7 +36,7 @@ class TOPBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level1_without_secno
-    @param["secnolevel"] = 0
+    @config["secnolevel"] = 0
     @builder.headline(1,"test","this is test.")
     assert_equal %Q|■H1■this is test.\n|, @builder.raw_result
   end
@@ -52,7 +52,7 @@ class TOPBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level3_with_secno
-    @param["secnolevel"] = 3
+    @config["secnolevel"] = 3
     @builder.headline(3,"test","this is test.")
     assert_equal %Q|■H3■1.0.1　this is test.\n|, @builder.raw_result
   end
@@ -185,7 +185,7 @@ class TOPBuidlerTest < Test::Unit::TestCase
   def test_image
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -196,7 +196,7 @@ class TOPBuidlerTest < Test::Unit::TestCase
   def test_image_with_metric
     def @chapter.image(id)
       item = Book::ImageIndex::Item.new("sampleimg",1)
-      item.instance_eval{@pathes=["./images/chap1-sampleimg.png"]}
+      item.instance_eval{@path="./images/chap1-sampleimg.png"}
       item
     end
 
@@ -235,45 +235,61 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def test_block_raw0
     @builder.raw("<>!\"\\n& ")
-    expect =<<-EOS
-<>!"
-& 
-EOS
+    expect = %Q(<>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw1
     @builder.raw("|top|<>!\"\\n& ")
-    expect =<<-EOS
-<>!"
-& 
-EOS
+    expect = %Q(<>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw2
     @builder.raw("|top, latex|<>!\"\\n& ")
-    expect =<<-EOS
-<>!\"
-& 
-EOS
+    expect = %Q(<>!\"\n& )
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw3
     @builder.raw("|latex, idgxml|<>!\"\\n& ")
-    expect =<<-EOS
-EOS
+    expect = ''
     assert_equal expect.chomp, @builder.raw_result
   end
 
   def test_block_raw4
     @builder.raw("|top <>!\"\\n& ")
+    expect = %Q(|top <>!\"\n& )
+    assert_equal expect.chomp, @builder.raw_result
+  end
+
+  def column_helper(review)
+    chap_singleton = class << @chapter; self; end
+    chap_singleton.send(:define_method, :content) { review }
+    @compiler.compile(@chapter)
+  end
+
+  def test_column_ref
+    review =<<-EOS
+===[column]{foo} test
+
+inside column
+
+=== next level
+
+this is @<column>{foo}.
+EOS
     expect =<<-EOS
-|top <>!\"
-& 
+◆→開始:コラム←◆
+■test
+inside column
+◆→終了:コラム←◆
+
+■H3■next level
+this is test.
 EOS
-    assert_equal expect.chomp, @builder.raw_result
+
+    assert_equal expect, column_helper(review)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - kmuto
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 description: Re:VIEW is a digital publishing system for books and ebooks. It supports
   InDesign, EPUB and LaTeX.
 email: kmuto@debian.org
@@ -33,7 +33,7 @@ executables:
 - review-checkdep
 - review-compile
 - review-epubmaker
-- review-epubmaker-ng
+- review-epubmaker-legacy
 - review-index
 - review-init
 - review-pdfmaker
@@ -45,6 +45,8 @@ extra_rdoc_files:
 - ChangeLog
 - README.rdoc
 files:
+- ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - COPYING
 - ChangeLog
@@ -55,7 +57,7 @@ files:
 - bin/review-checkdep
 - bin/review-compile
 - bin/review-epubmaker
-- bin/review-epubmaker-ng
+- bin/review-epubmaker-legacy
 - bin/review-index
 - bin/review-init
 - bin/review-pdfmaker
@@ -76,14 +78,15 @@ files:
 - debian/review.links
 - debian/rules
 - debian/source/format
+- doc/catalog.rdoc
 - doc/format.rdoc
 - doc/format_idg.rdoc
-- doc/libepubmaker/config.yaml
+- doc/libepubmaker/config.yml
 - doc/quickstart.rdoc
 - doc/ruby-uuid/README
 - doc/ruby-uuid/README.ja
 - doc/sample.css
-- doc/sample.yaml
+- doc/sample.yml
 - lib/epubmaker.rb
 - lib/epubmaker/content.rb
 - lib/epubmaker/epubv2.rb
@@ -96,12 +99,14 @@ files:
 - lib/review/book/base.rb
 - lib/review/book/chapter.rb
 - lib/review/book/compilable.rb
+- lib/review/book/image_finder.rb
 - lib/review/book/index.rb
 - lib/review/book/page_metric.rb
 - lib/review/book/parameters.rb
 - lib/review/book/part.rb
 - lib/review/book/volume.rb
 - lib/review/builder.rb
+- lib/review/catalog.rb
 - lib/review/compiler.rb
 - lib/review/configure.rb
 - lib/review/epubbuilder.rb
@@ -115,7 +120,7 @@ files:
 - lib/review/htmllayout.rb
 - lib/review/htmlutils.rb
 - lib/review/i18n.rb
-- lib/review/i18n.yaml
+- lib/review/i18n.yml
 - lib/review/idgxmlbuilder.rb
 - lib/review/inaobuilder.rb
 - lib/review/latexbuilder.rb
@@ -135,6 +140,7 @@ files:
 - lib/review/version.rb
 - lib/uuid.rb
 - review.gemspec
+- rubocop-todo.yml
 - test/CHAPS
 - test/bib.re
 - test/book_test_helper.rb
@@ -148,10 +154,10 @@ files:
 - test/sample-book/src/config.yml
 - test/sample-book/src/images/ch01-imgsample.jpg
 - test/sample-book/src/images/cover.jpg
-- test/sample-book/src/main.css
 - test/sample-book/src/preface.re
 - test/sample-book/src/sty/jumoline.sty
 - test/sample-book/src/sty/reviewmacro.sty
+- test/sample-book/src/style.css
 - test/sample-book/src/vendor/jumoline/README
 - test/sample-book/src/vendor/jumoline/jumoline.dtx
 - test/sample-book/src/vendor/jumoline/jumoline.ins
@@ -161,6 +167,7 @@ files:
 - test/test_book_parameter.rb
 - test/test_book_part.rb
 - test/test_builder.rb
+- test/test_catalog.rb
 - test/test_compiler.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
@@ -169,6 +176,7 @@ files:
 - test/test_htmlutils.rb
 - test/test_i18n.rb
 - test/test_idgxmlbuilder.rb
+- test/test_image_finder.rb
 - test/test_inaobuilder.rb
 - test/test_index.rb
 - test/test_latexbuilder.rb
@@ -218,10 +226,10 @@ test_files:
 - test/sample-book/src/config.yml
 - test/sample-book/src/images/ch01-imgsample.jpg
 - test/sample-book/src/images/cover.jpg
-- test/sample-book/src/main.css
 - test/sample-book/src/preface.re
 - test/sample-book/src/sty/jumoline.sty
 - test/sample-book/src/sty/reviewmacro.sty
+- test/sample-book/src/style.css
 - test/sample-book/src/vendor/jumoline/README
 - test/sample-book/src/vendor/jumoline/jumoline.dtx
 - test/sample-book/src/vendor/jumoline/jumoline.ins
@@ -231,6 +239,7 @@ test_files:
 - test/test_book_parameter.rb
 - test/test_book_part.rb
 - test/test_builder.rb
+- test/test_catalog.rb
 - test/test_compiler.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
@@ -239,6 +248,7 @@ test_files:
 - test/test_htmlutils.rb
 - test/test_i18n.rb
 - test/test_idgxmlbuilder.rb
+- test/test_image_finder.rb
 - test/test_inaobuilder.rb
 - test/test_index.rb
 - test/test_latexbuilder.rb
@@ -250,4 +260,3 @@ test_files:
 - test/test_textutils.rb
 - test/test_topbuilder.rb
 - test/test_uuid.rb
-has_rdoc: 

data/bin/review-epubmaker-ng

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-#
-# Copyright (c) 2010-2013 Kenshi Muto and Masayoshi Takahashi
-#
-# This program is free software.
-# You can distribute or modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of the GNU LGPL, see the file "COPYING".
-#
-require 'pathname'
-bindir = Pathname.new(__FILE__).realpath.dirname
-$LOAD_PATH.unshift((bindir + '../lib').realpath)
-require 'review/epubmaker'
-
-rv = ReVIEW::EPUBMaker.new
-if ARGV.size < 1 || !File.exist?(ARGV[0])
-  STDERR.puts "Usage: #{$0} YAML_filename [export_filename]"
-  exit 0
-end
-
-bookname = (ARGV.size > 1) ? ARGV[1] : nil
-rv.produce(ARGV[0], bookname)