review 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c085c6569216545a739b0b4ed817a350f52e45fd
-  data.tar.gz: f2fae8c6d527b106e595c43e7a2a990f967a580b
+  metadata.gz: 5449a3e4fd04d6c45855f7858fe37e4b73ed92f8
+  data.tar.gz: f14a9c926fd798eb05456fccec1d377573ec0e98
 SHA512:
-  metadata.gz: da2cf9ca8b6c25720d823d54546c697bc65c53ba2614c3be2632a904391e021d9b6f2aa2d89cc68051f5f28a1bce7f7521b7a28f1050d5a929f942b1e33e9f35
-  data.tar.gz: 1c13220303cc63f9437f0bc70b58d2e03a6f35c715e5f75678c2eeb50a729946fb7ebaa0644c5af629d82a9d247bdbf9a2a4e87bef64fb970a57d684a23ceab1
+  metadata.gz: 4f02063b7744003b7d51b41894c5bc4efba4446c33d7a0990d3054724e5d194109991c4005c083f1a1c1f4bb7fdb92c797cc1a214de8d77d29e664989e434f91
+  data.tar.gz: 0442d498dfbbab961286734b7ef544f86ad79f24a3744e6227f1e00b8d99fef12c81c0a27863b5c465f35b01e116cd4068f2f62fe6e926fad76f61eacec8ee36

data/ChangeLog

@@ -1,3 +1,7 @@
+Sun Dec 27 16:25:45 2015  Masayoshi Takahashi  <takahashimm@gmail.com>
+
+	* Release 1.7.2
+
 Sun Nov 29 23:12:29 2015  Masayoshi Takahashi  <takahashimm@gmail.com>
 
 	* Release 1.7.1

data/doc/NEWS.ja.md

@@ -1,3 +1,9 @@
+# Version 1.7.2の主な変更点
+
+## バグ修正
+* latexbuilderで`//list`がhighlitingなしのときにキャプションが表示されなくなっていたのを修正しました ([#465])
+* markdownbuilderでdefinition listを使うとエラーになるのを修正しました ([#473])
+
 # Version 1.7.1の主な変更点
 
 ## バグ修正

data/doc/NEWS.md

@@ -1,3 +1,9 @@
+# Version 1.7.2
+
+## Bug Fix
+* Fix latexbuilder to show caption in `//list` without highliting ([#465])
+* Fix markdownbuilder to use definition list ([#473])
+
 # Version 1.7.1
 
 ## Bug Fix

data/lib/review/latexbuilder.rb

@@ -262,7 +262,7 @@ module ReVIEW
       if highlight_listings?
         common_code_block_lst(id, lines, 'reviewlistlst', 'caption', caption, lang)
       else
-        common_code_block(id, lines, 'reviewlist', nil, lang) do |line, idx|
+        common_code_block(id, lines, 'reviewlist', caption, lang) do |line, idx|
           detab(line) + "\n"
         end
       end

data/lib/review/markdownbuilder.rb

@@ -99,6 +99,22 @@ module ReVIEW
       blank
     end
 
+    def dl_begin
+      puts '<dl>'
+    end
+
+    def dt(line)
+      puts "<dt>#{line}</dt>"
+    end
+
+    def dd(lines)
+      puts "<dd>#{lines.join}</dd>"
+    end
+
+    def dl_end
+      puts '</dl>'
+    end
+
     def emlist(lines, caption = nil, lang = nil)
       blank
       if caption

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

data/test/test_latexbuilder.rb

@@ -277,6 +277,31 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     assert_equal %Q|\n\\begin{reviewemlist}\n    foo\n        bar\n\n    buz\n\\end{reviewemlist}\n|, actual
   end
 
+  def test_emlistnum_caption
+    actual = compile_block("//emlistnum[cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\n\\reviewemlistcaption{cap1}\n\\begin{reviewemlist}\n 1: foo\n 2: bar\n 3: \n 4: buz\n\\end{reviewemlist}\n|, actual
+  end
+
+  def test_list
+    actual = compile_block("//list[id1][cap1]{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q|\\reviewlistcaption{リスト1.1: cap1}\n\\begin{reviewlist}\nfoo\nbar\n\nbuz\n\\end{reviewlist}\n|, actual
+  end
+
+  def test_list_lst
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    actual = compile_block("//list[id1][cap1][sql]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal %Q|\\begin{reviewlistlst}[caption={cap1},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewlistlst}\n|, actual
+  end
+
+  def test_list_lst_with_lang
+    @book.config["highlight"] = {}
+    @book.config["highlight"]["latex"] = "listings"
+    @book.config["highlight"]["lang"] = "sql"
+    actual = compile_block("//list[id1][cap1]{\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n//}\n")
+    assert_equal %Q|\\begin{reviewlistlst}[caption={cap1},language={sql}]\nSELECT COUNT(*) FROM tests WHERE tests.no > 10 AND test.name LIKE 'ABC%'\n\\end{reviewlistlst}\n|, actual
+  end
+
   def test_listnum
     actual = compile_block("//listnum[test1][ruby]{\nclass Foo\n  def foo\n    bar\n\n    buz\n  end\nend\n//}\n")
     assert_equal %Q|\\reviewlistcaption{リスト1.1: ruby}\n\\begin{reviewlist}\n 1: class Foo\n 2:   def foo\n 3:     bar\n 4: \n 5:     buz\n 6:   end\n 7: end\n\\end{reviewlist}\n|, actual

data/test/test_markdownbuilder.rb

@@ -62,6 +62,23 @@ EOS
     assert_equal "```shell-session\nlineA\nlineB\n```\n", actual
   end
 
+
+  def test_dlist
+    actual = compile_block(": foo\n  foo.\n  bar.\n")
+    assert_equal %Q|<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
+  end
+
+  def test_dlist_with_bracket
+    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
+    assert_equal %Q|<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n|, actual
+  end
+
+  def test_dlist_with_comment
+    source = ": title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
+    actual = compile_block(source)
+    assert_equal %Q|<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n|, actual
+  end
+
   def test_list
     actual = compile_block(<<-EOS)
 //list[name][caption]{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - kmuto