chupa-text 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683591985ea7d93bfde2dc2643964120d18c6a04
-  data.tar.gz: e0b1419f2d3a020d4036afbeb56c4b1366b8e4d8
+  metadata.gz: 07fabf59599faf7e5360e69c08e7d79614294099
+  data.tar.gz: e92e9800b47c7dc056b6232e371513832d18ded6
 SHA512:
-  metadata.gz: c9b33ecfc733c19827d0ce2a8484f7cd4a128a1435616dae03bf42707b11e8c99bd3402b885fa2af073424a87e786220008f8bf5c02912aaad5874a1f9a5add4
-  data.tar.gz: 85f8df4be72276db69c8938120c9ccd99bbf424493cf69f8b2357cb5e81053da9fcc35c386c3d1816ad53ea39d3de478ee9606e49783e2ed9b74631296cc413a
+  metadata.gz: f5d45be9f36b34dcc0987860b17f4e37808a7541acf74bc074e5c9c088b49d394ec5b4e0984d2c67686b6695450d4132effe7273c42c8786291de0c4e3619651
+  data.tar.gz: bf1e91f18a9e5206ef85f85afc522b86764a4ac4d09e1e3e3be38a35a26c05c5ecd051d41094b33acbd667e1ca0ab3e9b01e83f7400e9167a1ec3154bc243ff4

data/doc/text/news.md

@@ -1,5 +1,20 @@
 # News
 
+## 1.1.0: 2017-07-12
+
+### Improvements
+
+  * Supported external command limitation by the following environment
+    variables:
+
+    * `CHUPA_TEXT_EXTERNAL_COMMAND_LIMIT_CPU`
+
+    * `CHUPA_TEXT_EXTERNAL_COMMAND_LIMIT_AS`
+
+  * Handled more download errors.
+
+  * Improved extension detection.
+
 ## 1.0.9: 2017-07-11
 
 ### Improvements

data/lib/chupa-text/data.rb

@@ -166,7 +166,11 @@ module ChupaText
     #   lower case like `pdf` not `PDF`.
     def extension
       return nil if @uri.nil?
-      File.extname(@uri.path).downcase.gsub(/\A\./, "")
+      if @uri.is_a?(URI::HTTP) and @uri.path.end_with?("/")
+        "html"
+      else
+        File.extname(@uri.path).downcase.gsub(/\A\./, "")
+      end
     end
 
     # @return [Bool] true if MIME type is "text/XXX", false

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

@@ -56,6 +56,8 @@ module ChupaText
     end
 
     class SpawnLimitOptions
+      include Loggable
+
       attr_reader :options
       def initialize
         @options = {}
@@ -65,13 +67,16 @@ module ChupaText
       private
       def set_default_options
         set_option(:cpu, :int)
-        set_option(:rss, :size)
         set_option(:as, :size)
       end
 
       def set_option(key, type)
-        value = ENV["CHUPA_EXTERNAL_COMMAND_LIMIT_#{key.to_s.upcase}"]
+        value =
+          ENV["CHUPA_TEXT_EXTERNAL_COMMAND_LIMIT_#{key.to_s.upcase}"] ||
+          # For backward compatibility
+          ENV["CHUPA_EXTERNAL_COMMAND_LIMIT_#{key.to_s.upcase}"]
         return if value.nil?
+        return if value.empty?
         value = send("parse_#{type}", key, value)
         return if value.nil?
         rlimit_number = Process.const_get("RLIMIT_#{key.to_s.upcase}")
@@ -81,8 +86,17 @@ module ChupaText
           return nil
         end
         limit_info = "soft-limit:#{soft_limit}, hard-limit:#{hard_limit}"
-        log(:info, "[#{key}][set] <#{value}>(#{limit_info})")
-        @options[:"rlimit_#{key}"] = value
+        info("#{log_tag}[#{key}][set] <#{value}>(#{limit_info})")
+
+        # TODO: Workaround for Ruby 2.3.3p222
+        case key
+        when :cpu
+          @options[:rlimit_cpu] = value
+        when :as
+          @options[:rlimit_as] = value
+        else
+          @options[:"rlimit_#{key}"] = value
+        end
       end
 
       def parse_int(key, value)
@@ -122,15 +136,15 @@ module ChupaText
       end
 
       def log_hard_limit_over_value(key, value, hard_limit)
-        log(:warning, "[#{key}][large] <#{value}>(hard-limit:#{hard_limit})")
+        warn("#{log_tag}[#{key}][large] <#{value}>(hard-limit:#{hard_limit})")
       end
 
       def log_invalid_value(key, value, type)
-        log(:warning, "[#{key}][invalid] <#{value}>(#{type})")
+        warn("#{log_tag}[#{key}][invalid] <#{value}>(#{type})")
       end
 
-      def log(level, message)
-        ChupaText.logger.send(level, "[external-command][limit]#{message}")
+      def log_tag
+        "[external-command][limit]"
       end
     end
   end

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

@@ -45,15 +45,15 @@ module ChupaText
 
     private
     def download
-      path = @uri.path
-      path += "index.html" if path.end_with?("/")
       begin
         @uri.open("rb") do |input|
           self.mime_type = input.content_type.split(/;/).first
-          VirtualContent.new(input, path)
+          VirtualContent.new(input, @uri.path)
         end
       rescue OpenURI::HTTPError => error
         raise DownloadError.new(@uri, error.message.strip)
+      rescue => error
+        raise DownloadError.new(@uri, "#{error.class}: #{error.message}")
       end
     end
   end

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

@@ -18,8 +18,8 @@ module ChupaText
   class TextData < Data
     def initialize(text, options={})
       super(options)
-      self.uri = uri.to_s.gsub(/\.[^.]+\z/, ".txt")
-      self.path = path.to_s.gsub(/\.[^.]+\z/, ".txt")
+      self.uri = uri.to_s.gsub(/\.[a-z\d]+\z/i, ".txt")
+      self.path = path.to_s.gsub(/\.[a-z\d]+\z/i, ".txt")
       self.mime_type = "text/plain"
       self.body = text
       self.size = text.bytesize

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.0.9"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip