chupa-text 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b9d60aabd1c46f98936b2d0b9f78f48d5c868f4db9280f56b4b1d63501cfd7
-  data.tar.gz: dfc84f009246bdb3ce6f48183febb5911340bddb2e6308d412294955b2b97586
+  metadata.gz: 6eed021988da255a580fd8749e9f023f5a661c7950baff1403918ea153d48073
+  data.tar.gz: 0aa05754add5afd4b2527ed7b2bc90f8061b558ee0910d74b32f19658c3d3f2e
 SHA512:
-  metadata.gz: 688cc085c6cf205261b06283268a25d744440943fb9f972661d728d37fd24bbbc6caa9a0faabf9fa11e349a74d02dfec503dff8b4a0a32b82f2f27fbc7481b99
-  data.tar.gz: 84bb203f19333a733ebce2569e21e3284d140b0055202bae77605a052222e47580c8e7e4b1f5d7c328d56ac4965db2b9a202aff9e22ed413e3a871a40cea4f37
+  metadata.gz: 826667ab8c067a9a09c2b1801bc90a76869e43c345d262efd29a564da80a37c67f6ae607645c91487fe264fae4f872dec7f7ac7324ba0ed755f0a7759686e992
+  data.tar.gz: 2696c77f826dc04c27da73b97a640f723afd2007e2310ce35a2d67d27a28c924afeb3dbc3ceb298f7e9befafe2619c782ad300ce9fb086a49466b664d27b9d80

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.2.5: 2019-05-20
+
+### Improvements
+
+  * `http-server`: Added support for changing the default URL at run-time.
+
 ## 1.2.4: 2019-03-29
 
 ### Fixes

data/lib/chupa-text/decomposers/http-server.rb

@@ -38,16 +38,13 @@ module ChupaText
 
       def initialize(options)
         super
-        @url = @options[:url] ||
-               self.class.default_url ||
-               ENV["CHUPA_TEXT_HTTP_SERVER_URL"]
+        @url = @options[:url]
         @url = URI(@url) if @url
       end
 
       def target?(data)
-        return false unless @url
         return false if data.text_plain?
-        true
+        @url or default_url
       end
 
       def target_score(data)
@@ -59,8 +56,9 @@ module ChupaText
       end
 
       def decompose(data, &block)
-        http = Net::HTTP.new(@url.host, @url.port)
-        http.use_ssl = true if @url.is_a?(URI::HTTPS)
+        url = @url || default_url
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true if url.is_a?(URI::HTTPS)
         if data.timeout.is_a?(Numeric)
           http.open_timeout = data.timeout * 1.5
           http.read_timeout = data.timeout * 1.5
@@ -70,13 +68,13 @@ module ChupaText
         end
         begin
           http.start do
-            process_request(http, data, &block)
+            process_request(url, http, data, &block)
           end
         rescue SystemCallError => error
           error do
             message = "#{log_tag}[connection] "
             message << "Failed to process data in server: "
-            message << "#{@url}: "
+            message << "#{url}: "
             message << "#{error.class}: #{error.message}\n"
             message << error.backtrace.join("\n")
             message
@@ -85,7 +83,7 @@ module ChupaText
           error do
             message = "#{log_tag}[timeout] "
             message << "Failed to process data in server: "
-            message << "#{@url}: "
+            message << "#{url}: "
             message << "#{error.class}: #{error.message}\n"
             message << error.backtrace.join("\n")
             message
@@ -94,8 +92,14 @@ module ChupaText
       end
 
       private
-      def process_request(http, data)
-        request = Net::HTTP::Post.new(@url)
+      def default_url
+        url = self.class.default_url || ENV["CHUPA_TEXT_HTTP_SERVER_URL"]
+        return nil if url.nil?
+        URI(url)
+      end
+
+      def process_request(url, http, data)
+        request = Net::HTTP::Post.new(url)
         request["transfer-encoding"] = "chunked"
         data.open do |input|
           request.set_form(build_parameters(data, input),
@@ -115,7 +119,7 @@ module ChupaText
           else
             error do
               message = "#{log_tag} Failed to process data in server: "
-              message << "#{@url}: "
+              message << "#{url}: "
               message << "#{response.code}: #{response.message.strip}\n"
               case response.content_type
               when "application/json"

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.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -126,8 +126,8 @@ description: ''
 email:
 - kou@clear-code.com
 executables:
-- chupa-text
 - chupa-text-generate-decomposer
+- chupa-text
 extensions: []
 extra_rdoc_files: []
 files: