russian_inflect 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c307716037dd2adeaa77a714c95ad9cea3809c2f
-  data.tar.gz: 159838d9e8a3eda32cf893e6c93fcd08e98c95c3
+  metadata.gz: 5381c2481facf07752dd9021d46a529f59c0c948
+  data.tar.gz: 145b237507fcf48233128505432a5d606b24478e
 SHA512:
-  metadata.gz: de84706386e7b118efe2a232aa8106134e898239e459f6edd5e40077cc6ba6c0638e71b807a501958ce110be08ea6fdb27fc85e1c67703d2bbc0bc63012944b8
-  data.tar.gz: c8d982b06b4934cba1c46131473401ae3e6ada5791b63ebe755ff141ed7fe8c09f1b71eb373d461c303481b7951c0d69b0f20a04b3572db785d1f3bec5d3d475
+  metadata.gz: 652c3c75efa74eae5cf7fadeeb070aaa019d788c5f31cffefb25cddfa0489c3f3954262fa50edb48d4e71ac3df76df09de6b0494bf4cc1bebc5eefc80c5661ad
+  data.tar.gz: 8d6bfbc904c7f181775a15bfc2af9d27178fb19f9e61cb865097370663fdbf31a30d3d622b6dd65abdef584203ae8b242dba966d2948fa74c121e3d3f7ce430f

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc

data/README.md

@@ -20,15 +20,26 @@ Or install it yourself as:
 
 ## Usage
 
-    RussianInflect.inflect("Хорошая погода", :nominative)     # Хорошая погода
-    RussianInflect.inflect("Хорошая погода", :genitive)       # Хорошей погоды
-    RussianInflect.inflect("Хорошая погода", :dative)         # Хорошей погоде
-    RussianInflect.inflect("Хорошая погода", :accusative)     # Хорошую погоду
-    RussianInflect.inflect("Хорошая погода", :instrumental)   # Хорошей погодой
-    RussianInflect.inflect("Хорошая погода", :prepositional)  # Хорошей погоде
+```ruby
+RussianInflect.inflect("Хорошая погода", :nominative)     # => Хорошая погода
+RussianInflect.inflect("Хорошая погода", :genitive)       # => Хорошей погоды
+RussianInflect.inflect("Хорошая погода", :dative)         # => Хорошей погоде
+RussianInflect.inflect("Хорошая погода", :accusative)     # => Хорошую погоду
+RussianInflect.inflect("Хорошая погода", :instrumental)   # => Хорошей погодой
+RussianInflect.inflect("Хорошая погода", :prepositional)  # => Хорошей погоде
+```
+
+или
+
+```ruby
+words = RussianInflect.new("Хорошая погода")
+words.to_case :genitive     # => Хорошей погоды
+words.to_case :dative       # => Хорошей погоде
+# etc...
+```
 
 ## Помощь гему
 * Нужны тесты для всяких окончаний, исключений и т.п.   
   Дополнять их просто: в [spec/lib/russian_inflect_spec.rb](/estum/russian_inflect/blob/master/spec/lib/russian_inflect_spec.rb) нужно добавить пример словосочетания и правильные результаты склонения по аналогии с уже добавленными примерами.
