From 7bcb565668a17cbdd08dedba60dfc972a00c1f63 Mon Sep 17 00:00:00 2001 From: Jason Roelofs Date: Tue, 15 Jan 2013 11:33:17 -0500 Subject: [PATCH] Remove #to_sym calls from Drop and Variable Symbols are not needed here and using plain strings is nicer on Ruby --- lib/liquid/drop.rb | 4 ++-- lib/liquid/variable.rb | 2 +- test/liquid/variable_test.rb | 30 +++++++++++++++--------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/liquid/drop.rb b/lib/liquid/drop.rb index ee2a4d7..4d415c8 100644 --- a/lib/liquid/drop.rb +++ b/lib/liquid/drop.rb @@ -31,8 +31,8 @@ module Liquid # called by liquid to invoke a drop def invoke_drop(method_or_key) - if method_or_key && method_or_key != EMPTY_STRING && self.class.public_method_defined?(method_or_key.to_s.to_sym) - send(method_or_key.to_s.to_sym) + if method_or_key && method_or_key != EMPTY_STRING && self.class.public_method_defined?(method_or_key.to_s) + send(method_or_key.to_s) else before_method(method_or_key) end diff --git a/lib/liquid/variable.rb b/lib/liquid/variable.rb index 0c04fe2..962a992 100644 --- a/lib/liquid/variable.rb +++ b/lib/liquid/variable.rb @@ -26,7 +26,7 @@ module Liquid if matches = f.match(/\s*(\w+)/) filtername = matches[1] filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/o).flatten - @filters << [filtername.to_sym, filterargs] + @filters << [filtername, filterargs] end end end diff --git a/test/liquid/variable_test.rb b/test/liquid/variable_test.rb index 7bdef35..1e3335b 100644 --- a/test/liquid/variable_test.rb +++ b/test/liquid/variable_test.rb @@ -11,71 +11,71 @@ class VariableTest < Test::Unit::TestCase def test_filters var = Variable.new('hello | textileze') assert_equal 'hello', var.name - assert_equal [[:textileze,[]]], var.filters + assert_equal [["textileze",[]]], var.filters var = Variable.new('hello | textileze | paragraph') assert_equal 'hello', var.name - assert_equal [[:textileze,[]], [:paragraph,[]]], var.filters + assert_equal [["textileze",[]], ["paragraph",[]]], var.filters var = Variable.new(%! hello | strftime: '%Y'!) assert_equal 'hello', var.name - assert_equal [[:strftime,["'%Y'"]]], var.filters + assert_equal [["strftime",["'%Y'"]]], var.filters var = Variable.new(%! 'typo' | link_to: 'Typo', true !) assert_equal %!'typo'!, var.name - assert_equal [[:link_to,["'Typo'", "true"]]], var.filters + assert_equal [["link_to",["'Typo'", "true"]]], var.filters var = Variable.new(%! 'typo' | link_to: 'Typo', false !) assert_equal %!'typo'!, var.name - assert_equal [[:link_to,["'Typo'", "false"]]], var.filters + assert_equal [["link_to",["'Typo'", "false"]]], var.filters var = Variable.new(%! 'foo' | repeat: 3 !) assert_equal %!'foo'!, var.name - assert_equal [[:repeat,["3"]]], var.filters + assert_equal [["repeat",["3"]]], var.filters var = Variable.new(%! 'foo' | repeat: 3, 3 !) assert_equal %!'foo'!, var.name - assert_equal [[:repeat,["3","3"]]], var.filters + assert_equal [["repeat",["3","3"]]], var.filters var = Variable.new(%! 'foo' | repeat: 3, 3, 3 !) assert_equal %!'foo'!, var.name - assert_equal [[:repeat,["3","3","3"]]], var.filters + assert_equal [["repeat",["3","3","3"]]], var.filters var = Variable.new(%! hello | strftime: '%Y, okay?'!) assert_equal 'hello', var.name - assert_equal [[:strftime,["'%Y, okay?'"]]], var.filters + assert_equal [["strftime",["'%Y, okay?'"]]], var.filters var = Variable.new(%! hello | things: "%Y, okay?", 'the other one'!) assert_equal 'hello', var.name - assert_equal [[:things,["\"%Y, okay?\"","'the other one'"]]], var.filters + assert_equal [["things",["\"%Y, okay?\"","'the other one'"]]], var.filters end def test_filter_with_date_parameter var = Variable.new(%! '2006-06-06' | date: "%m/%d/%Y"!) assert_equal "'2006-06-06'", var.name - assert_equal [[:date,["\"%m/%d/%Y\""]]], var.filters + assert_equal [["date",["\"%m/%d/%Y\""]]], var.filters end def test_filters_without_whitespace var = Variable.new('hello | textileze | paragraph') assert_equal 'hello', var.name - assert_equal [[:textileze,[]], [:paragraph,[]]], var.filters + assert_equal [["textileze",[]], ["paragraph",[]]], var.filters var = Variable.new('hello|textileze|paragraph') assert_equal 'hello', var.name - assert_equal [[:textileze,[]], [:paragraph,[]]], var.filters + assert_equal [["textileze",[]], ["paragraph",[]]], var.filters var = Variable.new("hello|replace:'foo','bar'|textileze") assert_equal 'hello', var.name - assert_equal [[:replace, ["'foo'", "'bar'"]], [:textileze, []]], var.filters + assert_equal [["replace", ["'foo'", "'bar'"]], ["textileze", []]], var.filters end def test_symbol var = Variable.new("http://disney.com/logo.gif | image: 'med' ") assert_equal 'http://disney.com/logo.gif', var.name - assert_equal [[:image,["'med'"]]], var.filters + assert_equal [["image",["'med'"]]], var.filters end def test_string_single_quoted