jekyll-chatgpt-translate 0.0.32 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a186798ad4c85bb986a0ad9aa25a8b3c659af36f4ee351ab4b8c0a6ddc407f90
-  data.tar.gz: b7fac01e0df9bc04f2d977f729b6bfc6aa28997775346610c76e3b2df0736c71
+  metadata.gz: f382405857f236d2b59e129760b41f49efd2815b8ebcffab87bf8d92f89c40a6
+  data.tar.gz: 65897a2650943260e087213ae42baaee18cf34d6a163d90e7ba5348dd3c46a78
 SHA512:
-  metadata.gz: 135850d3b8d6a9bbeabde741e5cb1c183ab4ead16a5caeb6612e99c0db7f4d9dd310d889b9144b6985af9a003a99f184261ab72eeaffba0aff1dec31e54a45ba
-  data.tar.gz: fad830cf25f4bf56ad35216da0132c4911c08ad85de7dd5a25e79f583e3a06781eccc5529588f5d511e800f300cd0d01520559d7758723558118561e3b4142c9
+  metadata.gz: ebbc5c28294a0a69b9a0cf3ee08ee7cf84ff9eb609e8efde9549b02f11e653236deebe371e6506fefa78156a229c8deeaab7f0af13e4caa0f1e108205971ec51
+  data.tar.gz: 7de6d8bd8e966b3b0a4c322092dbaf0e38620e56d89ff1400f48f7a2199475133f095d18bec467bbe01c8fb12b63f13f982cc86d0376fe458631db22a82c6ecf

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
         ruby: [2.7, 3.1]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/Gemfile

@@ -25,11 +25,11 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'cucumber', '8.0.0', require: false
+gem 'cucumber', '9.0.1', require: false
 gem 'kramdown-parser-gfm', '1.1.0', require: false
 gem 'minitest', '5.19.0', require: false
 gem 'rake', '13.0.6', require: false
 gem 'rubocop', '1.56.2', require: false
 gem 'rubocop-rspec', '2.23.2', require: false
 gem 'simplecov', '0.22.0', require: false
-gem 'webmock', '3.18.1', require: false
+gem 'webmock', '3.19.1', require: false

data/README.md

@@ -50,7 +50,7 @@ to get the URL of the page that was translated.
 
 You can also use `{{ page.chatgpt-translate.model }}`
 inside both the original page and the translated one, to refer to the model of ChatGPT.
-The presence of this attribute in the `{{ page }}` means that the
+The presence of `{{ page.chatgpt-translate }}` means that the
 page was translated or the translated HTML was downloaded and placed into the `_site` directory.
 
 ## Options

data/jekyll-chatgpt-translate.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>= 2.6'
   s.name = 'jekyll-chatgpt-translate'
