wovnrb 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c458ea4be1b5bc1325a0c54a9672f7fd744b864975699ae48e70acde6d5265
-  data.tar.gz: 318102aa29ae9bbb03d5cf0b1ccffa3f39ada7a8fc963daad856b058f46e46ec
+  metadata.gz: '06193b75ac22b47169f8d766af6fefbd2313ab08d064bb375f5f0966c7545f8a'
+  data.tar.gz: 58dc13795166410b91a33a8de5c13ecbf44f2cc777c6b0696475ef1d938449b5
 SHA512:
-  metadata.gz: fd81bc766461ce8212a32afafc0a673790985213304c55765322e42591e34107a649d70e1133a597b88c6cda3ee0813cd1b4efbac1ff45d2d794f52d78c80814
-  data.tar.gz: fd4304143e2226ab1b9a887d45e2326da8b8b452e0a60bcbb94f3b680fc4280459e47fb3b025d6660c2d338a1d3150617fc279b279e68693b0566a41050bd3de
+  metadata.gz: f696a3e0078b1c51eee646143b90cd9cbb20ddfa95406f652db770ba28b9c655e76d6e907736dd35919089bb27671af792f938ceb4da20de46ddddfa4d122f06
+  data.tar.gz: 4ef3a31120a8052f5ac5a0b8fe8e289b269cd5ec85640eb677e1792f202d1dfdf396787be38876442be8f10ca33987cb8a472e1b9fb4b611ea36b3e759a9d544

data/docker/rails/TestSite/Gemfile

@@ -53,4 +53,4 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'wovnrb', path: './wovnrb'
+gem 'wovnrb', path: './wovnrb'

data/docker/rails/TestSite/start.sh

@@ -5,7 +5,6 @@ rm /usr/local/bin/bundle
 rm /usr/local/bin/bundler
 gem install bundler:2.1.4
 update --bundler
-bundle update
 bundle install
 apt update
 apt install npm -y

data/docker/rails/TestSite/yarn.lock

@@ -5129,9 +5129,9 @@ path-key@^2.0.0, path-key@^2.0.1:
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"

data/lib/wovnrb/api_translator.rb

@@ -24,18 +24,19 @@ module Wovnrb
 
       case response
       when Net::HTTPSuccess
-        if response.header['Content-Encoding'] == 'gzip'
-          response_body = Zlib::GzipReader.new(StringIO.new(response.body)).read
-
-          JSON.parse(response_body)['body'] || body
-        elsif @store.dev_mode?
-          JSON.parse(response.body)['body'] || body
-        else
-          WovnLogger.error("Received invalid content (\"#{response.header['Content-Encoding']}\") from WOVNio translation API.")
+        begin
+          raw_response_body = @store.dev_mode? ? response.body : Zlib::GzipReader.new(StringIO.new(response.body)).read
+        rescue Zlib::GzipFile::Error
+          raw_response_body = response.body
+        end
+
+        begin
+          JSON.parse(raw_response_body)['body'] || body
+        rescue JSON::JSONError
           body
         end
       else
-        WovnLogger.error("Received \"#{response.message}\" from WOVNio translation API.")
+        WovnLogger.error("HTML-swapper call failed. Received \"#{response.message}\" from WOVNio translation API.")
         body
       end
     end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.3.1'.freeze
+  VERSION = '3.4.0'.freeze
 end

data/test/lib/api_translator_test.rb

@@ -10,20 +10,24 @@ module Wovnrb
 
     def test_translate_falls_back_to_original_body_if_exception
       Net::HTTP.any_instance.expects(:request).raises
-      assert_translation('test.html', 'test_translated.html', false, nil)
+      assert_translation('test.html', 'test_translated.html', false, response: nil)
     end
 
     def test_translate_falls_back_to_original_body_if_api_error
-      assert_translation('test.html', 'test_translated.html', false, status_code: 500)
+      assert_translation('test.html', 'test_translated.html', false, response: { encoding: 'text/json', status_code: 500 })
     end
 
-    def test_translate_falls_back_to_original_body_if_api_response_is_not_compressed
-      assert_translation('test.html', 'test_translated.html', false, encoding: 'unknown')
+    def test_translate_continues_if_api_response_is_not_compressed
+      assert_translation('test.html', 'test_translated.html', true, response: { encoding: 'unknown', status: 200 }, compress_data: false)
+    end
+
+    def test_translate_continues_if_api_response_is_compressed
+      assert_translation('test.html', 'test_translated.html', true, response: { encoding: 'unknown', status: 200 })
     end
 
     def test_translate_accepts_uncompressed_response_from_api_in_dev_mode
       Wovnrb::Store.instance.update_settings('wovn_dev_mode' => true)
-      assert_translation('test.html', 'test_translated.html', true, encoding: 'text/json')
+      assert_translation('test.html', 'test_translated.html', true, response: { encoding: 'text/json', status: 200 }, compress_data: false)
     end
 
     def test_translate_without_api_compression_sends_json
@@ -60,10 +64,10 @@ module Wovnrb
 
     private
 
-    def assert_translation(original_html_fixture, translated_html_fixture, success_expected, response = { encoding: 'gzip', status_code: 200 })
+    def assert_translation(original_html_fixture, translated_html_fixture, success_expected, response: { encoding: 'gzip', status_code: 200 }, compress_data: true)
       original_html = File.read("test/fixtures/html/#{original_html_fixture}")
       translated_html = File.read("test/fixtures/html/#{translated_html_fixture}")
-      actual_translated_html = translate(original_html, translated_html, response)
+      actual_translated_html = translate(original_html, translated_html, response, compress_data: compress_data)
 
       if success_expected
         assert_equal(actual_translated_html, translated_html)
@@ -72,9 +76,9 @@ module Wovnrb
       end
     end
 
-    def translate(original_html, translated_html, response)
-      api_translator, store, headers = create_sut
-      translation_request_stub = stub_translation_api_request(store, headers, original_html, translated_html, response)
+    def translate(original_html, translated_html, response, compress_data: true)
+      api_translator, store, _headers = create_sut
+      translation_request_stub = stub_translation_api_request(store, original_html, translated_html, response, compress_data: compress_data)
 
       actual_translated_html = api_translator.translate(original_html)
       assert_requested(translation_request_stub, times: 1) if translation_request_stub
@@ -101,7 +105,7 @@ module Wovnrb
       [api_translator, store, headers]
     end
 
-    def stub_translation_api_request(store, headers, original_html, translated_html, response)
+    def stub_translation_api_request(store, original_html, translated_html, response, compress_data: true)
       if response
         cache_key = generate_cache_key(store, original_html)
         api_host = if store.dev_mode?
@@ -119,10 +123,10 @@ module Wovnrb
           'User-Agent' => 'Ruby'
         }
         stub_response_json = "{\"body\":\"#{translated_html.gsub("\n", '\n')}\"}"
-        stub_response = if store.dev_mode?
-                          stub_response_json
-                        else
+        stub_response = if compress_data
                           compress(stub_response_json)
+                        else
+                          stub_response_json
                         end
         response_headers = { 'Content-Encoding' => response[:encoding] || 'gzip' }
         stub_request(:post, api_url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Wovn Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport