eiwa 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da2b15cfd1217fc66c9cb8a33bfba25c04661b8da5566b25141b0c1817c014b
-  data.tar.gz: 2d9e4b4d9628e2a1d65c513662428947121309e7e383b922638633913fef0da9
+  metadata.gz: 9ffd9fbaca6f1c1217db4749eb9561e251906647dc28bf6ddb3fb964cfe2049b
+  data.tar.gz: f3e71e3dc6203a90de235644f7c8d7f6bf9e47f648186f4031ed43d7e401107c
 SHA512:
-  metadata.gz: 7434fdf07b21cd01088eae89b024c77e1ffc99d7377186ad833b4ff6ca68eac25123cc0b2139a01101acae4a367ad40daa4700770d5de2ed13eedf55ca873483
-  data.tar.gz: df9dc920677758fc3d9186205d3a623205c2ab481030e9a2966fe33a5113d14774f46ff31d3e0e72f28c909e6a9942742bd7fd6ba0f4298794a35e98f558da92
+  metadata.gz: bfda1b2ba7c5b970960c5b9ac90e48502e41b0db4c9ec14197ccc39a0c68bebabcfacc80340b84b1dfe9bbcf015c3cd41c50d06804ff9ce43bfbb75029f8425b
+  data.tar.gz: 7c0220401a9314f73bb01f0546c32848e5e1352237f9791ca3068d0eb1c9b6d55680ba86915bf5c824b2dc1686161380c56939efcb9efbb8a7ae913fd6ba813a

data/.standard.yml

@@ -1 +1 @@
-ruby_version: 3.0
+ruby_version: 3.2

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# 0.2.1
+
+* Require Nokogiri 1.19.4 or newer to incorporate current security fixes
+* Require Ruby 3.2 or newer, matching Nokogiri's supported Ruby versions
+* Support Ruby's future frozen string literal default
+
+# 0.2.0
+
+* Upgrade nokogiri and improve entity decoding - [@flavorjones](https://github.com/flavorjones) [#11](https://github.com/searls/eiwa/pull/11)
+
+# 0.1.2
+
+The time before this had a changelog.

data/Gemfile.lock

@@ -1,64 +1,72 @@
 PATH
   remote: .
   specs:
-    eiwa (0.1.2)
-      nokogiri (= 1.14.5)
+    eiwa (0.2.1)
+      nokogiri (>= 1.19.4, < 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    json (2.7.1)
+    json (2.21.1)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
     m (1.6.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
-    method_source (1.0.0)
-    mini_portile2 (2.8.5)
-    minitest (5.22.2)
-    nokogiri (1.14.5)
-      mini_portile2 (~> 2.8.0)
+    method_source (1.1.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.4)
+    nokogiri (1.19.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    nokogiri (1.19.4-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.4-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.4-x86_64-linux-gnu)
+      racc (~> 1.4)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rubocop (1.62.1)
+    rake (13.2.1)
+    regexp_parser (2.9.3)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-performance (1.20.2)
+    rubocop-ast (1.36.2)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    standard (1.34.0)
+    standard (1.42.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.60)
+      rubocop (~> 1.68.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.3)
+      standard-performance (~> 1.5)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.3.1)
+    standard-performance (1.5.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.20.2)
-    unicode-display_width (2.5.0)
+      rubocop-performance (~> 1.22.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   aarch64-linux
@@ -76,4 +84,4 @@ DEPENDENCIES
   standard
 
 BUNDLED WITH
-   2.5.4
+   2.5.23

data/eiwa.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Parses the JMDict Japanese-English dictionary"
   spec.homepage = "https://github.com/searls/eiwa"
   spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|tmp)/}) }
@@ -19,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "1.14.5"
+  spec.add_dependency "nokogiri", ">= 1.19.4", "< 2"
 end

data/lib/eiwa/jmdict/doc.rb

@@ -53,6 +53,10 @@ module Eiwa
         @current.add_characters(s)
       end
 
+      def reference(name, content)
+        @current.set_entity(name, content)
+      end
+
       # def comment string
       #   puts "comment #{string}"
       # end
@@ -62,15 +66,7 @@ module Eiwa
       # end
 
       def error(msg)
-        if (matches = msg.match(/Entity '(\S+)' not defined/))
-          # See: http://github.com/sparklemotion/nokogiri/issues/1926
-          code = matches[1]
-          @current.set_entity(code, ENTITIES[code])
-        elsif msg == "Detected an entity reference loop\n"
-          # Do nothing and hope this does not matter.
-        else
-          raise Eiwa::Error.new("Parsing error: #{msg}")
-        end
+        raise Eiwa::Error.new("Parsing error: #{msg}")
       end
 
       # def cdata_block string

data/lib/eiwa/jmdict/entities.rb

@@ -13,7 +13,7 @@ module Eiwa
       "adj-ku" => "`ku' adjective (archaic)",
       "adj-na" => "adjectival nouns or quasi-adjectives (keiyodoshi)",
       "adj-nari" => "archaic/formal form of na-adjective",
-      "adj-no" => "nouns which may take the genitive case particle `no'",
+      "adj-no" => "nouns which may take the genitive case particle 'no'",
       "adj-pn" => "pre-noun adjectival (rentaishi)",
       "adj-shiku" => "`shiku' adjective (archaic)",
       "adj-t" => "`taru' adjective",
@@ -34,7 +34,7 @@ module Eiwa
       "chem" => "chemistry term",
       "chn" => "children's language",
       "col" => "colloquialism",
-      "comp" => "computer terminology",
+      "comp" => "computing",
       "conj" => "conjunction",
       "cop" => "copula",
       "cop-da" => "copula",
@@ -101,6 +101,7 @@ module Eiwa
       "quote" => "quotation",
       "rare" => "rare",
       "rkb" => "Ryuukyuu-ben",
+      "rK" => "rarely used kanji form",
       "sens" => "sensitive",
       "shogi" => "shogi term",
       "sl" => "slang",

data/lib/eiwa/tag/any.rb

@@ -10,7 +10,7 @@ module Eiwa
       end
 
       def add_characters(s)
-        @characters ||= ""
+        @characters ||= +""
         @characters << s.chomp
       end
 

data/lib/eiwa/version.rb

@@ -1,3 +1,3 @@
 module Eiwa
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,30 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: eiwa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Justin Searls
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.5
+        version: 1.19.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.19.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.14.5
-description:
+        version: '2'
 email:
 - searls@gmail.com
 executables: []
@@ -34,6 +38,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".standard.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -69,7 +74,6 @@ homepage: https://github.com/searls/eiwa
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,15 +81,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Parses the JMDict Japanese-English dictionary
 test_files: []