togglate 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65547c6e81808aac70c1c4d2e5090f9d8f5922b6
-  data.tar.gz: ab0e68cce467df0c9ddb5cb80bbe68bd186b9832
+  metadata.gz: 57da012eeca551cd3f241a7da1ce2b9c6876f183
+  data.tar.gz: 767fd04b88c9d744b131f177da7492c969f86173
 SHA512:
-  metadata.gz: 196facfe16d6a389e7768f621fc32a604d92395daf3c9549364a7d4d374134e2f8483a12ddf923e0388dcb8bfb15e2d08201511054beb9e11eda922d009d4134
-  data.tar.gz: 18fac88443c51e12acc9e85eee4c9d2631df1788bc7047bcdf4f7b6801322be669af499664718f3f45964e691b3e8c4345427f39f39079cb1fce24ea63bacf80
+  metadata.gz: 8b1d2f7f6e7eac949163256db714b2352190d4b484f17da6269f5d2d14289fc6b8a3f6fbd7c4e025be06ce1b07fdb9b7597512e5ad8993346949af33bd979484
+  data.tar.gz: 0745a5419ff582ed151f354814209eb90e3ca9c87ee07441d632ae25f213d529e9f0b1de9a05009b326081f55c7682a8e8f11bcded872cee75bebdbdf936dc65

data/lib/togglate/block_wrapper.rb

@@ -16,8 +16,7 @@ class Togglate::BlockWrapper
     @indent_re = /^\s{4,}\S/
     @block_tags = {
       fenced: /^```/,
-      liquid: /^{%/,
-      html: /^<(?!img|br|hr|!--).+>\s*$/
+      liquid: /^{%/
     }
     @wrap_exceptions = wrap_exceptions.map { |key| @block_tags[key] }
   end
@@ -28,25 +27,46 @@ class Togglate::BlockWrapper
 
   private
   def build_chunks
-    in_block = false
-    in_indent = false
-    @text.each_line.chunk do |line|
-      in_block = in_block?(line, in_block)
-      prev_indent = in_indent
-      in_indent = in_indented_block?(line, in_indent, in_block)
-
-      if true_to_false?(prev_indent, in_indent)
-        if blank_line?(line)
-         true
+    pre_wrap_for(:html) do |text|
+      in_block = false
+      in_indent = false
+      chunks = text.each_line.chunk do |line|
+        in_block = in_block?(line, in_block)
+        prev_indent = in_indent
+        in_indent = in_indented_block?(line, in_indent, in_block)
+
+        if true_to_false?(prev_indent, in_indent)
+          if blank_line?(line)
+            true
+          else
+            :_alone  # line just after 4 indent block marked :_alone
+          end
         else
-        :_alone  # line just after 4 indent block marked :_alone
+          blank_line?(line) && !in_block && !in_indent
         end
-      else
-        blank_line?(line) && !in_block && !in_indent
       end
     end
   end
 
+  def pre_wrap_for(*targets, tag:"```__TEMP-WRAPPER-TAG__\n")
+    # Wrap targets blocks with a pair of fenced blocks once before
+    # chunking text, then remove the pair after the chunking.
+    #
+    # NOTE: I have tried to include 'four indented blocks' here,
+    #       but abandoned. Because it was complicated to handle
+    #       indented lines inside of html tag blocks.
+    target_re = { html: /^<(\w+)\s*.*?>\n.*?^<\/\1>\n/m }
+    text =
+      targets.inject(@text) do |txt, target|
+        txt.gsub(target_re[target]) { "#{tag}#{$&}#{tag}" }
+      end
+    chunks = yield(text)
+    chunks.map do |k, lines|
+      lines = lines[1..-2] if lines.first.match(/#{tag}/)
+      [k, lines]
+    end
+  end
+
   def blank_line?(line)
     !line.match(@blank_line_re).nil?
   end

data/lib/togglate/cli.rb

@@ -12,7 +12,7 @@ module Togglate
     def create(file)
       text = File.read(file)
       opts = symbolize_keys(options)
-      blocks = %i(fenced liquid html)
+      blocks = %i(fenced liquid)
       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.5"
+  VERSION = "0.1.6"
 end

data/spec/spec_helper.rb

@@ -3,10 +3,12 @@ require 'togglate'
 require "stringio"
 require "fakeweb"
 
-class String
-  def ~
-    margin = scan(/^ +/).map(&:size).min
-    gsub(/^ {#{margin}}/, '')
+module StringExt
+  refine String do
+    def ~
+      margin = scan(/^ +/).map(&:size).min
+      gsub(/^ {#{margin}}/, '')
+    end
   end
 end
 

data/spec/togglate_block_wrapper_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+using StringExt
 
 describe Togglate::BlockWrapper do
   before do
@@ -16,18 +17,17 @@ describe Togglate::BlockWrapper do
 
     context "with liquid tags" do
       it "wraps liquid tag blocks as target blocks" do
-        text =<<-EOS
-#title
+        text = ~<<-EOS
+        #title
 
-text
+        text
 
-{% highlight bash %}
-bash code
-
-here
-{% endhighlight %}
-EOS
+        {% highlight bash %}
+        bash code
 
+        here
+        {% endhighlight %}
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         exp = [[false, ["#title\n"]],
                [true,  ["\n"]],
@@ -44,17 +44,17 @@ EOS
 
     context "with fenced code blocks" do
       it "wraps fenced code blocks as target blocks" do
-        text = <<-EOS
-# title
+        text = ~<<-EOS
+        # title
 
-text
+        text
 
-``` ruby
-puts 'Hello'
+        ``` ruby
+        puts 'Hello'
 
-p :World
-```
-EOS
+        p :World
+        ```
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         exp = [
           [false, ["# title\n"]],
@@ -69,18 +69,17 @@ EOS
 
     context "with 4 indented code blocks" do
       it "wraps them as target blocks" do
-        text =<<-EOS
-#title
-
-    tell application 'Foo'
+        text = ~<<-EOS
+        #title
 
-      beep
+            tell application 'Foo'
 
-    end tell
+              beep
 
-  line
-EOS
+            end tell
 
+          line
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         exp = [[false, ["#title\n"]],
                [true,  ["\n"]],
@@ -97,16 +96,15 @@ EOS
 
     context "with html tag blocks" do
       it "wraps them as target blocks" do
-        text =<<-EOS
-#title
-
-<table>
-  <tr><th>Header</th></tr>
+        text = ~<<-EOS
+        #title
 
-  <tr><td>Data</td></tr>
-</table>
-EOS
+        <table>
+          <tr><th>Header</th></tr>
 
+          <tr><td>Data</td></tr>
+        </table>
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         exp = [[false, ["#title\n"]],
                [true,  ["\n"]],
@@ -118,19 +116,64 @@ EOS
         expect(wrapper.send(:build_chunks).to_a).to eq exp
       end
 
-      it "wraps self-closing tags as target blocks" do
-        text =<<-EOS
-#title
+      it "wraps irregularly indented tags" do
+        text = ~<<-EOS
+        #title
+
+        <table>
+        <tr><th>Header</th></tr>
+
+        <tr><td>Data</td></tr>
+        </table>
+
+        sentence
+        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"]],
+               [true, ["\n"]],
+               [false, ["sentence\n"]]]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
+
+      it "wraps html block which includes 4 or more indented parts" do
+        text = ~<<-EOS
+        <table>
+          <tr>
+            <th>
+              Header
+            </th>
+          </tr>
+        </table>
+        EOS
+        wrapper = Togglate::BlockWrapper.new(text)
+        exp = [[false, ["<table>\n",
+                        "  <tr>\n",
+                        "    <th>\n",
+                        "      Header\n",
+                        "    </th>\n",
+                        "  </tr>\n",
+                        "</table>\n"]]]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
 
-<!-- comment -->
+      it "wraps self-closing tags as target blocks" do
+        text = ~<<-EOS
+        #title
 
-<br />
+        <!-- comment -->
 
-<img src="img.png" />
+        <br />
 
-<hr />
-EOS
+        <img src="img.png" />
 
+        <hr />
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         exp = [[false, ["#title\n"]],
                [true,  ["\n"]],
@@ -148,29 +191,29 @@ EOS
 
   describe "#wrap_chunks" do
     before do
-      @text =<<-EOS
-#title
+      @text = ~<<-EOS
+      #title
 
-text
-EOS
+      text
+      EOS
     end
 
     it "returns wrapped text" do
       wrapper = Togglate::BlockWrapper.new(@text)
       chunks = wrapper.send(:build_chunks)
-      exp =<<-EOS
-[translation here]
+      exp = ~<<-EOS
+      [translation here]
 
-<!--original
-#title
--->
+      <!--original
+      #title
+      -->
 
-[translation here]
+      [translation here]
 
-<!--original
-text
--->
-EOS
+      <!--original
+      text
+      -->
+      EOS
       expect(wrapper.send(:wrap_chunks, chunks)).to eq exp
     end
 
@@ -185,78 +228,78 @@ EOS
 
     context "text has 4 indented code blocks" do
       it "wraps sentences after the code blocks correctly" do
-        text =<<-EOS
-#title
+        text = ~<<-EOS
+        #title
 
-    % echo hello
+            % echo hello
 
-line
-line2
-EOS
+        line
+        line2
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         chunks = wrapper.send(:build_chunks)
-        exp =<<-EOS
-[translation here]
+        exp = ~<<-EOS
+        [translation here]
 
-<!--original
-#title
--->
+        <!--original
+        #title
+        -->
 
-[translation here]
+        [translation here]
 
-<!--original
-    % echo hello
+        <!--original
+            % echo hello
 
--->
+        -->
 
-[translation here]
+        [translation here]
 
-<!--original
-line
-line2
--->
-EOS
+        <!--original
+        line
+        line2
+        -->
+        EOS
         expect(wrapper.send(:wrap_chunks, chunks)).to eq exp
       end
 
       it "wraps sentences after the code blocks correctly 2" do
-        text =<<-EOS
-#title
+        text = ~<<-EOS
+        #title
 
-    % echo hello
+            % echo hello
 
-line
+        line
 
-line2
-EOS
+        line2
+        EOS
         wrapper = Togglate::BlockWrapper.new(text)
         chunks = wrapper.send(:build_chunks)
-        exp =<<-EOS
-[translation here]
+        exp = ~<<-EOS
+        [translation here]
 
-<!--original
-#title
--->
+        <!--original
+        #title
+        -->
 
-[translation here]
+        [translation here]
 
-<!--original
-    % echo hello
+        <!--original
+            % echo hello
 
--->
+        -->
 
-[translation here]
+        [translation here]
 
-<!--original
-line
--->
+        <!--original
+        line
+        -->
 
-[translation here]
+        [translation here]
 
-<!--original
-line2
--->
-EOS
+        <!--original
+        line2
+        -->
+        EOS
         expect(wrapper.send(:wrap_chunks, chunks)).to eq exp
       end
     end

data/spec/togglate_cli_spec.rb

@@ -36,9 +36,9 @@ describe Togglate::CLI do
           expect($stdout.string).to match(/\n\n```ruby.*```\n\n/m)
         end
 
-        it "not wraps html tags" do
+        it "wraps html tags" do
           Togglate::CLI.start(['create', 'README.md', '--code-block'])
-          expect($stdout.string).to match(/\n\n<table>.*<\/table>\n\n/m)
+          expect($stdout.string).to match(/<!--original.*<table>.*<\/table>\n-->/m)
         end
       end
     end

metadata

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