rutils 1.1.4 → 2.0.0

data/lib/rudates.rb

@@ -0,0 +1,85 @@
+# -*- encoding: utf-8 -*- 
+module RuTils
+  module RuDates
+    
+    RU_MONTHNAMES = [nil] + %w{ январь февраль март апрель май июнь июль август сентябрь октябрь ноябрь декабрь }
+    RU_DAYNAMES = %w(воскресенье понедельник вторник среда четверг пятница суббота)
+    RU_ABBR_MONTHNAMES = [nil] + %w{ янв фев мар апр май июн июл авг сен окт ноя дек }
+    RU_ABBR_DAYNAMES = %w(вск пн вт ср чт пт сб)
+    RU_INFLECTED_MONTHNAMES = [nil] + %w{ января февраля марта апреля мая июня июля
+        августа сентября октября ноября декабря }
+    RU_DAYNAMES_E = [nil] + %w{первое второе третье четвёртое пятое шестое седьмое восьмое
+       девятое десятое одиннадцатое двенадцатое тринадцатое четырнадцатое пятнадцатое шестнадцатое 
+       семнадцатое восемнадцатое девятнадцатое двадцатое двадцать тридцатое тридцатьпервое}
+    
+    def self.distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, absolute = false) #nodoc
+      from_time = from_time.to_time if from_time.respond_to?(:to_time)
+      to_time   = to_time.to_time if to_time.respond_to?(:to_time)
+      distance_in_minutes = (((to_time - from_time).abs)/60).round
+      distance_in_seconds = ((to_time - from_time).abs).round
+      
+      case distance_in_minutes
+        when 0..1
+          return (distance_in_minutes==0) ? 'меньше минуты' : '1 минуту' unless include_seconds
+        
+        case distance_in_seconds
+           when 0..5   then 'менее 5 секунд'
+           when 6..10  then 'менее 10 секунд'
+           when 11..20 then 'менее 20 секунд'
+           when 21..40 then 'пол-минуты'
+           when 41..59 then 'меньше минуты'
+           else             '1 минуту'
+         end
+        
+         when 2..45      then distance_in_minutes.to_s + 
+                              " " + distance_in_minutes.items("минута", "минуты", "минут") 
+         when 46..90     then 'около часа'
+         
+         # исключение, сдвигаем на один влево чтобы соответствовать падежу
+         when 90..1440   then "около " + (distance_in_minutes.to_f / 60.0).round.to_s + 
+                              " " + (distance_in_minutes.to_f / 60.0).round.items("часа", 'часов', 'часов')
+         when 1441..2880 then '1 день'
+         else                  (distance_in_minutes / 1440).round.to_s + 
+                              " " + (distance_in_minutes / 1440).round.items("день", "дня", "дней")
+       end
+    end
+    
+    def self.ru_strftime(time, format_str='%d.%m.%Y') #:yields: replaced time string
+      clean_fmt = format_str.to_s.gsub(/%{2}/, RuTils::SUBSTITUTION_MARKER).
+        gsub(/%a/, RU_ABBR_DAYNAMES[time.wday]).
+        gsub(/%A/, RU_DAYNAMES[time.wday]).
+        gsub(/%b/, RU_ABBR_MONTHNAMES[time.mon]).
+        gsub(/%d(\s)*%B/, '%02d' % time.day + '\1' + RU_INFLECTED_MONTHNAMES[time.mon]).
+        gsub(/%e(\s)*%B/, '%d' % time.day + '\1' + RU_INFLECTED_MONTHNAMES[time.mon]).
+        gsub(/%B/, RU_MONTHNAMES[time.mon]).
+        gsub(/#{RuTils::SUBSTITUTION_MARKER}/, '%%')
+      # Теперь когда все нужные нам маркеры заменены можно отдать это стандартному strftime
+      if block_given?
+        yield(clean_fmt)
+      else
+        time.strftime_norutils(clean_fmt)
+      end
+    end
+    
+    module RuStrftimeOverride
+      
+      def self.included(into)
+        into.send(:alias_method, :strftime_norutils, :strftime)
+        into.class_eval do
+          def strftime(fmt)
+            if RuTils::overrides_enabled?
+              RuTils::RuDates.ru_strftime(self, fmt) do | fmt_with_replacements | 
+                strftime_norutils(fmt_with_replacements)
+              end
+            else
+              strftime_norutils(fmt)
+            end
+          end
+        end
+      end
+      
+    end
+    
+    [Time, Date].each{|k| k.send(:include, RuStrftimeOverride) }
+  end
+end

data/lib/rutils.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*- 
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 
-require File.dirname(__FILE__) + '/version'
+require File.expand_path(File.dirname(__FILE__)) + '/version'
 
 # Главный контейнер модуля
 module RuTils
@@ -36,12 +36,13 @@ module RuTils
   #
   # Флаг overrides в RuTils работают в контексте текущей нити
   def overrides=(new_override_flag)
-    Thread.current[:rutils_overrided_enabled] = (new_override_flag ? true : false)
+    Thread.current[:rutils_overrides_enabled] = (new_override_flag ? true : false)
   end
   module_function :overrides=
   
   def self.thread_local_or_own_flag #:nodoc:
-    Thread.current.keys.include?(:rutils_overrided_enabled) ? Thread.current[:rutils_overrided_enabled] : false
+    # Это может быть умирает на 1.9.2
+    Thread.current[:rutils_overrides_enabled] || false
   end
   
   def self.load_component(name) #:nodoc:
@@ -49,12 +50,17 @@ module RuTils
   end
 end
 
-[:pluralizer, :datetime, :transliteration, :countries].each do | submodule |
-  require File.join(RuTils::INSTALLATION_DIRECTORY, "lib", submodule.to_s, submodule.to_s)
-end
+require File.join(RuTils::INSTALLATION_DIRECTORY, "lib/pluralizer")
+require File.join(RuTils::INSTALLATION_DIRECTORY, "lib/rudates")
+require File.join(RuTils::INSTALLATION_DIRECTORY, "lib/transliteration")
 
 # Заглушка для подключения типографа (он теперь в отдельном геме)
-require File.join(RuTils::INSTALLATION_DIRECTORY, "lib/gilenson/gilenson_stub")
+require File.join(RuTils::INSTALLATION_DIRECTORY, "lib/gilenson_stub")
+
+require "russian"
+require "russian/transliteration"
+require "gilenson"
+require "ru_propisju"
 
 # Оверлоады грузим только если константа не установлена в false
 unless defined?(::RuTils::RUTILS_USE_DATE_HELPERS) && !::RuTils::RUTILS_USE_DATE_HELPERS

data/lib/transliteration.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*- 
+# ++DEPRECATED++ - Реализует простейшую транслитерацию используя Russian
+require "ru_translify"
+
+module RuTils::TransliterationStub
+  
+  # Транслитерирует строку в латиницу, и возвращает измененную строку
+  def translify
+    Russian.transliterate(self)
+  end
+
+  # Транслитерирует строку, меняя объект  
+  def translify!
+    self.replace(Russian.transliterate(self))
+  end
+  
+  # Транслитерирует строку, делая ее пригодной для применения как имя директории или URL
+  def dirify
+    st = translify
+    st.gsub!(/(\s\&\s)|(\s\&amp\;\s)/, ' and ') # convert & to "and"
+    st.gsub!(/\W/, ' ')  #replace non-chars
+    st.gsub!(/(_)$/, '') #trailing underscores
+    st.gsub!(/^(_)/, '') #leading unders
+    st.strip.gsub(/(\s)/,'-').downcase.squeeze('-')
+  end
+end
+
+class ::Object::String
+  include RuTils::TransliterationStub
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*- 
 module RuTils
   # Версия RuTils
-  VERSION = '1.1.4'
+  VERSION = '2.0.0'
 end

data/test/extras/integration_rails_filter.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*- 
 require 'action_controller'
 require 'action_controller/test_process'
-require File.dirname(__FILE__) +  '/../../init.rb'
+require File.expand_path(File.dirname(__FILE__)) +  '/../../init.rb'
 
 ActionController::Routing::Routes.draw {  |map| map.connect ':controller/:action/:id' }
 

data/test/extras/integration_rails_gilenson_helpers.rb

@@ -4,7 +4,7 @@ require 'action_controller'
 require 'action_view'
 
 require 'action_controller/test_process'
-require File.dirname(__FILE__) +  '/../../init.rb'
+require File.expand_path(File.dirname(__FILE__)) +  '/../../init.rb'
 
 # Перегрузка helper'ов Rails
 rails_test_class = defined?(ActionController::TestCase) ? ActionController::TestCase : Test::Unit::TestCase

data/test/extras/integration_rails_helpers.rb

@@ -4,7 +4,7 @@ require "ostruct"
 require 'action_controller'
 require 'action_view'
 require 'action_controller/test_process'
-require File.dirname(__FILE__) +  '/../../init.rb'
+require File.expand_path(File.dirname(__FILE__)) +  '/../../init.rb'
 require 'action_pack/version'
 
 ma, mi, ti = ActionPack::VERSION::MAJOR, ActionPack::VERSION::MINOR, ActionPack::VERSION::TINY 

data/test/run_tests.rb

@@ -1,4 +1,4 @@
 Dir.entries(File.dirname(__FILE__)).each do | it|
   next unless it =~ /^test_/
-  require File.dirname(__FILE__) + '/' + it
+  require File.expand_path(File.dirname(__FILE__)) + '/' + it
 end

data/test/test_datetime.rb

@@ -1,7 +1,8 @@
 # -*- encoding: utf-8 -*- 
+require "rubygems"
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rutils'
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/rutils'
 
 class DistanceOfTimeTest < Test::Unit::TestCase
   def test_distance_of_time_in_words
@@ -13,15 +14,23 @@ class DistanceOfTimeTest < Test::Unit::TestCase
   end
   
   def assert_format_eq(str, *from_and_distance)
-    assert_equal str, RuTils::DateTime.distance_of_time_in_words(*from_and_distance) 
+    assert_equal str, RuTils::RuDates.distance_of_time_in_words(*from_and_distance) 
   end
 end
 
 class StrftimeRuTest < Test::Unit::TestCase
+
+  def test_to_datetime_does_not_recurse_indefinitely
+    assert_nothing_raised do
+      t = Time.local(2,1,1,1)
+      s =  t.send(:to_datetime).strftime("%a, %A, %b, %B")
+      assert_equal "Tue, Tuesday, Jan, January", s
+    end
+  end
   
   def test_a_formatter_should_actually_return
     the_fmt = "Это случилось %d %B"
-    assert_equal "Это случилось 01 декабря", RuTils::DateTime::ru_strftime(Time.local(1985, "dec", 01), the_fmt)
+    assert_equal "Это случилось 01 декабря", RuTils::RuDates::ru_strftime(Time.local(1985, "dec", 01), the_fmt)
   end
   
   def test_should_not_touch_double_marks
@@ -62,7 +71,7 @@ class StrftimeRuTest < Test::Unit::TestCase
   
   def test_shorthands_defined
     date = Date.new(2005, 12, 31)
-    assert_equal "дек декабрь сб суббота", "#{Date::RU_ABBR_MONTHNAMES[date.mon]} #{Date::RU_MONTHNAMES[date.mon]} #{Date::RU_ABBR_DAYNAMES[date.wday]} #{Date::RU_DAYNAMES[date.wday]}"
+    assert_equal "дек декабрь сб суббота", "#{RuTils::RuDates::RU_ABBR_MONTHNAMES[date.mon]} #{RuTils::RuDates::RU_MONTHNAMES[date.mon]} #{RuTils::RuDates::RU_ABBR_DAYNAMES[date.wday]} #{RuTils::RuDates::RU_DAYNAMES[date.wday]}"
     
     date = Date.new(2005, 11, 9)
     assert_equal "Nov November Wed Wednesday", "#{Date::ABBR_MONTHNAMES[date.mon]} #{Date::MONTHNAMES[date.mon]} #{Date::ABBR_DAYNAMES[date.wday]} #{Date::DAYNAMES[date.wday]}"
@@ -73,7 +82,7 @@ class StrftimeRuTest < Test::Unit::TestCase
   
   def test_formatter_should_not_mutate_passed_format_strings
     the_fmt, backup = "Это случилось %d %B", "Это случилось %d %B"
-    assert_equal "Это случилось 01 декабря", RuTils::DateTime::ru_strftime(Time.local(1985, "dec", 01), the_fmt)
+    assert_equal "Это случилось 01 декабря", RuTils::RuDates::ru_strftime(Time.local(1985, "dec", 01), the_fmt)
     assert_equal the_fmt, backup
   end
   
@@ -85,7 +94,7 @@ class StrftimeRuTest < Test::Unit::TestCase
   end
   
   def assert_format_eq(str, time_or_date, fmt, msg = 'Should format as desired')
-    r = RuTils::DateTime::ru_strftime(time_or_date, fmt)
+    r = RuTils::RuDates::ru_strftime(time_or_date, fmt)
     assert_not_nil r, "The formatter should have returned a not-nil value for #{time_or_date} and #{fmt}"
     assert_kind_of String, "The formatter should have returned a String for #{time_or_date} and #{fmt}"
     assert_equal str, r, msg
@@ -129,7 +138,7 @@ class StrftimeTest < Test::Unit::TestCase
     end
     
     ensure
-     a.join; b.join 
+    a.join; b.join 
   end
   
   def with_overrides_set_to(value, &blk)

data/test/test_integration.rb

@@ -2,7 +2,7 @@
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 require 'test/unit'
 
-require File.dirname(__FILE__) + '/../lib/rutils'
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/rutils'
 
 # Load all the prereqs
 integration_tests = ['rubygems', 'multi_rails_init'] + Dir.glob(File.dirname(__FILE__) + '/extras/integration_*.rb')

data/test/test_integration_flag.rb

@@ -2,7 +2,7 @@
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 require 'test/unit'
 
-require File.dirname(__FILE__) + '/../lib/rutils'
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/rutils'
 
 class IntegrationFlagTest < Test::Unit::TestCase
   def setup

data/test/test_pluralize.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*- 
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rutils'
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/rutils'
 
 
 class PropisjuTestCase < Test::Unit::TestCase

data/test/test_rutils_base.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*- 
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rutils'
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/rutils'
 
 class RutilsBaseTest < Test::Unit::TestCase
   def test_rutils_location

data/test/test_transliteration.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*- 
 $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rutils'
+require File.expand_path(File.dirname(__FILE__)) + '/../lib/rutils'
 
 
 class TranslitTest < Test::Unit::TestCase
@@ -11,43 +11,12 @@ class TranslitTest < Test::Unit::TestCase
   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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutils
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Julian 'Julik' Tarkhanov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2011-04-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,43 +37,59 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: russian
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 25
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
-  type: :development
+        - 2
+        - 7
+        version: 0.2.7
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: ru_propisju
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 41
         segments: 
         - 2
-        - 6
+        - 9
         - 1
-        version: 2.6.1
+        version: 2.9.1
   type: :development
-  version_requirements: *id003
-description: Simple processing of russian strings
+  version_requirements: *id004
+description: DEPRECATED processing of russian strings
 email: 
 - me@julik.nl
 - yaroslav@markin.net
-executables: 
-- rutilize
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -89,19 +105,15 @@ files:
 - README.txt
 - Rakefile.rb
 - TODO.txt
-- bin/rutilize
 - init.rb
-- lib/countries/countries.rb
-- lib/datetime/datetime.rb
-- lib/gilenson/gilenson_stub.rb
+- lib/gilenson_stub.rb
 - lib/integration/integration.rb
 - lib/integration/rails_date_helper_override.rb
 - lib/integration/rails_pre_filter.rb
-- lib/pluralizer/pluralizer.rb
+- lib/pluralizer.rb
+- lib/rudates.rb
 - lib/rutils.rb
-- lib/transliteration/bidi.rb
-- lib/transliteration/simple.rb
-- lib/transliteration/transliteration.rb
+- lib/transliteration.rb
 - lib/version.rb
 - test/extras/integration_rails_filter.rb
 - test/extras/integration_rails_gilenson_helpers.rb
@@ -113,8 +125,9 @@ files:
 - test/test_pluralize.rb
 - test/test_rutils_base.rb
 - test/test_transliteration.rb
+- .gemtest
 has_rdoc: true
-homepage: http://rutils.rubyforge.org
+homepage: http://github.com/julik/rutils
 licenses: []
 
 post_install_message: 
@@ -147,10 +160,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rutils
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: Simple processing of russian strings
+summary: DEPRECATED processing of russian strings
 test_files: 
 - test/test_datetime.rb
 - test/test_integration.rb