togglate 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8838d984a567e19332eefd8db08ac37d50087ba9
-  data.tar.gz: 918a7a0d84ca37b6e509b03ee9f02b2e431d48f0
+  metadata.gz: 65547c6e81808aac70c1c4d2e5090f9d8f5922b6
+  data.tar.gz: ab0e68cce467df0c9ddb5cb80bbe68bd186b9832
 SHA512:
-  metadata.gz: 963997000ded8bfa81f8246e6ba3dd6f09dfedf0fc207921919095001896bfc7e84d191f0dd5fdef4eb0a65d73a100fe22d36688f7a6521813bcdb0c5ddf9cec
-  data.tar.gz: 42948d55aa29bd9802fca99a13ba90335771c333bb1d9811f4dd410b222470e706ea20e17f8583477df6e4d883fabf6bce2f011510637c8f399d8221cbeab94a
+  metadata.gz: 196facfe16d6a389e7768f621fc32a604d92395daf3c9549364a7d4d374134e2f8483a12ddf923e0388dcb8bfb15e2d08201511054beb9e11eda922d009d4134
+  data.tar.gz: 18fac88443c51e12acc9e85eee4c9d2631df1788bc7047bcdf4f7b6801322be669af499664718f3f45964e691b3e8c4345427f39f39079cb1fce24ea63bacf80

data/lib/togglate/block_wrapper.rb

@@ -9,11 +9,17 @@ class Togglate::BlockWrapper
     @text = text
     @wrapper = wrapper
     @pretext = pretext
-    @wrap_exceptions = wrap_exceptions
     @translate = set_translate_opt(opts[:translate])
     @timeout = opts.fetch(:timeout, 5)
     @email = opts[:email]
+    @blank_line_re = /^\s*$/
     @indent_re = /^\s{4,}\S/
+    @block_tags = {
+      fenced: /^```/,
+      liquid: /^{%/,
+      html: /^<(?!img|br|hr|!--).+>\s*$/
+    }
+    @wrap_exceptions = wrap_exceptions.map { |key| @block_tags[key] }
   end
 
   def run
@@ -33,7 +39,7 @@ class Togglate::BlockWrapper
         if blank_line?(line)
          true
         else
-        :alone  # line just after 4 indent block marked :alone
+        :_alone  # line just after 4 indent block marked :_alone
         end
       else
         blank_line?(line) && !in_block && !in_indent
@@ -41,8 +47,8 @@ class Togglate::BlockWrapper
     end
   end
 
-  def blank_line?(line, blank_line_re:/^\s*$/)
-    !line.match(blank_line_re).nil?
+  def blank_line?(line)
+    !line.match(@blank_line_re).nil?
   end
 
   def true_to_false?(prev, curr)
@@ -50,8 +56,8 @@ class Togglate::BlockWrapper
     [prev, curr] == [true, false]
   end
 
-  def in_block?(line, in_block, block_tags:[/^```/, /^{%/])
-    return !in_block if block_tags.any? { |ex| line.match ex }
+  def in_block?(line, in_block)
+    return !in_block if @block_tags.any? { |_, ex| line.match ex }
     in_block
   end
 
@@ -66,12 +72,12 @@ class Togglate::BlockWrapper
   end
 
   def wrap_chunks(chunks)
-    # a line just after 4 indent block(marked :alone) is
+    # a line just after 4 indent block(marked :_alone) is
     # saved to local var 'reserve', then it is merged with
     # next lines or wrapped solely depend the type of next lines
     reserve = nil
     wrap_lines = chunks.inject([]) do |m, (is_blank_line, lines)|
-      next m.tap { reserve = lines } if is_blank_line == :alone
+      next m.tap { reserve = lines } if is_blank_line == :_alone
 
       if is_blank_line || exception_block?(lines.first)
         if reserve

data/lib/togglate/cli.rb

@@ -12,7 +12,7 @@ module Togglate
     def create(file)
       text = File.read(file)
       opts = symbolize_keys(options)
-      blocks = [/^```/, /^{%/]
+      blocks = %i(fenced liquid html)
       opts.update(wrap_exceptions:blocks) if opts[:code_block]
       opts.update(translate:nil) if opts[:translate].empty?
       puts Togglate.create(text, opts)

data/lib/togglate/version.rb

@@ -1,3 +1,3 @@
 module Togglate
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/fixtures/README.ja.md

@@ -35,3 +35,17 @@ def hello
 end
 ```
 -->
+
+<!--original
+<table>
+  <tr><th>Header</th></tr>
+
+  <tr><td>Data</td></tr>
+</table>
+-->
+
+<table>
+  <tr><th>Header</th></tr>
+
+  <tr><td>Data</td></tr>
+</table>

data/spec/fixtures/README.md

@@ -11,3 +11,9 @@ def hello
   puts :hello
 end
 ```
+
+<table>
+  <tr><th>Header</th></tr>
+
+  <tr><td>Data</td></tr>
+</table>

data/spec/togglate_block_wrapper_spec.rb

@@ -90,7 +90,57 @@ EOS
                         "\n",
                         "    end tell\n",
                         "\n"]],
-               [:alone,  ["  line\n"]]]
+               [:_alone,  ["  line\n"]]]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
+    end
+
+    context "with html tag blocks" do
+      it "wraps them as target blocks" do
+        text =<<-EOS
+#title
+
+<table>
+  <tr><th>Header</th></tr>
+
+  <tr><td>Data</td></tr>
+</table>
+EOS
+
+        wrapper = Togglate::BlockWrapper.new(text)
+        exp = [[false, ["#title\n"]],
+               [true,  ["\n"]],
+               [false, ["<table>\n",
+                        "  <tr><th>Header</th></tr>\n",
+                        "\n",
+                        "  <tr><td>Data</td></tr>\n",
+                        "</table>\n"]]]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
+
+      it "wraps self-closing tags as target blocks" do
+        text =<<-EOS
+#title
+
+<!-- comment -->
+
+<br />
+
+<img src="img.png" />
+
+<hr />
+EOS
+
+        wrapper = Togglate::BlockWrapper.new(text)
+        exp = [[false, ["#title\n"]],
+               [true,  ["\n"]],
+               [false, ["<!-- comment -->\n"]],
+               [true,  ["\n"]],
+               [false, ["<br />\n"]],
+               [true,  ["\n"]],
+               [false, ["<img src=\"img.png\" />\n"]],
+               [true,  ["\n"]],
+               [false, ["<hr />\n"]]]
         expect(wrapper.send(:build_chunks).to_a).to eq exp
       end
     end

data/spec/togglate_cli_spec.rb

@@ -32,8 +32,13 @@ describe Togglate::CLI do
       context "set code-block option to true" do
         it "not wraps fenced and indented code blocks" do
           Togglate::CLI.start(['create', 'README.md', '--code-block'])
-          expect($stdout.string).to match(/^\n {4}% ruby title\.rb\n$/)
-          expect($stdout.string).to match(/^\n```ruby.*```\n$/m)
+          expect($stdout.string).to match(/\n\n {4}% ruby.*\n\n/m)
+          expect($stdout.string).to match(/\n\n```ruby.*```\n\n/m)
+        end
+
+        it "not wraps html tags" do
+          Togglate::CLI.start(['create', 'README.md', '--code-block'])
+          expect($stdout.string).to match(/\n\n<table>.*<\/table>\n\n/m)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: togglate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor