eiwa 0.0.2 → 0.1.1

data/lib/eiwa/tag/cross_reference.rb

@@ -12,7 +12,7 @@ module Eiwa
       def end_self
         parts = @characters.split("・")
         @text = parts.first
-        @reading = parts[1..-1].find { |part| /[^0-9]/.match(part) }
+        @reading = parts[1..].find { |part| /[^0-9]/.match(part) }
         @sense_ordinal = parts.find { |part| /^[0-9]+$/.match(part) }&.to_i
       end
 
@@ -21,10 +21,10 @@ module Eiwa
           @reading == other.reading &&
           @sense_ordinal == other.sense_ordinal
       end
-      alias == eql?
+      alias_method :==, :eql?
 
       def hash
-        @text.hash + @reading.hash + @sense_ordinal.hash
+        [@text, @reading, @sense_ordinal].hash
       end
     end
   end

data/lib/eiwa/tag/definition.rb

@@ -35,10 +35,10 @@ module Eiwa
           @gender == other.gender &&
           @type == other.type
       end
-      alias == eql?
+      alias_method :==, :eql?
 
       def hash
-        @text.hash + @language.hash + @gender.hash + @type.hash
+        [@text, @language, @gender, @type].hash
       end
     end
   end

data/lib/eiwa/tag/entity.rb

@@ -1,5 +1,3 @@
-require_relative "any"
-
 module Eiwa
   module Tag
     class Entity < Any
@@ -19,10 +17,10 @@ module Eiwa
         @code == other.code &&
           @text == other.text
       end
-      alias == eql?
+      alias_method :==, :eql?
 
       def hash
-        @code.hash + @text.hash
+        [@code, @text].hash
       end
     end
   end

data/lib/eiwa/tag/entry.rb

@@ -1,5 +1,3 @@
-require_relative "any"
-
 module Eiwa
   module Tag
     class Entry < Any

data/lib/eiwa/tag/list.rb

@@ -0,0 +1,18 @@
+module Eiwa
+  module Tag
+    # For containers of lists or repeated elements
+    class List < Any
+      Item = Struct.new(:name, :attrs, :text, keyword_init: true)
+
+      attr_reader :items
+
+      def initialize
+        @items = []
+      end
+
+      def end_child(child)
+        @items << Item.new(name: child.tag_name, attrs: child.attrs, text: child.text)
+      end
+    end
+  end
+end

data/lib/eiwa/tag/meaning.rb

@@ -1,5 +1,3 @@
-require_relative "any"
-
 module Eiwa
   module Tag
     class Meaning < Any

data/lib/eiwa/tag/other.rb

@@ -1,9 +1,11 @@
-require_relative "any"
-
 module Eiwa
   module Tag
     class Other < Any
-      attr_reader :text
+      attr_reader :attrs
+
+      def text
+        @characters
+      end
     end
   end
 end

data/lib/eiwa/tag/reading.rb

@@ -1,5 +1,3 @@
-require_relative "any"
-
 module Eiwa
   module Tag
     class Reading < Any

data/lib/eiwa/tag/reading_meaning.rb

@@ -0,0 +1,11 @@
+module Eiwa
+  module Tag
+    class ReadingMeaning < Any
+      attr_reader :rmgroup
+
+      def end_child(child)
+        @rmgroup = child if child.tag_name == "rmgroup"
+      end
+    end
+  end
+end

data/lib/eiwa/tag/source_language.rb

@@ -23,10 +23,10 @@ module Eiwa
           @wasei == other.wasei &&
           @type == other.type
       end
-      alias == eql?
+      alias_method :==, :eql?
 
       def hash
-        @text.hash + @language.hash + @wasei.hash + @type.hash
+        [@text, @language, @wasei, @type].hash
       end
     end
   end

data/lib/eiwa/tag/spelling.rb

@@ -1,5 +1,3 @@
-require_relative "any"
-
 module Eiwa
   module Tag
     class Spelling < Any

data/lib/eiwa/version.rb

@@ -1,3 +1,3 @@
 module Eiwa
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/lib/eiwa.rb

@@ -1,15 +1,27 @@
 require "eiwa/version"
-require "eiwa/parses_jmdict_file"
+
+require "eiwa/tag/any"
+require "eiwa/tag/character"
+require "eiwa/tag/bag"
+require "eiwa/tag/list"
+require "eiwa/tag/reading_meaning"
+require "eiwa/tag/entry"
+require "eiwa/tag/spelling"
+require "eiwa/tag/reading"
+require "eiwa/tag/meaning"
+require "eiwa/tag/entity"
+require "eiwa/tag/cross_reference"
+require "eiwa/tag/antonym"
+require "eiwa/tag/source_language"
+require "eiwa/tag/definition"
+require "eiwa/tag/other"
+
+require "eiwa/parses_file"
 
 module Eiwa
   class Error < StandardError; end
 
   def self.parse_file(filename, type: :jmdict_e, &each_entry_block)
-    case type
-    when :jmdict_e
-      ParsesJmdictFile.new.call(filename, each_entry_block)
-    else
-      raise Eiwa::Error.new("Unknown file type: #{type}")
-    end
+    ParsesFile.new.call(filename, type, each_entry_block)
   end
 end

metadata

@@ -1,100 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: eiwa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Searls
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
+        version: 1.15.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: 1.15.5
+description:
 email:
 - searls@gmail.com
 executables: []
@@ -103,6 +33,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".standard.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -112,18 +43,23 @@ files:
 - bin/setup
 - eiwa.gemspec
 - lib/eiwa.rb
-- lib/eiwa/jmdict_doc.rb
-- lib/eiwa/jmdict_entities.rb
-- lib/eiwa/parses_jmdict_file.rb
+- lib/eiwa/jmdict/doc.rb
+- lib/eiwa/jmdict/entities.rb
+- lib/eiwa/kanjidic/doc.rb
+- lib/eiwa/parses_file.rb
 - lib/eiwa/tag/antonym.rb
 - lib/eiwa/tag/any.rb
+- lib/eiwa/tag/bag.rb
+- lib/eiwa/tag/character.rb
 - lib/eiwa/tag/cross_reference.rb
 - lib/eiwa/tag/definition.rb
 - lib/eiwa/tag/entity.rb
 - lib/eiwa/tag/entry.rb
+- lib/eiwa/tag/list.rb
 - lib/eiwa/tag/meaning.rb
 - lib/eiwa/tag/other.rb
 - lib/eiwa/tag/reading.rb
+- lib/eiwa/tag/reading_meaning.rb
 - lib/eiwa/tag/source_language.rb
 - lib/eiwa/tag/spelling.rb
 - lib/eiwa/version.rb
@@ -133,7 +69,7 @@ homepage: https://github.com/searls/eiwa
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.4
+signing_key:
 specification_version: 4
 summary: Parses the JMDict Japanese-English dictionary
 test_files: []

data/lib/eiwa/jmdict_doc.rb

@@ -1,93 +0,0 @@
-require_relative "tag/entry"
-require_relative "tag/spelling"
-require_relative "tag/reading"
-require_relative "tag/meaning"
-require_relative "tag/entity"
-require_relative "tag/cross_reference"
-require_relative "tag/antonym"
-require_relative "tag/source_language"
-require_relative "tag/definition"
-require_relative "tag/other"
-
-require_relative "jmdict_entities"
-
-module Eiwa
-  TAGS = {
-    "entry" => Tag::Entry,
-    "k_ele" => Tag::Spelling,
-    "r_ele" => Tag::Reading,
-    "sense" => Tag::Meaning,
-    "pos" => Tag::Entity,
-    "misc" => Tag::Entity,
-    "dial" => Tag::Entity,
-    "field" => Tag::Entity,
-    "ke_inf" => Tag::Entity,
-    "re_inf" => Tag::Entity,
-    "xref" => Tag::CrossReference,
-    "ant" => Tag::Antonym,
-    "lsource" => Tag::SourceLanguage,
-    "gloss" => Tag::Definition
-  }
-
-  class JmdictDoc < Nokogiri::XML::SAX::Document
-    def initialize(each_entry_block)
-      @each_entry_block = each_entry_block
-    end
-
-    def start_document
-    end
-
-    def end_document
-    end
-
-    def start_element(name, attrs)
-      parent = @current
-      @current = (TAGS[name] || Tag::Other).new
-      @current.start(name, attrs, parent)
-    end
-
-    def end_element(name)
-      raise Eiwa::Error.new("Parsing error. Expected <#{@current.tag_name}> to close before <#{name}>") if @current.tag_name != name
-      ending = @current
-      ending.end_self
-      if ending.is_a?(Tag::Entry)
-        @each_entry_block&.call(ending)
-      end
-
-      @current = ending.parent
-      @current&.end_child(ending)
-    end
-
-    def characters(s)
-      @current.add_characters(s)
-    end
-
-    # def comment string
-    #   puts "comment #{string}"
-    # end
-
-    # def warning string
-    #   puts "warning #{string}"
-    # 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, JMDICT_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
-    end
-
-    # def cdata_block string
-    #   puts "cdata_block #{string}"
-    # end
-
-    # def processing_instruction name, content
-    #   puts "processing_instruction #{name}, #{content}"
-    # end
-  end
-end

data/lib/eiwa/jmdict_entities.rb

