zidian 0.1.1 → 0.2.0

data/README.mkd

@@ -19,6 +19,10 @@ Examples of use
     Zidian.find("文") # returns all the words that contain "文"
 
     Zidian.find([653,34]) # returns the 2 words corresponding to the given ids
+    
+    Zidian.find("wei2 cheng2") # returns the words corresponding to the given pinyin with tones
+    
+    Zidian.find("wei cheng") # returns the words corresponding to the given pinyin without tones
  
 Author:   Bastien Vaucher
 Version:  0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/zidian.rb

@@ -17,8 +17,9 @@ module Zidian
   protected
   
   def self.find_word(word) #:nodoc:
+    words = word.split.map{|w| "#{w}[1-4]?"}.join(" ")
     # adding the -i option allows to search independently from the case, but it makes it very slow
-    `less #{File.dirname(__FILE__)}/cedict_ts.u8 | grep -n '[/\s]#{word.gsub(/\s/,"\s")}[/\s]'`
+    `less #{File.dirname(__FILE__)}/cedict_ts.u8 | grep -n -E '(^|[^a-zA-Z])#{words}($|[^a-zA-Z])'`
   end
   
   def self.get_line(line_number) #:nodoc:

data/test/test_zidian.rb

@@ -29,6 +29,16 @@ class TestZidian < Test::Unit::TestCase
     assert_equal("guai3", words.last.pinyin)
   end
   
+  def test_find_word_from_pinyin
+    words = Zidian.find("wei cheng")
+    assert_equal("围城", words.first.simplified)
+  end
+  
+  def test_find_word_from_pinyin_marked
+    words = Zidian.find("wei2 cheng2")
+    assert_equal("siege", words.first.english.first)
+  end
+  
   def test_raise_when_invalid_input_type
     assert_raise(Zidian::InvalFindInputException) do
       Zidian.find(:shanghai)

data/zidian.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zidian}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bastien Vaucher"]
-  s.date = %q{2010-04-04}
+  s.date = %q{2010-04-10}
   s.description = %q{Chinese dictionary using the CEDICT word list}
   s.email = %q{bastien.vaucher@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bastien Vaucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +02:00
+date: 2010-04-10 00:00:00 +02:00
 default_executable: 
 dependencies: []