copy_tuner_client 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 264af961181ce5a021556bb69739e1db4ca2ac1910da7dda22e14c9b959acda1
-  data.tar.gz: 814fc09372ec9ef826609631e104db8b9df0c5e36d1dc75f85be1e3eae865eff
+  metadata.gz: 757532de573065d4b93a08c8bd5061a17c8fbef293d5f14a8ff24bb3815f3323
+  data.tar.gz: 5d6ceefe8fcb9b2d21ad9592e07d8e0ac68c9ef8684824e57e2a24d5f22afeb1
 SHA512:
-  metadata.gz: 8bf796f105c5db21aebf649ce5a141b9e0f32eb2ebb9b79f50e5508a276439410389ff9ffadb1b77287ed3d206be812a9b8229188f59ae25e1573aa992827604
-  data.tar.gz: 2176d41612626e59cf8ce7708a18cb32d60f2ce3635306b68c124c377353bbef4e4a247bdda2c92268673d75b846f1bfdf340c7531771f977a9baf122359d0d7
+  metadata.gz: e1effa31089ac5b0b480196ff1fb9700b92b80a2137393467923c84150a252688c2bc4b33f5a1a63c84a58af9128866a22a784111dcd16842a24b0a00437e11f
+  data.tar.gz: 8e987b21c4b30714b056f2685f57b9b4157f505fb4ef6857b853ab1dd82b3bbaffd442f8add04c8ffed8d0c80d1f52e2eb00d2a452be6859cd42aa048c5ef602

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.1
+
+- Fix bug in `CopyrayMiddleware`
+
 ## 0.8.0
 
 - Change the default value of config.upload_disabled_environments

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.8.0)
+    copy_tuner_client (0.8.1)
       i18n (>= 0.5.0)
       json
 

data/lib/copy_tuner_client/copyray_middleware.rb

@@ -37,14 +37,14 @@ module CopyTunerClient
       if CopyTunerClient::TranslationLog.initialized?
         json = CopyTunerClient::TranslationLog.translations.to_json
         # Use block to avoid back reference \?
-        html.sub('</body>') { "<div id='copy-tuner-data' data-copy-tuner-translation-log='#{ERB::Util.html_escape json}' data-copy-tuner-url='#{CopyTunerClient.configuration.project_url}'></div></body>" }
+        append_to_html_body(html, "<div id='copy-tuner-data' data-copy-tuner-translation-log='#{ERB::Util.html_escape json}' data-copy-tuner-url='#{CopyTunerClient.configuration.project_url}'></div>")
       else
         html
       end
     end
 
     def inject_copy_tuner_bar(html)
-      html.sub(/<body[^>]*>/) { "#{Regexp.last_match}\n#{render_copy_tuner_bar}" }
+      append_to_html_body(html, render_copy_tuner_bar)
     end
 
     def render_copy_tuner_bar
@@ -59,19 +59,25 @@ module CopyTunerClient
     end
 
     def append_css(html)
-      html.sub(/<body[^>]*>/) { "#{Regexp.last_match}\n#{css_tag}" }
+      append_to_html_body(html, css_tag)
     end
 
     def append_js(html)
-      html.sub(%r{</body>}) do
-       "#{helpers.javascript_include_tag(:copyray)}\n#{Regexp.last_match}"
-      end
+      append_to_html_body(html, helpers.javascript_include_tag(:copyray))
     end
 
     def css_tag
       helpers.stylesheet_link_tag :copyray, media: :all
     end
 
+    def append_to_html_body(html, content)
+      content = content.html_safe if content.respond_to?(:html_safe)
+      return html unless html.include?('</body>')
+
+      position = html.rindex('</body>')
+      html.insert(position, content + "\n")
+    end
+
     def file?(headers)
       headers["Content-Transfer-Encoding"] == "binary"
     end

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n