russian 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 0.2.5 - 23.12.2009
+
+* Added support for multi-char substrings in Russian.transliterate [Alex Fortuna]
+* Rails 2.3.5 error messages overloading compatibility (error messages overloading) (thanks Alex Eagle for bugreport)
+
+* Russian.transliterate: Теперь можно добавлять правила матчинга подстрок из нескольких символов ("Воробьёв", "Алябьев"). [Alex Fortuna]
+* Rails 2.3.5: совместимость для перегрузки сообщений об ошибках (багрепорт -- Александр Орел)
+
 === 0.2.4 - 12.11.2009
 
 * Revert nested validation errors patch

data/README.textile

@@ -155,6 +155,8 @@ Russian::strftime
 
 Russian::strftime(Time.now)
 => "Пн, 01 сент. 2008, 11:12:43 +0300"
+Russian::strftime(Time.now, "%d %B")
+>> "01 сентября"
 Russian::strftime(Time.now, "%B")
 => "Сентябрь"
 </code></pre>

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "russian"
-GEM_VERSION = "0.2.4"
+GEM_VERSION = "0.2.5"
 AUTHOR = "Yaroslav Markin"
 EMAIL = "yaroslav@markin.net"
 HOMEPAGE = "http://github.com/yaroslav/russian/"

data/lib/russian.rb

@@ -29,7 +29,7 @@ module Russian
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/russian/active_record_ext/custom_error_message.rb

@@ -1,56 +1,112 @@
 # -*- encoding: utf-8 -*- 
 
-if defined?(ActiveRecord::Error)
+if defined?(ActiveRecord::Error) # Rails 2.3.4+
   module ActiveRecord
     class Error
       protected
-        # Redefine the ActiveRecord::Error::generate_full_message method:
-        #  Returns all the full error messages in an array. 'Base' messages are handled as usual.
-        #  Non-base messages are prefixed with the attribute name as usual UNLESS they begin with '^'
-        #  in which case the attribute name is omitted.
-        #  E.g. validates_acceptance_of :accepted_terms, :message => '^Please accept the terms of service'
-        #
-        #
-        # Переопределяет метод ActiveRecord::Error::generate_full_message. Сообщения об ошибках для атрибутов
-        # теперь не имеют префикса с названием атрибута если в сообщении об ошибке первым символом указан "^".
-        #
-        # Так, например,
-        # 
-        #   validates_acceptance_of :accepted_terms, :message => 'нужно принять соглашение'
-        # 
-        # даст сообщение
-        # 
-        #   Accepted terms нужно принять соглашение
-        # 
-        # однако,
-        # 
-        #   validates_acceptance_of :accepted_terms, :message => '^Нужно принять соглашение'
-        # 
-        # даст сообщение
-        # 
-        #   Нужно принять соглашение
-        def generate_full_message(message, options = {})
-          options.reverse_merge! :message => self.message,
-                                 :model => @base.class.human_name,
-                                 :attribute => @base.class.human_attribute_name(attribute.to_s),
-                                 :value => value
+        if instance_methods.include?('default_options') # Rails 2.3.5+
+          # Redefine the ActiveRecord::Error::generate_full_message method:
+          #  Returns all the full error messages in an array. 'Base' messages are handled as usual.
+          #  Non-base messages are prefixed with the attribute name as usual UNLESS they begin with '^'
+          #  in which case the attribute name is omitted.
+          #  E.g. validates_acceptance_of :accepted_terms, :message => '^Please accept the terms of service'
+          #
+          #
+          # Переопределяет метод ActiveRecord::Error::generate_full_message. Сообщения об ошибках для атрибутов
+          # теперь не имеют префикса с названием атрибута если в сообщении об ошибке первым символом указан "^".
+          #
+          # Так, например,
+          # 
+          #   validates_acceptance_of :accepted_terms, :message => 'нужно принять соглашение'
+          # 
+          # даст сообщение
+          # 
+          #   Accepted terms нужно принять соглашение
+          # 
+          # однако,
+          # 
+          #   validates_acceptance_of :accepted_terms, :message => '^Нужно принять соглашение'
+          # 
+          # даст сообщение
+          # 
+          #   Нужно принять соглашение
+          def generate_full_message(options = {})
+            keys = [
+              :"full_messages.#{@message}",
+              :'full_messages.format',
+              '{{attribute}} {{message}}'
+            ]
+
+            if self.message.is_a?(String) && self.message =~ /^\^/
+              ActiveSupport::Deprecation.warn("Using '^' hack for ActiveRecord error messages has been deprecated. Please use errors.full_messages.format I18n key for formatting")
+
+              options[:full_message] = self.message[1..-1]
+
+              keys = [
+                :"full_messages.#{@message}",
+                '{{full_message}}'
+              ]
+            else
+              keys = [
+                :"full_messages.#{@message}",
+                :'full_messages.format',
+                '{{attribute}} {{message}}'
+              ]
+            end
+
+            options.merge!(:default => keys, :message => self.message)
+
+            I18n.translate(keys.shift, options)
+          end
+        else # Rails 2.3.4
+          # Redefine the ActiveRecord::Error::generate_full_message method:
+          #  Returns all the full error messages in an array. 'Base' messages are handled as usual.
+          #  Non-base messages are prefixed with the attribute name as usual UNLESS they begin with '^'
+          #  in which case the attribute name is omitted.
+          #  E.g. validates_acceptance_of :accepted_terms, :message => '^Please accept the terms of service'
+          #
+          #
+          # Переопределяет метод ActiveRecord::Error::generate_full_message. Сообщения об ошибках для атрибутов
+          # теперь не имеют префикса с названием атрибута если в сообщении об ошибке первым символом указан "^".
+          #
+          # Так, например,
+          # 
+          #   validates_acceptance_of :accepted_terms, :message => 'нужно принять соглашение'
+          # 
+          # даст сообщение
+          # 
+          #   Accepted terms нужно принять соглашение
+          # 
+          # однако,
+          # 
+          #   validates_acceptance_of :accepted_terms, :message => '^Нужно принять соглашение'
+          # 
+          # даст сообщение
+          # 
+          #   Нужно принять соглашение
+          def generate_full_message(message, options = {})
+            options.reverse_merge! :message => self.message,
+                                   :model => @base.class.human_name,
+                                   :attribute => @base.class.human_attribute_name(attribute.to_s),
+                                   :value => value
           
-          key = :"full_messages.#{@message}"
-          defaults = [:'full_messages.format', '{{attribute}} {{message}}']
+            key = :"full_messages.#{@message}"
+            defaults = [:'full_messages.format', '{{attribute}} {{message}}']
           
-          if options[:message].is_a?(String) && options[:message] =~ /^\^/
-            ActiveSupport::Deprecation.warn("Using '^' hack for ActiveRecord error messages has been deprecated. Please use errors.full_messages.format I18n key for formatting")
+            if options[:message].is_a?(String) && options[:message] =~ /^\^/
+              ActiveSupport::Deprecation.warn("Using '^' hack for ActiveRecord error messages has been deprecated. Please use errors.full_messages.format I18n key for formatting")
 
-            options[:full_message] = options[:message][1..-1]
-            defaults = [:"full_messages.#{@message}.format", '{{full_message}}']
-          end
+              options[:full_message] = options[:message][1..-1]
+              defaults = [:"full_messages.#{@message}.format", '{{full_message}}']
+            end
             
-          I18n.t(key, options.merge(:default => defaults, :scope => [:activerecord, :errors]))
+            I18n.t(key, options.merge(:default => defaults, :scope => [:activerecord, :errors]))
+          end
         end
     end
   end
 
-else
+else # Rails 2.3.3-
   module ActiveRecord
     class Errors
       # DEPRECATED as of Rails 2.3.4

data/lib/russian/transliteration.rb

@@ -6,39 +6,51 @@ module Russian
   # Транслитерация для букв русского алфавита
   module Transliteration
     extend self
-  
+
     # Transliteration heavily based on rutils gem by Julian "julik" Tarkhanov and Co.
     # <http://rutils.rubyforge.org/>
     # Cleaned up and optimized.
