chupa-text 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fabf59599faf7e5360e69c08e7d79614294099
-  data.tar.gz: e92e9800b47c7dc056b6232e371513832d18ded6
+  metadata.gz: dfad2e42fd742ce0a396ccb6240d87e2e2df335f
+  data.tar.gz: 3200375114c918a04f41e89fb2bbd60cde223628
 SHA512:
-  metadata.gz: f5d45be9f36b34dcc0987860b17f4e37808a7541acf74bc074e5c9c088b49d394ec5b4e0984d2c67686b6695450d4132effe7273c42c8786291de0c4e3619651
-  data.tar.gz: bf1e91f18a9e5206ef85f85afc522b86764a4ac4d09e1e3e3be38a35a26c05c5ecd051d41094b33acbd667e1ca0ab3e9b01e83f7400e9167a1ec3154bc243ff4
+  metadata.gz: 265d9f9a164b04ebf0cbe67f8e022faed0c99f9af594449affe21e9387f12229c2a31691aa2e60df2a12fa17e3fca027555cbd9ebfec6bec03fd6e37a74d19ae
+  data.tar.gz: fe8031b39a1654ae7c0f54a06cd588263bfba9f988b124c823438213742a6c9f2e23eaefc705c3fac55f1e1fb84d61151b5c9c39cd5699ff78f65b1c4ed9dd22

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 1.1.1: 2017-12-13
+
+### Improvements
+
+  * Added MIME formatter.
+    [GitHub#4][Patch by okkez]
+
+### Thanks
+
+  * okkez
+
 ## 1.1.0: 2017-07-12
 
 ### Improvements

data/lib/chupa-text/command/chupa-text.rb

@@ -26,16 +26,16 @@ module ChupaText
         end
       end
 
-      AVAILABLE_FORMATS = [:json, :text]
+      AVAILABLE_FORMATS = [:json, :text, :mime]
 
       SIZE = /\A\d+x\d+\z/o
       OptionParser.accept(SIZE, SIZE) do |value|
         if value
-           begin
-             value.split("x").collect {|number| Integer(number)}
-           rescue ArgumentError
-             raise OptionParser::InvalidArgument, value
-           end
+          begin
+            value.split("x").collect {|number| Integer(number)}
+          rescue ArgumentError
+            raise OptionParser::InvalidArgument, value
+          end
         end
       end
 
@@ -219,6 +219,8 @@ module ChupaText
           Formatters::JSON.new($stdout)
         when :text
           Formatters::Text.new($stdout)
+        when :mime
+          Formatters::MIME.new($stdout)
         end
       end
     end

data/lib/chupa-text/formatters.rb

@@ -17,3 +17,4 @@
 require "chupa-text/formatters/hash"
 require "chupa-text/formatters/json"
 require "chupa-text/formatters/text"
+require "chupa-text/formatters/mime"

data/lib/chupa-text/formatters/mime.rb

@@ -0,0 +1,63 @@
+# Copyright (C) 2017  Kenji Okimoto <okimoto@clear-code.com>
+# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "digest/sha1"
+
+require "chupa-text/formatters/hash"
+
+module ChupaText
+  module Formatters
+    class MIME < Hash
+      def initialize(output)
+        super()
+        @output = output
+      end
+
+      def format_finish(data)
+        formatted = super
+
+        @output << "MIME-Version: 1.0\r\n"
+        format_hash(formatted, ["texts"])
+        texts = formatted["texts"]
+        boundary = Digest::SHA1.hexdigest(data.uri.to_s)
+        @output << "Content-Type: multipart/mixed; boundary=#{boundary}\r\n"
+        texts.each do |text|
+          @output << "\r\n--#{boundary}\r\n"
+          format_text(text)
+        end
+        @output << "\r\n--#{boundary}--\r\n"
+      end
+
+      private
+      def format_hash(hash, ignore_keys)
+        hash.each do |key, value|
+          next if ignore_keys.include?(key)
+          @output << "#{key}: #{value}\r\n"
+        end
+      end
+
+      def format_text(hash)
+        format_hash(hash, ["body"])
+        body = hash["body"]
+        if body
+          @output << "\r\n"
+          @output << body
+        end
+      end
+    end
+  end
+end

data/lib/chupa-text/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module ChupaText
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/decomposers/test-tar.rb

@@ -46,7 +46,7 @@ class TestDecomposersTar < Test::Unit::TestCase
         data = ChupaText::InputData.new(data_path)
         assert_equal([
                        {
-                         :uri    => "file:#{base_path}/top-level.txt",
+                         :uri    => file_uri("#{base_path}/top-level.txt").to_s,
                          :body   => "top level\n",
                          :source => data.uri.to_s,
                        },
@@ -62,7 +62,7 @@ class TestDecomposersTar < Test::Unit::TestCase
         data = ChupaText::InputData.new(data_path)
         assert_equal([
                        {
-                         :uri    => "file:#{base_path}/directory/hello.txt",
+                         :uri    => file_uri("#{base_path}/directory/hello.txt").to_s,
                          :body   => "Hello in directory\n",
                          :source => data.uri.to_s,
                        },

data/test/decomposers/test-zip.rb

@@ -45,19 +45,19 @@ class TestDecomposersZip < Test::Unit::TestCase
       base_path = data_path.sub_ext("")
       assert_equal([
                      {
-                       :uri    => "file:#{base_path}/hello.txt",
+                       :uri    => file_uri("#{base_path}/hello.txt").to_s,
                        :body   => "Hello!\n",
-                       :source => "file:#{data_path}",
+                       :source => file_uri(data_path).to_s,
                      },
                      {
-                       :uri    => "file:#{base_path}/hello.csv",
+                       :uri    => file_uri("#{base_path}/hello.csv").to_s,
                        :body   => "Hello,World\n",
-                       :source => "file:#{data_path}",
+                       :source => file_uri(data_path).to_s,
                      },
                      {
-                       :uri    => "file:#{base_path}/hello/world.txt",
+                       :uri    => file_uri("#{base_path}/hello/world.txt").to_s,
                        :body   => "World!\n",
-                       :source => "file:#{data_path}",
+                       :source => file_uri(data_path).to_s,
                      },
                    ],
                    decompose(data_path))

data/test/formatters/test-mime.rb

@@ -0,0 +1,85 @@
+# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestMIMEFormatter < Test::Unit::TestCase
+  def setup
+    @output = StringIO.new
+    @formatter = ChupaText::Formatters::MIME.new(@output)
+  end
+
+  def format(data, extracted_data)
+    @formatter.format_start(data)
+    extracted_data.each do |extracted_datum|
+      @formatter.format_extracted(extracted_datum)
+    end
+    @formatter.format_finish(data)
+    @output.string
+  end
+
+  def test_text
+    data = ChupaText::TextData.new("Hello")
+    data.uri = URI.parse("file:///tmp/hello.txt")
+    assert_equal(<<-MIME.gsub(/\n/, "\r\n"), format(data, [data]))
+MIME-Version: 1.0
+mime-type: text/plain
+uri: file:///tmp/hello.txt
+path: /tmp/hello.txt
+size: 5
+Content-Type: multipart/mixed; boundary=a21ff2fc51d8d8c8af3e7ccb974e34b0368e2891
+
+--a21ff2fc51d8d8c8af3e7ccb974e34b0368e2891
+mime-type: text/plain
+uri: file:///tmp/hello.txt
+path: /tmp/hello.txt
+size: 5
+
+Hello
+--a21ff2fc51d8d8c8af3e7ccb974e34b0368e2891--
+    MIME
+  end
+
+  def test_texts
+    data = ChupaText::Data.new
+    data.uri = URI.parse("file:///tmp/hello-world.zip")
+    data1 = ChupaText::TextData.new("Hello")
+    data1.uri = URI.parse("file:///tmp/hello.txt")
+    data2 = ChupaText::TextData.new("World")
+    data2.uri = URI.parse("file:///tmp/world.txt")
+    assert_equal(<<-MIME.gsub(/\n/, "\r\n"), format(data, [data1, data2]))
+MIME-Version: 1.0
+mime-type: application/zip
+uri: file:///tmp/hello-world.zip
+path: /tmp/hello-world.zip
+Content-Type: multipart/mixed; boundary=e53a82b45aee7c6a07ea51dcf930118dedf7da4d
+
+--e53a82b45aee7c6a07ea51dcf930118dedf7da4d
+mime-type: text/plain
+uri: file:///tmp/hello.txt
+path: /tmp/hello.txt
+size: 5
+
+Hello
+--e53a82b45aee7c6a07ea51dcf930118dedf7da4d
+mime-type: text/plain
+uri: file:///tmp/world.txt
+path: /tmp/world.txt
+size: 5
+
+World
+--e53a82b45aee7c6a07ea51dcf930118dedf7da4d--
+    MIME
+  end
+end

data/test/helper.rb

@@ -26,6 +26,10 @@ module Helper
 
   def fixture_uri(*components)
     path = fixture_path(*components)
+    file_uri(path)
+  end
+
+  def file_uri(path)
     URI.parse("file://#{path}")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -141,6 +141,7 @@ files:
 - lib/chupa-text/formatters.rb
 - lib/chupa-text/formatters/hash.rb
 - lib/chupa-text/formatters/json.rb
+- lib/chupa-text/formatters/mime.rb
 - lib/chupa-text/formatters/text.rb
 - lib/chupa-text/input-data.rb
 - lib/chupa-text/loggable.rb
@@ -171,6 +172,7 @@ files:
 - test/fixture/tar/top-level.tar
 - test/fixture/zip/hello.zip
 - test/fixture/zip/password.zip
+- test/formatters/test-mime.rb
 - test/helper.rb
 - test/run-test.rb
 - test/test-attributes.rb
@@ -207,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: ChupaText is an extensible text extractor. You can plug your custom text