russian_word_forms 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 342af8888b394e9eb6f997faf378f7b6ff3e3845
-  data.tar.gz: a44afb323002b6705b985a71db4b2f3e8ff0e316
+  metadata.gz: ade7ff1c37d3f2c7285af4c39a9c103d30f36be1
+  data.tar.gz: 4aeb05584df63c15a3ea0ca5acf1aeb68d5bc5f0
 SHA512:
-  metadata.gz: 177c6eabe8c59b4721ca9b56a75eba54dadcc95171b11203bc30c0bdf58f950d6daa791eb43dd1cfc24f5b2b157ea8d3f72cacec7d0d60bca3e8fba0da6b7f5c
-  data.tar.gz: a04c04d564bde2fb6c88e167d364000950a500938484483e6f1673841c1d135ea4e373fe6a39b85bf71ff4710fde881b7d44356688c8b500cf1aafff845f34dc
+  metadata.gz: c7c688c887c7b153f62b975fd75b91086ce8bce9cafd9724202a8eb888c8aec2baf518349bfcc7e19b1a5c5b5ea2cf5f2868a3252b5602a0c9ed52b746113e2e
+  data.tar.gz: ef355f059533a935ae5e6c5f77ae1b645f5fe64361cc0152f5f0a6dbe10830416b2042db02409b7f8e660ddb94debc220e314172475d5243a120cd05b11077e1

data/lib/russian_word_forms.rb

@@ -1,76 +1,71 @@
 require "russian_word_forms/version"
 require 'russian_word_forms/dictionary'
 require 'russian_word_forms/rules'
+require "unicode"
+
 module RussianWordForms