-  
-    LOWER = {
-       "і"=>"i","ґ"=>"g","ё"=>"yo","№"=>"#","є"=>"e",
-       "ї"=>"yi","а"=>"a","б"=>"b",
-       "в"=>"v","г"=>"g","д"=>"d","е"=>"e","ж"=>"zh",
-       "з"=>"z","и"=>"i","й"=>"y","к"=>"k","л"=>"l",
-       "м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r",
-       "с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h",
-       "ц"=>"ts","ч"=>"ch","ш"=>"sh","щ"=>"sch","ъ"=>"'",
-       "ы"=>"y","ь"=>"","э"=>"e","ю"=>"yu","я"=>"ya"
-    }.freeze
-  
-    UPPER = {
+
+    LOWER_SINGLE = {
+      "і"=>"i","ґ"=>"g","ё"=>"yo","№"=>"#","є"=>"e",
+      "ї"=>"yi","а"=>"a","б"=>"b",
+      "в"=>"v","г"=>"g","д"=>"d","е"=>"e","ж"=>"zh",
+      "з"=>"z","и"=>"i","й"=>"y","к"=>"k","л"=>"l",
+      "м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r",
+      "с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h",
+      "ц"=>"ts","ч"=>"ch","ш"=>"sh","щ"=>"sch","ъ"=>"'",
+      "ы"=>"y","ь"=>"","э"=>"e","ю"=>"yu","я"=>"ya",
+    }
+    LOWER_MULTI = {
+      "ье"=>"ie",
+      "ьё"=>"ie",
+    }
+
+    UPPER_SINGLE = {
       "Ґ"=>"G","Ё"=>"YO","Є"=>"E","Ї"=>"YI","І"=>"I",
       "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G",
-       "Д"=>"D","Е"=>"E","Ж"=>"ZH","З"=>"Z","И"=>"I",
-       "Й"=>"Y","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N",
-       "О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T",
-       "У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"TS","Ч"=>"CH",
-       "Ш"=>"SH","Щ"=>"SCH","Ъ"=>"'","Ы"=>"Y","Ь"=>"",
-       "Э"=>"E","Ю"=>"YU","Я"=>"YA",
-    }.freeze
+      "Д"=>"D","Е"=>"E","Ж"=>"ZH","З"=>"Z","И"=>"I",
+      "Й"=>"Y","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N",
+      "О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T",
+      "У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"TS","Ч"=>"CH",
+      "Ш"=>"SH","Щ"=>"SCH","Ъ"=>"'","Ы"=>"Y","Ь"=>"",
+      "Э"=>"E","Ю"=>"YU","Я"=>"YA",
+    }
+    UPPER_MULTI = {
+      "ЬЕ"=>"IE",
+      "ЬЁ"=>"IE",
+    }
+
+    LOWER = (LOWER_SINGLE.merge(LOWER_MULTI)).freeze
+    UPPER = (UPPER_SINGLE.merge(UPPER_MULTI)).freeze
+    MULTI_KEYS = (LOWER_MULTI.merge(UPPER_MULTI)).keys.sort_by {|s| s.length}.reverse.freeze
 
     # Transliterate a string with russian characters
     #
     # Возвращает строку, в которой все буквы русского алфавита заменены на похожую по звучанию латиницу
     def transliterate(str)
-      chars = str.split(//)    
-    
+      chars = str.scan(%r{#{MULTI_KEYS.join '|'}|\w|.})
+
       result = ""
 
       chars.each_with_index do |char, index|
@@ -54,7 +66,7 @@ module Russian
         end
       end
 
-      return result
+      result
     end
   end
 end

data/spec/transliteration_spec.rb

@@ -17,7 +17,7 @@ describe Russian do
     end
 
     # These tests are from rutils, <http://rutils.rubyforge.org>.
-    
+
     it "should transliterate properly" do
       t("Это просто некий текст").should == "Eto prosto nekiy tekst"
       t("щ").should == "sch"
@@ -40,5 +40,12 @@ describe Russian do
       t("Н.П. Шерстяков").should == "N.P. Sherstyakov"
       t("ШАРОВАРЫ").should == "SHAROVARY"
     end
+
+    it "should work for multi-char substrings" do
+      t("38 воробьёв").should == "38 vorobiev"
+      t("Вася Воробьёв").should == "Vasya Vorobiev"
+      t("Алябьев").should == "Alyabiev"
+      t("АЛЯБЬЕВ").should == "ALYABIEV"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: russian
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Yaroslav Markin
@@ -9,7 +9,7 @@ autorequire: russian
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 +03:00
+date: 2009-12-23 00:00:00 +03:00
 default_executable: 
 dependencies: []