chupa-text 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81031d80654a357700972d1443aea5994ba4e3f4a1684e670a19b7041b12073
-  data.tar.gz: 17d66e6f6660066fd8c4fd83baf01eee8c2296a2a7a777ab7c0db3bbf9917d56
+  metadata.gz: 8e24f007b2ce32dbfd3e2bc8a453d003d3cd9d528d097214e7c9a0a59a6e7427
+  data.tar.gz: efbe5bc163d8f170f04074272071815002678ccbf7ec0f7d6282d7382aec5b2e
 SHA512:
-  metadata.gz: e3ab55e7923da653b4c277491712e6564db633b664830ad2153b60b0ada7d09de69576074a0a3592406b03041f09990fa7a0daf0fd3f99d798543d22d5416a2c
-  data.tar.gz: ab8e04142b49119e51c9d7da40776efc674e75034148670c7f921a06320896426f7aba99a42ff467a97d07bd89c776bc4e04ddfa788ce826d51481baf8890470
+  metadata.gz: 29dcae1ce19af6cade4f2cacbdd465f6f6af14ff566054c44fe021bfb8cdfd9d475a8fe5871387d46ade8063b30a0711f70470f677d405961f5a8e7eca04cfd9
+  data.tar.gz: 638682d059e805c471b76ab0c1413e917acb690cee80b54b2855837203d029b8c0383c0e5e96d2d7676144cb79e048f0e4bd81b59b24e59c566c1b5cf0b3d731

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.3.5: 2024-09-22
+
+### Improvements
+
+  * Added support for REXML 3.3.2 or later.
+
 ## 1.3.4: 2024-09-22
 
 ### Improvements

data/lib/chupa-text/decomposers/csv.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2024  Sutou Kouhei <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
@@ -36,7 +36,7 @@ module ChupaText
       end
 
       def decompose(data)
-        text = ""
+        text = +""
         data.open do |input|
           begin
             csv = ::CSV.new(input, liberal_parsing: true)
@@ -68,7 +68,7 @@ module ChupaText
         width, height = data.expected_screenshot_size
         max_n_lines = 10
         font_size = height / max_n_lines
-        target_text = ""
+        target_text = +""
         text.each_line.with_index do |line, i|
           break if i == max_n_lines
           target_text << line

data/lib/chupa-text/decomposers/office-open-xml-document.rb

@@ -41,7 +41,7 @@ module ChupaText
 
       private
       def start_decompose(context)
-        context[:text] = ""
+        context[:text] = +""
       end
 
       def process_entry(entry, context)

data/lib/chupa-text/decomposers/office-open-xml-presentation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019-2024  Sutou Kouhei <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
@@ -56,7 +56,7 @@ module ChupaText
         case entry.zip_path
         when /\Appt\/slides\/slide(\d+)\.xml/
           nth_slide = Integer($1, 10)
-          slide_text = ""
+          slide_text = +""
           extract_text(entry, slide_text)
           context[:slides] << [nth_slide, slide_text]
         end

data/lib/chupa-text/decomposers/office-open-xml-workbook.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2022  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2019-2024  Sutou Kouhei <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
@@ -73,7 +73,7 @@ module ChupaText
         sheets = context[:sheets].sort_by(&:first).collect(&:last)
         sheet_names = context[:sheet_names]
         sheets.each_with_index do |sheet, i|
-          sheet_text = ""
+          sheet_text = +""
           sheet.each do |row|
             row_texts = row.collect do |cell|
               case cell

data/lib/chupa-text/decomposers/opendocument-presentation.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019-2024  Sutou Kouhei <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
@@ -72,7 +72,7 @@ module ChupaText
           when DRAW_URI
             case local_name
             when "page"
-              @slides << {text: ""}
+              @slides << {text: +""}
             end
           end
         end

data/lib/chupa-text/decomposers/opendocument-spreadsheet.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019-2024  Sutou Kouhei <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
@@ -96,9 +96,9 @@ module ChupaText
             when "table-row"
               @sheets.last[:rows] << []
             when "table-cell"
-              @sheets.last[:rows].last << {text: ""}
+              @sheets.last[:rows].last << {text: +""}
             when "covered-table-cell"
-              @sheets.last[:rows].last << {text: ""}
+              @sheets.last[:rows].last << {text: +""}
             when "shapes"
               @in_shapes = true
             end
@@ -116,7 +116,7 @@ module ChupaText
             case local_name
             when "table"
               sheet = @sheets.last
-              text = ""
+              text = +""
               shape_texts = sheet[:shape_texts]
               unless shape_texts.empty?
                 text << shape_texts.join("\n") << "\n"

data/lib/chupa-text/decomposers/opendocument-text.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019-2024  Sutou Kouhei <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
@@ -29,7 +29,7 @@ module ChupaText
 
       private
       def process_content(entry, context, &block)
-        context[:text] = ""
+        context[:text] = +""
         listener = TextListener.new(context[:text])
         parse(entry.file_data, listener)
       end

data/lib/chupa-text/decomposers/xml.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2024  Sutou Kouhei <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
@@ -29,7 +29,7 @@ module ChupaText
       end
 
       def decompose(data)
-        text = ""
+        text = +""
         listener = Listener.new(text)
         data.open do |input|
           begin

data/lib/chupa-text/sax-parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019-2024  Sutou Kouhei <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
@@ -16,6 +16,7 @@
 
 require "cgi/util"
 require "rexml/parsers/sax2parser"
+require "rexml/rexml"
 require "rexml/sax2listener"
 
 begin
@@ -156,12 +157,22 @@ module ChupaText
           @listener.end_element(*args)
         end
 
-        def characters(text)
-          @listener.characters(CGI.unescapeHTML(text))
-        end
+        if (REXML::VERSION <=> "3.3.2") >= 0
+          def characters(text)
+            @listener.characters(text)
+          end
+
+          def cdata(content)
+            @listener.cdata(content)
+          end
+        else
+          def characters(text)
+            @listener.characters(CGI.unescapeHTML(text))
+          end
 
-        def cdata(content)
-          @listener.cdata(CGI.unescapeHTML(content))
+          def cdata(content)
+            @listener.cdata(CGI.unescapeHTML(content))
+          end
         end
       end
     end

data/lib/chupa-text/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2022  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2013-2024  Sutou Kouhei <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
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module ChupaText
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Sutou Kouhei