wovnrb 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d23f8ac05cb8fbefe04b2c8ae96f9932b280762e2491c80552bd20314d17e6d
-  data.tar.gz: 44118f0db0276085f492b631eeba2af8fe349f6b9d7ef96627590dda63793d80
+  metadata.gz: b81d287414c2bec2a702a64f26f3bb7d17af912b558e420f5483b1adea3319e7
+  data.tar.gz: 638c81c1d8935753526b11a0a5d36b4d661fbb9cc7739054b121e66f6000c142
 SHA512:
-  metadata.gz: a71cbbd14782608c0c445d146bc262d5dfcf6bd7fca9cbfb467aad6f62caf9f979a98ae29a3e0fee38d77202217960b39e5ac9755975ba1fbd5e3899d5d7e69b
-  data.tar.gz: 9576ec7bd9d7053be56a116286ee9fe45df7a1f0c9e826dc114b0c77963d5e7c4ae53245655269fa8287cb45aa2ea0e56fdeecdf4cb81e4ce397d7f5595c31ef
+  metadata.gz: f801b9ea2a61e7b1a0192d521ffcaac701262b277e732ab618aadc5fcfb41a2d812493a7e42c326726884a5b811d61763dbb5db9bc9c7bf6f7d6e47bcbfd52c1
+  data.tar.gz: f5ae170d54ac362dd74710ef05660e00f914f1cca8b1b13aeb0177478bd5d89fe472b4735df26cfd95ff854c88198f6e698c1ea33772734c52f3403af3ecbe75

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,6 +5,7 @@ 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/lib/wovnrb/api_translator.rb

@@ -5,9 +5,10 @@ require 'zlib'
 
 module Wovnrb
   class ApiTranslator
-    def initialize(store, headers)
+    def initialize(store, headers, uuid)
       @store = store
       @headers = headers
+      @uuid = uuid
     end
 
     def translate(body)
@@ -55,7 +56,8 @@ module Wovnrb
       headers = {
         'Accept-Encoding' => 'gzip',
         'Content-Type' => 'application/octet-stream',
-        'Content-Length' => data.bytesize.to_s
+        'Content-Length' => data.bytesize.to_s,
+        'X-Request-Id' => @uuid
       }
       request = Net::HTTP::Post.new(generate_request_path(body), headers)
 

data/lib/wovnrb/services/wovn_logger.rb

@@ -3,15 +3,22 @@ require 'logger' unless defined?(Logger)
 
 module Wovnrb
   class WovnLogger
+    attr_reader :uuid
+
     include Singleton
 
     class << self
       def error(message)
         instance.error(message)
       end
+
+      def uuid
+        instance.uuid
+      end
     end
 
     def initialize
+      @uuid = SecureRandom.uuid
       path = Store.instance.settings['log_path']
       if path
         begin
@@ -40,9 +47,9 @@ module Wovnrb
 
     def error(message)
       if @logger == $stderr
-        @logger.puts "Wovnrb Error: #{message}"
+        @logger.puts "[#{@uuid}] Wovnrb Error: #{message}"
       else
-        @logger.error message
+        @logger.error "[#{@uuid}] #{message}"
       end
     end
   end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'.freeze
 end

data/lib/wovnrb.rb

@@ -80,7 +80,7 @@ module Wovnrb
 
         if needs_api?(html_body, headers)
           converted_html, marker = html_converter.build_api_compatible_html
-          translated_content = ApiTranslator.new(@store, headers).translate(converted_html)
+          translated_content = ApiTranslator.new(@store, headers, WovnLogger.uuid).translate(converted_html)
           translated_body.push(marker.revert(translated_content))
         else
           string_body = html_converter.build if html_body.html?

data/test/lib/api_translator_test.rb

@@ -53,7 +53,7 @@ module Wovnrb
         Wovnrb.get_env('url' => 'http://fr.wovn.io/test'),
         Wovnrb.get_settings(settings)
       )
-      api_translator = ApiTranslator.new(store, headers)
+      api_translator = ApiTranslator.new(store, headers, 'ABCD')
       translation_request_stub = stub_translation_api_request(store, headers, original_html, translated_html, response)
 
       actual_translated_html = api_translator.translate(original_html)

data/test/lib/services/wovn_logger_test.rb

@@ -31,9 +31,11 @@ module Wovnrb
     end
 
     def test_error
-      mock = LogMock.mock_log
-      WovnLogger.instance.error('aaa')
-      assert_equal(['aaa'], mock.errors)
+      SecureRandom.stub(:uuid, 'a') do
+        mock = LogMock.mock_log
+        WovnLogger.instance.error('aaa')
+        assert_equal(['[a] aaa'], mock.errors)
+      end
     end
   end
 end

data/test/lib/store_test.rb

@@ -78,12 +78,14 @@ module Wovnrb
     end
 
     def test_invalid_settings
-      mock = LogMock.mock_log
-      store = Wovnrb::Store.instance
-      valid = store.valid_settings?
+      SecureRandom.stub(:uuid, 'a') do
+        mock = LogMock.mock_log
+        store = Wovnrb::Store.instance
+        valid = store.valid_settings?
 
-      assert_equal(false, valid)
-      assert_equal(['Project token  is not valid.'], mock.errors)
+        assert_equal(false, valid)
+        assert_equal(['[a] Project token  is not valid.'], mock.errors)
+      end
     end
 
     def test_settings_ignore_paths
@@ -110,12 +112,14 @@ module Wovnrb
     end
 
     def test_settings_invalid_ignore_paths
-      mock = LogMock.mock_log
-      store = Wovnrb::Store.instance
-      store.update_settings('ignore_paths' => 'aaaa')
-
-      assert_equal(false, store.valid_settings?)
-      assert_equal(['Project token  is not valid.', 'Ignore Paths aaaa should be Array.'], mock.errors)
+      SecureRandom.stub(:uuid, 'a') do
+        mock = LogMock.mock_log
+        store = Wovnrb::Store.instance
+        store.update_settings('ignore_paths' => 'aaaa')
+
+        assert_equal(false, store.valid_settings?)
+        assert_equal(['[a] Project token  is not valid.', '[a] Ignore Paths aaaa should be Array.'], mock.errors)
+      end
     end
 
     def test_settings_ignore_glob_injection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Wovn Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -567,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Gem for WOVN.io