togglate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5c239c406f9d4efc4110ed2bdbd52b8883a20b
-  data.tar.gz: 18e0df107f759b24428304dcf50eec2f38a3a95b
+  metadata.gz: 8838d984a567e19332eefd8db08ac37d50087ba9
+  data.tar.gz: 918a7a0d84ca37b6e509b03ee9f02b2e431d48f0
 SHA512:
-  metadata.gz: 8486218902d6329ca64ce0ecf2566ef793ad7440b7837f8ce63615d4f3ea5717f5952ca8c1efa867e9342e26179e4c414031eb2d8af04340422c2852488d497a
-  data.tar.gz: b685a75c8849329e5a9df1644adc5fe409843b3fe88f17331c6a93b0f0ab22f73995b2745081b569b57c284e07afcee02abc96cf9889816981bb7c107b3acfaf
+  metadata.gz: 963997000ded8bfa81f8246e6ba3dd6f09dfedf0fc207921919095001896bfc7e84d191f0dd5fdef4eb0a65d73a100fe22d36688f7a6521813bcdb0c5ddf9cec
+  data.tar.gz: 42948d55aa29bd9802fca99a13ba90335771c333bb1d9811f4dd410b222470e706ea20e17f8583477df6e4d883fabf6bce2f011510637c8f399d8221cbeab94a

data/lib/togglate/block_wrapper.rb

@@ -13,6 +13,7 @@ class Togglate::BlockWrapper
     @translate = set_translate_opt(opts[:translate])
     @timeout = opts.fetch(:timeout, 5)
     @email = opts[:email]
+    @indent_re = /^\s{4,}\S/
   end
 
   def run
@@ -20,11 +21,23 @@ class Togglate::BlockWrapper
   end
 
   private
