remove method

.rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml

@@ -892,7 +892,7 @@ Lint/FormatParameterMismatch:
   Enabled: true
 
 Lint/HandleExceptions:
-  AllowComments: true
+  Enabled: true
 
 Lint/ImplicitStringConcatenation:
   Description: Checks for adjacent string literals on the same line, which could

.travis.yml

@@ -1,15 +1,11 @@
 language: ruby
 cache: bundler
-os: [osx, linux]
 
 rvm:
   - 2.4
   - 2.5
   - &latest_ruby 2.6
   - 2.7
-  - 2.7.0-preview1
-  - 2.7.0-preview2
-  - 2.7.0-preview3
   - ruby-head
 
 matrix:
@@ -19,9 +15,6 @@ matrix:
       name: Profiling Memory Usage
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.7
-    - rvm: 2.7.0-preview2
-    - rvm: 2.7.0-preview3
 
 branches:
   only:

lib/liquid/condition.rb

@@ -38,7 +38,6 @@ module Liquid
       @left = left
       @operator = operator
       @right = right
-
       @child_relation = nil
       @child_condition = nil
     end

lib/liquid/parse_context.rb

@@ -7,10 +7,8 @@ module Liquid
 
     def initialize(options = {})
       @template_options = options ? options.dup : {}
-
       @locale = @template_options[:locale] ||= I18n.new
       @warnings = []
-
       self.depth = 0
       self.partial = false
     end
@@ -22,7 +20,6 @@ module Liquid
     def partial=(value)
       @partial = value
       @options = value ? partial_options : @template_options
-
       @error_mode = @options[:error_mode] || Template.error_mode
     end
 

lib/liquid/partial_cache.rb

@@ -9,7 +9,6 @@ module Liquid
 
       file_system = (context.registers[:file_system] ||= Liquid::Template.file_system)
       source = file_system.read_template_file(template_name)
-
       parse_context.partial = true
 
       partial = Liquid::Template.parse(source, parse_context)

lib/liquid/profiler.rb

@@ -46,7 +46,7 @@ module Liquid
     include Enumerable
 
     class Timing
-      attr_reader :code, :partial, :line_number, :children, :total_time, :self_time
+      attr_reader :code, :partial, :line_number, :children
 
       def initialize(node, partial)
         @code        = node.respond_to?(:raw) ? node.raw : node
@@ -65,17 +65,6 @@ module Liquid
 
       def finish
         @end_time = Time.now
-        @total_time = @end_time - @start_time
-
-        if @children.empty?
-          @self_time = @total_time
-        else
-          total_children_time = 0
-          @children.each do |child|
-            total_children_time += child.total_time
-          end
-          @self_time = @total_time - total_children_time
-        end
       end
 
       def render_time
@@ -109,8 +98,8 @@ module Liquid
       Thread.current[:liquid_profiler]
     end
 
-    def initialize(partial_name = "<root>")
+    def initialize
-      @partial_stack = [partial_name]
+      @partial_stack = ["<root>"]
 
       @root_timing = Timing.new("", current_partial)
       @timing_stack = [@root_timing]

lib/liquid/standardfilters.rb

@@ -78,12 +78,9 @@ module Liquid
       return if input.nil?
       input_str = input.to_s
       length = Utils.to_integer(length)
-
       truncate_string_str = truncate_string.to_s
-
       l = length - truncate_string_str.length
       l = 0 if l < 0
-
       input_str.length > length ? input_str[0...l].concat(truncate_string_str) : input_str
     end
 
@@ -91,10 +88,8 @@ module Liquid
       return if input.nil?
       wordlist = input.to_s.split
       words = Utils.to_integer(words)
-
       l = words - 1
       l = 0 if l < 0
-
       wordlist.length > l ? wordlist[0..l].join(" ").concat(truncate_string.to_s) : input
     end
 
@@ -133,13 +128,13 @@ module Liquid
 
     # Join elements of the array with certain character between them
     def join(input, glue = ' ')
