rutils 0.2.5 → 1.0.0

data/test/test_integration_flag.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*- 
+$KCODE = 'u'
+require 'test/unit'
+
+require File.dirname(__FILE__) + '/../lib/rutils'
+
+class IntegrationFlagTest < Test::Unit::TestCase
+  def setup
+    RuTils::overrides = true
+  end
+  
+  def test_integration_flag
+    RuTils::overrides = false
+    assert !RuTils::overrides_enabled?
+    RuTils::overrides = true    
+    assert RuTils::overrides_enabled?
+  end  
+end

data/test/{t_pluralize.rb → test_pluralize.rb}

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*- 
 $KCODE = 'u'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/rutils'
@@ -16,7 +17,7 @@ class PropisjuTestCase < Test::Unit::TestCase
     assert_equal "двадцать пять колес", 25.propisju_items(3, "колесо", "колеса", "колес")
     assert_equal "двадцать одна подстава", 21.propisju_items(2, "подстава", "подставы", "подстав")    
   end
-
+  
   def test_floats
     assert_equal "шесть целых пять десятых", (6.50).propisju
     assert_equal "триста сорок одна целая девять десятых", (341.9).propisju
@@ -26,7 +27,7 @@ class PropisjuTestCase < Test::Unit::TestCase
     assert_equal "двести двенадцать целых четыре десятых сволочи", (212.40).propisju_items(2, "сволочь", "сволочи", "сволочей")
     assert_equal "двести двенадцать сволочей", (212.00).propisju_items(2, "сволочь", "сволочи", "сволочей")
   end
-      
+  
   def test_items
     assert_equal "чемодана", 523.items("чемодан", "чемодана", "чемоданов")
     assert_equal "партий", 6727.items("партия", "партии", "партий")

data/test/{t_rutils_base.rb → test_rutils_base.rb}

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*- 
 $KCODE = 'u'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/rutils'

data/test/test_transliteration.rb

@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*- 
+$KCODE = 'u'
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/rutils'
+
+
+class TranslitTest < Test::Unit::TestCase
+
+  def setup
+    @string = "Это кусок строки русских букв v peremeshku s latinizey i амперсандом (pozor!) & something"
+  end
+
+  def test_translify
+    assert_equal "sch", 'щ'.translify
+    assert_equal "stansyi", "стансы".translify
+    assert_equal "upuschenie", 'упущение'.translify    
+    assert_equal "sh", 'ш'.translify
+    assert_equal "SH", 'Ш'.translify
+    assert_equal "ts", 'ц'.translify
+    assert_equal "Eto kusok stroki russkih bukv v peremeshku s latinizey i ampersandom (pozor!) & something", @string.translify
+    assert_equal "Это просто некий текст".translify, "Eto prosto nekiy tekst"
+
+    assert_equal "NEVEROYATNOE UPUSCHENIE", 'НЕВЕРОЯТНОЕ УПУЩЕНИЕ'.translify
+    assert_equal "Neveroyatnoe Upuschenie", 'Невероятное Упущение'.translify
+    assert_equal "Sherstyanoy Zayats", 'Шерстяной Заяц'.translify
+    assert_equal "N.P. Sherstyakov", 'Н.П. Шерстяков'.translify
+    assert_equal "SHAROVARYI", 'ШАРОВАРЫ'.translify
+  end
+  
+# def test_detranslify
+#   puts "Шерстяной негодяй"
+#   assert_equal "щ", "sch".detranslify
+#   assert_equal "Щ", "SCH".detranslify
+#   assert_equal "Щ", "Sch".detranslify
+#   assert_equal "Щукин", "Schukin".detranslify
+#   assert_equal "Шерстяной негодяй", "Scherstyanoy negodyay".detranslify
+# end
+
+  def test_dirify
+    assert_equal "eto-kusok-stroki-russkih-bukv-v-peremeshku-s-latinizey-i-ampersandom-pozor-and-something", @string.dirify
+    assert_equal "esche-russkiy-tekst", "Еще РусСКий теКст".dirify
+    assert_equal "kooperator-poobedal-offlayn", "кооператор  пообедал  оффлайн".dirify, "dirify не должен съедать парные буквы"
+  end  
+end
+
+
+class BiDiTranslitTest < Test::Unit::TestCase
+
+  def test_bidi_translify_raises_unsupported
+    assert_raise(RuTils::RemovedFeature) { "xxx".bidi_translify }
+    assert_raise(RuTils::RemovedFeature) { "xxx".bidi_detranslify }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutils
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 1.0.0
 platform: ruby
 authors: 
 - Julian 'Julik' Tarkhanov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-08 00:00:00 +04:00
+date: 2009-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.3
     version: 
 description: Simple processing of russian strings
 email: 
@@ -38,44 +38,52 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - TODO.txt
+- WHAT_HAS_CHANGED.txt
 files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile.rb
 - TODO.txt
+- WHAT_HAS_CHANGED.txt
 - bin/gilensize
 - bin/rutilize
 - init.rb
 - lib/countries/countries.rb
 - lib/datetime/datetime.rb
+- lib/gilenson/bluecloth_extra.rb
 - lib/gilenson/gilenson.rb
-- lib/integration/blue_cloth_override.rb
+- lib/gilenson/helper.rb
+- lib/gilenson/maruku_extra.rb
+- lib/gilenson/rdiscount_extra.rb
+- lib/gilenson/redcloth_extra.rb
 - lib/integration/integration.rb
 - lib/integration/rails_date_helper_override.rb
 - lib/integration/rails_pre_filter.rb
-- lib/integration/red_cloth_four.rb
-- lib/integration/red_cloth_override.rb
-- lib/integration/red_cloth_three.rb
 - lib/pluralizer/pluralizer.rb
 - lib/rutils.rb
 - lib/transliteration/bidi.rb
 - lib/transliteration/simple.rb
 - lib/transliteration/transliteration.rb
+- lib/version.rb
+- test/extras/integration_bluecloth.rb
+- test/extras/integration_maruku.rb
+- test/extras/integration_rails_filter.rb
+- test/extras/integration_rails_gilenson_helpers.rb
+- test/extras/integration_rails_helpers.rb
+- test/extras/integration_rdiscount.rb
+- test/extras/integration_redcloth3.rb
+- test/extras/integration_redcloth4.rb
 - test/run_tests.rb
-- test/t_datetime.rb
-- test/t_gilenson.rb
-- test/t_integration.rb
-- test/t_pluralize.rb
-- test/t_rutils_base.rb
-- test/t_transliteration.rb
-- test/test_integration_bluecloth.rb
-- test/test_integration_redcloth3.rb
-- test/test_integration_redcloth4.rb
-- test/test_rails_filter.rb
-- test/test_rails_helpers.rb
+- test/test_datetime.rb
+- test/test_gilenson.rb
+- test/test_integration.rb
+- test/test_integration_flag.rb
+- test/test_pluralize.rb
+- test/test_rutils_base.rb
+- test/test_transliteration.rb
 has_rdoc: true
-homepage: http://rutils.rubyforge.org
+homepage: "RuTils - \xD0\xBF\xD1\x80\xD0\xBE\xD1\x81\xD1\x82\xD0\xBE\xD0\xB9 \xD0\xBE\xD0\xB1\xD1\x80\xD0\xB0\xD0\xB1\xD0\xBE\xD1\x82\xD1\x87\xD0\xB8\xD0\xBA \xD1\x80\xD1\x83\xD1\x81\xD1\x81\xD0\xBA\xD0\xBE\xD0\xB3\xD0\xBE \xD1\x82\xD0\xB5\xD0\xBA\xD1\x81\xD1\x82\xD0\xB0 \xD0\xBD\xD0\xB0 Ruby. \xD0\x9E\xD1\x81\xD0\xBD\xD0\xBE\xD0\xB2\xD0\xBD\xD0\xB0\xD1\x8F \xD1\x86\xD0\xB5\xD0\xBB\xD1\x8C RuTils -"
 post_install_message: 
 rdoc_options: 
 - --main
@@ -97,14 +105,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rutils
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Simple processing of russian strings
 test_files: 
-- test/t_datetime.rb
-- test/t_gilenson.rb
-- test/t_integration.rb
-- test/t_pluralize.rb
-- test/t_rutils_base.rb
-- test/t_transliteration.rb
+- test/test_datetime.rb
+- test/test_gilenson.rb
+- test/test_integration.rb
+- test/test_integration_flag.rb
+- test/test_pluralize.rb
+- test/test_rutils_base.rb
+- test/test_transliteration.rb

data/lib/integration/blue_cloth_override.rb

@@ -1,12 +0,0 @@
-if defined?(BlueCloth) && !BlueCloth.instance_methods.include?("to_html_without_rutils")
-  class Object::BlueCloth < String  #:nodoc:
-    alias_method :to_html_without_rutils, :to_html
-    def to_html(*opts)
-      if RuTils::overrides_enabled?
-        RuTils::Gilenson::Formatter.new(to_html_without_rutils(*opts)).to_html
-      else
-        to_html_without_rutils(*opts)
-      end
-    end
-  end
-end

data/lib/integration/red_cloth_four.rb

@@ -1,24 +0,0 @@
-# RedCloth 4
-class RedCloth::TextileDoc < String
-  alias_method  :to_html_without_rutils, :to_html
-  
-  def to_html
-    if RuTils::overrides_enabled?
-      suspended = to_html_without_rutils
-      
-      # Return quotes to original state
-      [187, 171, 8220, 8221].map do |e| 
-        suspended.gsub! /&\##{e};/, '"'
-      end
-      
-      # Return spaces to original state
-      [160].map do |e| 
-        suspended.gsub! /&\##{e};/, ' '
-      end
-      
-      suspended.gilensize
-    else
-      to_html_without_rutils
-    end
-  end
-end

data/lib/integration/red_cloth_override.rb

@@ -1,7 +0,0 @@
-if defined?(Object::RedCloth) && !RedCloth.instance_methods.include?(:htmlesc_without_rutils)
-  if RedCloth.class == Module
-    require File.dirname(__FILE__) + '/red_cloth_four'
-  else 
-    require File.dirname(__FILE__) + '/red_cloth_three'
-  end 
-end

data/lib/integration/red_cloth_three.rb

@@ -1,25 +0,0 @@
-# RuTils выполняет перегрузку Textile Glyphs в RedCloth, перенося форматирование спецсимволов на Gilenson.
-class RedCloth  < String #:nodoc:
-  # Этот метод в RedCloth при наличии Гиленсона надо отключать    
-  alias_method  :htmlesc_without_rutils, :htmlesc
-  def htmlesc(text, mode=0) #:nodoc:
-    RuTils::overrides_enabled? ?  text :  htmlesc_without_rutils(text, mode)
-  end
-  
-  # А этот метод обрабатывает Textile Glyphs - ту самую типографицу.
-  # Вместо того чтобы влезать в чужие таблицы мы просто заменим Textile Glyphs на Gilenson - и все будут рады.  
-  alias_method  :pgl_without_rutils, :pgl
-  def pgl(text) #:nodoc:
-    if RuTils::overrides_enabled?
-      # Suspend the spaces in the start and end of the block because Gilenson chews them off, 
-      # and RedCloth feeds them to us in packs
-      # that appear between tag starts/stops. We mess up the formatting but preserve the spacing.
-      spaces =  Array.new(2,'')
-      text.gsub!(/\A([\s]+)/) { spaces[0] = $1; '' }
-      text.gsub!(/(\s+)\Z/) { spaces[1] = $1; '' }
-      text.replace(spaces[0].to_s + RuTils::Gilenson::Formatter.new(text).to_html + spaces[1].to_s)
-    else
-      pgl_without_rutils(text)
-    end
-  end
-end

data/test/t_integration.rb

@@ -1,46 +0,0 @@
-$KCODE = 'u'
-require 'rubygems'
-require 'test/unit'
-
-def requiring_with_dependencies(*tests)
-  begin
-    yield
-    tests.map {|t|  require File.join(File.dirname(__FILE__), t) }
-  rescue LoadError => e
-    $stderr.puts "Skipping integration test - #{e}"
-  end
-end
-
-requiring_with_dependencies { require 'multi_rails_init' }
-
-requiring_with_dependencies('test_rails_helpers', 'test_rails_filter') do
-  require 'action_controller' unless defined?(ActionController)
-  require 'action_view' unless defined?(ActionView)
-end
-
-
-requiring_with_dependencies('test_integration_bluecloth') { require 'bluecloth' }
-requiring_with_dependencies do
-  require 'RedCloth' unless defined? RedCloth
-  if RedCloth::VERSION =~ /^3/
-    require File.dirname(__FILE__) + '/test_integration_redcloth3'
-  else
-    require File.dirname(__FILE__) + '/test_integration_redcloth4'
-  end
-end
-
-require File.dirname(__FILE__) + '/../lib/rutils'
-load File.dirname(__FILE__) +  '/../lib/integration/integration.rb'
-
-class IntegrationFlagTest < Test::Unit::TestCase
-  def setup
-    RuTils::overrides = true
-  end
-  
-  def test_integration_flag
-    RuTils::overrides = false
-    assert !RuTils::overrides_enabled?
-    RuTils::overrides = true    
-    assert RuTils::overrides_enabled?
-  end  
-end

data/test/t_transliteration.rb

