jelegante 1.1.0 → 1.2.0

data/Gemfile

@@ -10,5 +10,5 @@ group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  # gem "rcov", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/jelegante.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jelegante"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpm11"]
-  s.date = "2011-10-17"
+  s.date = "2012-09-18"
   s.description = "Guess whether text is japanese or not heuristically."
   s.email = "lpm11r@gmail.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/lpm11/jelegante"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Guess whether text is japanese or not heuristically."
 
   if s.respond_to? :specification_version then
@@ -44,20 +44,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<unicode-block>, [">= 1.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<unicode-block>, [">= 1.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/jelegante.rb

@@ -174,6 +174,8 @@ class Jelegante
     撹 攪 麹 麴 鹸 鹼 噛 嚙 繍 繡 蒋 蔣 醤 醬 曽 曾 掻 搔 痩 瘦 祷 禱 屏 屛 并
     幷 桝 枡 麺 麵 沪 濾 芦 蘆 蝋 蠟 弯 彎
   ].sort();
+  
+  POPULAR_KANJI_LIST = (JYOUYOU_KANJI_LIST + JINMEI_KANJI_LIST + HYOUGAI_KANJI_LIST).sort();
 
   HIRAGANA_PROP       = "\\p{Hiragana}";
   KATAKANA_PROP       = "\\p{Katakana}";
@@ -181,7 +183,7 @@ class Jelegante
   JYOUYOU_PROP        = "#{JYOUYOU_KANJI_LIST.join('')}";
   JINMEI_PROP         = "#{JINMEI_KANJI_LIST.join('')}";
   HYOUGAI_PROP        = "#{HYOUGAI_KANJI_LIST.join('')}";
-  POPULAR_KANJI_PROP  = "#{JYOUYOU_PROP}#{JINMEI_PROP}#{HYOUGAI_PROP}"
+  POPULAR_KANJI_PROP  = "#{POPULAR_KANJI_LIST.join('')}"
 
   HIRAGANA_REGEX            = /\p{Hiragana}/;
   KATAKANA_REGEX            = /\p{Katakana}/;
@@ -209,7 +211,11 @@ class Jelegante
   #  ・漢字を含むが、常用漢字・人名漢字・表外漢字以外の漢字を含まない
   def self.japanese?(text)
     return true if (self.include_hiragana?(text) || self.include_katakana?(text));
-    return true if (text.gsub(NO_KANJI_REGEX,"") =~ /^[#{POPULAR_KANJI_PROP}]+$/);
-    return false;
+
+    # return true if (text.gsub(NO_KANJI_REGEX,"") =~ /^[#{POPULAR_KANJI_PROP}]+$/);
+    kanjis = text.gsub(NO_KANJI_REGEX,"");
+    return false if (kanjis.empty?);
+    kanjis.each_char { |c| return false if (!POPULAR_KANJI_LIST.include?(c)); }
+    return true;
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jelegante
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - lpm11
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: unicode-block
@@ -56,17 +56,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
 description: Guess whether text is japanese or not heuristically.
 email: lpm11r@gmail.com
 executables: []
@@ -102,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 127203842517963343
+      hash: 1722093530685843826
       segments: 
       - 0
       version: "0"
@@ -115,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Guess whether text is japanese or not heuristically.