-      InputIterator.new(input, context).join(glue)
+      InputIterator.new(input).join(glue)
     end
 
     # Sort elements of the array
     # provide optional property with which to sort an array of hashes or drops
     def sort(input, property = nil)
-      ary = InputIterator.new(input, context)
+      ary = InputIterator.new(input)
 
       return [] if ary.empty?
 
@@ -159,7 +154,7 @@ module Liquid
     # Sort elements of an array ignoring case if strings
     # provide optional property with which to sort an array of hashes or drops
     def sort_natural(input, property = nil)
-      ary = InputIterator.new(input, context)
+      ary = InputIterator.new(input)
 
       return [] if ary.empty?
 
@@ -179,7 +174,7 @@ module Liquid
     # Filter the elements of an array to those with a certain property value.
     # By default the target is any truthy value.
     def where(input, property, target_value = nil)
-      ary = InputIterator.new(input, context)
+      ary = InputIterator.new(input)
 
       if ary.empty?
         []
@@ -201,7 +196,7 @@ module Liquid
     # Remove duplicate elements from an array
     # provide optional property with which to determine uniqueness
     def uniq(input, property = nil)
-      ary = InputIterator.new(input, context)
+      ary = InputIterator.new(input)
 
       if property.nil?
         ary.uniq
@@ -218,13 +213,13 @@ module Liquid
 
     # Reverse the elements of an array
     def reverse(input)
-      ary = InputIterator.new(input, context)
+      ary = InputIterator.new(input)
       ary.reverse
     end
 
     # map/collect on a given property
     def map(input, property)
-      InputIterator.new(input, context).map do |e|
+      InputIterator.new(input).map do |e|
         e = e.call if e.is_a?(Proc)
 
         if property == "to_liquid"
@@ -241,7 +236,7 @@ module Liquid
     # Remove nils within an array
     # provide optional property with which to check for nil
     def compact(input, property = nil)
-      ary = InputIterator.new(input, context)
+      ary = InputIterator.new(input)
 
       if property.nil?
         ary.compact
@@ -285,7 +280,7 @@ module Liquid
       unless array.respond_to?(:to_ary)
         raise ArgumentError, "concat filter requires an array argument"
       end
-      InputIterator.new(input, context).concat(array)
+      InputIterator.new(input).concat(array)
     end
 
     # prepend a string to another
@@ -426,26 +421,17 @@ module Liquid
       result.is_a?(BigDecimal) ? result.to_f : result
     end
 
-    # Set a default value when the input is nil, false or empty
+    def default(input, default_value = '')
-    #
+      if !input || input.respond_to?(:empty?) && input.empty?
-    # Example:
+        Usage.increment("default_filter_received_false_value") if input == false # See https://github.com/Shopify/liquid/issues/1127
-    #    {{ product.title | default: "No Title" }}
+        default_value
-    #
+      else
-    # Use `allow_false` when an input should only be tested against nil or empty and not false.
+        input
-    #
+      end
-    # Example:
-    #    {{ product.title | default: "No Title", allow_false: true }}
-    #
-    def default(input, default_value = '', options = {})
-      options = {} unless options.is_a?(Hash)
-      false_check = options['allow_false'] ? input.nil? : !input
-      false_check || (input.respond_to?(:empty?) && input.empty?) ? default_value : input
     end
 
     private
 
-    attr_reader :context
-
     def raise_property_error(property)
       raise Liquid::ArgumentError, "cannot select the property '#{property}'"
     end
@@ -474,8 +460,7 @@ module Liquid
     class InputIterator
       include Enumerable
 
-      def initialize(input, context)
+      def initialize(input)
-        @context = context
         @input = if input.is_a?(Array)
           input.flatten
         elsif input.is_a?(Hash)
@@ -514,7 +499,6 @@ module Liquid
 
       def each
         @input.each do |e|
-          e.context = @context if e.respond_to?(:context=)
           yield(e.respond_to?(:to_liquid) ? e.to_liquid : e)
         end
       end

lib/liquid/tags/cycle.rb

