rutils 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.3 - 09.02.2009
+
+* Предотвращена загрузка date helper overridesв при установленном russian gem
+
 === 1.0.2 - 09.02.2009
 
 * В 1879 раз поправлена генерация rdoc из gems

data/Rakefile.rb

@@ -14,7 +14,13 @@ begin
   Hoe::RUBY_FLAGS.replace ENV['RUBY_FLAGS'] || "-I#{%w(lib test).join(File::PATH_SEPARATOR)}" + 
     (Hoe::RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
   
-  rutils = Hoe.new('rutils', RuTils::VERSION) do |p|
+  #Rake::RDocTask.class_eval do
+  #  alias_method :_odefine, :define
+  #  def define; @options.unshift(*DOCOPTS); _odefine; end
+  #end
+
+  rutils = Hoe.spec('rutils') do |p|
+    p.version = RuTils::VERSION
     p.name = "rutils"
     p.author = ["Julian 'Julik' Tarkhanov", "Danil Ivanov", "Yaroslav Markin"]
     p.email = ['me@julik.nl', 'yaroslav@markin.net']
@@ -35,7 +41,7 @@ rescue LoadError
   desc "Run all tests (requires BlueCloth, RedCloth and Rails for integration tests)"
   Rake::TestTask.new("test") do |t|
     t.libs << "test"
-    t.pattern = 'test/t_*.rb'
+    t.pattern = 'test/test_*.rb'
     t.verbose = true
   end
 end

data/init.rb

@@ -17,10 +17,11 @@ def russan_gem_required?
   false
 end
 
-if russan_gem_required?
+RUTILS_USE_DATE_HELPERS = if russan_gem_required?
   STDERR.puts "RuTils: On this version of Rails use the `russian` gem for date helper overrides instead"
+  false
 else
-  require File.dirname(__FILE__) + "/lib/integration/rails_date_helper_override"
+  true
 end
 
 # textilize и markdown

data/lib/rutils.rb

@@ -49,6 +49,10 @@ module RuTils
   end
 end
 
-[:pluralizer, :gilenson, :datetime, :transliteration, :integration, :countries].each do | submodule |
+[:pluralizer, :gilenson, :datetime, :transliteration, :countries].each do | submodule |
   require File.join(RuTils::INSTALLATION_DIRECTORY, "lib", submodule.to_s, submodule.to_s)
-end
+end
+
+unless defined?(RUTILS_USE_DATE_HELPERS) && !RUTILS_USE_DATE_HELPERS
+  require File.join(RuTils::INSTALLATION_DIRECTORY, "lib", "integration", "integration")
+end

data/lib/version.rb

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

data/test/extras/integration_rails_helpers.rb

@@ -66,7 +66,7 @@ class RailsHelpersOverrideTest < Test::Unit::TestCase
   end
   
   def test_html_options
-    if ActionView::Helpers::DateHelper::DATE_HELPERS_RECEIVE_HTML_OPTIONS
+    if defined?(ActionView::Helpers::DateHelper::DATE_HELPERS_RECEIVE_HTML_OPTIONS)
       assert_match /id\=\"foobar\"/m,  @stub.select_month(TEST_DATE, {}, :id => "foobar"),
         "Хелпер select_month принимает html_options"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutils
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Julian 'Julik' Tarkhanov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 +01:00
+date: 2009-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.3
     version: 
 description: Simple processing of russian strings
 email: 
@@ -84,6 +84,8 @@ files:
 - test/test_transliteration.rb
 has_rdoc: true
 homepage: http://rutils.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -108,9 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rutils
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Simple processing of russian strings
 test_files: 
 - test/test_datetime.rb