kanjidic 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a84afcc6326773e3dce339b1a5e7308d6ff38c4
-  data.tar.gz: dfb53b89d2eefe510953ae9c3352239eb87b2e4a
+  metadata.gz: 8cb9fc88a4e195baca868cb39878d4c8691072ce
+  data.tar.gz: 5c070cc640d2f802662ad5dac854ded9f90717cd
 SHA512:
-  metadata.gz: 3abbfb813e3532e9c37aba8349ccf6c18369a3ead426b13e4e3f51e0570233b5ed4bf45a8171886c823b398dea72e1eced94d6c5aa5bde0b8d738a6a2cbf8686
-  data.tar.gz: ed7999d8710a4cebe97106c937812eaf9dca3f6b6ee925d73b9d4857ded86249f3c7141f3c971ebb4bdbe9827aeb302485f1ea0ff85dbff9e1d5c8423d1b7fb8
+  metadata.gz: 18763a461c35e4e02353ab06813eefe926767aeacf1bfbaafd7ecc40f4233fc6b6e784dd0b2eae67fa52bf55952c658acde4095e1f8dc19bb9f69c05a9a542bc
+  data.tar.gz: 8d229595ec660f8db02849bcaf379585fecc794aaf165d29ece4adfdf7a7ae7f19bcff1cb556fe2d1fb2c7201d1588c80b53fa0c78c4d4423e5eb31359110755

data/bin/kanjidic

@@ -5,13 +5,20 @@ require "optparse"
 require "irb"
 
 file_name = ARGV[0]
+unless file_name
+	$stderr.puts "Usage:\n\tkanjidic FILE [options]\n\tkanjidic FILE [options] -e {expression}"
+	exit
+end
+unless File.exist? file_name
+	$stderr.puts "No such file: #{file_name}"
+	exit
+end
 defaults = { file: file_name, jis: 0, ext_jis: [1, 2] }
-raise "No such file #{file_name}" unless File.exist? file_name
 options = {}
 
 OptionParser.new do |opts|
 
-	opts.banner = "Usage: \tkanjidic FILE [options]\n\t\t\tkanjidic FILE [options] -e {expression}"
+	opts.banner = "Usage:\n\tkanjidic FILE [options]\n\tkanjidic FILE [options] -e {expression}"
 
 	opts.on("-e EXPRESSION", "--expression EXPRESSION", "Run a Ruby expression inside the context of the dictionary") do |e|
 		options[:expression] = e

data/lib/kanjidic.rb

@@ -214,7 +214,7 @@ module Kanjidic
 	# Takes a boolean parameter to indicate whether the regexp should be constructed from
 	# scratches as opposed to retrieved from a cached value, false by default (returns the cache).
 	#
-	#The resulting regexp will return matches as follow:
+	# The resulting regexp will return matches as follow:
 	#
 	# 3 groups (code, sub code, value) if the element is code based,
 	#
@@ -283,8 +283,6 @@ module Kanjidic
 	end
 
 	# Alias for Kanjidic::all_symbols
-	#
-	# See Kanjidic::all_symbols
 	def self.symbols
 		all_symbols
 	end
@@ -301,7 +299,7 @@ module Kanjidic
 		}.to_h)
 	end
 
-	# Return a hash of all symboles not associated with a letter code
+	# Return a hash of all symboles not associated with a letter code.
 	#
 	# The values are the description strings
 	def self.uncoded_symbols
@@ -347,6 +345,22 @@ module Kanjidic
 		end
 	end
 
+
+	# Basic search tool matching any entry in the dictionary that matches the conditions 
+	# given in parameter
+	#
+	# Example: 
+	#   search pronunciation: "あ", jlpt: '1'
+	def self.search h = {}
+		raise "Load the dictionary before searching" unless @@dic
+		@@dic.select do |kanji| 
+			h.inject(true) do |acc, a|
+				key, value = a
+				acc && _include?(value, kanji[key])
+			end
+		end
+	end
+
 	# Insert values in a hash depending on the previous content of the hash
 	#
 	# Essentially a deep_merge implementation..
@@ -391,5 +405,24 @@ module Kanjidic
 		}
 		r ? " (#{r[:character]})" : ""
 	end
+
+	private_class_method def self._include? value, target
+		case target
+		when Hash
+			value.is_a?(Hash) ? 
+				(value.to_a.inject(true) { |acc, a|
+				k, v = a
+				acc && (target[k] == v)
+			}) : false
+		when Array
+			value.is_a?(Array) ? 
+				(value.inject(true) { |acc, e| 
+				acc && target.include?(e)
+			}) : target.include?(value)
+
+		else
+			value == target
+		end
+	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanjidic
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sylvain Leclercq