@@ -51,8 +51,8 @@ module Liquid
 
       iteration += 1
       iteration  = 0 if iteration >= @variables.size
-
       context.registers[:cycle][key] = iteration
+
       output
     end
 

lib/liquid/tags/for.rb

@@ -105,11 +105,9 @@ module Liquid
       p = Parser.new(markup)
       @variable_name = p.consume(:id)
       raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_in") unless p.id?('in')
-
       collection_name = p.expression
-      @collection_name = Expression.parse(collection_name)
-
       @name = "#{@variable_name}-#{collection_name}"
+      @collection_name = Expression.parse(collection_name)
       @reversed = p.id?('reversed')
 
       while p.look(:id) && p.look(:colon, 1)

lib/liquid/tags/render.rb

@@ -2,8 +2,7 @@
 
 module Liquid
   class Render < Tag
-    FOR = 'for'
+    SYNTAX = /(#{QuotedString}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?(\s+(?:as)\s+(#{VariableSegment}+))?/o
-    SYNTAX = /(#{QuotedString}+)(\s+(with|#{FOR})\s+(#{QuotedFragment}+))?(\s+(?:as)\s+(#{VariableSegment}+))?/o
 
     disable_tags "include"
 
@@ -15,13 +14,11 @@ module Liquid
       raise SyntaxError, options[:locale].t("errors.syntax.render") unless markup =~ SYNTAX
 
       template_name = Regexp.last_match(1)
-      with_or_for = Regexp.last_match(3)
+      variable_name = Regexp.last_match(3)
-      variable_name = Regexp.last_match(4)
 
-      @alias_name = Regexp.last_match(6)
+      @alias_name = Regexp.last_match(5)
       @variable_name_expr = variable_name ? Expression.parse(variable_name) : nil
       @template_name_expr = Expression.parse(template_name)
-      @for = (with_or_for == FOR)
 
       @attributes = {}
       markup.scan(TagAttributes) do |key, value|
@@ -46,27 +43,19 @@ module Liquid
 
       context_variable_name = @alias_name || template_name.split('/').last
 
-      render_partial_func = ->(var, forloop) {
+      render_partial_func = ->(var) {
         inner_context = context.new_isolated_subcontext
         inner_context.template_name = template_name
         inner_context.partial = true
-        inner_context['forloop']    = forloop if forloop
-
         @attributes.each do |key, value|
           inner_context[key] = context.evaluate(value)
         end
         inner_context[context_variable_name] = var unless var.nil?
         partial.render_to_output_buffer(inner_context, output)
-        forloop&.send(:increment!)
       }
 
       variable = @variable_name_expr ? context.evaluate(@variable_name_expr) : nil
-      if @for && variable.respond_to?(:each) && variable.respond_to?(:count)
+      variable.is_a?(Array) ? variable.each(&render_partial_func) : render_partial_func.call(variable)
-        forloop = Liquid::ForloopDrop.new(template_name, variable.count, nil)
-        variable.each { |var| render_partial_func.call(var, forloop) }
-      else
-        render_partial_func.call(variable, nil)
-      end
 
       output
     end

lib/liquid/tags/table_row.rb

@@ -27,6 +27,7 @@ module Liquid
       to = @attributes.key?('limit') ? from + context.evaluate(@attributes['limit']).to_i : nil
 
       collection = Utils.slice_collection(collection, from, to)
+
       length = collection.length
 
       cols = context.evaluate(@attributes['cols']).to_i

lib/liquid/template.rb

@@ -254,7 +254,7 @@ module Liquid
       if @profiling && !context.partial
         raise "Profiler not loaded, require 'liquid/profiler' first" unless defined?(Liquid::Profiler)
 
-        @profiler = Profiler.new(context.template_name)
+        @profiler = Profiler.new
         @profiler.start
 
         begin

test/integration/drop_test.rb

@@ -179,11 +179,6 @@ class DropsTest < Minitest::Test
     assert_equal(' carrot ', output)
   end
 
-  def test_context_drop_array_with_map
-    output = Liquid::Template.parse(' {{ contexts | map: "bar" }} ').render!('contexts' => [ContextDrop.new, ContextDrop.new], 'bar' => "carrot")
-    assert_equal(' carrotcarrot ', output)
-  end
-
   def test_nested_context_drop
     output = Liquid::Template.parse(' {{ product.context.foo }} ').render!('product' => ProductDrop.new, 'foo' => "monkey")
     assert_equal(' monkey ', output)

test/integration/error_handling_test.rb

@@ -252,7 +252,6 @@ class ErrorHandlingTest < Minitest::Test
 
     begin
       Liquid::Template.file_system = TestFileSystem.new
-
       template = Liquid::Template.parse("Argument error:\n{% include 'product' %}", line_numbers: true)
       page = template.render('errors' => ErrorDrop.new)
     ensure

test/integration/render_profiling_test.rb

@@ -153,19 +153,4 @@ class RenderProfilingTest < Minitest::Test
     # Will profile each invocation of the for block
     assert_equal(2, t.profiler[0].children.length)
   end
-
-  def test_profiling_supports_self_time
-    t = Template.parse("{% for item in collection %} {{ item }} {% endfor %}", profile: true)
-    t.render!("collection" => ["one", "two"])
-    leaf = t.profiler[0].children[0]
-
-    assert_operator leaf.self_time, :>, 0
-  end
-
-  def test_profiling_supports_total_time
-    t = Template.parse("{% if true %} {% increment test %} {{ test }} {% endif %}", profile: true)
-    t.render!
-
-    assert_operator t.profiler[0].total_time, :>, 0
-  end
 end

test/integration/standard_filter_test.rb

@@ -685,17 +685,6 @@ class StandardFiltersTest < Minitest::Test
     assert_equal("bar", @filters.default(false, "bar"))
     assert_equal("bar", @filters.default([], "bar"))
     assert_equal("bar", @filters.default({}, "bar"))
-    assert_template_result('bar', "{{ false | default: 'bar' }}")
-  end
-
-  def test_default_handle_false
-    assert_equal("foo", @filters.default("foo", "bar", "allow_false" => true))
-    assert_equal("bar", @filters.default(nil, "bar", "allow_false" => true))
-    assert_equal("bar", @filters.default("", "bar", "allow_false" => true))
-    assert_equal(false, @filters.default(false, "bar", "allow_false" => true))
-    assert_equal("bar", @filters.default([], "bar", "allow_false" => true))
-    assert_equal("bar", @filters.default({}, "bar", "allow_false" => true))
-    assert_template_result('false', "{{ false | default: 'bar', allow_false: true }}")
   end
 
   def test_cannot_access_private_methods

test/integration/tags/render_tag_test.rb

@@ -205,31 +205,4 @@ class RenderTagTest < Minitest::Test
     assert_template_result("Product: Draft 151cm Product: Element 155cm ",
                            "{% render 'product' for products %}", "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }])
   end
-
-  def test_render_tag_forloop
-    Liquid::Template.file_system = StubFileSystem.new(
-      'product' => "Product: {{ product.title }} {% if forloop.first %}first{% endif %} {% if forloop.last %}last{% endif %} index:{{ forloop.index }} ",
-    )
-
-    assert_template_result("Product: Draft 151cm first  index:1 Product: Element 155cm  last index:2 ",
-                           "{% render 'product' for products %}", "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }])
-  end
-
-  def test_render_tag_for_drop
-    Liquid::Template.file_system = StubFileSystem.new(
-      'loop' => "{{ value.foo }}",
-    )
-
-    assert_template_result("123",
-                           "{% render 'loop' for loop as value %}", "loop" => TestEnumerable.new)
-  end
-
-  def test_render_tag_with_drop
-    Liquid::Template.file_system = StubFileSystem.new(
-      'loop' => "{{ value }}",
-    )
-
-    assert_template_result("TestEnumerable",
-                           "{% render 'loop' with loop as value %}", "loop" => TestEnumerable.new)
-  end
 end