chupa-text 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dfad2e42fd742ce0a396ccb6240d87e2e2df335f
-  data.tar.gz: 3200375114c918a04f41e89fb2bbd60cde223628
+SHA256:
+  metadata.gz: a508472a3d7b4b9a0cbcf39c8090ae013bf174859fb1c9d1d558c8847787d86c
+  data.tar.gz: 2eb41dedf87b02b40f67c12574c517dd10b0079bf4dfe652a1e8966e6eed31f8
 SHA512:
-  metadata.gz: 265d9f9a164b04ebf0cbe67f8e022faed0c99f9af594449affe21e9387f12229c2a31691aa2e60df2a12fa17e3fca027555cbd9ebfec6bec03fd6e37a74d19ae
-  data.tar.gz: fe8031b39a1654ae7c0f54a06cd588263bfba9f988b124c823438213742a6c9f2e23eaefc705c3fac55f1e1fb84d61151b5c9c39cd5699ff78f65b1c4ed9dd22
+  metadata.gz: 97240067f9c2fd099109513c775a365655e168b4c3e6cd39fb1b0387ba8a1d5493eba93856aa7364265c3b499ffb73bf634041c517487ae066a3f7ca33885088
+  data.tar.gz: 06ae2a89ad702422f72c2b9a1967ec7cfc22102890698b1dbdb48a442be3b10f96d68ece9b7729b02d6d36bbf8ae5b6596b47cab7e0b97c0768851b76ee0caa0

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.1.2: 2018-06-18
+
+### Improvements
+
+  * Added support for Ruby 2.6.
+
 ## 1.1.1: 2017-12-13
 
 ### Improvements

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

@@ -52,8 +52,11 @@ module ChupaText
       def format_headers(data, target)
         format_header("mime-type", data.mime_type, target)
         format_header("uri",       data.uri,       target)
-        if data.uri.class == URI::Generic
-          format_header("path",      data.path,      target)
+        case data.uri
+        when URI::HTTP, URI::FTP, nil
+          # No path
+        else
+          format_header("path",    data.path,      target)
         end
         format_header("size",      data.size,      target)
         data.attributes.each do |name, value|

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

@@ -23,11 +23,12 @@ module ChupaText
     def initialize(uri, options={})
       super(options)
       self.uri = uri
-      if @uri.class == URI::Generic
-        @content = FileContent.new(path)
-      else
+      case @uri
+      when URI::HTTP, URI::FTP
         @content = download
         self.path = @content.path
+      else
+        @content = FileContent.new(path)
       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.1"
+  VERSION = "1.1.2"
 end

data/test/formatters/test-mime.rb

@@ -15,6 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestMIMEFormatter < Test::Unit::TestCase
+  include Helper
+
   def setup
     @output = StringIO.new
     @formatter = ChupaText::Formatters::MIME.new(@output)
@@ -31,55 +33,50 @@ class TestMIMEFormatter < Test::Unit::TestCase
 
   def test_text
     data = ChupaText::TextData.new("Hello")
-    data.uri = URI.parse("file:///tmp/hello.txt")
+    data.uri = URI.parse("http://example.com/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
+uri: http://example.com/hello.txt
 size: 5
-Content-Type: multipart/mixed; boundary=a21ff2fc51d8d8c8af3e7ccb974e34b0368e2891
+Content-Type: multipart/mixed; boundary=e37eebaf33e7c817702a3ceb4b86260a936b2503
 
---a21ff2fc51d8d8c8af3e7ccb974e34b0368e2891
+--e37eebaf33e7c817702a3ceb4b86260a936b2503
 mime-type: text/plain
-uri: file:///tmp/hello.txt
-path: /tmp/hello.txt
+uri: http://example.com/hello.txt
 size: 5
 
 Hello
---a21ff2fc51d8d8c8af3e7ccb974e34b0368e2891--
+--e37eebaf33e7c817702a3ceb4b86260a936b2503--
     MIME
   end
 
   def test_texts
     data = ChupaText::Data.new
-    data.uri = URI.parse("file:///tmp/hello-world.zip")
+    data.uri = URI.parse("http://example.com/hello-world.zip")
     data1 = ChupaText::TextData.new("Hello")
-    data1.uri = URI.parse("file:///tmp/hello.txt")
+    data1.uri = URI.parse("http://example.com/hello-world.zip/hello.txt")
     data2 = ChupaText::TextData.new("World")
-    data2.uri = URI.parse("file:///tmp/world.txt")
+    data2.uri = URI.parse("http://example.com/hello-world.zip/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
+uri: http://example.com/hello-world.zip
+Content-Type: multipart/mixed; boundary=2982df00a82c74bdb9d9c6dd5bf007d435c352c9
 
---e53a82b45aee7c6a07ea51dcf930118dedf7da4d
+--2982df00a82c74bdb9d9c6dd5bf007d435c352c9
 mime-type: text/plain
-uri: file:///tmp/hello.txt
-path: /tmp/hello.txt
+uri: http://example.com/hello-world.zip/hello.txt
 size: 5
 
 Hello
---e53a82b45aee7c6a07ea51dcf930118dedf7da4d
+--2982df00a82c74bdb9d9c6dd5bf007d435c352c9
 mime-type: text/plain
-uri: file:///tmp/world.txt
-path: /tmp/world.txt
+uri: http://example.com/hello-world.zip/world.txt
 size: 5
 
 World
---e53a82b45aee7c6a07ea51dcf930118dedf7da4d--
+--2982df00a82c74bdb9d9c6dd5bf007d435c352c9--
     MIME
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: ChupaText is an extensible text extractor. You can plug your custom text