petrovich 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bdd0d35ffbd7b6455086828943281878f4b562a
-  data.tar.gz: 0ba6ed9248845aa1ca241f7ec84925397ffbef13
+  metadata.gz: 472235efdec99b791c56797b53fbbc8c8685a8f5
+  data.tar.gz: 84ebcaa80006b7939fdb426adda30dd3102ac22e
 SHA512:
-  metadata.gz: 5d743a612fdc52f4f3992fffe81e4ffe4867e93a971aaa05b8c1aacb15b332df6ba591379c25e368acfea5e547c503e31b9bae59f6d7a9202dd97dfc1dccac73
-  data.tar.gz: b254a76b0922ed3b752ca40cfe87a11ea25e0025133295c508617a45d67ba12549ce307b5cd63a9e7112991ce936813bcdee423cea72136d2383da68c7a0509a
+  metadata.gz: 1c32dd5188b1345645e6ab1bdc2f068176c609d42ec8fd802d48b41b914dac96059004f8a34ae612c186f5741fdd46d11d2899fe790cbae9aa1e5cc59c51f196
+  data.tar.gz: 7e3c8db37df8c7c8216b77a30ada9068a1dd4e1920924e4a763da27c765d5b3ae7300328933150ce59ce3d0f2ca49781ba3502794d09d351135155716408758d

data/README.md

@@ -50,7 +50,7 @@ p.middlename('Сергеевич', :dative) # => Сергеевичу
 
 Важно понимать, что явное указание пола повышает аккуратность обработки слов.
 Если пол неизвестен, однако известно отчество, то гем постарается
-определить по пол отчеству на основе простой эвристики.
+определить пол по отчеству на основе простой эвристики.
 
 ### Продвинутое использование
 

data/lib/petrovich.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 require 'yaml'
-require 'unicode_utils'
+require 'petrovich/unicode'
 require 'petrovich/rules'
 require 'petrovich/extension'
 
 # Склонение падежей русских имён фамилий и отчеств. Вы задаёте начальное имя в именительном падеже,
 # а получаете в нужном вам.
-# 
+#
 # Использование
-# 
+#
 #   # Склонение в дательном падеже
 #   rn = Petrovich.new
 #   puts rn.firstname('Иван', :dative)       # => Ивану
@@ -67,6 +67,8 @@ class Petrovich
   end
 
   class << self
+    include Petrovich::Unicode
+
     # Определение пола по отчеству
     #
     #   detect_gender('Алексеевич') # => male
@@ -76,7 +78,7 @@ class Petrovich
     #   detect_gender('блаблабла') # => androgynous
     #
     def detect_gender(midname)
-      case UnicodeUtils.downcase(midname[-2, 2])
+      case downcase(midname[-2, 2])
         when /ич|ыч/
           'male'
         when 'на'

data/lib/petrovich/rules.rb

@@ -10,6 +10,8 @@ class Petrovich
 
   # Набор методов для нахождения и применения правил к имени, фамилии и отчеству.
   class Rules
+    include Petrovich::Unicode
+
     attr_reader :gender
 
     Matchers = [
@@ -133,7 +135,7 @@ class Petrovich
 
     # Найти подходящее правило в конкретном списке правил
     def find(name, gcase, scase, rules, match_whole_word, tags)
-      name = UnicodeUtils.downcase(name)
+      name = downcase(name)
       first =
       rules.map do| rule |
         score = match?(name, gcase, scase, rule, match_whole_word, tags)

data/lib/petrovich/unicode.rb

@@ -0,0 +1,27 @@
+class Petrovich
+  module Unicode
+    RU_UPPER = [
+      "\u0410", "\u0411", "\u0412", "\u0413", "\u0414", "\u0415", "\u0416", "\u0417",
+      "\u0418", "\u0419", "\u041A", "\u041B", "\u041C", "\u041D", "\u041E", "\u041F",
+      "\u0420", "\u0421", "\u0422", "\u0423", "\u0424", "\u0425", "\u0426", "\u0427",
+      "\u0428", "\u0429", "\u042A", "\u042B", "\u042C", "\u042D", "\u042E", "\u042F",
+      "\u0401" # Ё
+    ].join
+
+    RU_LOWER = [
+      "\u0430", "\u0431", "\u0432", "\u0433", "\u0434", "\u0435", "\u0436", "\u0437",
+      "\u0438", "\u0439", "\u043A", "\u043B", "\u043C", "\u043D", "\u043E", "\u043F",
+      "\u0440", "\u0441", "\u0442", "\u0443", "\u0444", "\u0445", "\u0446", "\u0447",
+      "\u0448", "\u0449", "\u044A", "\u044B", "\u044C", "\u044D", "\u044E", "\u044F",
+      "\u0451" # Ё
+    ].join
+
+    def downcase(entry)
+      entry.to_s.tr(RU_UPPER, RU_LOWER)
+    end
+
+    def upcase(entry)
+      entry.to_s.tr(RU_LOWER, RU_UPPER)
+    end
+  end
+end

data/lib/tasks/evaluate.rake

@@ -1,6 +1,11 @@
 # encoding: utf-8
 
 require 'csv'
+require 'petrovich/unicode'
+
+class Object
+  include Petrovich::Unicode
+end
 
 CASES = [
   :nominative,
@@ -13,7 +18,7 @@ CASES = [
 
 def check!(errors, correct, total, lemma, gender, gcase, expected)
   inflector = Petrovich.new(gender)
-  inflection = UnicodeUtils.upcase(inflector.lastname(lemma, gcase))
+  inflection = upcase(inflector.lastname(lemma, gcase))
 
   total[[gender, gcase]] += 1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petrovich
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kozloff
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: unicode_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +40,7 @@ files:
 - lib/petrovich.rb
 - lib/petrovich/extension.rb
 - lib/petrovich/rules.rb
+- lib/petrovich/unicode.rb
 - lib/tasks/evaluate.rake
 - rules/rules.yml
 homepage: https://github.com/petrovich/petrovich-ruby
@@ -76,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Automatic inflection of Russian anthroponyms