jedict 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2d3ccd5333f78b5caca6e7d3b73abee141e79a
-  data.tar.gz: 6ace75ccb126b0e6e7b90476c635726f6e26d832
+  metadata.gz: 7fa2481254a6a05fb482d77d9bc88817649488d7
+  data.tar.gz: d35c0fdc8ce2b5aac5c92096abb4adb40fee2780
 SHA512:
-  metadata.gz: d980a64a4143a5b849f5abc3871afc8151affa3d17ae1d482ef65b8a54b9624d62b95f9118a3d328908858d2adee8220bebdd15400e00e02985b2e72cb881628
-  data.tar.gz: 24df4af66e5e5cbc80f3d4e12e0e11ce067248bfed82548313f9a5bd9978c33e626b18e9811ddfd79d695a738c09c2735abcdb92b6fb5429e05e3b47543f7356
+  metadata.gz: 094391c021ade59ddcdc82600980453d582049653072259f66c6704a30446285a7c0bc1a0380a71da44c0f1f167f163844246cd9e99b092e80b2155e687c2f00
+  data.tar.gz: fb2ef060835a71b8b9ecf956e52cdab7019751387dcd96015dcfde25c28788b536877348846f385ca20a775262db3a3537a93e9b141f5a09b0b9bedf14bd8826

data/lib/jedict.rb

@@ -19,140 +19,193 @@ require "nokogiri"
 
 module JEDICT 
 
-	def self.instanciate_from filename, eager_load
-		raise "Invalid path #{filename}" unless FileTest.exist? filename
-		DictionaryProxy.new(filename, eager_load)
-	end
-
-	def self.[] filename, eager_load = false
-		instanciate_from filename, eager_load
-	end
-
-	def self.new eager_load = false
-		instanciate_from File.join(__dir__, '../assets/jedict'), eager_load
-	end
-
-	class DictionaryProxy 
-
-		def method_missing sym, *args, &blck
-			return @dic.send(sym, *args, &blck) if @dic && @dic.respond_to?(sym)
-			super
-		end
-
-		def initialize filename, eager_load
-			@filename = filename 
-			@dic = eager_load ? JEDICT::load_file(filename) : nil
-		end
-
-		def count 
-			@count ||= (@dic && @dic.length) || JEDICT::load_file(@filename, Parser::Count.new)
-		end
-
-		def each_entry &blck
-			raise "Block expected" unless blck
-			JEDICT::load_file @filename, Parser::Entry.new(blck)
-		end
-
-	end
-
-	def self.load_file filename, parser = Parser::Full.new
-		Nokogiri::XML::SAX::Parser.new(parser).parse(File.open(filename))
-		parser.value
-	end
-
-	def self.format_node n, pre = ""
-		if n.is_a? Array
-			n.reduce("") do |s, e| 
-				s + pre + format_node(e, pre + "  ") 
-			end
-		elsif n.is_a? Hash
-			n.to_a.reduce("") do |s, e|
-				key, value = *e
-				s + "\n" + pre + ((key == :value) ? "" : key.to_s  + ": ") + format_node(value, pre + "  ")
-			end
-		else 
-			n.to_s
-		end
-	end
-
-	module NodePrinting
-		def to_s
-			JEDICT::format_node(self).strip
-		end
-	end
-		
-
-	module  Parser
-
-		class Entry < Nokogiri::XML::SAX::Document
-			attr_accessor :callback, :parents, :position
-
-			def initialize prc
-				@callback = prc
-				@parents = []
-				@position = {} 
-			end
-
-			def start_element(name, attrs)
-				return if name == "JMdict"
-				name = name.to_sym
-				pos = position[name]
-				if !pos
-					self.position[name] = {}
-				elsif pos.is_a? Array 
-					position[name] << {}
-				else
-					self.position[name] = [pos, {}]
-				end
-				self.parents << position
-				self.position = position[name]
-				self.position = position[-1] if position.is_a? Array
-				self.position[:attrs] = attrs.flatten if attrs.flatten.length > 0
-			end
-
-			def characters(string)
-				string.gsub!(/[\n]/, "")
-				string.strip!
-				position[:value] = string unless string == ""
-			end
-
-			def end_element(name)
-				self.position = parents.pop
-				if name == "entry"
-					position[:entry].extend NodePrinting
-					callback.call(position[:entry])
-					self.position = {}
-					self.parents = []
-				end
-			end
-
-			def value
-				nil
-			end
-
-		end
-
-		class Full < Entry 
-			attr_accessor :value
-			def initialize
-				@value = []
-				super(proc { |e| value << e })
-			end
-		end
-
-		class Count < Nokogiri::XML::SAX::Document
-			attr_accessor :value
-
-			def initialize 
-				@value = 0
-			end
-
-			def start_element(name, attrs)
-				@value += 1 if name == "entry"
-			end
-		end
-		
-	end
+  def self.instanciate_from filename, eager_load
+    raise "Invalid path #{filename}" unless FileTest.exist? filename
+    DictionaryProxy.new(filename, eager_load)
+  end
+
+  def self.[] filename, eager_load = false
+    instanciate_from filename, eager_load
+  end
+
+  def self.new file: File.join(__dir__, '../assets/jedict'), eager: false
+    instanciate_from file, eager
+  end
+
+  class DictionaryProxy 
+
+    def method_missing sym, *args, &blck
+      return @dic.send(sym, *args, &blck) if @dic && @dic.respond_to?(sym)
+      super
+    end
+
+    def initialize filename, eager_load
+      @filename = filename 
+      @dic = eager_load ? JEDICT::load_file(filename) : nil
+    end
+
+    def count 
+      @count ||= (@dic && @dic.length) || JEDICT::load_file(@filename, Parser::Count.new)
+    end
+
+    def each_entry &blck
+      raise "Block expected" unless blck
+      JEDICT::load_file @filename, Parser::Entry.new(blck)
+    end
+
+  end
+
+  def self.load_file filename, parser = Parser::Full.new
+    Nokogiri::XML::SAX::Parser.new(parser).parse(File.open(filename))
+    parser.value
+  end
+
+  def self.format_node n, pre = ""
+    if n.is_a? Array
+      n.reduce("") do |s, e| 
+        s + pre + format_node(e, pre + "  ") 
+      end
+    elsif n.is_a? Hash
+      n.to_a.reduce("") do |s, e|
+        key, value = *e
+        s + "\n" + pre + ((key == :value) ? "" : key.to_s  + ": ") + format_node(value, pre + "  ")
+      end
+    else 
+      n.to_s
+    end
+  end
+
+  module NodeExtention
+    PATHS = {
+      meaning: [:sense, :gloss, :value],
+      kanji_representation: [:k_ele, :keb, :value],
+      reading_representation: [:r_ele, :reb, :value],
+      kanji_priority: [:k_ele, :ke_pri, :value],
+      reading_priority: [:r_ele, :re_pri, :value],
+      kanji_information: [:k_ele, :ke_inf, :value],
+      reading_information: [:r_ele, :re_inf, :value],
+      sense_information: [:sense, :s_inf, :value],
+      gramatical_position: [:sense, :pos, :value],
+      lexical_field: [:sense, :field, :value],
+      dialect: [:sense, :dial, :value],
+#      primary_meaning: [:sense, :gloss, :pri, :value], # In the documentation but doesn't actually appear in the dictionnary at the time of writing (2017/12/17)
+    }
+    def to_s
+      JEDICT::format_node(self).strip
+    end
+
+    def self.elements_at node, path, *args
+      if args.length == 0
+        if node.is_a? Hash
+          [node[path]].flatten.compact
+        elsif node.is_a? Array
+          node.map { |e| e[path] }.flatten.compact
+        else
+          [node]
+        end
+      else
+        if node.is_a? Array
+          node.map { |e| elements_at e[path], *args }.flatten.compact
+        elsif node.is_a? Hash
+          elements_at(node[path], *args).flatten.compact
+        else
+          []
+        end
+      end
+    end
+
+    PATHS.each do |key, path|
+      define_method key do
+        NodeExtention::elements_at self, *path
+      end
+
+      define_method "#{key}?" do |param|
+        send(key).include?(param)
+      end
+
+      define_method "#{key}_is_one_of?" do |array|
+        (send(key) - array).length > 0
+      end
+
+      define_method "#{key}_matches?" do |regex|
+        send(key).reduce(false) { |acc, r| acc or r.match(regex) }
+      end
+    end
+
+  end
+
+
+  module  Parser
+
+    class Entry < Nokogiri::XML::SAX::Document
+      attr_accessor :callback, :parents, :position
+
+      def initialize prc
+        @callback = prc
+        @parents = []
+        @position = {} 
+      end
+
+      def start_element(name, attrs)
+        return if name == "JMdict"
+        name = name.to_sym
+        pos = position[name]
+        if !pos
+          self.position[name] = {}
+        elsif pos.is_a? Array 
+          position[name] << {}
+        else
+          self.position[name] = [pos, {}]
+        end
+        self.parents << position
+        self.position = position[name]
+        self.position = position[-1] if position.is_a? Array
+        self.position[:attrs] = attrs.flatten if attrs.flatten.length > 0
+      end
+
+      def characters(string)
+        string.gsub!(/[\n]/, "")
+        string.strip!
+        position[:value] = string unless string == ""
+      end
+
+      def end_element(name)
+        self.position = parents.pop
+        if name == "entry"
+          position[:entry].extend NodeExtention
+          callback.call(position[:entry])
+          self.position = {}
+          self.parents = []
+        end
+      end
+
+      def value
+        nil
+      end
+
+    end
+
+    class Full < Entry 
+      attr_accessor :value
+      def initialize
+        @value = []
+        super(proc { |e| value << e })
+      end
+    end
+
+    class Count < Nokogiri::XML::SAX::Document
+      attr_accessor :value
+
+      def initialize 
+        @value = 0
+      end
+
+      def start_element(name, attrs)
+        @value += 1 if name == "entry"
+      end
+    end
+
+  end
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jedict
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Sylvain Leclercq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.8'
 description: Parse the JEDICT and run search operations on the fly or load the entire
   dictionary in memory
 email: maisbiensurqueoui@gmail.com
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: JEDICT custom parser