togglate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e882d0a7b6b8494adb72255373853b954d24bf
-  data.tar.gz: 2dfa813070babdae9203d5b53075a4eb788ab8dd
+  metadata.gz: 7d5c239c406f9d4efc4110ed2bdbd52b8883a20b
+  data.tar.gz: 18e0df107f759b24428304dcf50eec2f38a3a95b
 SHA512:
-  metadata.gz: 3e1034613d6c3c779ea614d79caf82c82c76fdbf34aa944574169d7dce51d68e621567802faeeee62d7f5b0bd6ca7bb640f2a83fbb3a875779d0fead09c82929
-  data.tar.gz: f72edcd08d81e63d99566ecb0e24ae7dfafe00dc6c5bcc24f86db20a4991d6016543422eb15370cd4d47c51595fa41336253848773dd1e198354f128ff07e821
+  metadata.gz: 8486218902d6329ca64ce0ecf2566ef793ad7440b7837f8ce63615d4f3ea5717f5952ca8c1efa867e9342e26179e4c414031eb2d8af04340422c2852488d497a
+  data.tar.gz: b685a75c8849329e5a9df1644adc5fe409843b3fe88f17331c6a93b0f0ab22f73995b2745081b569b57c284e07afcee02abc96cf9889816981bb7c107b3acfaf

data/lib/togglate/block_wrapper.rb

@@ -16,36 +16,44 @@ class Togglate::BlockWrapper
   end
 
   def run
-    wrap_with chunk_by_space
+    wrap_chunks build_chunks
   end
 
   private