@@ -1,178 +0,0 @@
-module Eiwa
-  JMDICT_ENTITIES = {
-    "Buddh" => "Buddhist term",
-    "MA" => "martial arts term",
-    "Shinto" => "Shinto term",
-    "X" => "rude or X-rated term (not displayed in educational software)",
-    "abbr" => "abbreviation",
-    "adj-f" => "noun or verb acting prenominally",
-    "adj-i" => "adjective (keiyoushi)",
-    "adj-ix" => "adjective (keiyoushi) - yoi/ii class",
-    "adj-kari" => "`kari' adjective (archaic)",
-    "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-pn" => "pre-noun adjectival (rentaishi)",
-    "adj-shiku" => "`shiku' adjective (archaic)",
-    "adj-t" => "`taru' adjective",
-    "adv" => "adverb (fukushi)",
-    "adv-to" => "adverb taking the `to' particle",
-    "anat" => "anatomical term",
-    "arch" => "archaism",
-    "archit" => "architecture term",
-    "astron" => "astronomy, etc. term",
-    "ateji" => "ateji (phonetic) reading",
-    "aux" => "auxiliary",
-    "aux-adj" => "auxiliary adjective",
-    "aux-v" => "auxiliary verb",
-    "baseb" => "baseball term",
-    "biol" => "biology term",
-    "bot" => "botany term",
-    "bus" => "business term",
-    "chem" => "chemistry term",
-    "chn" => "children's language",
-    "col" => "colloquialism",
-    "comp" => "computer terminology",
-    "conj" => "conjunction",
-    "cop" => "copula",
-    "cop-da" => "copula",
-    "ctr" => "counter",
-    "derog" => "derogatory",
-    "eK" => "exclusively kanji",
-    "econ" => "economics term",
-    "ek" => "exclusively kana",
-    "engr" => "engineering term",
-    "exp" => "expressions (phrases, clauses, etc.)",
-    "fam" => "familiar language",
-    "fem" => "female term or language",
-    "finc" => "finance term",
-    "food" => "food term",
-    "geol" => "geology, etc. term",
-    "geom" => "geometry term",
-    "gikun" => "gikun (meaning as reading) or jukujikun (special kanji reading)",
-    "hob" => "Hokkaido-ben",
-    "hon" => "honorific or respectful (sonkeigo) language",
-    "hum" => "humble (kenjougo) language",
-    "iK" => "word containing irregular kanji usage",
-    "id" => "idiomatic expression",
-    "ik" => "word containing irregular kana usage",
-    "int" => "interjection (kandoushi)",
-    "io" => "irregular okurigana usage",
-    "iv" => "irregular verb",
-    "joc" => "jocular, humorous term",
-    "ksb" => "Kansai-ben",
-    "ktb" => "Kantou-ben",
-    "kyb" => "Kyoto-ben",
-    "kyu" => "Kyuushuu-ben",
-    "law" => "law, etc. term",
-    "ling" => "linguistics terminology",
-    "m-sl" => "manga slang",
-    "mahj" => "mahjong term",
-    "male" => "male term or language",
-    "male-sl" => "male slang",
-    "math" => "mathematics",
-    "med" => "medicine, etc. term",
-    "mil" => "military",
-    "music" => "music term",
-    "n" => "noun (common) (futsuumeishi)",
-    "n-adv" => "adverbial noun (fukushitekimeishi)",
-    "n-pr" => "proper noun",
-    "n-pref" => "noun, used as a prefix",
-    "n-suf" => "noun, used as a suffix",
-    "n-t" => "noun (temporal) (jisoumeishi)",
-    "nab" => "Nagano-ben",
-    "num" => "numeric",
-    "oK" => "word containing out-dated kanji",
-    "obs" => "obsolete term",
-    "obsc" => "obscure term",
-    "oik" => "old or irregular kana form",
-    "ok" => "out-dated or obsolete kana usage",
-    "on-mim" => "onomatopoeic or mimetic word",
-    "osb" => "Osaka-ben",
-    "physics" => "physics terminology",
-    "pn" => "pronoun",
-    "poet" => "poetical term",
-    "pol" => "polite (teineigo) language",
-    "pref" => "prefix",
-    "proverb" => "proverb",
-    "prt" => "particle",
-    "quote" => "quotation",
-    "rare" => "rare",
-    "rkb" => "Ryuukyuu-ben",
-    "sens" => "sensitive",
-    "shogi" => "shogi term",
-    "sl" => "slang",
-    "sports" => "sports term",
-    "suf" => "suffix",
-    "sumo" => "sumo term",
-    "thb" => "Touhoku-ben",
-    "tsb" => "Tosa-ben",
-    "tsug" => "Tsugaru-ben",
-    "uK" => "word usually written using kanji alone",
-    "uk" => "word usually written using kana alone",
-    "unc" => "unclassified",
-    "v-unspec" => "verb unspecified",
-    "v1" => "Ichidan verb",
-    "v1-s" => "Ichidan verb - kureru special class",
-    "v2a-s" => "Nidan verb with 'u' ending (archaic)",
-    "v2b-k" => "Nidan verb (upper class) with `bu' ending (archaic)",
-    "v2b-s" => "Nidan verb (lower class) with `bu' ending (archaic)",
-    "v2d-k" => "Nidan verb (upper class) with `dzu' ending (archaic)",
-    "v2d-s" => "Nidan verb (lower class) with `dzu' ending (archaic)",
-    "v2g-k" => "Nidan verb (upper class) with `gu' ending (archaic)",
-    "v2g-s" => "Nidan verb (lower class) with `gu' ending (archaic)",
-    "v2h-k" => "Nidan verb (upper class) with `hu/fu' ending (archaic)",
-    "v2h-s" => "Nidan verb (lower class) with `hu/fu' ending (archaic)",
-    "v2k-k" => "Nidan verb (upper class) with `ku' ending (archaic)",
-    "v2k-s" => "Nidan verb (lower class) with `ku' ending (archaic)",
-    "v2m-k" => "Nidan verb (upper class) with `mu' ending (archaic)",
-    "v2m-s" => "Nidan verb (lower class) with `mu' ending (archaic)",
-    "v2n-s" => "Nidan verb (lower class) with `nu' ending (archaic)",
-    "v2r-k" => "Nidan verb (upper class) with `ru' ending (archaic)",
-    "v2r-s" => "Nidan verb (lower class) with `ru' ending (archaic)",
-    "v2s-s" => "Nidan verb (lower class) with `su' ending (archaic)",
-    "v2t-k" => "Nidan verb (upper class) with `tsu' ending (archaic)",
-    "v2t-s" => "Nidan verb (lower class) with `tsu' ending (archaic)",
-    "v2w-s" => "Nidan verb (lower class) with `u' ending and `we' conjugation (archaic)",
-    "v2y-k" => "Nidan verb (upper class) with `yu' ending (archaic)",
-    "v2y-s" => "Nidan verb (lower class) with `yu' ending (archaic)",
-    "v2z-s" => "Nidan verb (lower class) with `zu' ending (archaic)",
-    "v4b" => "Yodan verb with `bu' ending (archaic)",
-    "v4g" => "Yodan verb with `gu' ending (archaic)",
-    "v4h" => "Yodan verb with `hu/fu' ending (archaic)",
-    "v4k" => "Yodan verb with `ku' ending (archaic)",
-    "v4m" => "Yodan verb with `mu' ending (archaic)",
-    "v4n" => "Yodan verb with `nu' ending (archaic)",
-    "v4r" => "Yodan verb with `ru' ending (archaic)",
-    "v4s" => "Yodan verb with `su' ending (archaic)",
-    "v4t" => "Yodan verb with `tsu' ending (archaic)",
-    "v5aru" => "Godan verb - -aru special class",
-    "v5b" => "Godan verb with `bu' ending",
-    "v5g" => "Godan verb with `gu' ending",
-    "v5k" => "Godan verb with `ku' ending",
-    "v5k-s" => "Godan verb - Iku/Yuku special class",
-    "v5m" => "Godan verb with `mu' ending",
-    "v5n" => "Godan verb with `nu' ending",
-    "v5r" => "Godan verb with `ru' ending",
-    "v5r-i" => "Godan verb with `ru' ending (irregular verb)",
-    "v5s" => "Godan verb with `su' ending",
-    "v5t" => "Godan verb with `tsu' ending",
-    "v5u" => "Godan verb with `u' ending",
-    "v5u-s" => "Godan verb with `u' ending (special class)",
-    "v5uru" => "Godan verb - Uru old class verb (old form of Eru)",
-    "vi" => "intransitive verb",
-    "vk" => "Kuru verb - special class",
-    "vn" => "irregular nu verb",
-    "vr" => "irregular ru verb, plain form ends with -ri",
-    "vs" => "noun or participle which takes the aux. verb suru",
-    "vs-c" => "su verb - precursor to the modern suru",
-    "vs-i" => "suru verb - included",
-    "vs-s" => "suru verb - special class",
-    "vt" => "transitive verb",
-    "vulg" => "vulgar expression or word",
-    "vz" => "Ichidan verb - zuru verb (alternative form of -jiru verbs)",
-    "yoji" => "yojijukugo",
-    "zool" => "zoology term"
-  }
-end

data/lib/eiwa/parses_jmdict_file.rb

@@ -1,21 +0,0 @@
-require "nokogiri"
-require_relative "jmdict_doc"
-
-module Eiwa
-  class ParsesJmdictFile
-    def call(filename, each_entry_block)
-      if each_entry_block.nil?
-        entries = []
-        each_entry_block ||= ->(e) { entries << e }
-      end
-
-      JmdictDoc.new(each_entry_block).tap do |doc|
-        Nokogiri::XML::SAX::Parser.new(doc).parse_file(filename) do |ctx|
-          ctx.recovery = true
-        end
-      end
-
-      entries
-    end
-  end
-end