-* Правила склонения пока далеки от идеала и тоже ждут своего Розенталя. Они похожи на правила из гема [petrovich](https://github.com/rocsci/petrovich) и находятся в [lib/russian_inflect/rules.yml](/estum/russian_inflect/blob/master/lib/russian_inflect/rules.yml).
-* Как видите, ридми тоже не мешало бы переписать.
+* Правила склонения пока далеки от идеала и тоже ждут своего Розенталя. Они похожи на правила из гема [petrovich](https://github.com/rocsci/petrovich) и находятся в [lib/russian_inflect/rules.yml](/lib/russian_inflect/rules.yml).
+* Как видите, ридми тоже не мешало бы переписать.

data/lib/russian_inflect.rb

@@ -1,70 +1,78 @@
-# encoding: UTF-8
-
 require 'yaml'
 require 'unicode_utils'
-require 'active_support'
-require 'active_support/core_ext'
 require 'russian_inflect/rules'
 require "russian_inflect/version"
 
 class RussianInflect
-  CASES = [:nominative, :genitive, :dative, :accusative, :instrumental, :prepositional]
-  GROUPS = [nil, :first, :second, :third]
-  
   NOMINATIVE      = :nominative    # именительный
   GENITIVE        = :genitive      # родительный
   DATIVE          = :dative        # дательный
   ACCUSATIVE      = :accusative    # винительный
   INSTRUMENTAL    = :instrumental  # творительный
   PREPOSITIONAL   = :prepositional # предложный
-  
+
+  CASES = [NOMINATIVE, GENITIVE, DATIVE, ACCUSATIVE, INSTRUMENTAL, PREPOSITIONAL]
+  GROUPS = [nil, :first, :second, :third]
+
   attr_accessor :source, :words, :noun, :case_group
-  
-  def initialize(source, options = {})
+
+  def initialize(source, options = nil)
+    options ||= {}
+
     @source = source
-    @words = source.split
+    @words  = source.split
+
     @noun = case options[:noun]
             when String then options[:noun]
             when Fixnum then @words[options[:noun]]
-            else @words[0]
+            else @words.detect { |w| self.class.detect_type(w) == :noun }
             end
-    group = options[:group].presence || self.class.detect_case_group(@noun)
+    group = options.fetch(:group) { self.class.detect_case_group(@noun) }
     @case_group = GROUPS[group]
   end
-  
-  def to_case(gcase)
+
+  def to_case(gcase, force_downcase: false)
     after_prepositions = false
+
     inflected_words = words.map do |word|
-      result = word
       unless after_prepositions
-        if word.in?(RULES['prepositions'])
+        downcased = UnicodeUtils.downcase(word)
+        if Rules.prepositions.include?(downcased)
           after_prepositions = true
         else
-          result = Rules.new(case_group).inflect(word, gcase)
+          result = Rules[case_group].inflect(downcased, gcase)
+          word = if force_downcase
+            result
+          else
+            len = downcased.each_char.take_while.with_index { |x, n| x == result[n] }.size
+            word[0, len] << result[len..-1]
+          end
         end
       end
-      result
+
+      word
     end
+
     inflected_words.join(' ')
   end
-  
+
   def self.inflect(text, gcase)
-    self.new(text).to_case(gcase)
+    new(text).to_case(gcase)
   end
-  
+
   def self.detect_case_group(noun)
     case noun
     when /(а|я|и)$/i then 1
     when /(о|е|ы)$/i then 2
-    when /(мя|ь)$/i then 3
-    else 2
+    when /(мя|ь)$/i  then 3
+                     else 2
     end
   end
-  
+
   def self.detect_type(word)
     case word
     when /(ая|яя|ые|ие|ый|ой|[^р]ий|ое|ее)$/i then :adjective
-    else :noun
+                                              else :noun
     end
   end
 end

data/lib/russian_inflect/rules.rb

@@ -1,93 +1,111 @@
-# encoding: UTF-8
-
 class RussianInflect
-  RULES = YAML.load_file(File.expand_path 'rules.yml', File.dirname(__FILE__))
-  
-  class UnknownCaseException < Exception;;end
-  class UnknownRuleException < Exception;;end
+  UnknownError = Class.new(StandardError)
 
-  # Набор методов для нахождения и применения правил к имени, фамилии и отчеству.
-  class Rules
-    def initialize(args)
-      @group = args
+  class UnknownCaseException < UnknownError
+    def initialize(gcase)
+      super "Unknown grammatical case: `#{gcase}'."
     end
-    
-    def inflect(word, gcase)
-      type = RussianInflect.detect_type(word)
-      find_and_apply(word, gcase, RussianInflect::RULES["#{@group.to_s}_group"][type.to_s])
+  end
+
+  class UnknownRuleException < UnknownError
+    def initialize(name)
+      super "Can't find rule for `#{name}'."
     end
-    
-    protected
+  end
 
-    def match?(name, rule, match_whole_word)
-      name = UnicodeUtils.downcase(name)
-      rule['test'].each do |chars|
-        test = match_whole_word ? name : name.slice([name.size - chars.size, 0].max .. -1)        
-        return true if test == chars
+  Rules = Struct.new(:group, :rules)
+
+  # Набор методов для нахождения и применения правил к имени, фамилии и отчеству.
+  class Rules
+    class << self
+      def prepositions
+        @prepositions ||= []
       end
 
-      false
-    end
+      def dictionary
+        @dictionary ||= {}
+      end
 
-    # Применить правило
-    def apply(name, gcase, rule)
-      modificator_for(gcase, rule).each_char do |char|
-        case char
-        when '.'
-        when '-'
-          name = name.slice(0, name.size - 1)
-        else
-          name += char
+      def [](group)
+        dictionary.fetch(group)
+      end
+
+      def load_dictionary(hash)
+        @prepositions = Array(hash[:prepositions])
+        hash[:rules].each do |group, rules|
+          dictionary[group] = new(group, rules)
         end
       end
+    end
 
-      name
+    load_dictionary YAML.load_file(File.expand_path('../rules.yml', __FILE__))
+
+    def inflect(word, gcase)
+      type = RussianInflect.detect_type(word)
+      find_and_apply(word, gcase, type)
     end
 
+    protected
+
     # Найти правило и применить к имени с учетом склонения
-    def find_and_apply(name, gcase, rules)
-      rule = find_for(name, rules)
-      apply(name, gcase, rule)
+    def find_and_apply(name, gcase, type)
+      apply(name, gcase, find_for(name, type))
     rescue UnknownRuleException
-      # Если не найдено правило для имени, возвращаем неизмененное имя.
       name
     end
 
     # Найти подходящее правило в исключениях или суффиксах
-    def find_for(name, rules)
-      # Сначала пытаемся найти исключения
-      if rules.has_key?('exceptions')
-        p = find(name, rules['exceptions'], true)
-        return p if p
+    def find_for(name, type)
+      if scoped_rules = rules[type][:exceptions]
+        ex = find(name, scoped_rules, true)
+        return ex if ex
+      else
+        scoped_rules = rules[type][:suffixes]
       end
 
-      # Не получилось, ищем в суффиксах. Если не получилось найти и в них,
-      # возвращаем неизмененное имя.
-      find(name, rules['suffixes'], false) or raise UnknownRuleException, "Cannot find rule for #{name}"
+      find(name, scoped_rules) || fail(UnknownRuleException, name)
+    end
+
+    def find(name, scoped_rules, match_whole_word = false)
+      scoped_rules.detect { |rule| match?(name, rule, match_whole_word) }
+    end
+
+    # Проверить правило
+    def match?(word, rule, match_whole_word = false)
+      # word = UnicodeUtils.downcase(word)
+
+      rule[:test].any? do |chars|
+        test = match_whole_word ? word : word.slice([word.length - chars.length, 0].max .. -1)
+        test == chars
+      end
     end
 
-    # Найти подходящее правило в конкретном списке правил
-    def find(name, rules, match_whole_word)
-      rules.find { |rule| match?(name, rule, match_whole_word) }
+    # Применить правило
+    def apply(word, gcase, rule)
+      modificator = modificator_for(gcase, rule)
+      result = word.dup
+
+      modificator.each_char do |char|
+        case char
+        when '.'
+        when '-' then result.slice!(-1)
+                 else result << char
+        end
+      end
+
+      result
     end
 
     # Получить модификатор из указанного правиля для указанного склонения
     def modificator_for(gcase, rule)
       case gcase.to_sym
-      when NOMINATIVE
-        '.'
-      when GENITIVE
-        rule['mods'][0]
-      when DATIVE
-        rule['mods'][1]
-      when ACCUSATIVE
-        rule['mods'][2]
-      when INSTRUMENTAL
-        rule['mods'][3]
-      when PREPOSITIONAL
-        rule['mods'][4]
-      else
-        raise UnknownCaseException, "Unknown grammatic case: #{gcase}"
+      when NOMINATIVE    then '.'
+      when GENITIVE      then rule[:mods][0]
+      when DATIVE        then rule[:mods][1]
+      when ACCUSATIVE    then rule[:mods][2]
+      when INSTRUMENTAL  then rule[:mods][3]
+      when PREPOSITIONAL then rule[:mods][4]
+                         else fail UnknownCaseException, gcase
       end
     end
   end

data/lib/russian_inflect/rules.yml

@@ -1,85 +1,86 @@
-prepositions: [в, без, до, из, к, на, по, о, от, перед, при, через, у, за, над, об, под, про, для, с, со, без]
+:prepositions: [в, без, до, из, к, на, по, о, от, перед, при, через, у, за, над, об, под, про, для, с, со, без]
 
-first_group:
-  adjective:
-    suffixes:
-      - 
-        test: [шая]
-        mods: [--ей, --ей, --ую, --ей, --ей]
-      - 
-        test: [ая]
-        mods: [--ой, --ой, --ую, --ой, --ой]
-      - 
-        test: [яя]
-        mods: [--ей, --ей, --юю, --ей, --ей]
-      - 
-        test: [ые, ие]
-        mods: [-х, -м, ., -ми, -х]
-  noun:
-    suffixes:
-      - 
-        test: [га, ка, ха, ча, ша, ща]
-        mods: [-и, -е, -у, -ой, -е]
-      - 
-        test: [ба, ва, да, жа, за, ла, ма, на, па, ра, са, та, фа, ца]
-        mods: [-ы, -е, -у, -ой, -е]
-      - 
-        test: [я]
-        mods: [-и, -е, -ю, -ей, -е]
-      - 
-        test: [и]
-        mods: [--ок, -ам, ., -ами, -ах]
+:rules:
+  :first:
+    :adjective:
+      :suffixes:
+        -
+          :test: [шая]
+          :mods: [--ей, --ей, --ую, --ей, --ей]
+        -
+          :test: [ая]
+          :mods: [--ой, --ой, --ую, --ой, --ой]
+        -
+          :test: [яя]
+          :mods: [--ей, --ей, --юю, --ей, --ей]
+        -
+          :test: [ые, ие]
+          :mods: [-х, -м, ., -ми, -х]
+    :noun:
+      :suffixes:
+        -
+          :test: [га, ка, ха, ча, ша, ща]
+          :mods: [-и, -е, -у, -ой, -е]
+        -
+          :test: [ба, ва, да, жа, за, ла, ма, на, па, ра, са, та, фа, ца]
+          :mods: [-ы, -е, -у, -ой, -е]
+        -
+          :test: [я]
+          :mods: [-и, -е, -ю, -ей, -е]
+        -
+          :test: [и]
+          :mods: [--ок, -ам, ., -ами, -ах]
 
-second_group:
-  adjective:
-    suffixes:
-      -
-        test: [шое, шый, шой]
-        mods: [--ого, --ому, ., --им, --ом]
-      -
-        test: [ое, ый, ой]
-        mods: [--ого, --ому, ., --ым, --ом]
-      -
-        test: [ее, ий]
-        mods: [--его, --ему, ., --им, --ем]
-  noun:
-    suffixes:
-      -
-        test: [б, в, г, д, ж, з, к, л, м, н, п, р, с, т, ф, х, ц, ч, щ]
-        mods: [а, у, ., ом, е]
-      - 
-        test: [ш]
-        mods: [а, у, ., ем, е]
-      -
-        test: [о]
-        mods: [-а, -у, ., м, -е]
-      -
-        test: [е]
-        mods: [-я, -ю, ., м, .]
-      -
-        test: [ы]
-        mods: [-ов, -ам, ., -ами, -ах]
-      -
-        test: [ий]
-        mods: [-я, -ю, ., -ем, -и]
+  :second:
+    :adjective:
+      :suffixes:
+        -
+          :test: [шое, шый, шой]
+          :mods: [--ого, --ому, ., --им, --ом]
+        -
+          :test: [ое, ый, ой]
+          :mods: [--ого, --ому, ., --ым, --ом]
+        -
+          :test: [ее, ий]
+          :mods: [--его, --ему, ., --им, --ем]
+    :noun:
+      :suffixes:
+        -
+          :test: [б, в, г, д, ж, з, к, л, м, н, п, р, с, т, ф, х, ц, ч, щ]
+          :mods: [а, у, ., ом, е]
+        -
+          :test: [ш]
+          :mods: [а, у, ., ем, е]
+        -
+          :test: [о]
+          :mods: [-а, -у, ., м, -е]
+        -
+          :test: [е]
+          :mods: [-я, -ю, ., м, .]
+        -
+          :test: [ы]
+          :mods: [-ов, -ам, ., -ами, -ах]
+        -
+          :test: [ий]
+          :mods: [-я, -ю, ., -ем, -и]
 
-third_group:
-  adjective:
-    suffixes:
-      - 
-        test: [ая]
-        mods: [--ой, --ой, --ую, --ой, --ой]
-      - 
-        test: [яя]
-        mods: [--ей, --ей, --юю, --ей, --ей]
-      - 
-        test: [ые, ие]
-        mods: [-х, -м, ., -ми, -х]
-  noun:
-    suffixes:
-      - 
-        test: [ь]
-        mods: [-и, -и, ., -ью, -и]
-      - 
-        test: [мя]
-        mods: [-ени, --ени, ., -енем, -ени]
+  :third:
+    :adjective:
+      :suffixes:
+        -
+          :test: [ая]
+          :mods: [--ой, --ой, --ую, --ой, --ой]
+        -
+          :test: [яя]
+          :mods: [--ей, --ей, --юю, --ей, --ей]
+        -
+          :test: [ые, ие]
+          :mods: [-х, -м, ., -ми, -х]
+    :noun:
+      :suffixes:
+        -
+          :test: [ь]
+          :mods: [-и, -и, ., -ью, -и]
+        -
+          :test: [мя]
+          :mods: [-ени, --ени, ., -енем, -ени]

data/lib/russian_inflect/version.rb

@@ -1,3 +1,3 @@
 class RussianInflect
-  VERSION = "0.0.4"
+  VERSION = "1.0.0"
 end

data/russian_inflect.gemspec

@@ -1,7 +1,6 @@
-# encoding: UTF-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'russian_inflect/version'
 
 Gem::Specification.new do |spec|
@@ -19,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 3.0.0"
-  spec.add_dependency "unicode_utils", "~> 1.4"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency "unicode_utils", ">= 1.4"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/spec/spec_helper.rb

@@ -4,11 +4,11 @@ class RussianInflect
   def self.each_case(&block)
     CASES.each_with_index &block
   end
-  
+
   def test_each_case(*answers)
     puts ''
     RussianInflect.each_case do |c, index|
-      result = self.to_case(c)
+      result = to_case(c)
       puts %{RussianInflect.inflect("#{source}", :#{c})   # #{result}}
       result.should == answers[index]
     end

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: russian_inflect
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Tõnis Simo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Склонение по падежам заголовков на русском языке
@@ -87,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Склоняет заданный заголовок по падежам