From fea9c54768145f56237b4af1f5ad2c2aefa056d7 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 18 Nov 2012 10:08:00 +0100 Subject: [PATCH 1/6] Avoid warning for grouped expression --- lib/liquid/htmltags.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/liquid/htmltags.rb b/lib/liquid/htmltags.rb index 78424e65..62a53895 100644 --- a/lib/liquid/htmltags.rb +++ b/lib/liquid/htmltags.rb @@ -57,7 +57,7 @@ module Liquid result << "" << render_all(@nodelist, context) << '' - if col == cols and not (index == length - 1) + if col == cols and (index != length - 1) col = 0 row += 1 result << "\n" From 90b40ffb4b6a91a76c381e811bcadc414bad0ae5 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 18 Nov 2012 10:19:05 +0100 Subject: [PATCH 2/6] Avoid warnings for shadowed outer local variable --- lib/liquid/tags/include.rb | 4 ++-- lib/liquid/tags/unless.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/liquid/tags/include.rb b/lib/liquid/tags/include.rb index f7400abd..97c5f479 100644 --- a/lib/liquid/tags/include.rb +++ b/lib/liquid/tags/include.rb @@ -34,8 +34,8 @@ module Liquid end if variable.is_a?(Array) - variable.collect do |variable| - context[@template_name[1..-2]] = variable + variable.collect do |var| + context[@template_name[1..-2]] = var partial.render(context) end else diff --git a/lib/liquid/tags/unless.rb b/lib/liquid/tags/unless.rb index a3d4d089..2581d25b 100644 --- a/lib/liquid/tags/unless.rb +++ b/lib/liquid/tags/unless.rb @@ -11,9 +11,9 @@ module Liquid context.stack do # First condition is interpreted backwards ( if not ) - block = @blocks.first - unless block.evaluate(context) - return render_all(block.attachment, context) + first_block = @blocks.first + unless first_block.evaluate(context) + return render_all(first_block.attachment, context) end # After the first condition unless works just like if @@ -30,4 +30,4 @@ module Liquid Template.register_tag('unless', Unless) -end \ No newline at end of file +end From c79abf1f87e87f248999599b5ce5d804e04ffbe3 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 18 Nov 2012 10:20:07 +0100 Subject: [PATCH 3/6] Avoid warnings for assigned but unused variable --- lib/liquid/standardfilters.rb | 2 +- lib/liquid/utils.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb index 651216ac..d9d48927 100644 --- a/lib/liquid/standardfilters.rb +++ b/lib/liquid/standardfilters.rb @@ -180,7 +180,7 @@ module Liquid else input end - rescue => e + rescue input end diff --git a/lib/liquid/utils.rb b/lib/liquid/utils.rb index 6058a924..2ba48399 100644 --- a/lib/liquid/utils.rb +++ b/lib/liquid/utils.rb @@ -3,7 +3,7 @@ module Liquid def self.slice_collection_using_each(collection, from, to) segments = [] index = 0 - yielded = 0 + #yielded = 0 # not used # Maintains Ruby 1.8.7 String#each behaviour on 1.9 return [collection] if non_blank_string?(collection) From afc3944a4a2b04afe214143eb6aa07feadc5734a Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 18 Nov 2012 10:21:03 +0100 Subject: [PATCH 4/6] Fix assignment with no effect outside of iterator --- lib/liquid/context.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/liquid/context.rb b/lib/liquid/context.rb index 4500aeff..793bf137 100644 --- a/lib/liquid/context.rb +++ b/lib/liquid/context.rb @@ -168,6 +168,7 @@ module Liquid # Fetches an object starting at the local scope and then moving up the hierachy def find_variable(key) scope = @scopes.find { |s| s.has_key?(key) } + variable = nil if scope.nil? @environments.each do |e| From b48ad7da3ac2d75e2d3ad695badf74b7e0c69c61 Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Sun, 18 Nov 2012 10:29:22 +0100 Subject: [PATCH 5/6] Remove trailing whitespace --- lib/liquid/tags/include.rb | 18 +++++++++--------- lib/liquid/tags/unless.rb | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/liquid/tags/include.rb b/lib/liquid/tags/include.rb index 97c5f479..07c9221b 100644 --- a/lib/liquid/tags/include.rb +++ b/lib/liquid/tags/include.rb @@ -1,11 +1,11 @@ module Liquid class Include < Tag Syntax = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?/o - - def initialize(tag_name, markup, tokens) + + def initialize(tag_name, markup, tokens) if markup =~ Syntax - @template_name = $1 + @template_name = $1 @variable_name = $3 @attributes = {} @@ -19,15 +19,15 @@ module Liquid super end - + def parse(tokens) end - + def render(context) source = _read_template_from_file_system(context) partial = Liquid::Template.parse(source) variable = context[@variable_name || @template_name[1..-2]] - + context.stack do @attributes.each do |key, value| context[key] = context[value] @@ -44,11 +44,11 @@ module Liquid end end end - + private def _read_template_from_file_system(context) file_system = context.registers[:file_system] || Liquid::Template.file_system - + # make read_template_file call backwards-compatible. case file_system.method(:read_template_file).arity when 1 @@ -61,5 +61,5 @@ module Liquid end end - Template.register_tag('include', Include) + Template.register_tag('include', Include) end diff --git a/lib/liquid/tags/unless.rb b/lib/liquid/tags/unless.rb index 2581d25b..e5614811 100644 --- a/lib/liquid/tags/unless.rb +++ b/lib/liquid/tags/unless.rb @@ -9,25 +9,25 @@ module Liquid class Unless < If def render(context) context.stack do - + # First condition is interpreted backwards ( if not ) first_block = @blocks.first unless first_block.evaluate(context) return render_all(first_block.attachment, context) end - + # After the first condition unless works just like if @blocks[1..-1].each do |block| if block.evaluate(context) return render_all(block.attachment, context) end end - + '' end end end - + Template.register_tag('unless', Unless) end From 1cac09831d12c50b5eaeffc3653f78268495873e Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Tue, 5 Mar 2013 22:19:38 +0100 Subject: [PATCH 6/6] Completely remove unused variable --- lib/liquid/utils.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/liquid/utils.rb b/lib/liquid/utils.rb index 2ba48399..0bf6df29 100644 --- a/lib/liquid/utils.rb +++ b/lib/liquid/utils.rb @@ -3,7 +3,6 @@ module Liquid def self.slice_collection_using_each(collection, from, to) segments = [] index = 0 - #yielded = 0 # not used # Maintains Ruby 1.8.7 String#each behaviour on 1.9 return [collection] if non_blank_string?(collection)