-  def chunk_by_space(block_tags:[/^```/], space_re:/^\s*$/)
+  def build_chunks(block_tags:[/^```/, /^{%/])
     in_block = false
     @text.each_line.chunk do |line|
       in_block = !in_block if block_tags.any? { |ex| line.match ex }
-      !line.match(space_re).nil? && !in_block
+      blank_line?(line) && !in_block
     end
   end
 
-  def wrap_with(chunks)
-    wrap_lines = chunks.inject([]) do |m, (is_space, lines)|
-      if is_space || @wrap_exceptions.any? { |ex| lines[0].match ex }
+  def blank_line?(line, blank_line_re:/^\s*$/)
+    !line.match(blank_line_re).nil?
+  end
+
+  def wrap_chunks(chunks)
+    wrap_lines = chunks.inject([]) do |m, (is_blank_line, lines)|
+      if is_blank_line || @wrap_exceptions.any? { |ex| lines[0].match ex }
         m.push *lines
       else
-        if @translate
-          hash_value = lines.join.hash
-          sentences_to_translate[hash_value] = lines.join
-          m.push hash_value
-        else
-          m.push @pretext
-        end
+        m.push pretext(lines)
         m.push "\n\n", @wrapper[0], "\n", *lines, @wrapper[1], "\n"
       end
     end
     @translate ? hash_to_translation(wrap_lines).join : wrap_lines.join
   end
 
+  def pretext(lines)
+    if @translate
+      hash_value = lines.join.hash
+      sentences_to_translate[hash_value] = lines.join
+      hash_value
+    else
+      @pretext
+    end
+  end
+
   def set_translate_opt(opt)
     case opt
     when Hash, FalseClass, NilClass
@@ -66,12 +74,10 @@ class Togglate::BlockWrapper
     lines.map { |line| translates[line] || line }
   end
 
-  using CoreExt
-
   def request_translation
     Mymemory.config.email = @email if @email
     res = {}
-    sentences_to_translate.thread_with do |k, text|
+    thread_with(sentences_to_translate) do |k, text|
       begin
         timeout(@timeout) { res[k] = ::Mymemory.translate(text, @translate) }
       rescue Timeout::Error
@@ -80,4 +86,14 @@ class Togglate::BlockWrapper
     end
     res
   end
+
+  def thread_with(hash)
+    mem = []
+    hash.map do |*item|
+      Thread.new(*item) do |*_item|
+        mem << yield(*_item)
+      end
+    end.each(&:join)
+    mem
+  end
 end

data/lib/togglate/cli.rb

@@ -12,7 +12,8 @@ module Togglate
     def create(file)
       text = File.read(file)
       opts = symbolize_keys(options)
-      opts.update(wrap_exceptions:[/^```/, /^ {4}/]) if opts[:code_block]
+      blocks = [/^```/, /^ {4}/, /^{%/]
+      opts.update(wrap_exceptions:blocks) if opts[:code_block]
       opts.update(translate:nil) if opts[:translate].empty?
       puts Togglate.create(text, opts)
     rescue => e

data/lib/togglate/version.rb

@@ -1,3 +1,3 @@
 module Togglate
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/togglate.rb

@@ -1,7 +1,6 @@
 require "mymemory"
 
 require "togglate/version"
-require "togglate/core_ext"
 require "togglate/block_wrapper"
 require "togglate/cli"
 

data/spec/togglate_block_wrapper_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Togglate::BlockWrapper do
+  before do
+    @text = "#title\n\n\ntext\n"
+  end
+
+  describe "#build_chunks" do
+    it "returns chunked array" do
+      wrapper = Togglate::BlockWrapper.new(@text)
+      exp = [[false, ["#title\n"]],
+             [true, ["\n", "\n"]],
+             [false, ["text\n"]]]
+      expect(wrapper.send(:build_chunks).to_a).to eq exp
+    end
+
+    context "with liquid tags" do
+      it "wraps liquid tag blocks as target blocks" do
+        text =<<-EOS
+#title
+
+text
+
+{% highlight bash %}
+bash code
+
+here
+{% endhighlight %}
+EOS
+
+        wrapper = Togglate::BlockWrapper.new(text)
+        exp = [[false, ["#title\n"]],
+               [true,  ["\n"]],
+               [false, ["text\n"]],
+               [true,  ["\n"]],
+               [false, ["{% highlight bash %}\n",
+                        "bash code\n",
+                        "\n",
+                        "here\n",
+                        "{% endhighlight %}\n"]]]
+        expect(wrapper.send(:build_chunks).to_a).to eq exp
+      end
+    end
+  end
+
+  describe "#wrap_chunks" do
+    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"
+      expect(wrapper.send(:wrap_chunks, chunks)).to eq exp
+    end
+
+    context "optional pre-text" do
+      it "returns wrapped text with a custom text" do
+        wrapper = Togglate::BlockWrapper.new(@text, pretext:"-- translation --")
+        chunks = wrapper.send(:build_chunks)
+        exp = "-- translation --\n\n<!--original\n"
+        expect(wrapper.send(:wrap_chunks, chunks)).to match(exp)
+      end
+    end
+  end
+
+  describe "Embed results of MyMemory translation service" do
+    describe ".new with translate option" do
+      it "sets en-ja option when passed true" do
+        wrapper = Togglate::BlockWrapper.new('I need you.', translate:true)
+        opt = {to: :ja}
+        expect(wrapper.instance_variable_get('@translate')).to eq opt
+      end
+
+      it "sets passed options" do
+        opt = {from: :en, to: :it, email:true}
+        wrapper = Togglate::BlockWrapper.new('I need you.', translate:opt)
+        expect(wrapper.instance_variable_get('@translate')).to eq opt
+      end
+    end
+
+    describe "#wrap_chunks" do
+      it "sets translated sentences to pretext" do
+        text = "#Title\n\nProgramming is fun.\n"
+        opt = {from: :en, to: :ja}
+        wrapper = Togglate::BlockWrapper.new(text, translate:opt)
+        chunks = wrapper.send(:build_chunks)
+        exp = /プログラミングは楽しいです.*<!--original/m
+        expect(wrapper.send(:wrap_chunks, chunks)).to match(exp)
+      end
+    end
+  end
+end

data/spec/togglate_spec.rb

@@ -20,64 +20,3 @@ describe Togglate do
     end
   end
 end
-
-describe Togglate::BlockWrapper do
-  before do
-    @text = "#title\n\n\ntext\n"
-  end
-
-  describe "#chunk_by_space" do
-    it "returns chunked array" do
-      wrapper = Togglate::BlockWrapper.new(@text)
-      exp = [[false, ["#title\n"]],
-             [true, ["\n", "\n"]],
-             [false, ["text\n"]]]
-      expect(wrapper.send(:chunk_by_space).to_a).to eq exp
-    end
-  end
-
-  describe "#wrap_with" do
-    it "returns wrapped text" do
-      wrapper = Togglate::BlockWrapper.new(@text)
-      chunks = wrapper.send(:chunk_by_space)
-      exp = "[translation here]\n\n<!--original\n#title\n-->\n\n\n[translation here]\n\n<!--original\ntext\n-->\n"
-      expect(wrapper.send(:wrap_with, chunks)).to eq exp
-    end
-
-    context "optional pre-text" do
-      it "returns wrapped text with a custom text" do
-        wrapper = Togglate::BlockWrapper.new(@text, pretext:"-- translation --")
-        chunks = wrapper.send(:chunk_by_space)
-        exp = "-- translation --\n\n<!--original\n"
-        expect(wrapper.send(:wrap_with, chunks)).to match(exp)
-      end
-    end
-  end
-
-  describe "Embed results of MyMemory translation service" do
-    describe ".new with translate option" do
-      it "sets en-ja option when passed true" do
-        wrapper = Togglate::BlockWrapper.new('I need you.', translate:true)
-        opt = {to: :ja}
-        expect(wrapper.instance_variable_get('@translate')).to eq opt
-      end
-
-      it "sets passed options" do
-        opt = {from: :en, to: :it, email:true}
-        wrapper = Togglate::BlockWrapper.new('I need you.', translate:opt)
-        expect(wrapper.instance_variable_get('@translate')).to eq opt
-      end
-    end
-
-    describe "#wrap_with" do
-      it "sets translated sentences to pretext" do
-        text = "#Title\n\nProgramming is fun.\n"
-        opt = {from: :en, to: :ja}
-        wrapper = Togglate::BlockWrapper.new(text, translate:opt)
-        chunks = wrapper.send(:chunk_by_space)
-        exp = /プログラミングは楽しいです.*<!--original/m
-        expect(wrapper.send(:wrap_with, chunks)).to match(exp)
-      end
-    end
-  end
-end

data/togglate.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>=2.1.0'
+  spec.required_ruby_version = '>=2.0.0'
 
   spec.add_dependency "thor"
   spec.add_dependency "mymemory"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: togglate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -113,12 +113,12 @@ files:
 - lib/togglate.rb
 - lib/togglate/block_wrapper.rb
 - lib/togglate/cli.rb
-- lib/togglate/core_ext.rb
 - lib/togglate/version.rb
 - spec/fixtures/README.ja.md
 - spec/fixtures/README.md
 - spec/fixtures/translated_text.json
 - spec/spec_helper.rb
+- spec/togglate_block_wrapper_spec.rb
 - spec/togglate_cli_spec.rb
 - spec/togglate_spec.rb
 - togglate.gemspec
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create base text for translation, in which original is togglable
@@ -151,6 +151,7 @@ test_files:
 - spec/fixtures/README.md
 - spec/fixtures/translated_text.json
 - spec/spec_helper.rb
+- spec/togglate_block_wrapper_spec.rb
 - spec/togglate_cli_spec.rb
 - spec/togglate_spec.rb
 has_rdoc: 

data/lib/togglate/core_ext.rb

@@ -1,13 +0,0 @@
-module CoreExt
-  refine Hash do
-    def thread_with
-      mem = []
-      map do |*item|
-        Thread.new(*item) do |*_item|
-          mem << yield(*_item)
-        end
-      end.each(&:join)
-      mem
-    end
-  end
-end