jekyll-chatgpt-translate 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2375ac0c0ab9bc728d9e1d6684b4cb1f1424ae5718095a8644a447b91487e8
-  data.tar.gz: bf13ed8a50dad4ca6f4cdd1d719728a57e0c7081a16eda4d56bb6dbbcae5bb3d
+  metadata.gz: 951ecc1df96633e4552be477e42c43977b0187282978d9cb1c07bedc3913e8fa
+  data.tar.gz: 9fb20f291797eaee903f0ca20aaf0adcc7ed65fd77626dda6afbe3c6390418cd
 SHA512:
-  metadata.gz: 26dbc8403f36f4bfb8c127efac666dd8884823be38b9fda7a7c92800c50f6805cfe7aa8b04251830412025ae3582a799331fdff0e8336507a6c2004fbbbbf49c
-  data.tar.gz: 5f5cd81fd192d7945f57b23148df57ebd95f09ff8b917190ffd89cb2a8dc4d44f49afffc78d7032c0194a6a0e0aa25ce95b80d97a210cfd1cbfe9965e0a44f6c
+  metadata.gz: d94a2be708d58bb23427a707660276ce7d42dc90372924644b76558933c631834d3eeece4b1bb46c5b89221c3d758b62e71958137e355edb02451ef671fc9f03
+  data.tar.gz: 623f0e383d89805288678b37d9304d365b3adf6995d60c9bec4e7a9e6c85e2be44cb51e4a1001892cb5919a55799f99dfe9e174c5edf931f9f2e641d24ffed37

data/Gemfile

@@ -32,3 +32,4 @@ gem 'rake', '13.0.6', require: false
 gem 'rubocop', '1.55.1', require: false
 gem 'rubocop-rspec', '2.23.2', require: false
 gem 'simplecov', '0.22.0', require: false
+gem 'webmock', '3.18.1', require: false

data/features/cli.feature

@@ -13,11 +13,11 @@ Feature: Simple site building
       targets:
         -
           language: cn
-          permalink: :year-:month-:day-:title-chinese.html
+          permalink: :year-:month-:day-:slug-chinese.html
           layout: chinese-translated
         -
           language: fr
-          permalink: :year/:title-french.html
+          permalink: :year/:slug-french.html
     """
     And I have a "_layouts/default.html" file with content:
     """
@@ -30,13 +30,15 @@ Feature: Simple site building
     And I have a "_posts/2023-01-01-hello.md" file with content:
     """
     ---
+    title: Hello, world!
     layout: default
     ---
     Hello, world!
     """
     Then I build Jekyll site
+    Then File "_chatgpt-translated/cn/2023-01-01-hello-cn.md" exists
     Then File "_site/2023/01/01/hello.html" exists
-    Then File "_site/2023-01-01-Hello-chinese.html" exists
-    Then File "_site/2023/Hello-french.html" exists
+    Then File "_site/2023-01-01-hello-chinese.html" exists
+    Then File "_site/2023/hello-french.html" exists
     And Exit code is zero
 

data/features/step_definitions/steps.rb

@@ -50,7 +50,7 @@ Then(/^Stdout contains "([^"]*)"$/) do |txt|
 end
 
 Then(/^File "([^"]*)" exists$/) do |name|
-  raise unless File.exist?(name)
+  raise "The file \"#{name}\" is absent:\n#{`tree`}" unless File.exist?(name)
 end
 
 Then(/^Stdout is empty$/) do

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.6'
+  s.version = '0.0.7'
   s.license = 'MIT'
   s.summary = 'Translate Jekyll Pages Through ChatGPT'
   s.description = [

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

@@ -65,7 +65,7 @@ class GptTranslate::ChatGPT
   private
 
   def translate_par(par)
-    Time.now
+    start = Time.now
     t = nil
     attempt = 0
     begin
@@ -80,26 +80,21 @@ class GptTranslate::ChatGPT
         }
       )
       t = response.dig('choices', 0, 'message', 'content')
-    rescue StandardError
+    rescue StandardError => e
       attempt += 1
       retry if attempt < 4
+      raise e
     end
