bitclust-core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 65bc872cdee2bcbfa401dd333e2da96d4baf89b0
-  data.tar.gz: 6eba8bfb09fdb1cabff3c622cf80ef89e090bfb1
+SHA256:
+  metadata.gz: 6e32c5dfdf60ae79984fb44940fa5125727de9823b97d57f4476ff17381f71fe
+  data.tar.gz: c6e37cad779f2876ae2ad907b7e0d04ad21a2cfd622c68089edcb2995788a723
 SHA512:
-  metadata.gz: 1e5df249ca6c12c2523615ed9f5eb2a6105961eeba64427e3040b0ebf203994f3c9c0eecfd2123704a7dad4fed624122491bf1f049a13a3806cc4ec8848a209e
-  data.tar.gz: 32ae4f1ee90a470735707c86bda648e810ff7d4cce10253ad02c54924b6b45845f8b15da35cc6c65cf6b5e79d469bd80a26db52e958a4f77c6a23357ab2e3492
+  metadata.gz: 5fdb5e20b6d1469f314e2abb08e5082169a340e49679f22e5d89195d595b66791e2e2adad946946c56c487fa7491aaacc4b75eeae5394621858011e9f46eaded
+  data.tar.gz: 86042f89cc75d2cca54cef4c6622bcadd05987bb9a3ff0ef7bd2a7a7ec3f3320f41b40ca2c10c9c7e2984684c8afcf1eaa5ef29dff19c1a120077bf84556bd45

data/lib/bitclust/rdcompiler.rb

@@ -447,7 +447,7 @@ module BitClust
         rfc_link(arg)
       when 'ruby-list', 'ruby-dev', 'ruby-ext', 'ruby-talk', 'ruby-core'
         blade_link(type, arg)
-      when 'feature', 'bug'
+      when 'feature', 'bug', 'misc'
         bugs_link(type, arg)
       else
         "[[#{escape_html(link)}]]"
