zidian 0.2.0 → 0.3.0

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+group :development do
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.2"
+  gem "ruby-debug",   :platforms => [:ruby_18, :mri_18]
+  gem 'ruby-debug19',   :platforms => [:ruby_19, :mri_19]
+end

data/Gemfile.lock

@@ -0,0 +1,40 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.4)
+    git (1.2.5)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    rake (0.9.2)
+    rbx-require-relative (0.0.5)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.6.2)
+  ruby-debug
+  ruby-debug19

data/Rakefile

@@ -1,30 +1,44 @@
-require 'rubygems'  
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 require 'rake/rdoctask'
   
-begin  
-  require 'jeweler'
+require 'jeweler'
   
-  Jeweler::Tasks.new do |gemspec|  
+Jeweler::Tasks.new do |gemspec|  
     gemspec.name = "zidian"  
     gemspec.summary = "Chinese dictionary"  
     gemspec.description = "Chinese dictionary using the CEDICT word list"  
     gemspec.email = "bastien.vaucher@gmail.com"  
     gemspec.homepage = "http://github.com/bastien/zidian"  
     gemspec.authors = ["Bastien Vaucher"]  
-  end 
-  Jeweler::GemcutterTasks.new
-rescue LoadError  
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
-end  
+end 
+Jeweler::GemcutterTasks.new 
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
 
 desc 'Generate documentation for the Zidian gem.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Zidian'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.mkd')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/zidian.rb

@@ -1,14 +1,14 @@
 module Zidian
   
   def self.find(expression)
-    $KCODE = 'UTF8'
+    $KCODE = 'UTF8' if RUBY_VERSION < "1.9.0"
     case expression.class.name
     when "Array"
       expression.collect{|e| find(e) }.flatten.uniq
     when "Integer", "Fixnum" then
       Word.new(get_line(expression), expression)
     when "String" then
-      find_word(expression).lines.to_a.collect{|line| Word.new(line) }
+      find_words(expression).collect{|raw_word| Word.new(raw_word) }
     else
       raise InvalFindInputException
     end
@@ -16,10 +16,11 @@ module Zidian
   
   protected
   
-  def self.find_word(word) #:nodoc:
+  def self.find_words(word, case_sensitive = false) #: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 -E '(^|[^a-zA-Z])#{words}($|[^a-zA-Z])'`
+    results = `less #{File.dirname(__FILE__)}/cedict_ts.u8 | grep -n -E#{ case_sensitive ? ' -i' : ''} '(^|[^a-zA-Z])#{words}($|[^a-zA-Z])'`
+    sort_lines(results.lines.to_a, words)
   end
   
   def self.get_line(line_number) #:nodoc:
@@ -27,6 +28,22 @@ module Zidian
     `sed -n '#{line_number}p' #{File.dirname(__FILE__)}/cedict_ts.u8`
   end
   
+  # Sorts the lines by similarity to the words
+  #
+  def self.sort_lines(lines, words)
+    lines.sort do |a, b|
+      line_similarity_to_words(a, words) <=> line_similarity_to_words(b, words)
+    end
+  end
+  
+  def self.line_similarity_to_words(line, words)
+    # words delimited by : ],:/[
+    # Very basic similarity determination
+    # we count how many characters before and after the word, the less characters the more similar the match is
+    match_data = line.match("(^|[,:\\\[\/,])([^\\\[\/,:]*)#{words}([^\\\]\\\[\/,]*)($|[,\\\]\\\[\/,])").to_a
+    match_data[2].strip.size + match_data[3].strip.size
+  end
+  
   class Word
     
     attr_reader :id, :traditional, :simplified, :pinyin, :english

data/test/helper.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+require "ruby-debug"
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'zidian'
+
+class Test::Unit::TestCase
+end

data/test/test_zidian.rb

@@ -1,5 +1,5 @@
-require "#{File.dirname(__FILE__)}/../lib/zidian"
-require "test/unit"
+# encoding: utf-8
+require "helper"
 
 class TestZidian < Test::Unit::TestCase
 
@@ -34,6 +34,11 @@ class TestZidian < Test::Unit::TestCase
     assert_equal("围城", words.first.simplified)
   end
   
+  def test_find_word_from_chinese
+    words = Zidian.find("围城")
+    assert_equal("wei2 cheng2", words.first.pinyin)
+  end
+  
   def test_find_word_from_pinyin_marked
     words = Zidian.find("wei2 cheng2")
     assert_equal("siege", words.first.english.first)

data/zidian.gemspec

@@ -1,48 +1,57 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{zidian}
-  s.version = "0.2.0"
+  s.version = "0.3.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-10}
+  s.date = %q{2011-08-03}
   s.description = %q{Chinese dictionary using the CEDICT word list}
   s.email = %q{bastien.vaucher@gmail.com}
   s.extra_rdoc_files = [
     "README.mkd"
   ]
   s.files = [
-    ".gitignore",
-     "Manifest",
-     "README.mkd",
-     "Rakefile",
-     "VERSION",
-     "lib/cedict_ts.u8",
-     "lib/zidian.rb",
-     "test/test_zidian.rb",
-     "zidian.gemspec"
+    "Gemfile",
+    "Gemfile.lock",
+    "Manifest",
+    "README.mkd",
+    "Rakefile",
+    "VERSION",
+    "lib/cedict_ts.u8",
+    "lib/zidian.rb",
+    "test/helper.rb",
+    "test/test_zidian.rb",
+    "zidian.gemspec"
   ]
   s.homepage = %q{http://github.com/bastien/zidian}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Chinese dictionary}
-  s.test_files = [
-    "test/test_zidian.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
     else
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
   else
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
   end
 end
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: zidian
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bastien Vaucher
@@ -14,10 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 +02:00
+date: 2011-08-03 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: Chinese dictionary using the CEDICT word list
 email: bastien.vaucher@gmail.com
 executables: []
@@ -27,13 +66,15 @@ extensions: []
 extra_rdoc_files: 
 - README.mkd
 files: 
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - Manifest
 - README.mkd
 - Rakefile
 - VERSION
 - lib/cedict_ts.u8
 - lib/zidian.rb
+- test/helper.rb
 - test/test_zidian.rb
 - zidian.gemspec
 has_rdoc: true
@@ -41,30 +82,31 @@ homepage: http://github.com/bastien/zidian
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4377275587190922647
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Chinese dictionary
-test_files: 
-- test/test_zidian.rb
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-pkg
-doc