-  def build_chunks(block_tags:[/^```/, /^{%/])
+  def build_chunks
     in_block = false
+    in_indent = false
     @text.each_line.chunk do |line|
-      in_block = !in_block if block_tags.any? { |ex| line.match ex }
-      blank_line?(line) && !in_block
+      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
+        blank_line?(line) && !in_block && !in_indent
+      end
     end
   end
 
@@ -32,18 +45,72 @@ class Togglate::BlockWrapper
     !line.match(blank_line_re).nil?
   end
 
+  def true_to_false?(prev, curr)
+    # this captures the in-out state transition on 4 indent block.
+    [prev, curr] == [true, false]
+  end
+
+  def in_block?(line, in_block, block_tags:[/^```/, /^{%/])
+    return !in_block if block_tags.any? { |ex| line.match ex }
+    in_block
+  end
+
+  def in_indented_block?(line, status, in_block)
+    return false if in_block
+    if !status && line.match(@indent_re) ||
+        status && line.match(/^\s{,3}\S/)
+      !status
+    else
+      status
+    end
+  end
+
   def wrap_chunks(chunks)
+    # 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)|
-      if is_blank_line || @wrap_exceptions.any? { |ex| lines[0].match ex }
+      next m.tap { reserve = lines } if is_blank_line == :alone
+
+      if is_blank_line || exception_block?(lines.first)
+        if reserve
+          m.push "\n"
+          m.push *wrapped_block(reserve)
+        end
         m.push *lines
       else
-        m.push pretext(lines)
-        m.push "\n\n", @wrapper[0], "\n", *lines, @wrapper[1], "\n"
+        if reserve
+          m.push "\n"
+          lines = reserve + lines
+        end
+        m.push *wrapped_block(lines)
       end
+      m.tap { reserve = nil }
     end
     @translate ? hash_to_translation(wrap_lines).join : wrap_lines.join
   end
 
+  def wrapped_block(contents)
+    [
+      pretext(contents),
+      "\n\n",
+      @wrapper[0],
+      "\n",
+      *contents,
+      @wrapper[1],
+      "\n"
+    ]
+  end
+
+  def exception_block?(line)
+    if @wrap_exceptions.empty?
+      false
+    else
+      (@wrap_exceptions + [@indent_re]).any? { |ex| line.match ex }
+    end
+  end
+
   def pretext(lines)
     if @translate
       hash_value = lines.join.hash

data/lib/togglate/cli.rb

@@ -12,7 +12,7 @@ module Togglate
     def create(file)
       text = File.read(file)
       opts = symbolize_keys(options)
-      blocks = [/^```/, /^ {4}/, /^{%/]
+      blocks = [/^```/, /^{%/]
       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.3"
+  VERSION = "0.1.4"
 end

data/spec/fixtures/README.ja.md

@@ -16,6 +16,12 @@ Programming is fun.
     % ruby title.rb
 -->
 
+ほんとに楽しい。
+
+<!--original
+Really fun.
+-->
+
 ```ruby
 def hello
   puts :hello

data/spec/fixtures/README.md

@@ -4,6 +4,8 @@ Programming is fun.
 
     % ruby title.rb
 
+Really fun.
+
 ```ruby
 def hello
   puts :hello

data/spec/togglate_block_wrapper_spec.rb

@@ -41,13 +41,86 @@ EOS
         expect(wrapper.send(:build_chunks).to_a).to eq exp
       end
     end
+
+    context "with fenced code blocks" do
+      it "wraps fenced code blocks as target blocks" do
+        text = <<-EOS
+# title
+
+text
+
+``` ruby
+puts 'Hello'
+
+p :World
+```
+EOS
+        wrapper = Togglate::BlockWrapper.new(text)
+        exp = [
+          [false, ["# title\n"]],
+          [true,  ["\n"]],
+          [false, ["text\n"]],
+          [true,  ["\n"]],
+          [false, ["``` ruby\n", "puts 'Hello'\n", "\n", "p :World\n", "```\n"]]
+        ]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
+    end
+
+    context "with 4 indented code blocks" do
+      it "wraps them as target blocks" do
+        text =<<-EOS
+#title
+
+    tell application 'Foo'
+
+      beep
+
+    end tell
+
+  line
+EOS
+
+        wrapper = Togglate::BlockWrapper.new(text)
+        exp = [[false, ["#title\n"]],
+               [true,  ["\n"]],
+               [false, ["    tell application 'Foo'\n",
+                        "\n",
+                        "      beep\n",
+                        "\n",
+                        "    end tell\n",
+                        "\n"]],
+               [:alone,  ["  line\n"]]]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
+    end
   end
 
   describe "#wrap_chunks" do
+    before do
+      @text =<<-EOS
+#title
+
+text
+EOS
+    end
+
     it "returns wrapped text" do
       wrapper = Togglate::BlockWrapper.new(@text)
       chunks = wrapper.send(:build_chunks)
-      exp = "[translation here]\n\n<!--original\n#title\n-->\n\n\n[translation here]\n\n<!--original\ntext\n-->\n"
+      exp =<<-EOS
+[translation here]
+
+<!--original
+#title
+-->
+
+[translation here]
+
+<!--original
+text
+-->
+EOS
       expect(wrapper.send(:wrap_chunks, chunks)).to eq exp
     end
 
@@ -59,6 +132,84 @@ EOS
         expect(wrapper.send(:wrap_chunks, chunks)).to match(exp)
       end
     end
+
+    context "text has 4 indented code blocks" do
+      it "wraps sentences after the code blocks correctly" do
+        text =<<-EOS
+#title
+
+    % echo hello
+
+line
+line2
+EOS
+        wrapper = Togglate::BlockWrapper.new(text)
+        chunks = wrapper.send(:build_chunks)
+        exp =<<-EOS
+[translation here]
+
+<!--original
+#title
+-->
+
+[translation here]
+
+<!--original
+    % echo hello
+
+-->
+
+[translation here]
+
+<!--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
+
+    % echo hello
+
+line
+
+line2
+EOS
+        wrapper = Togglate::BlockWrapper.new(text)
+        chunks = wrapper.send(:build_chunks)
+        exp =<<-EOS
+[translation here]
+
+<!--original
+#title
+-->
+
+[translation here]
+
+<!--original
+    % echo hello
+
+-->
+
+[translation here]
+
+<!--original
+line
+-->
+
+[translation here]
+
+<!--original
+line2
+-->
+EOS
+        expect(wrapper.send(:wrap_chunks, chunks)).to eq exp
+      end
+    end
   end
 
   describe "Embed results of MyMemory translation service" do

data/spec/togglate_cli_spec.rb

@@ -21,7 +21,7 @@ describe Togglate::CLI do
 
       it "wraps code blocks" do
         Togglate::CLI.start(['create', 'README.md'])
-        expect($stdout.string).to match(/<!--original\n\s{4}% ruby title\.rb\n-->/)
+        expect($stdout.string).to match(/<!--original\n\s{4}% ruby title\.rb\n\n-->/)
       end
 
       it "wraps gfm code blocks" do
@@ -29,10 +29,12 @@ describe Togglate::CLI do
         expect($stdout.string).to match(/<!--original.*```ruby.*```\n-->/m)
       end
 
-      it "wraps sentences except 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)
+      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)
+        end
       end
     end
 

metadata

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