-    if t.nil?
-      Jekyll.logger.error("Failed to translate #{par.split.count}
-#{@source.upcase} words after #{attempt} attempts :(")
-      'FAILED TO TRANSLATE THIS PARAGRAPH'
-    else
-      Jekyll.logger.debug("Translated #{par.split.count} #{@source.upcase} words
-to #{t.split.count} #{@target.upcase} words
-through #{@model} in #{(Time.now - pstart).round(2)}s")
-      t
-    end
+    Jekyll.logger.info("Translated #{par.split.count} #{@source.upcase} words \
+to #{t.split.count} #{@target.upcase} words \
+through #{@model} in #{(Time.now - start).round(2)}s")
+    t
   end
 
   def prompt
-    if (source == 'ru') && (target == 'en')
+    if (@source == 'ru') && (@target == 'en')
       'Пожалуйста, переведи этот параграф на английский язык'
-    elsif (source == 'en') && (target == 'ru')
+    elsif (@source == 'en') && (@target == 'ru')
       'Please, translate this paragraph to Russian'
     else
       [

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

@@ -43,11 +43,12 @@ class GptTranslate::Generator < Jekyll::Generator
   # Main plugin action, called by Jekyll-core
   def generate(site)
     @site = site
+    home = '_chatgpt-translated'
     key = ENV.fetch('OPENAI_API_KEY', nil)
     if key.nil? && Jekyll.env == 'development'
-      Jekyll.logger.info('OPENAI_API_KEY environment variable is not set and
-we are in development mode, no actual translation will happen,
-but pages will be generated')
+      Jekyll.logger.info("OPENAI_API_KEY environment variable is not set and \
+we are in development mode, no actual translation will happen, \
+but pages will be generated")
       key = ''
     end
     if key.nil?
@@ -61,7 +62,7 @@ but pages will be generated')
     site.posts.docs.each do |doc|
       plain = GptTranslate::Plain.new(doc.content).to_s
       config['targets'].each do |target|
-        link = GptTranslate::Permalink.new(doc, target['permalink']).to_s
+        link = GptTranslate::Permalink.new(doc, target['permalink']).to_path
         next if GptTranslate::Ping.new(site, link).exists?
         lang = target['language']
         raise 'Language must be defined for each target' if target.nil?
@@ -77,7 +78,7 @@ but pages will be generated')
           lang
         )
         translated = gpt.translate(plain)
-        path = "_chatgpt-translated/#{doc.basename}"
+        path = File.join(home, lang, doc.basename.gsub(/\.md$/, "-#{lang}.md"))
         FileUtils.mkdir_p(File.dirname(path))
         File.write(
           path,
@@ -98,7 +99,7 @@ but pages will be generated')
       end
       break if total >= threshold
     end
-    Jekyll.logger.info("#{total} pages generated in #{(Time.now - start).round(2)}s")
+    Jekyll.logger.info("#{total} pages translated in #{(Time.now - start).round(2)}s")
   end
 
   private

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

@@ -38,11 +38,14 @@ class GptTranslate::Permalink
     @template = template
   end
 
-  def to_s
-    @template
+  def to_path
+    path = @template
       .gsub(':year', format('%04d', @doc['date'].year))
       .gsub(':month', format('%02d', @doc['date'].month))
       .gsub(':day', format('%02d', @doc['date'].day))
       .gsub(':title', CGI.escape(@doc['title']))
+      .gsub(':slug', CGI.escape(@doc['slug']))
+    path = "/#{path}" unless path.start_with?('/')
+    path
   end
 end

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

@@ -40,15 +40,16 @@ module GptTranslate; end
 # License:: MIT
 class GptTranslate::Ping
   # Ctor.
-  def initialize(site, link)
+  def initialize(site, path)
     @site = site
-    @link = link
+    raise 'Permalink must start with a slash' unless path.start_with?('/')
+    @path = path
   end
 
   def exists?
     home = @site.config['url']
     return false if home.nil?
-    uri = Iri.new(home).path(@link)
+    uri = Iri.new(home).path(@path)
     before = Net::HTTP.get_response(URI(uri.to_s))
     if before.is_a?(Net::HTTPSuccess) && before.body.include?("/#{GptTranslate::VERSION}")
       Jekyll.logger.info("No need to translate, page exists at #{uri} (#{before.body.split.count} words)")

data/test/test_chatgpt.rb

@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'webmock/minitest'
 require_relative '../lib/jekyll-chatgpt-translate/chatgpt'
 
 # ChatGPT test.
@@ -44,4 +45,11 @@ class GptTranslate::ChatGPTTest < Minitest::Test
     chat = GptTranslate::ChatGPT.new('fake-key', 'gpt-3.5-turbo', 'en', 'ru')
     assert_equal('<img src="a"/>', chat.translate('<img src="a"/>'))
   end
+
+  def test_through_webmock
+    stub_request(:any, 'https://api.openai.com/v1/chat/completions')
+      .to_return(body: '{"choices":[{"message":{"content": "boom!"}}]}')
+    chat = GptTranslate::ChatGPT.new('fake-key', 'gpt-3.5-turbo', 'en', 'ru')
+    assert_equal('boom!', chat.translate('This is the text to send to OpenAI'))
+  end
 end

data/test/test_permalink.rb

@@ -34,9 +34,9 @@ class GptTranslate::PermalinkTest < Minitest::Test
     assert_equal(
       '/2023.html',
       GptTranslate::Permalink.new(
-        { 'date' => Time.parse('2023-01-01'), 'title' => 'Hello' },
-        '/:year.html'
-      ).to_s
+        { 'date' => Time.parse('2023-01-01'), 'title' => 'Hello', 'slug' => 'hello' },
+        ':year.html'
+      ).to_path
     )
   end
 
@@ -44,9 +44,9 @@ class GptTranslate::PermalinkTest < Minitest::Test
     assert_equal(
       '/2023-%23%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82.html',
       GptTranslate::Permalink.new(
-        { 'date' => Time.parse('2023-01-01'), 'title' => '#привет' },
-        '/:year-:title.html'
-      ).to_s
+        { 'date' => Time.parse('2023-01-01'), 'title' => '#привет', 'slug' => 'hello' },
+        ':year-:title.html'
+      ).to_path
     )
   end
 end

data/test/test_ping.rb

@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'webmock/minitest'
 require 'jekyll'
 require_relative '../lib/jekyll-chatgpt-translate/ping'
 
@@ -40,8 +41,22 @@ class GptTranslate::PingTest < Minitest::Test
   end
 
   def test_when_exists
+    stub_request(:any, 'https://www.yegor256.com/about-me.html')
     site = FakeSite.new({ 'url' => 'https://www.yegor256.com/' })
     ping = GptTranslate::Ping.new(site, '/about-me.html')
     assert(!ping.exists?)
   end
+
+  def test_when_not_exists
+    stub_request(:any, 'https://www.yegor256.com/absent.html').to_return(status: 404)
+    site = FakeSite.new({ 'url' => 'https://www.yegor256.com/' })
+    ping = GptTranslate::Ping.new(site, '/absent.html')
+    assert(!ping.exists?)
+  end
+
+  def test_relative_path
+    assert_raises do
+      GptTranslate::Ping.new({}, '404.html')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-chatgpt-translate
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-20 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iri