translit 0.1.1 → 0.1.2

data/README.markdown

@@ -1,26 +1,23 @@
-## What is it / Что это ##
+## English ##
 
-It is a simple library allowing you to transliterate between cyrillic and latin.
-R: Это простая и элегантная программа позволит вам проводить транслитерацию между кирилицой и латиницой.
+It is a simple library allowing you to transliterate between cyrillic and latin. It is easy to use from the command line and in your code.
 
-It is easy to use from the command line and in your code.
-R: Ее легко использовать как в коммандной строке так и в вашем коде.
+Install it via: <code>gem install translit</code>
 
-Install it via:
-R: Устанавливается она просто:
-<code>gem install translit</code>
+### Usage ###
 
-## USAGE ##
+To use translit from the command line you just type <code>translit [your_input_here]</code> where your input could be in cyrillic or latin.
 
-To use translit from the command line you just type
-R: Для использовавания translit в командной строке просто напишите
-<code>translit [your_input_here]</code>
-where your input could be in cyrillic or latin
-R: где ваш текст может быть написан успользуя русскую клавиатуру либо латинскую
+Or you can translit stdin now via just: <code>translit</code>. To stop stdin input use .\n (press dot and then enter on the new line)
 
-Or you can translit stdin now via just:
-R: Либо вы можете просто вызвать программу и передавать текст в потоке чтения данных
-<code>translit</code>
+## Русский ##
 
-To stop stdin input use .\n (press dot and then enter on the new line)
-R: Чтобы прервать поток используется стандарная система .\n (напишите . и нажмите enter на чистой строке)
+Это простая и элегантная программа позволит вам проводить транслитерацию между кирилицой и латиницой. Ее легко использовать как в коммандной строке так и в вашем коде.
+
+Устанавливается она просто: <code>gem install translit</code>
+
+### Использование ###
+
+Для использования translit в командной строке просто напишите <code>translit [your_input_here]</code> где ваш текст может быть написан успользуя русскую клавиатуру либо латинскую
+
+Либо вы можете просто вызвать программу и передавать текст в потоке чтения данных <code>translit</code>. Чтобы прервать поток используется стандарная система .\n (напишите . и нажмите enter на чистой строке)

data/lib/translit.rb

@@ -1,21 +1,12 @@
 # coding: utf-8
 
 module Translit
-  def self.english
-    { "a"=>["А","а"], "b"=>["Б","б"], "v"=>["В","в"], "g"=>["Г","г"], "d"=>["Д","д"], "e"=>["Е","е"], "jo"=>["Ё","ё"], "yo"=>["Ё","ё"], "ö"=>["Ё","ё"], "zh"=>["Ж","ж"],
-      "z"=>["З","з"], "i"=>["И","и"], "j"=>["Й","й"], "k"=>["К","к"], "l"=>["Л","л"], "m"=>["М","м"], "n"=>["Н","н"], "o"=>["О","о"], "p"=>["П","п"], "r"=>["Р","р"],
-      "s"=>["С","с"], "t"=>["Т","т"], "u"=>["У","у"], "f"=>["Ф","ф"], "h"=>["Х","х"], "x"=>["Х","х"], "c"=>["Ц","ц"], "ch"=>["Ч","ч"], "sh"=>["Ш","ш"], "w"=>["Щ","щ"],
-      "shh"=>["Щ","щ"], "sch"=>["Щ","щ"], "#"=>["Ъ","ъ"], "y"=>["Ы","ы"], "'"=>["Ь","ь"], "je"=>["Э","э"], "ä"=>["Э","э"], "ju"=>["Ю","ю"], "yu"=>["Ю","ю"],
-      "ü"=>["Ю","ю"], "ya"=>["Я","я"], "ja"=>["Я","я"], "q"=>["Я","я"]}
-  end
+  def self.convert(text, enforce_language = nil)
+    language = detect_input_language(text.split(/\s+/).first)
 
-  def self.russian
-    @russian ||= create_russian_map
-  end
+    return text if language == enforce_language
 
-  def self.convert(text)
-    lang = detect_input_language(text.split(/\s+/).first)
-    map = self.send(lang.to_s).sort_by {|k,v| v.length <=>  k.length}
+    map = self.send(language.to_s).sort_by {|k,v| v.length <=>  k.length}
     map.each do |translit_key, translit_value|
       text.gsub!(translit_key.capitalize, translit_value.first)
       text.gsub!(translit_key, translit_value.last)
