togglate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae98309acb4d7d77bf8ee8310f90a1975882fd2f
-  data.tar.gz: b1acea0eb9c4e0faf137065341509582c8cbfd05
+  metadata.gz: f3e882d0a7b6b8494adb72255373853b954d24bf
+  data.tar.gz: 2dfa813070babdae9203d5b53075a4eb788ab8dd
 SHA512:
-  metadata.gz: 91fc7c49ecf28eda7d9f4c85a7a2a9482d0f40de30c8be3d2f7c53409e0a84b059fc25cc057cae9de752cc29830a1a0784ecbf51a77e55c4a1b0c7ac825a960b
-  data.tar.gz: 793719ac0f7a4cb35c90b2f0bdeba1508d003e4f8a2d95e7f91ec0062b798411f526a079fd74769099c11d409eeacf699674cefdbf4bb4f53f961d0c1bd8947d
+  metadata.gz: 3e1034613d6c3c779ea614d79caf82c82c76fdbf34aa944574169d7dce51d68e621567802faeeee62d7f5b0bd6ca7bb640f2a83fbb3a875779d0fead09c82929
+  data.tar.gz: f72edcd08d81e63d99566ecb0e24ae7dfafe00dc6c5bcc24f86db20a4991d6016543422eb15370cd4d47c51595fa41336253848773dd1e198354f128ff07e821

data/lib/togglate/cli.rb

@@ -10,10 +10,14 @@ module Togglate
     option :translate, aliases:'-t', type: :hash, default:{}, desc:"Embed machine translated text. ex.-t=to:ja"
     option :email, desc:"Passing a valid email extends a limit of Mymemory anonymous usage from 100 to 1000 requests/day"
     def create(file)
+      text = File.read(file)
       opts = symbolize_keys(options)
       opts.update(wrap_exceptions:[/^```/, /^ {4}/]) if opts[:code_block]
       opts.update(translate:nil) if opts[:translate].empty?
-      puts Togglate.create(file, opts)
+      puts Togglate.create(text, opts)
+    rescue => e
+      STDERR.puts "something go wrong. #{e}"
+      exit
     end
 
     desc "append_code FILE", "Append a hover or toggle code to a FILE"
@@ -30,6 +34,18 @@ module Togglate
       exit
     end
 
+    desc "commentout FILE", "Extract commented contents from a FILE"
+    option :remains, aliases:'-r', default:false, type: :boolean, desc:"Output remaining text after extraction of comments"
+    option :tag, aliases:'-t', default:'original', desc:"Specify comment tag name"
+    def commentout(file)
+      text = File.read(file)
+      comments, remains = Togglate.commentout(text, tag:options['tag'])
+      puts options['remains'] ? remains : comments
+    rescue => e
+      STDERR.puts "something go wrong. #{e}"
+      exit
+    end
+
     desc "version", "Show Togglate version"
     def version
       puts "Togglate #{Togglate::VERSION} (c) 2014 kyoendo"

data/lib/togglate/version.rb

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

data/lib/togglate.rb

@@ -6,26 +6,32 @@ require "togglate/block_wrapper"
 require "togglate/cli"
 
 module Togglate
-  def self.create(file, opts={})
-    text = File.read(file)
-    wrapped = BlockWrapper.new(text, opts).run
-    if opts[:embed_code]
-      code = append_code(opts[:method], opts)
-      "#{wrapped}\n#{code}"
-    else
-      wrapped
+  class << self
+    def create(text, opts={})
+      wrapped = BlockWrapper.new(text, opts).run
+      if opts[:embed_code]
+        code = append_code(opts[:method], opts)
+        "#{wrapped}\n#{code}"
+      else
+        wrapped
+      end
     end
-  rescue => e
-    STDERR.puts "something go wrong. #{e}"
-    exit
-  end
 
-  def self.append_code(method, opts)
-    send("#{method}_code", opts)
-  end
+    def commentout(text, tag:'original')
+      comments = []
+      comment_re = /\n?^<!--#{tag}\n(.*?)^-->\n?/m
 
-  def self.toggle_code(name:'original', toggle_link_text:["*", "hide"], **opts)
-    <<-"CODE"
+      remains = text.gsub(comment_re) { |m| comments << $1; '' }
+      return comments*"\n", remains
+    end
+    alias :comment_out :commentout
+
+    def append_code(method, opts)
+      send("#{method}_code", opts)
+    end
+
+    def toggle_code(name:'original', toggle_link_text:["*", "hide"], **opts)
+      <<-"CODE"
 <script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
 <script>
 $(function() {
@@ -51,10 +57,10 @@ $(function() {
 });
 </script>
 CODE
-  end
+    end
 
-  def self.hover_code(name:'original', **opts)
-    <<-"CODE"
+    def hover_code(name:'original', **opts)
+      <<-"CODE"
 <script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
 <script>
 $(function() {
@@ -67,5 +73,6 @@ $(function() {
 });
 </script>
 CODE
+    end
   end
 end

data/spec/fixtures/README.ja.md

@@ -0,0 +1,31 @@
+# タイトル
+
+<!--original
+# Title
+-->
+
+プログラミングは楽しい。
+
+<!--original
+Programming is fun.
+-->
+
+    % ruby title.rb
+
+<!--original
+    % ruby title.rb
+-->
+
+```ruby
+def hello
+  puts :hello
+end
+```
+
+<!--original
+```ruby
+def hello
+  puts :hello
+end
+```
+-->

data/spec/fixtures/README.md

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

data/spec/togglate_cli_spec.rb

@@ -80,4 +80,20 @@ describe Togglate::CLI do
       expect($stdout.string).to match(/<script.*showme.*<\/script>/m)
     end
   end
+
+  describe "#commentout" do
+    it "extract comments from given file" do
+      Togglate::CLI.start(['commentout', 'README.ja.md'])
+      expect($stdout.string).to match(/# Title.*Programming/m)
+      expect($stdout.string).not_to match(/# タイトル.*プログラミングは楽しい/m)
+    end
+
+    context "set remains option to true" do
+      it "outputs remaining text" do
+        Togglate::CLI.start(['commentout', 'README.ja.md', '--remains'])
+        expect($stdout.string).not_to match(/# Title.*Programming/m)
+        expect($stdout.string).to match(/# タイトル.*プログラミングは楽しい/m)
+      end
+    end
+  end
 end

data/spec/togglate_spec.rb

@@ -4,6 +4,21 @@ describe Togglate do
   it 'should have a version number' do
     Togglate::VERSION.should_not be_nil
   end
+
+  describe ".commentout" do
+    before do
+      @original, @translated = begin
+        %w(README.md README.ja.md).map do |f|
+          File.read File.join(source_root, f)
+        end
+      end
+    end
+
+    it "extract comments from a text" do
+      comments, remains = Togglate.commentout(@translated)
+      expect(@original == comments).to be_true
+    end
+  end
 end
 
 describe Togglate::BlockWrapper do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: togglate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -115,6 +115,7 @@ files:
 - 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
@@ -146,6 +147,7 @@ signing_key:
 specification_version: 4
 summary: Create base text for translation, in which original is togglable
 test_files:
+- spec/fixtures/README.ja.md
 - spec/fixtures/README.md
 - spec/fixtures/translated_text.json
 - spec/spec_helper.rb