-  s.version = '0.0.32'
+  s.version = '0.0.34'
   s.license = 'MIT'
   s.summary = 'Translate Jekyll Pages Through ChatGPT'
   s.description = [

data/lib/jekyll-chatgpt-translate/chatgpt.rb

@@ -25,6 +25,7 @@
 require 'jekyll'
 require 'openai'
 require 'iso-639'
+require_relative 'pars'
 require_relative 'prompt'
 
 # The module we are in.
@@ -51,7 +52,7 @@ class GptTranslate::ChatGPT
   end
 
   def translate(markdown, min: 32)
-    markdown.split(/\n{2,}/).compact.map do |par|
+    GptTranslate::Pars.new(markdown).to_a.map do |par|
       par.strip!
       if @source == @target
         Jekyll.logger.debug("No need to translate from #{@source.inspect} to #{@target.inspect}: #{par.inspect}")
@@ -59,7 +60,7 @@ class GptTranslate::ChatGPT
       elsif par.length < min
         Jekyll.logger.debug("Not translating this, b/c too short: #{par.inspect}")
         par
-      elsif par.start_with?('```') || par.end_with?('```')
+      elsif par.start_with?('```')
         Jekyll.logger.debug("Not translating this code block: #{par.inspect}")
         par
       elsif par =~ /^[^\p{Alnum}\*'"\[]/

data/lib/jekyll-chatgpt-translate/pars.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# (The MIT License)
+#
+# Copyright (c) 2023 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# The module we are in.
+module GptTranslate; end
+
+# Markdown broken down ito pars.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2023 Yegor Bugayenko
+# License:: MIT
+class GptTranslate::Pars
+  # Ctor.
+  # +markdown+ The markdown
+  def initialize(markdown)
+    @markdown = markdown
+  end
+
+  # Returns an array of strings
+  def to_a
+    pars = []
+    inside = false
+    @markdown.strip.split(/\n{2,}/).compact.each do |par|
+      if inside
+        pars[pars.size - 1] = "#{pars[pars.size - 1]}\n\n#{par}"
+      else
+        pars << par
+      end
+      inside = true if par.start_with?('```') && !inside
+      inside = false if par.end_with?('```') && inside
+    end
+    pars
+  end
+end

data/lib/jekyll-chatgpt-translate/ping.rb

@@ -57,8 +57,7 @@ class GptTranslate::Ping
       html = response.body if response.is_a?(Net::HTTPSuccess)
       Jekyll.logger.debug("GET #{uri.inspect}: #{response.code}")
     rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL => e
-      Jekyll.logger.debug("Failed to ping #{uri.inspect}: #{e.message}")
-      Jekyll.logger.info("The page is absent (#{e.class.name}): #{uri.inspect}")
+      Jekyll.logger.debug("Failed to ping #{uri.inspect} (#{e.class.name}): #{e.message}")
     end
     html
   end

data/lib/jekyll-chatgpt-translate/plain.rb

@@ -42,7 +42,7 @@ class GptTranslate::Plain
   def to_s
     Redcarpet::Markdown.new(Strip).render(
       @markdown
-        .gsub(/([^\n])\n(\s*\* )/, "\\1\n\n\\2")
+        .gsub(/([^\n])\n(\s*\* )/, "\\1\n\n\\2") # condensed list into item-per-par
         .gsub(/<!--.+?-->/m, '')
         .gsub(/{{[^}]+}}/, '')
         .gsub(/{%.+?%}/, '')

data/lib/jekyll-chatgpt-translate/prompt.rb

@@ -54,6 +54,10 @@ class GptTranslate::Prompt
       to[3],
       ', don\'t translate technical terms and proper nouns'
     ].join
-    "#{head}:\n\n#{@par}"
+    if @par.include?('"') || @par.split.count >= 8
+      "#{head}:\n\n#{@par}"
+    else
+      "#{head}: \"#{@par}\""
+    end
   end
 end

data/lib/jekyll-chatgpt-translate/version.rb

@@ -23,5 +23,5 @@
 # SOFTWARE.
 
 module GptTranslate
-  VERSION = '0.0.32'
+  VERSION = '0.0.34'
 end

data/test/test_pars.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+# (The MIT License)
+#
+# Copyright (c) 2023 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative 'test__helper'
+require_relative '../lib/jekyll-chatgpt-translate/pars'
+
+# Test for Pars.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2023 Yegor Bugayenko
+# License:: MIT
+class GptTranslate::ParsTest < Minitest::Test
+  def test_simple_cases
+    assert_equal(1, GptTranslate::Pars.new('Hello, **world**!').to_a.size)
+    assert_equal(2, GptTranslate::Pars.new("Hello,\n\n**world**!").to_a.size)
+    assert_equal(2, GptTranslate::Pars.new("\n\n\nHello,\n\n**world**\n!\n\n").to_a.size)
+  end
+
+  def test_understands_code_block
+    pars = GptTranslate::Pars.new("Hello:\n\n```java\na\n\nb\n\nc\n```\n\nz").to_a
+    assert_equal(3, pars.size)
+    assert_equal('Hello:', pars[0])
+    assert_equal("```java\na\n\nb\n\nc\n```", pars[1])
+    assert_equal('z', pars[2])
+  end
+
+  def test_understands_empty_block
+    pars = GptTranslate::Pars.new("Hello:\n\n```\n```\n\nz").to_a
+    assert_equal(3, pars.size)
+    assert_equal('Hello:', pars[0])
+    assert_equal("```\n```", pars[1])
+    assert_equal('z', pars[2])
+  end
+
+  def test_understands_empty_block_with_type
+    pars = GptTranslate::Pars.new("Hello:\n\n```java\n```\n\nz").to_a
+    assert_equal(3, pars.size)
+    assert_equal('Hello:', pars[0])
+    assert_equal("```java\n```", pars[1])
+    assert_equal('z', pars[2])
+  end
+
+  def test_understands_two_blocks
+    pars = GptTranslate::Pars.new("```java\na\n\nb\n```\n\n```text\na\n\nb\n```").to_a
+    assert_equal(2, pars.size)
+    assert_equal("```java\na\n\nb\n```", pars[0])
+    assert_equal("```text\na\n\nb\n```", pars[1])
+  end
+end

data/test/test_plain.rb

@@ -111,6 +111,13 @@ class GptTranslate::PlainTest < Minitest::Test
     )
   end
 
+  def test_code_block_with_empty_lines_inside
+    assert_equal(
+      "```\n\nhello\n\nworld!\n\n```",
+      GptTranslate::Plain.new("```\n\nhello\n\n\n\nworld!\n\n```").to_s
+    )
+  end
+
   def test_titles
     assert_equal('# Hello', GptTranslate::Plain.new('# Hello').to_s)
     assert_equal('## Hello', GptTranslate::Plain.new('## Hello').to_s)

data/test/test_prompt.rb

@@ -31,24 +31,24 @@ require_relative '../lib/jekyll-chatgpt-translate/prompt'
 # Copyright:: Copyright (c) 2023 Yegor Bugayenko
 # License:: MIT
 class GptTranslate::PromptTest < Minitest::Test
-  def par(body, source, target)
+  def head(source, target)
     [
       'Please, translate the following Markdown paragraph',
       " from #{source} to #{target},",
-      " don't translate technical terms and proper nouns:\n\n#{body}"
+      " don't translate technical terms and proper nouns"
     ].join
   end
 
   def test_english_to_russian
     assert_equal(
-      par('Hello, dude!', 'English', 'Russian'),
-      GptTranslate::Prompt.new('Hello, dude!', 'en', 'ru').to_s
+      "#{head('English', 'Russian')}:\n\nHello, dude, how are you doing today in this fair city?",
+      GptTranslate::Prompt.new('Hello, dude, how are you doing today in this fair city?', 'en', 'ru').to_s
     )
   end
 
   def test_english_to_chinese
     assert_equal(
-      par('Hello, Jeff!', 'English', 'Chinese'),
+      "#{head('English', 'Chinese')}: \"Hello, Jeff!\"",
       GptTranslate::Prompt.new('Hello, Jeff!', 'en', 'zh').to_s
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-chatgpt-translate
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.34
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iri
@@ -107,6 +107,7 @@ files:
 - lib/jekyll-chatgpt-translate.rb
 - lib/jekyll-chatgpt-translate/chatgpt.rb
 - lib/jekyll-chatgpt-translate/generator.rb
+- lib/jekyll-chatgpt-translate/pars.rb
 - lib/jekyll-chatgpt-translate/permalink.rb
 - lib/jekyll-chatgpt-translate/ping.rb
 - lib/jekyll-chatgpt-translate/plain.rb
@@ -117,6 +118,7 @@ files:
 - test/test__helper.rb
 - test/test_chatgpt.rb
 - test/test_generator.rb
+- test/test_pars.rb
 - test/test_permalink.rb
 - test/test_ping.rb
 - test/test_plain.rb