@@ -37,4 +28,16 @@ private
   def self.detect_input_language(text)
     text.scan(/\w+/).empty? ? :russian : :english
   end
+
+  def self.english
+    { "a"=>["А","а"], "b"=>["Б","б"], "v"=>["В","в"], "g"=>["Г","г"], "d"=>["Д","д"], "e"=>["Е","е"], "jo"=>["Ё","ё"], "yo"=>["Ё","ё"], "ö"=>["Ё","ё"], "zh"=>["Ж","ж"],
+      "z"=>["З","з"], "i"=>["И","и"], "j"=>["Й","й"], "k"=>["К","к"], "l"=>["Л","л"], "m"=>["М","м"], "n"=>["Н","н"], "o"=>["О","о"], "p"=>["П","п"], "r"=>["Р","р"],
+      "s"=>["С","с"], "t"=>["Т","т"], "u"=>["У","у"], "f"=>["Ф","ф"], "h"=>["Х","х"], "x"=>["Х","х"], "c"=>["Ц","ц"], "ch"=>["Ч","ч"], "sh"=>["Ш","ш"], "w"=>["Щ","щ"],
+      "shh"=>["Щ","щ"], "sch"=>["Щ","щ"], "#"=>["Ъ","ъ"], "y"=>["Ы","ы"], "'"=>["Ь","ь"], "je"=>["Э","э"], "ä"=>["Э","э"], "ju"=>["Ю","ю"], "yu"=>["Ю","ю"],
+      "ü"=>["Ю","ю"], "ya"=>["Я","я"], "ja"=>["Я","я"], "q"=>["Я","я"]}
+  end
+
+  def self.russian
+    @russian ||= create_russian_map
+  end
 end

metadata

@@ -1,83 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: translit
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - tjbladez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-28 00:00:00 -05:00
-default_executable: bin/translit
+date: 2010-09-28 00:00:00.000000000Z
 dependencies: []
-
-description: !binary |
-  VHJhbnNsaXRlcmF0aW9uIGJldHdlZW4gY3lyaWxsaWMgPC0+IGxhdGluIHwg
-  0KLRgNCw0L3RgdC70LjRgtC10YDQsNGG0LjRjyDQvNC10LbQtNGDINC60LjR
-  gNC40LvQuNGG0L7QuSDQuCDQu9Cw0YLQuNC90LjRhtC+0Lkg
-
+description: ! 'Transliteration between cyrillic <-> latin | Транслитерация между
+  кирилицой и латиницой '
 email: tjbladez@gmail.com
-executables: 
+executables:
 - translit
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/translit
 - lib/translit.rb
 - README.markdown
-has_rdoc: false
 homepage: http://github.com/tjbladez/translit
 licenses: []
-
-post_install_message: !binary |
-  WW91IGFyZSByZWFkeSB0byB0cmFuc2xpdGVyYXRlIHwg0JLRiyDQs9C+0YLQ
-  vtCy0Ysg0Log0YLRgNCw0L3RgdC70LjRgtC10YDQsNGG0LjQuA==
-
+post_install_message: You are ready to transliterate | Вы готовы к транслитерации
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: !binary |
-  VHJhbnNsaXRlcmF0aW9uIGJldHdlZW4gY3lyaWxsaWMgPC0+IGxhdGluIGZy
-  b20gY29tbWFuZC1saW5lIG9yIHlvdXIgcHJvZ3JhbSB8INCi0YDQsNC90YHQ
-  u9C40YLQtdGA0LDRhtC40Y8g0LzQtdC20LTRgyDQutC40YDQuNC70LjRhtC+
-  0Lkg0Lgg0LvQsNGC0LjQvdC40YbQvtC5INGBINC60L7QvNC80LDQvdC00L3Q
-  vtC5INGB0YLRgNC+0LrQuCDQuNC70Lgg0LIg0YLQstC+0LXQuSDQv9GA0L7Q
-  s9GA0LDQvNC80LU=
-
+summary: Transliteration between cyrillic <-> latin from command-line or your program
+  | Транслитерация между кирилицой и латиницой с коммандной строки или в твоей программе
 test_files: []
-