@@ -1,109 +0,0 @@
-$KCODE = 'u'
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rutils'
-
-
-class TranslitTest < Test::Unit::TestCase
-
-  def setup
-    @string = "Это кусок строки русских букв v peremeshku s latinizey i амперсандом (pozor!) & something"
-  end
-
-  def test_translify
-    assert_equal "sch", 'щ'.translify
-    assert_equal "stansyi", "стансы".translify
-    assert_equal "upuschenie", 'упущение'.translify    
-    assert_equal "sh", 'ш'.translify
-    assert_equal "SH", 'Ш'.translify
-    assert_equal "ts", 'ц'.translify
-    assert_equal "Eto kusok stroki russkih bukv v peremeshku s latinizey i ampersandom (pozor!) & something", @string.translify
-    assert_equal "Это просто некий текст".translify, "Eto prosto nekiy tekst"
-
-    assert_equal "NEVEROYATNOE UPUSCHENIE", 'НЕВЕРОЯТНОЕ УПУЩЕНИЕ'.translify
-    assert_equal "Neveroyatnoe Upuschenie", 'Невероятное Упущение'.translify
-    assert_equal "Sherstyanoy Zayats", 'Шерстяной Заяц'.translify
-    assert_equal "N.P. Sherstyakov", 'Н.П. Шерстяков'.translify
-    assert_equal "SHAROVARYI", 'ШАРОВАРЫ'.translify
-  end
-  
-# def test_detranslify
-#   puts "Шерстяной негодяй"
-#   assert_equal "щ", "sch".detranslify
-#   assert_equal "Щ", "SCH".detranslify
-#   assert_equal "Щ", "Sch".detranslify
-#   assert_equal "Щукин", "Schukin".detranslify
-#   assert_equal "Шерстяной негодяй", "Scherstyanoy negodyay".detranslify
-# end
-
-  def test_dirify
-    assert_equal "eto-kusok-stroki-russkih-bukv-v-peremeshku-s-latinizey-i-ampersandom-pozor-and-something", @string.dirify
-    assert_equal "esche-russkiy-tekst", "Еще РусСКий теКст".dirify
-    # dirify не должен съедать парные буквы
-    assert_equal "kooperator-poobedal-offlayn", "кооператор  пообедал  оффлайн".dirify
-  end  
-end
-
-
-class BiDiTranslitTest < Test::Unit::TestCase
-
-  def setup
-  @strings_all_with_slash = {
-  "ThisIsРусскийName/ДляВас/ДемонстрацияOfSwitching" => "ThisIs+Russkijj+Name/+DljaVas+/+Demonstracija+OfSwitching",
-  "Андрэ Нортон Зачумлённый корабльzip" => "+Andreh__Norton__Zachumljonnyjj__korabl'+zip",
-  "Эй Эгегей" => "+EHjj__EHgegejj",
-  "эй-эй" => "+ehjj+-+ehjj",
-  "WebРазработка/Скрипты" => "Web+Razrabotka+/+Skripty",
-  "Смотрите зайцы -- нас много" => "+Smotrite__zajjcy__+--+__nas__mnogo",
-  "Привет Родина" => "+Privet__Rodina",
-  "ЙухХа" => "+JJukhKHa",
-  "Ыхыхых Its English text" => "+Ykhykhykh__+Its+__+English+__+text",
-  "Пьянь" => "+P'jan'",
-  "----____" => "----____",
-  "Madonna - Свежия Песенки" => "Madonna+__+-+__Svezhija__Pesenki",
-  "58-49" => "58-49",
-  "Въезд ГЛЯНЬ ВЪЕЗД" => "+V~ezd__GLJAN_'__V_~EZD",
-  "----____" => "----____",
-  "Въезд ГЛЯНь ВЪЕЗД" => "+V~ezd__GLJAN'__V_~EZD",
-  "Установка mod_perl" => "+Ustanovka__+mod_perl",
-  "Проверка__двери неразумной" => "+Proverka+__+dveri__nerazumnojj",
-  "Проверка_ дверцы" => "+Proverka+_+__dvercy",
-  "Кровать устала _ь" => "+Krovat'__ustala__+_+'",
-  "test__bed" => "test__bed",
-  "test_ bed" => "test_+__+bed",
-  "test__ __bed" => "test__+__+__bed",
-  "a_-_b-_-c" => "a_-_b-_-c",
-  "a - b _ c" => "a+__+-+__+b+__+_+__+c",
-  }
-  
-  @strings_tran_without_slash = {
-  "Андрэ/ Н/о/ртон /Зачум//лённый корабль/z/ip" => "+Andreh__Norton__Zachumljonnyjj__korabl'+zip",
-  "WebРазработка/Мимо" => "Web+RazrabotkaMimo",
-  "test_/_bed" => "test__bed",
-  }
-  
-  @strings_detran_without_slash = {
-  "Webds" => "/We/bds/",
-  "WebРазработкаМимо" => "Web/+Razrabotka+/+Mimo",
-  "WebСкрипты" => "Web/+Skripty",
-  "ПХПScripts" => "+PKHP+/Scripts",
-  }
-  end
-
-  def test_bidi_translify
-    @strings_all_with_slash.each do |str_from, str_to|
-      assert_equal str_to, str_from.bidi_translify
-    end
-    @strings_tran_without_slash.each do |str_from, str_to|
-      assert_equal str_to, str_from.bidi_translify(false)
-    end
-  end
-
-  def test_bidi_detranslify
-    @strings_all_with_slash.each do |str_to, str_from|
-      assert_equal str_to, str_from.bidi_detranslify
-    end
-    @strings_detran_without_slash.each do |str_to, str_from|
-      assert_equal str_to, str_from.bidi_detranslify(false)
-    end
-  end
-end