From 475a1249a3b421e5ef7464be6f19458dd2218c71 Mon Sep 17 00:00:00 2001 From: Claudio Poli Date: Mon, 28 Sep 2009 03:37:43 +0200 Subject: [PATCH] Removed old hpricot references --- actionpack/lib/action_view/helpers/text_helper.rb | 4 ++-- .../source/rails_application_templates.textile | 2 +- .../rails/app/templates/config/environment.rb | 2 +- railties/test/gem_dependency_test.rb | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 1d92bcb..1e8e741 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -226,7 +226,7 @@ module ActionView # Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags. # # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile]. - # This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/] + # This method is only available if RedCloth[http://redcloth.org/] # is available. # # ==== Examples @@ -263,7 +263,7 @@ module ActionView # but without the bounding

tag that RedCloth adds. # # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile]. - # This method is requires RedCloth[http://whytheluckystiff.net/ruby/redcloth/] + # This method is requires RedCloth[http://redcloth.org/] # to be available. # # ==== Examples diff --git a/railties/guides/source/rails_application_templates.textile b/railties/guides/source/rails_application_templates.textile index fc178fa..4469b9f 100644 --- a/railties/guides/source/rails_application_templates.textile +++ b/railties/guides/source/rails_application_templates.textile @@ -55,7 +55,7 @@ For example, if your application depends on the gems +bj+ and +hpricot+ : gem "bj" -gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" +gem "tenderlove-nokogiri", :version => '1.3.3', :source => "http://gems.github.com" Please note that this will NOT install the gems for you. So you may want to run the +rake gems:install+ task too : diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb index 2f2d116..c1ecab7 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb @@ -18,7 +18,7 @@ module <%= app_name.camelize %>; end # Specify gems that this application depends on and have them installed with rake gems:install # config.gem "bj" - # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" + # config.gem "tenderlove-nokogiri", :version => '1.3.3', :source => "http://gems.github.com" # config.gem "sqlite3-ruby", :lib => "sqlite3" # config.gem "aws-s3", :lib => "aws/s3" diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb index 92132be..7463986 100644 --- a/railties/test/gem_dependency_test.rb +++ b/railties/test/gem_dependency_test.rb @@ -9,11 +9,11 @@ Rails::VendorGemSourceIndex.silence_spec_warnings = true class GemDependencyTest < Test::Unit::TestCase def setup - @gem = Rails::GemDependency.new "xhpricotx" - @gem_with_source = Rails::GemDependency.new "xhpricotx", :source => "http://code.whytheluckystiff.net" - @gem_with_version = Rails::GemDependency.new "xhpricotx", :version => "= 0.6" + @gem = Rails::GemDependency.new "xnokogirix" + @gem_with_source = Rails::GemDependency.new "xnokogirix", :source => "http://gems.rubyforge.org" + @gem_with_version = Rails::GemDependency.new "xnokogirix", :version => "= 1.3.3" @gem_with_lib = Rails::GemDependency.new "xaws-s3x", :lib => "aws/s3" - @gem_without_load = Rails::GemDependency.new "xhpricotx", :lib => false + @gem_without_load = Rails::GemDependency.new "xnokogirix", :lib => false end def test_configuration_adds_gem_dependency @@ -23,19 +23,19 @@ class GemDependencyTest < Test::Unit::TestCase end def test_gem_creates_install_command - assert_equal %w(install xhpricotx), @gem.install_command + assert_equal %w(install xnokogirix), @gem.install_command end def test_gem_with_source_creates_install_command - assert_equal %w(install xhpricotx --source http://code.whytheluckystiff.net), @gem_with_source.install_command + assert_equal %w(install xnokogirix --source http://gems.rubyforge.org), @gem_with_source.install_command end def test_gem_with_version_creates_install_command - assert_equal ["install", "xhpricotx", "--version", '"= 0.6"'], @gem_with_version.install_command + assert_equal ["install", "xnokogirix", "--version", '"= 0.6"'], @gem_with_version.install_command end def test_gem_creates_unpack_command - assert_equal %w(unpack xhpricotx), @gem.unpack_command + assert_equal %w(unpack xnokogirix), @gem.unpack_command end def test_gem_with_version_unpack_install_command @@ -43,7 +43,7 @@ class GemDependencyTest < Test::Unit::TestCase mock_spec = mock() mock_spec.stubs(:version).returns('0.6') @gem_with_version.stubs(:specification).returns(mock_spec) - assert_equal ["unpack", "xhpricotx", "--version", '= 0.6'], @gem_with_version.unpack_command + assert_equal ["unpack", "xnokogirix", "--version", '= 0.6'], @gem_with_version.unpack_command end def test_gem_adds_load_paths -- 1.6.4.1