@@ -501,7 +501,7 @@ module BitClust
       %Q(<a class="external" href="#{escape_html(url)}">[#{escape_html("#{ml}:#{num}")}]</a>)
     end
 
-    RFC_URL = 'http://www.ietf.org/rfc/rfc%s.txt'
+    RFC_URL = 'https://tools.ietf.org/html/rfc%s'
 
     def rfc_link(num)
       url = sprintf(RFC_URL, num)

data/lib/bitclust/screen.rb

@@ -285,7 +285,7 @@ module BitClust
 
     def google_tag_manager
       tracking_id = @conf[:gtm_tracking_id]
-      return "\b" unless tracking_id
+      return "" unless tracking_id
       <<-HTML.chomp
 <!-- Global Site Tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=#{tracking_id}"></script>
@@ -301,8 +301,8 @@ module BitClust
 
     def meta_robots
       content = @conf[:meta_robots_content]
-      return "\b" unless content
-      return "\b" if content.empty?
+      return "" unless content
+      return "" if content.empty?
       %Q(<meta name="robots" content="#{content.join(',')}">)
     end
 

data/lib/bitclust/syntax_highlighter.rb

@@ -282,7 +282,11 @@ module BitClust
     end
 
     def on_tstring_end(token, data)
-      if token == "'"
+      case
+      when token == "'"
+        data << "#{token}</span>"
+      when [:qwords, :words].include?(@stack.last)
+        @stack.pop
         data << "#{token}</span>"
       else
         data << "<span class=\"s2\">#{token}</span>"
@@ -291,6 +295,20 @@ module BitClust
       data
     end
 
+    def on_qwords_beg(token, data)
+      @stack.push(:qwords)
+      style = COLORS[:qwords_beg]
+      data << "<span class=\"#{style}\">#{token}"
+      data
+    end
+
+    def on_words_beg(token, data)
+      @stack.push(:words)
+      style = COLORS[:words_beg]
+      data << "<span class=\"#{style}\">#{token}"
+      data
+    end
+
     def on_heredoc_beg(token, data)
       @stack.push(:heredoc)
       on_default(:on_heredoc_beg, token, data)

data/lib/bitclust/version.rb

@@ -1,3 +1,3 @@
 module BitClust
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/test_preprocessor.rb

@@ -109,9 +109,11 @@ HERE
     assert_equal(expected, ret.join)
   end
 
-  def test_samplecode
-    params = { 'version' => '1.9.2' }
-    src = <<HERE
+  sub_test_case("samplecode") do
+
+    def test_samplecode
+      params = { 'version' => '1.9.2' }
+      src = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -122,7 +124,7 @@ puts("yyy")
 \#@end
 HERE
 
-    expected = <<HERE
+      expected = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -132,13 +134,13 @@ puts("xxx")
 puts("yyy")
 //}
 HERE
-    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
-    assert_equal(expected, ret.join)
-  end
+      ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+      assert_equal(expected, ret.join)
+    end
 
-  def test_samplecode_without_description
-    params = { 'version' => '1.9.2' }
-    src = <<HERE
+    def test_samplecode_without_description
+      params = { 'version' => '1.9.2' }
+      src = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -149,7 +151,7 @@ puts("yyy")
 \#@end
 HERE
 
-    expected = <<HERE
+      expected = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -159,13 +161,13 @@ puts("xxx")
 puts("yyy")
 //}
 HERE
-    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
-    assert_equal(expected, ret.join)
-  end
+      ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+      assert_equal(expected, ret.join)
+    end
 
-  def test_samplecode_with_condition1
-    params = { 'version' => '1.9.2' }
-    src = <<HERE
+    def test_samplecode_with_condition1
+      params = { 'version' => '1.9.2' }
+      src = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -183,7 +185,7 @@ puts("yyy2")
 \#@end
 HERE
 
-    expected = <<HERE
+      expected = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -193,13 +195,13 @@ puts("xxx1")
 puts("yyy1")
 //}
 HERE
-    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
-    assert_equal(expected, ret.join)
-  end
+      ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+      assert_equal(expected, ret.join)
+    end
 
-  def test_samplecode_with_condition2
-    params = { 'version' => '1.9.2' }
-    src = <<HERE
+    def test_samplecode_with_condition2
+      params = { 'version' => '1.9.2' }
+      src = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -213,7 +215,7 @@ puts("yyy")
 \#@end
 HERE
 
-    expected = <<HERE
+      expected = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -222,13 +224,13 @@ xxx
 puts("xxx")
 //}
 HERE
-    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
-    assert_equal(expected, ret.join)
-  end
+      ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+      assert_equal(expected, ret.join)
+    end
 
-  def test_samplecode_with_condition3
-    params = { 'version' => '1.9.2' }
-    src = <<HERE
+    def test_samplecode_with_condition3
+      params = { 'version' => '1.9.2' }
+      src = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -246,7 +248,7 @@ zzz
 \#@end
 HERE
 
-    expected = <<HERE
+      expected = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -255,13 +257,13 @@ xxx
 puts("xxx")
 //}
 HERE
-    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
-    assert_equal(expected, ret.join)
-  end
+      ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+      assert_equal(expected, ret.join)
+    end
 
-  def test_samplecode_with_condition4
-    params = { 'version' => '1.9.2' }
-    src = <<HERE
+    def test_samplecode_with_condition4
+      params = { 'version' => '1.9.2' }
+      src = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -275,7 +277,7 @@ puts("zzz")
 \#@end
 HERE
 
-    expected = <<HERE
+      expected = <<HERE
 --- puts(str) -> String
 
 xxx
@@ -286,7 +288,8 @@ puts("yyy")
 puts("zzz")
 //}
 HERE
-    ret = Preprocessor.wrap(StringIO.new(src), params).to_a
-    assert_equal(expected, ret.join)
+      ret = Preprocessor.wrap(StringIO.new(src), params).to_a
+      assert_equal(expected, ret.join)
+    end
   end
 end

data/test/test_rdcompiler.rb

@@ -658,7 +658,7 @@ HERE
        "man command"         => ['[[man:tr(1)]]',     '<a class="external" href="http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html">tr(1)</a>'],
        "man header"          => ['[[man:sys/socket.h(header)]]', '<a class="external" href="http://www.opengroup.org/onlinepubs/009695399/basedefs/sys/socket.h.html">sys/socket.h(header)</a>'],
        "man system call"     => ['[[man:fopen(3linux)]]', '<a class="external" href="http://man7.org/linux/man-pages/man3/fopen.3.html">fopen(3linux)</a>'],
-       "RFC"                 => ['[[RFC:2822]]',      '<a class="external" href="http://www.ietf.org/rfc/rfc2822.txt">[RFC2822]</a>'],
+       "RFC"                 => ['[[RFC:2822]]',      '<a class="external" href="https://tools.ietf.org/html/rfc2822">[RFC2822]</a>'],
        "special var $~"      => ['[[m:$~]]',          '<a href="dummy/method/Kernel/v/=7e">$~</a>'],
        "special var $,"      => ['[[m:$,]]',          '<a href="dummy/method/Kernel/v/=2c">$,</a>'],
        "extra close bracket" => ['[[c:String]]]', '<a href="dummy/class/String">String</a>]'],
@@ -667,7 +667,8 @@ HERE
        "url"                 => ['[[url:http://i.loveruby.net]]', '<a class="external" href="http://i.loveruby.net">http://i.loveruby.net</a>'],
        "ruby-list"           => ['[[ruby-list:12345]]', '<a class="external" href="http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/12345">[ruby-list:12345]</a>'],
        "bugs.r-l.o feature"  => ['[[feature:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[feature#12345]</a>'],
-       "bugs.r-l.o bug"      => ['[[bug:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[bug#12345]</a>'],)
+       "bugs.r-l.o bug"      => ['[[bug:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[bug#12345]</a>'],
+       "bugs.r-l.o misc"     => ['[[misc:12345]]', '<a class="external" href="https://bugs.ruby-lang.org/issues/12345">[misc#12345]</a>'])
   def test_bracket_link(data)
     target, expected = data
     assert_equal(expected, @c.send(:compile_text, target), target)

data/theme/default/style.css

@@ -115,9 +115,16 @@ span.compileerror {
 
 pre {
     line-height: 1.1;
-    background-color: #eee;
+    background-color: #f2f2f2;
     padding: 10px;
     font-weight: normal;
+}
+
+pre.highlight {
+    line-height: 1.1;
+    background-color: #f2f2f2;
+    padding: 0px 10px 10px 10px;
+    font-weight: normal;
     position: relative;
 }
 

data/theme/default/syntax-highlight.css

@@ -205,5 +205,5 @@
   color: #bbbbbb;
 }
 .highlight {
-  background-color: #f8f8f8;
+  background-color: #f2f2f2;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitclust-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - https://github.com/rurema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: BitClust is a rurema document processor.