natsukantou 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e03ddc9cd827e3047661cab129984d98c4feb300a4ba9a61980dfba440a74a
-  data.tar.gz: aeff37004a2afb7094f391bb25ffeaa2696979382f6170c28b72a600aaee8cae
+  metadata.gz: 1b299497adbec2c0446350fc1085c4f17c6a9ebe165246dbba07fef1914348e5
+  data.tar.gz: 8164f3a25f80bc7fde73fd8062563ecbdf34f5abc2f5b1b594e78a219bafe2b8
 SHA512:
-  metadata.gz: 3cea30f5d6074a7dfd075d6489bbe8cbbbaf4a053a3aa3645d9540f206e526834ef301710306949676917c94c7aef3b519c07ca8b3ed5ac8fe870606b2131108
-  data.tar.gz: 8cf2cbd8fdc20cf6c3a24deadbf7f98ebb0cb5dd242c4d013182d264bcd9d482668ba263eb89bb01c8c8245abebc7dc2734941c0d2b32130dbe615f0fce24e67
+  metadata.gz: 34b63359b8441b651ffc071c841eae8cb74a29b2c7ea0fb2a717794a16de5dcc2fa8b94c5abf9e59f600cc49c7c9716a668e456790e01bf709d70a39737ef435
+  data.tar.gz: 951610545756fbe6b1b8384ba358b64b32f471ec6e5574f270b88f166ec70ef575270ac90b4ec2624f904d3d8bfb6ffe7b977a3aa4930ac82fc6ed04f1d90d70

data/CHANGELOG.md

@@ -3,3 +3,17 @@
 ## [0.1.0] - 2022-07-05
 
 - Initial release
+
+## [0.1.1] - 2022-09-04
+
+- Fix compatibility to Ruby 3
+
+## [0.1.2] - 2022-10-01
+
+- Document interlacing
+- Set lang attribute after translation
+- Fix Oga error
+
+## [0.1.3] - 2023-02-27
+
+- Skip interlacing if nodes' text() are identical

data/README.md

@@ -18,13 +18,17 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
-If you want to just use it as a executable, run `natsukantou [XML_FILE]`.
+To run it as a command:
+
+    $ natsukantou [XML_FILE]
 
 It's a wizard that guides you through setting up a translator configuration.
 
 Then it will translate the XML document.
 
-If you choose to save the config (`translator_config.rb`), next time you can reuse it by calling `natsukantou -c [CONFIG_FILE] [XML_FILE]`.
+If you choose to save the config (`translator_config.rb`), next time you can reuse it by calling
+
+    $ natsukantou -c [CONFIG_FILE] [XML_FILE]
 
 ## Feature
 

data/lib/monkey_patch/oga_document.rb

@@ -0,0 +1,66 @@
+module Oga
+  module XML
+    class Element
+      def lang
+        get('lang')
+      end
+
+      def lang=(lang)
+        if lang
+          set('lang', lang)
+          set('xml:lang', lang) if attribute('xml:lang')
+        else
+          unset('lang')
+          unset('xml:lang')
+        end
+      end
+    end
+
+    class Document
+      def html_node
+        at_xpath('html')
+      end
+
+      def lang
+        html_node&.lang
+      end
+
+      # TODO: handle non-HTML
+      def lang=(lang)
+        html_node&.lang = lang
+      end
+
+      # @param other [Oga::XML::Document] other to interlace from.
+      #   Note this will have side-effects on it, so be aware not to persist it.
+      # @param level [String] CSS selector to interlace
+      def interlace(other, level:)
+        nodes = css(level).to_a
+        nodes_other = other.css(level).to_a
+
+        root_lang = lang
+        root_lang_other = other.lang
+
+        nodes.each.with_index do |node, i|
+          node_other = nodes_other[i]
+
+          node.lang = root_lang
+          node_other.lang = root_lang_other
+
+          next if node.text() == nodes_other[i].text()
+
+          node.after(node_other)
+        end
+      end
+    end
+
+    class Generator
+      def on_text(node, output)
+        if @html_mode && (parent = node.parent) && parent.literal_html_name?
+          output << node.text.encode('utf-8')
+        else
+          output << Entities.encode(node.text).encode('utf-8')
+        end
+      end
+    end
+  end
+end

data/lib/natsukantou/deep_l.rb

@@ -47,6 +47,8 @@ module Natsukantou
 
       env[:dom] = dom(result)
 
+      env[:dom].lang = env[:lang_to].code
+
       @app.call(env)
     end
   end

data/lib/natsukantou/minhon.rb

@@ -54,6 +54,8 @@ module Natsukantou
         env[:dom] = dom(translated_xml)
       end
 
+      env[:dom].lang = env[:lang_to].code
+
       @app.call(env)
     end
 

data/lib/natsukantou/setup/config_load_or_prompt.rb

@@ -20,6 +20,8 @@ module Natsukantou
 
           Kernel.eval(config_content)
         end
+
+        NatsukantouTranslator
       end
     end
   end

data/lib/natsukantou/utility/env.rb

@@ -14,7 +14,10 @@ module Natsukantou
     def initialize(env)
       # Convert languages
       [:lang_from, :lang_to].each do |key|
-        env[key] = LanguageCode.new(env.fetch(key))
+        lang = env.fetch(key)
+        next if lang.is_a?(LanguageCode)
+
+        env[key] = LanguageCode.new(lang)
       end
 
       # Required keys

data/lib/natsukantou/utility/language_code.rb

@@ -7,14 +7,16 @@ module Natsukantou
       @main, @sub = @code.split('-')
 
       if @main.length != 2
-        raise 'Language code shoul be in the form of xx or xx-yy'
+        raise 'Language code should be in the form of xx or xx-yy'
       end
     end
 
     attr_reader :code, :main, :sub
 
-    def is?(other_code)
-      other = self.class.new(other_code)
+    def is?(other)
+      if !other.is_a?(self.class)
+        other = self.class.new(other)
+      end
 
       return false if other.main != main
 

data/lib/natsukantou/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Natsukantou
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/natsukantou.rb

@@ -3,8 +3,9 @@
 require 'logger'
 require 'middleware'
 require_relative "monkey_patch/builder"
-require_relative "monkey_patch/runner"
 require 'oga'
+require_relative "monkey_patch/oga_document"
+require_relative "monkey_patch/runner"
 
 require_relative "natsukantou/version"
 require_relative "natsukantou/setup/registry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natsukantou
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - lulalala
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleware
@@ -125,6 +125,7 @@ files:
 - Rakefile
 - exe/natsukantou
 - lib/monkey_patch/builder.rb
+- lib/monkey_patch/oga_document.rb
 - lib/monkey_patch/runner.rb
 - lib/natsukantou.rb
 - lib/natsukantou/deep_l.rb
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: human language translation library for XML documents