change request to use always use JSON (#195)

* change request to use always use JSON * fix. * fix test. * fixed mock. * bump version. * rubocop
WOVNio · Jan 4, 2022 · 84c8e64 · 84c8e64
1 parent 0c1808b
commit 84c8e64
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/lib/wovnrb/api_translator.rb b/lib/wovnrb/api_translator.rb
@@ -62,10 +62,10 @@ def prepare_request(body)
 
     def gzip_request(html_body)
       api_params = build_api_params(html_body)
-      compressed_body = compress_request_data(api_params)
+      compressed_body = compress_request_data(api_params.to_json)
       request = Net::HTTP::Post.new(request_path(html_body), {
                                       'Accept-Encoding' => 'gzip',
-                                      'Content-Type' => 'application/octet-stream',
+                                      'Content-Type' => 'application/json',
                                       'Content-Encoding' => 'gzip',
                                       'Content-Length' => compressed_body.bytesize.to_s,
                                       'X-Request-Id' => @uuid
@@ -122,13 +122,7 @@ def build_api_params(body)
     end
 
     def compress_request_data(data_hash)
-      encoded_data_components = data_hash.map do |key, value|
-        "#{key}=#{CGI.escape(value)}"
-      end
-
-      gzip = Zlib::GzipWriter.new(StringIO.new)
-      gzip << encoded_data_components.join('&')
-      gzip.close.string
+      ActiveSupport::Gzip.compress(data_hash)
     end
 
     def api_uri

diff --git a/lib/wovnrb/store.rb b/lib/wovnrb/store.rb
@@ -114,7 +114,7 @@ def settings
     # Load Rails config.wovnrb
     #
     def load_settings
-      if Object.const_defined?('Rails') && Rails.configuration.respond_to?(:wovnrb)
+      if Object.const_defined?(:Rails) && Rails.configuration.respond_to?(:wovnrb)
         @config_loaded = true
         update_settings(Rails.configuration.wovnrb)
       end

diff --git a/lib/wovnrb/version.rb b/lib/wovnrb/version.rb
@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.4.1'.freeze
+  VERSION = '3.5.0'.freeze
 end
diff --git a/test/lib/api_translator_test.rb b/test/lib/api_translator_test.rb
@@ -119,7 +119,8 @@ def stub_translation_api_request(store, original_html, translated_html, response
           'Accept' => '*/*',
           'Accept-Encoding' => 'gzip',
           'Content-Length' => compressed_data.bytesize,
-          'Content-Type' => 'application/octet-stream',
+          'Content-Type' => 'application/json',
+          'Content-Encoding' => 'gzip',
           'User-Agent' => 'Ruby'
         }
         stub_response_json = "{\"body\":\"#{translated_html.gsub("\n", '\n')}\"}"
@@ -157,13 +158,11 @@ def generate_data(original_html)
         'custom_lang_aliases' => '{"ja":"Japanese"}'
       }
 
-      data.map { |key, value| "#{key}=#{CGI.escape(value)}" }.join('&')
+      data.to_json
     end
 
     def compress(string)
-      gzip = Zlib::GzipWriter.new(StringIO.new)
-      gzip << string
-      gzip.close.string
+      ActiveSupport::Gzip.compress(string)
     end
   end
 end