Convert array to string interpolation, use 'unless' rather than 'if x !='

lib/liquid/tags/case.rb

@@ -52,14 +52,7 @@ module Liquid
       @blocks.each do |block|
         if block.else?
           block.attachment.render_to_output_buffer(context, output) if execute_else_block
-          next
+        elsif block.evaluate(context)
-        end
-
-        result = Liquid::Utils.to_liquid_value(
-          block.evaluate(context)
-        )
-
-        if result
           execute_else_block = false
           block.attachment.render_to_output_buffer(context, output)
         end

lib/liquid/tags/if.rb

@@ -50,11 +50,7 @@ module Liquid
 
     def render_to_output_buffer(context, output)
       @blocks.each do |block|
-        result = Liquid::Utils.to_liquid_value(
+        if block.evaluate(context)
-          block.evaluate(context)
-        )
-
-        if result
           return block.attachment.render_to_output_buffer(context, output)
         end
       end

lib/liquid/tags/unless.rb

@@ -11,20 +11,13 @@ module Liquid
     def render_to_output_buffer(context, output)
       # First condition is interpreted backwards ( if not )
       first_block = @blocks.first
-      result = Liquid::Utils.to_liquid_value(
+      unless first_block.evaluate(context)
-        first_block.evaluate(context)
-      )
-
-      unless result
         return first_block.attachment.render_to_output_buffer(context, output)
       end
 
       # After the first condition unless works just like if
       @blocks[1..-1].each do |block|
-        result = block.evaluate(context)
+        if block.evaluate(context)
-        result = result.to_liquid_value if result.is_a?(Liquid::Drop)
-
-        if result
           return block.attachment.render_to_output_buffer(context, output)
         end
       end

lib/liquid/utils.rb

@@ -81,13 +81,5 @@ module Liquid
     rescue ::ArgumentError
       nil
     end
-
-    def self.to_liquid_value(obj)
-      # Enable "obj" to represent itself as a primitive value like integer, string, or boolean
-      return obj.to_liquid_value if obj.respond_to?(:to_liquid_value)
-
-      # Otherwise return the object itself
-      obj
-    end
   end
 end

lib/liquid/variable_lookup.rb

@@ -40,9 +40,6 @@ module Liquid
       @lookups.each_index do |i|
         key = context.evaluate(@lookups[i])
 
-        # Cast "key" to its liquid value to enable it to act as a primitive value
-        key = Liquid::Utils.to_liquid_value(key)
-
         # If object is a hash- or array-like object we look for the
         # presence of the key and if its available we return it
         if object.respond_to?(:[]) &&

performance/shopify/shop_filter.rb

@@ -14,11 +14,11 @@ module ShopFilter
   end
 
   def script_tag(url)
-    %(<script src="#{url}" type="text/javascript"></script>)
+    %(<script src="#{url}"></script>)
   end
 
   def stylesheet_tag(url, media = "all")
-    %(<link href="#{url}" rel="stylesheet" type="text/css"  media="#{media}"  />)
+    %(<link href="#{url}" rel="stylesheet" #{%(media="#{media}" ) unless media == 'all'}/>)
   end
 
   def link_to(link, url, title = "")

test/integration/variable_test.rb

@@ -15,31 +15,6 @@ class VariableTest < Minitest::Test
     assert_template_result('foobar', '{{ foo }}', 'foo' => ThingWithToLiquid.new)
   end
 
-  def test_variable_lookup_calls_to_liquid_value
-    assert_template_result('1', '{{ foo }}', 'foo' => IntegerDrop.new('1'))
-    assert_template_result('2', '{{ list[foo] }}', 'foo' => IntegerDrop.new('1'), 'list' => [1, 2, 3])
-    assert_template_result('one', '{{ list[foo] }}', 'foo' => IntegerDrop.new('1'), 'list' => { 1 => 'one' })
-    assert_template_result('Yay', '{{ foo }}', 'foo' => BooleanDrop.new(true))
-    assert_template_result('YAY', '{{ foo | upcase }}', 'foo' => BooleanDrop.new(true))
-  end
-
-  def test_if_tag_calls_to_liquid_value
-    assert_template_result('one', '{% if foo == 1 %}one{% endif %}', 'foo' => IntegerDrop.new('1'))
-    assert_template_result('true', '{% if foo == true %}true{% endif %}', 'foo' => BooleanDrop.new(true))
-    assert_template_result('true', '{% if foo %}true{% endif %}', 'foo' => BooleanDrop.new(true))
-
-    assert_template_result('', '{% if foo %}true{% endif %}', 'foo' => BooleanDrop.new(false))
-    assert_template_result('', '{% if foo == true %}True{% endif %}', 'foo' => BooleanDrop.new(false))
-  end
-
-  def test_unless_tag_calls_to_liquid_value
-    assert_template_result('', '{% unless foo %}true{% endunless %}', 'foo' => BooleanDrop.new(true))
-  end
-
-  def test_case_tag_calls_to_liquid_value
-    assert_template_result('One', '{% case foo %}{% when 1 %}One{% endcase %}', 'foo' => IntegerDrop.new('1'))
-  end
-
   def test_simple_with_whitespaces
     template = Template.parse(%(  {{ test }}  ))
     assert_equal('  worked  ', template.render!('test' => 'worked'))
@@ -129,8 +104,4 @@ class VariableTest < Minitest::Test
   def test_dynamic_find_var
     assert_template_result('bar', '{{ [key] }}', 'key' => 'foo', 'foo' => 'bar')
   end
-
-  def test_raw_value_variable
-    assert_template_result('bar', '{{ [key] }}', 'key' => 'foo', 'foo' => 'bar')
-  end
 end

test/test_helper.rb

@@ -119,44 +119,6 @@ class ThingWithToLiquid
   end
 end
 
-class IntegerDrop < Liquid::Drop
-  def initialize(value)
-    super()
-    @value = value.to_i
-  end
-
-  def ==(other)
-    @value == other
-  end
-
-  def to_s
-    @value.to_s
-  end
-
-  def to_liquid_value
-    @value
-  end
-end
-
-class BooleanDrop < Liquid::Drop
-  def initialize(value)
-    super()
-    @value = value
-  end
-
-  def ==(other)
-    @value == other
-  end
-
-  def to_liquid_value
-    @value
-  end
-
-  def to_s
-    @value ? "Yay" : "Nay"
-  end
-end
-
 class ErrorDrop < Liquid::Drop
   def standard_error
     raise Liquid::StandardError, 'standard error'