russian 0.0.7 → 0.0.8

data/README.textile

@@ -182,6 +182,19 @@ Russian.p(3.14, "вещь", "вещи", "вещей", "вещи") # послед
 
 -- упрощенная (без использования хешей I18n) плюрализация для русского языка
 
+<pre><code>
+Russian::transliterate
+Russian::translit
+
+Russian.translit("рубин")
+=> "rubin"
+Russian.translit("Hallo Юлику Тарханову")
+=> "Hallo Yuliku Tarhanovu"
+</code></pre>
+
+-- транслитерация русских букв в строке.
+
+
 h2. Ruby on Rails
 
 h3. Переводы
@@ -218,7 +231,6 @@ ru-RU:
 <label for="user_name">Имя</label>
 </code></pre>
 
-
 h3. Валидация
 
 Обработка ошибок в ActiveRecord перегружается -- в Russian включен популярный плагин custom_error_message, с помощью которого можно переопределять стандартное отображение сообщений об ошибках. Так, например,
@@ -245,8 +257,32 @@ h3. Валидация
 
 _NB:_ в сообщениях валидации можно использовать такие макросы как @{{attribute}}@, @{{value}}@ -- подробнее см. документацию по I18n.
 
+h3. Параметризация строк
+
+Перегружается метод @parameterize@ инфлектора ActiveSupport (он же -- @String#parameterize@), теперь в нем идет транслитерация букв русского алфавита.
+
+Пример:
+
+<pre><code>
+class Person
+  def to_param
+    "#{id}-#{name.parameterize}"
+  end
+end
+
+@person = Person.find(1)
+# => #<Person id: 1, name: "Дональд Кнут">
+
+<%= link_to(@person.name, person_path %>
+# => <a href="/person/1-donald-knut">Дональд Кнут</a>
+</code></pre>
+
 h1. Автор
 
 Для сообщений об ошибках, обнаруженных неточностях и предложений:
 
 Ярослав Маркин ("yaroslav@markin.net":mailto:yaroslav@markin.net)
+
+Огромное спасибо:
+
+Юлику Тарханову (me@julik.nl) за "rutils":http://rutils.rubyforge.org/

data/Rakefile

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

data/TODO

@@ -12,3 +12,4 @@ Questionable
 * integration spec coverage for actionview locale
 * integration spec coverage for activerecord locale
 * integration spec coverage for activesupport locale
+* integration specs for rails hacks

data/lib/russian.rb

@@ -1,13 +1,13 @@
 $KCODE='u'
 
 $:.push File.join(File.dirname(__FILE__), 'russian')
+require 'transliteration'
 
 # I18n require
 unless defined?(I18n)
   $:.push File.join(File.dirname(__FILE__), 'vendor', 'i18n', 'lib')
   require 'i18n'
 end
-
 # Advanced backend
 require 'backend/advanced'
 
@@ -17,12 +17,13 @@ if defined?(ActionView::Helpers)
   require 'action_view_ext/helpers/date_helper' 
   require 'vendor/i18n_label/init'
 end
+require 'active_support_ext/parameterize' if defined?(ActiveSupport::Inflector)
 
 module Russian
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -81,6 +82,16 @@ module Russian
       I18n.backend.send(:pluralize, LOCALE, variants_hash, n)
     end
     alias :p :pluralize
+
+    # Transliteration for russian language
+    #
+    # Usage:
+    #  Russian.translit("рубин")
+    #  Russian.transliterate("рубин")
+    def transliterate(str)
+      Russian::Transliteration.transliterate(str)
+    end
+    alias :translit :transliterate
     
     protected
       # Returns all locale files shipped with library

data/lib/russian/active_support_ext/parameterize.rb

@@ -0,0 +1,24 @@
+module ActiveSupport
+  module Inflector
+    # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
+    #
+    # ==== Examples
+    #
+    # class Person
+    #   def to_param
+    #     "#{id}-#{name.parameterize}"
+    #   end
+    # end
+    #
+    # @person = Person.find(1)
+    # # => #<Person id: 1, name: "Дональд Кнут">
+    #
+    # <%= link_to(@person.name, person_path %>
+    # # => <a href="/person/1-donald-knut">Дональд Кнут</a>
+    def parameterize_with_russian(string, sep = '-')
+      parameterize_without_russian(Russian::transliterate(string), sep)
+    end
+    alias_method :parameterize_without_russian, :parameterize
+    alias_method :parameterize, :parameterize_with_russian
+  end
+end

data/lib/russian/transliteration.rb

@@ -0,0 +1,54 @@
+module Russian
+  # Russian transliteration 
+  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","ъ"=>"'",
+       "ы"=>"yi","ь"=>"","э"=>"e","ю"=>"yu","я"=>"ya"
+    }.freeze
+  
+    UPPER = {
+      "Ґ"=>"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","Ъ"=>"'","Ы"=>"YI","Ь"=>"",
+       "Э"=>"E","Ю"=>"YU","Я"=>"YA",
+    }.freeze
+
+    # Transliterate a string with russian characters
+    def transliterate(str)
+      chars = str.split(//)    
+    
+      result = ""
+
+      chars.each_with_index do |char, index|
+        if UPPER.has_key?(char) && LOWER.has_key?(chars[index+1])
+          # combined case
+          result << UPPER[char].downcase.capitalize
+        elsif UPPER.has_key?(char)
+          result << UPPER[char]
+        elsif LOWER.has_key?(char)
+          result << LOWER[char]
+        else
+          result << char
+        end
+      end
+
+      return result
+    end
+  end
+end

data/spec/transliteration_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Russian do
+  describe "transliteration" do
+    def t(str)
+      Russian::transliterate(str)
+    end
+
+    %w(transliterate translit).each do |method|
+      it "#{method} method should perform transliteration" do
+        str = mock(:str)
+        Russian::Transliteration.should_receive(:transliterate).with(str)
+        Russian.send(method, str)
+      end
+    end
+
+    # These tests are from rutils, <http://rutils.rubyforge.org>.
+    
+    it "should transliterate properly" do
+      t("Это просто некий текст").should == "Eto prosto nekiy tekst"
+      t("щ").should == "sch"
+      t("стансы").should == "stansyi"
+      t("упущение").should == "upuschenie"
+      t("ш").should == "sh"
+      t("Ш").should == "SH"
+      t("ц").should == "ts"
+    end
+    
+    it "should properly transliterate mixed russian-english strings" do
+      t("Это кусок строки русских букв v peremeshku s latinizey i амперсандом (pozor!) & something").should == 
+        "Eto kusok stroki russkih bukv v peremeshku s latinizey i ampersandom (pozor!) & something"      
+    end
+    
+    it "should properly transliterate mixed case chars in a string" do
+      t("НЕВЕРОЯТНОЕ УПУЩЕНИЕ").should == "NEVEROYATNOE UPUSCHENIE"
+      t("Невероятное Упущение").should == "Neveroyatnoe Upuschenie"
+      t("Шерстяной Заяц").should == "Sherstyanoy Zayats"
+      t("Н.П. Шерстяков").should == "N.P. Sherstyakov"
+      t("ШАРОВАРЫ").should == "SHAROVARYI"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: russian
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Yaroslav Markin
@@ -9,7 +9,7 @@ autorequire: russian
 bindir: bin
 cert_chain: []
 
-date: 2008-11-09 00:00:00 +03:00
+date: 2008-11-21 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,8 @@ files:
 - lib/russian/action_view_ext/helpers/date_helper.rb
 - lib/russian/active_record_ext
 - lib/russian/active_record_ext/custom_error_message.rb
+- lib/russian/active_support_ext
+- lib/russian/active_support_ext/parameterize.rb
 - lib/russian/backend
 - lib/russian/backend/advanced.rb
 - lib/russian/core_ext
@@ -44,6 +46,7 @@ files:
 - lib/russian/locale/activesupport.yml
 - lib/russian/locale/datetime.yml
 - lib/russian/locale/pluralize.rb
+- lib/russian/transliteration.rb
 - lib/russian.rb
 - lib/vendor
 - lib/vendor/i18n
@@ -86,6 +89,7 @@ files:
 - spec/locale_spec.rb
 - spec/russian_spec.rb
 - spec/spec_helper.rb
+- spec/transliteration_spec.rb
 has_rdoc: true
 homepage: http://github.com/yaroslav/russian/
 post_install_message: