kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

remove warning: assigned but unused variable

Browse source
This commit is contained in:
Santiago Pastorino 2011-06-07 21:39:55 -03:00
parent f2f63bf2ff
commit 1d3618a9b4
20 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
actionpack/lib/action_controller/caching/fragments.rb
View file

@ -109,7 +109,6 @@ module ActionController #:nodoc:
def expire_fragment(key, options = nil) def expire_fragment(key, options = nil)
return unless cache_configured? return unless cache_configured?
key = fragment_cache_key(key) unless key.is_a?(Regexp) key = fragment_cache_key(key) unless key.is_a?(Regexp)
message = nil
instrument_fragment_cache :expire_fragment, key do instrument_fragment_cache :expire_fragment, key do
if key.is_a?(Regexp) if key.is_a?(Regexp)

2
actionpack/lib/action_controller/metal/http_authentication.rb
View file

@ -423,7 +423,7 @@ module ActionController
# Returns an Array of [String, Hash] if a token is present. # Returns an Array of [String, Hash] if a token is present.
# Returns nil if no token is found. # Returns nil if no token is found.
def token_and_options(request) def token_and_options(request)
if header = request.authorization.to_s[/^Token (.*)/] if request.authorization.to_s[/^Token (.*)/]
values = Hash[$1.split(',').map do |value| values = Hash[$1.split(',').map do |value|
value.strip! # remove any spaces between commas and values value.strip! # remove any spaces between commas and values
key, value = value.split(/\=\"?/) # split key=value pairs key, value = value.split(/\=\"?/) # split key=value pairs

2
actionpack/lib/action_dispatch/middleware/head.rb
View file

@ -8,7 +8,7 @@ module ActionDispatch
if env["REQUEST_METHOD"] == "HEAD" if env["REQUEST_METHOD"] == "HEAD"
env["REQUEST_METHOD"] = "GET" env["REQUEST_METHOD"] = "GET"
env["rack.methodoverride.original_method"] = "HEAD" env["rack.methodoverride.original_method"] = "HEAD"
status, headers, body = @app.call(env) status, headers, _ = @app.call(env)
[status, headers, []] [status, headers, []]
else else
@app.call(env) @app.call(env)

3
actionpack/lib/action_dispatch/testing/integration.rb
View file

@ -207,9 +207,6 @@ module ActionDispatch
"*/*;q=0.5" "*/*;q=0.5"
unless defined? @named_routes_configured unless defined? @named_routes_configured
# install the named routes in this session instance.
klass = singleton_class
# the helpers are made protected by default--we make them public for # the helpers are made protected by default--we make them public for
# easier access during testing and troubleshooting. # easier access during testing and troubleshooting.
@named_routes_configured = true @named_routes_configured = true

2
actionpack/lib/action_view/helpers/debug_helper.rb
View file

@ -30,7 +30,7 @@ module ActionView
begin begin
Marshal::dump(object) Marshal::dump(object)
"<pre class='debug_dump'>#{h(object.to_yaml).gsub(" ", "&nbsp; ")}</pre>".html_safe "<pre class='debug_dump'>#{h(object.to_yaml).gsub(" ", "&nbsp; ")}</pre>".html_safe
rescue Exception => e # errors from Marshal or YAML rescue Exception # errors from Marshal or YAML
# Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback # Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
"<code class='debug_dump'>#{h(object.inspect)}</code>".html_safe "<code class='debug_dump'>#{h(object.inspect)}</code>".html_safe
end end

2
actionpack/lib/action_view/renderer/template_renderer.rb
View file

@ -64,7 +64,7 @@ module ActionView
layout =~ /^\// ? layout =~ /^\// ?
with_fallbacks { find_template(layout, nil, false, keys) } : find_template(layout, nil, false, keys) with_fallbacks { find_template(layout, nil, false, keys) } : find_template(layout, nil, false, keys)
end end
rescue ActionView::MissingTemplate => e rescue ActionView::MissingTemplate
update_details(:formats => nil) do update_details(:formats => nil) do
raise unless template_exists?(layout) raise unless template_exists?(layout)
end end

1
actionpack/lib/action_view/template/error.rb
View file

@ -31,7 +31,6 @@ module ActionView
def initialize(paths, path, prefixes, partial, details, *) def initialize(paths, path, prefixes, partial, details, *)
@path = path @path = path
prefixes = Array.wrap(prefixes) prefixes = Array.wrap(prefixes)
display_paths = paths.compact.map{ |p| p.to_s.inspect }.join(", ")
template_type = if partial template_type = if partial
"partial" "partial"
elsif path =~ /layouts/i elsif path =~ /layouts/i

1
actionpack/test/dispatch/session/test_session_test.rb
View file

@ -29,7 +29,6 @@ class ActionController::TestSessionTest < ActiveSupport::TestCase
end end
def test_clear_emptys_session def test_clear_emptys_session
params = {:one => 'one', :two => 'two'}
session = ActionController::TestSession.new({:one => 'one', :two => 'two'}) session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
session.clear session.clear
assert_nil(session[:one]) assert_nil(session[:one])

4
actionpack/test/template/html-scanner/document_test.rb
View file

@ -123,7 +123,7 @@ HTML
def test_parse_invalid_document def test_parse_invalid_document
assert_nothing_raised do assert_nothing_raised do
doc = HTML::Document.new("<html> HTML::Document.new("<html>
<table> <table>
<tr> <tr>
<td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td> <td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td>
@ -135,7 +135,7 @@ HTML
def test_invalid_document_raises_exception_when_strict def test_invalid_document_raises_exception_when_strict
assert_raise RuntimeError do assert_raise RuntimeError do
doc = HTML::Document.new("<html> HTML::Document.new("<html>
<table> <table>
<tr> <tr>
<td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td> <td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td>

2
actionpack/test/template/record_tag_helper_test.rb
View file

@ -48,14 +48,12 @@ class RecordTagHelperTest < ActionView::TestCase
end end
def test_block_works_with_content_tag_for_in_erb def test_block_works_with_content_tag_for_in_erb
__in_erb_template = ''
expected = %(<tr class="post" id="post_45">#{@post.body}</tr>) expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
actual = content_tag_for(:tr, @post) { concat @post.body } actual = content_tag_for(:tr, @post) { concat @post.body }
assert_dom_equal expected, actual assert_dom_equal expected, actual
end end
def test_div_for_in_erb def test_div_for_in_erb
__in_erb_template = ''
expected = %(<div class="post bar" id="post_45">#{@post.body}</div>) expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
actual = div_for(@post, :class => "bar") { concat @post.body } actual = div_for(@post, :class => "bar") { concat @post.body }
assert_dom_equal expected, actual assert_dom_equal expected, actual

4
actionpack/test/template/render_test.rb
View file

@ -370,7 +370,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
def test_render_utf8_template_with_incompatible_external_encoding def test_render_utf8_template_with_incompatible_external_encoding
with_external_encoding Encoding::SHIFT_JIS do with_external_encoding Encoding::SHIFT_JIS do
begin begin
result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield") @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield")
flunk 'Should have raised incompatible encoding error' flunk 'Should have raised incompatible encoding error'
rescue ActionView::Template::Error => error rescue ActionView::Template::Error => error
assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
@ -381,7 +381,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
def test_render_utf8_template_with_partial_with_incompatible_encoding def test_render_utf8_template_with_partial_with_incompatible_encoding
with_external_encoding Encoding::SHIFT_JIS do with_external_encoding Encoding::SHIFT_JIS do
begin begin
result = @view.render(:file => "test/utf8_magic_with_bare_partial.html.erb", :layouts => "layouts/yield") @view.render(:file => "test/utf8_magic_with_bare_partial.html.erb", :layouts => "layouts/yield")
flunk 'Should have raised incompatible encoding error' flunk 'Should have raised incompatible encoding error'
rescue ActionView::Template::Error => error rescue ActionView::Template::Error => error
assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message

1
actionpack/test/template/template_test.rb
View file

@ -153,7 +153,6 @@ class TestERBTemplate < ActiveSupport::TestCase
def test_encoding_can_be_specified_with_magic_comment_in_erb def test_encoding_can_be_specified_with_magic_comment_in_erb
with_external_encoding Encoding::UTF_8 do with_external_encoding Encoding::UTF_8 do
@template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil) @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil)
result = render
assert_equal Encoding::UTF_8, render.encoding assert_equal Encoding::UTF_8, render.encoding
assert_equal "hello \u{fc}mlat", render assert_equal "hello \u{fc}mlat", render
end end

4
actionpack/test/template/text_helper_test.rb
View file

@ -291,7 +291,7 @@ class TextHelperTest < ActionView::TestCase
end end
def test_cycle_class_with_no_arguments def test_cycle_class_with_no_arguments
assert_raise(ArgumentError) { value = Cycle.new() } assert_raise(ArgumentError) { Cycle.new }
end end
def test_cycle def test_cycle
@ -304,7 +304,7 @@ class TextHelperTest < ActionView::TestCase
end end
def test_cycle_with_no_arguments def test_cycle_with_no_arguments
assert_raise(ArgumentError) { value = cycle() } assert_raise(ArgumentError) { cycle }
end end
def test_cycle_resets_with_new_values def test_cycle_resets_with_new_values

2
activerecord/lib/active_record/associations/collection_proxy.rb
View file

@ -67,7 +67,7 @@ module ActiveRecord
def method_missing(method, *args, &block) def method_missing(method, *args, &block)
match = DynamicFinderMatch.match(method) match = DynamicFinderMatch.match(method)
if match && match.instantiator? if match && match.instantiator?
record = send(:find_or_instantiator_by_attributes, match, match.attribute_names, *args) do |r| send(:find_or_instantiator_by_attributes, match, match.attribute_names, *args) do |r|
@association.send :set_owner_attributes, r @association.send :set_owner_attributes, r
@association.send :add_to_target, r @association.send :add_to_target, r
yield(r) if block_given? yield(r) if block_given?

2
activerecord/lib/active_record/base.rb
View file

@ -2006,7 +2006,7 @@ MSG
set_values = (1..3).collect{|position| values_hash_from_param[position].blank? ? 1 : values_hash_from_param[position]} set_values = (1..3).collect{|position| values_hash_from_param[position].blank? ? 1 : values_hash_from_param[position]}
begin begin
Date.new(*set_values) Date.new(*set_values)
rescue ArgumentError => ex # if Date.new raises an exception on an invalid date rescue ArgumentError # if Date.new raises an exception on an invalid date
instantiate_time_object(name, set_values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates instantiate_time_object(name, set_values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
end end
end end

1
activeresource/test/cases/base/load_test.rb
View file

@ -72,7 +72,6 @@ class BaseLoadTest < Test::Unit::TestCase
def test_after_load_attributes_are_accessible_via_indifferent_access def test_after_load_attributes_are_accessible_via_indifferent_access
assert_equal Hash.new, @person.attributes assert_equal Hash.new, @person.attributes
matz_attributes = @matz.values.first
assert_equal @matz.stringify_keys, @person.load(@matz).attributes assert_equal @matz.stringify_keys, @person.load(@matz).attributes
assert_equal @matz[:name], @person.attributes['name'] assert_equal @matz[:name], @person.attributes['name']
assert_equal @matz[:name], @person.attributes[:name] assert_equal @matz[:name], @person.attributes[:name]

2
activeresource/test/cases/finder_test.rb
View file

@ -95,7 +95,7 @@ class FinderTest < Test::Unit::TestCase
def test_find_all_sub_objects_not_found def test_find_all_sub_objects_not_found
assert_nothing_raised do assert_nothing_raised do
addys = StreetAddress.find(:all, :params => { :person_id => 2 }) StreetAddress.find(:all, :params => { :person_id => 2 })
end end
end end

2
activeresource/test/cases/log_subscriber_test.rb
View file

@ -23,7 +23,7 @@ class LogSubscriberTest < ActiveSupport::TestCase
end end
def test_request_notification def test_request_notification
matz = Person.find(1) Person.find(1)
wait wait
assert_equal 2, @logger.logged(:info).size assert_equal 2, @logger.logged(:info).size
assert_equal "GET http://37s.sunrise.i:3000/people/1.json", @logger.logged(:info)[0] assert_equal "GET http://37s.sunrise.i:3000/people/1.json", @logger.logged(:info)[0]

2
activeresource/test/cases/observing_test.rb
View file

@ -37,7 +37,7 @@ class ObservingTest < Test::Unit::TestCase
end end
def test_create_fires_save_and_create_notifications def test_create_fires_save_and_create_notifications
rick = Person.create(:name => 'Rick') Person.create(:name => 'Rick')
assert_equal [:before_save, :before_create, :after_create, :after_save], self.history assert_equal [:before_save, :before_create, :after_create, :after_save], self.history
end end

2
activesupport/test/test_test.rb
View file

@ -50,7 +50,7 @@ class AssertDifferenceTest < ActiveSupport::TestCase
def test_expression_is_evaluated_in_the_appropriate_scope def test_expression_is_evaluated_in_the_appropriate_scope
silence_warnings do silence_warnings do
local_scope = 'foo' local_scope = local_scope = 'foo'
assert_difference('local_scope; @object.num') { @object.increment } assert_difference('local_scope; @object.num') { @object.increment }
end end
end end