-  @dictionary=Dictionary.new
-  @rules=Rules.new
-  
-  def self.inflect(word)    
-    word=word.mb_chars.upcase.to_s
-    flags=@dictionary.dictionary[word]
-    output=[]
-    output<<word if !flags.kind_of?(Array)
-    flags=@rules.rules.keys.join if flags.empty? # if not found in dictionary 
-    flags.each_char do |flag|
-      rules=@rules.rules[flag]
-      rules.keys.each do |rule|
-        rules[rule].each do |affix|
-          left,right=affix.split(",")          
-          if right
-            left=left[1..-1] if left[0]=='-'
-            right=right[1..-1] if right[0]=='-'
-            
-            output<<word.gsub(/(#{left})$/,right) if word.match(/(#{rule})$/)
-          else
 
-            output<<word+left if word.match(/(#{rule})$/)
-          end
+  @@dictionary=Dictionary.new
+  @@rules=Rules.new
+
 
+  def self.inflect(word)
+    word = Unicode::upcase(word)
+    flags = @@dictionary.get_flags word
+    output = []
+    if flags
+      flags.each_char do |flag|
+        rules_keys = @@rules.rules[flag]
+        rules_keys.each do |key,rules|
+          rules.each do |rule|
+            if rule.suffix
+              output << word.gsub(/(#{rule.normal_suffix})$/i,rule.suffix) if word.match(/(#{rule.rule})$/i)
+            else
+              output << word+rule.normal_suffix if word.match(/(#{rule.rule})$/i)
+            end
+
+          end
         end
-      end  
+      end
     end
     output.uniq
   end
   def self.get_base_form(word)
-    word=word.mb_chars.upcase.to_s
-    flags=@dictionary.dictionary[word]
-    variants=[]
-    variants<<word if !flags.kind_of?(Array)
-    @rules.rules.keys.each do |flag|
-      rules=@rules.rules[flag]
-      rules.keys.each do |rule|
-        rules[rule].each do |affix|
-          left,right=affix.split(",")          
-          if right
-            left=left[1..-1] if left[0]=='-'
-            right=right[1..-1] if right[0]=='-'
-            if word.match(/(#{right})$/)
-              tmp=word.gsub(/(#{right})$/,left)
-              variants<< tmp if tmp.match(/(#{rule})$/)
+    word = Unicode::upcase(word).to_s
+    flags = @@dictionary.dictionary[word]
+    variants = []
+    variants << word if flags
+    @@rules.rules.each do |flag,rules_keys|
+      rules_keys.each do |key,rules|
+        rules.each do |rule|
+          if rule.suffix && !rule.suffix.empty?
+            # puts "#{word} #{rule.suffix}"
+
+            if word.end_with? rule.suffix
+              tmp = word.gsub(rule.suffix,rule.normal_suffix)
+              # puts tmp
+              variants << tmp if tmp != word && tmp.match(/(#{rule.rule})$/i) && @@dictionary.get_flags(tmp)
             end
+
           else
-            if word.match(/(#{left})$/)
-              tmp=word.gsub(/(#{left})$/,"")
-              variants<<tmp if tmp.match(/(#{rule})$/)
+            if word.end_with?(rule.normal_suffix)
+              tmp = word.gsub(rule.normal_suffix,"")
+              variants << tmp if tmp != word && tmp.match(/(#{rule.rule})$/i) && @@dictionary.dictionary[tmp]
             end
           end
         end
       end
     end
-    output=[]
-    variants.each do |variant|
-      if !@dictionary.dictionary[variant].kind_of?(Array)&&self.inflect(variant).any? { |w| w==word }
-        output<<variant
-      end
-    end
-    return output.uniq
+
+
+    return variants.uniq
   end
-  
+
   def self.rules
-    @rules
+    @@rules
   end
-  
+
   def self.dictionary
-    @dictionary
+    @@dictionary
   end
 end

data/lib/russian_word_forms/dictionaries/russian.aff

@@ -16,8 +16,8 @@
 #	Affix table for Russian
 #
 
-nroffchars      ().\\*
-texchars        ()\[]{}<\>\\$*.%
+# nroffchars      ().\\*
+# texchars        ()\[]{}<\>\\$*.%
 
 # First we declare the character set.
 
@@ -69,7 +69,7 @@ texchars        ()\[]{}<\>\\$*.%
 
 #prefixes
 
-suffixes
+#suffixes
 
 flag *L:
 #

data/lib/russian_word_forms/dictionary.rb

@@ -1,35 +1,35 @@
-module RussianWordForms  
-  class Dictionary    
-    @@dictionary=Hash.new {|h,k| h[k]=[]}
+require "unicode"
+module RussianWordForms
+
+  class Dictionary
+
+    attr_accessor :dictionary
 
     def initialize
+      @dictionary = Hash.new
       load_dictionaries
-    end    
-    def load_dictionary(file)      
+    end
+
+    def load_dictionary(file)
       File.readlines(file).each do |line|
-        word=line.chomp.split('/')
-        word[0]=word[0].mb_chars.upcase.to_s
-        #
-        word[0].gsub!("Ё","Е")
-        if word.count>1            
-          @@dictionary[word[0]]=word[1]
-        else
-          @@dictionary[word[0]]=""
-        end
-      end                          
+        stem,flags = line.chomp.split('/')
+        stem = Unicode::upcase stem
+        stem.gsub!("Ё","Е")
+        @dictionary[stem]=flags
+      end
     end
 
-    def load_dictionaries            
-      files=Dir[File.dirname(__FILE__)+"/dictionaries/*.dic"]
-      files.each do |file|        
+    def load_dictionaries
+      files = Dir[File.dirname(__FILE__)+"/dictionaries/*.dic"]
+      files.each do |file|
         load_dictionary file
-      end      
+      end
     end
 
-    def dictionary
-      @@dictionary
+    def get_flags(word)
+      @dictionary[word]      
     end
-    
 
   end
-end
+
+end

data/lib/russian_word_forms/rules.rb

@@ -1,41 +1,49 @@
-module RussianWordForms  
-  class Rules    
-    @@rules=Hash.new {|h,k| h[k]=Hash.new {|h2,k2| h2[k2]=[]}}
+module RussianWordForms
+  class Rules
+    class Rule
+      attr_accessor :rule,:normal_suffix,:suffix
+      def initialize(rule,normal_suffix,suffix)
+        @rule = rule
+        @normal_suffix = normal_suffix
+        @suffix = suffix
+      end
+    end
+    attr_accessor :rules,:rules_without_flags
+
 
     def initialize
+      @rules = Hash.new {|h,k| h[k]=Hash.new {|h2,k2| h2[k2]=[]}}
+      @rules_without_flags = Hash.new {|h2,k2| h2[k2]=[]}
       load_rules
-    end    
-    def load_file(file)      
-      flag=""
+    end
+
+    def load_file(file)
+      flag = ""
       File.readlines(file).each do |line|
-        command=line.chomp.split('#')[0] # get rid of comments
-        
-        if command&&command!=""
-          command=command.split(" ")
-          if command.count==2 # 
-            case command[0]
-            when "flag"
-              flag=command[1][1..-2]              
-            end
-          elsif command.count>2 # command
-            rule=command.join.split(">")                        
-            @@rules[flag][rule[0]]<<rule[1]
-          end          
+        command,comments = line.chomp.split('#') # get rid of comments
+        if command && !command.empty?
+          if command.start_with? "flag"
+            flag = command[6..-2]
+          else
+            rule,suffixes = command.split.join.split(">")
+            normal_suffix,suffix = suffixes.split(",")
+            normal_suffix = normal_suffix[1..-1] if normal_suffix[0] == '-'
+            suffix=suffix[1..-1] if suffix && suffix[0] == '-'
+            @rules[flag][rule] << Rule.new(rule,normal_suffix,suffix)
+            @rules_without_flags[rule] << Rule.new(rule,normal_suffix,suffix)
+          end
         end
-      end                          
+      end
     end
 
-    def load_rules          
-      files=Dir[File.dirname(__FILE__)+"/dictionaries/*.aff"]
-      files.each do |file|        
+    def load_rules
+      files = Dir[File.dirname(__FILE__)+"/dictionaries/*.aff"]
+      files.each do |file|
         load_file file
-      end      
+      end
     end
 
-    def rules
-      @@rules
-    end
-    
+
 
   end
-end
+end

data/lib/russian_word_forms/version.rb

@@ -1,3 +1,3 @@
 module RussianWordForms
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/russian_word_forms.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "unicode"
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: russian_word_forms
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Maksatbek Mansurov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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: unicode
+  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: Gem detects wordforms. It uses russian ispell dictionary written by Alexander
@@ -46,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,17 +88,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.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gem detects wordforms