liquid 2.5.1 → 2.5.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjdlODliYmQ5MTliNTllM2NjZDIxNzE0ZGE3MjBkMGQxYjEwMWFlZQ==
+  data.tar.gz: !binary |-
+    ZmYxZmFjNTlkNGQ2ODM1YTlkZjlmZGU3ODE2MDhiOThlZTQ1MmI0Ng==
+SHA512:
+  metadata.gz: !binary |-
+    ZDQ5NjhlNmMyYTBjNDkwZjA5ZjkwMzE0Y2VkYWVlNDFhZmY4ZTExYTM3NDkw
+    OTI3ZmZkNzBiNjY0OTVlNWIxMjU5OWI0NGZjNjFhMjJlMzgxMGQ2NGE4ZWE0
+    YTllYTQwNzY5YTVlYzMyZDQ3YjM3MmIwNjExOTNlYTkyNTNhZDQ=
+  data.tar.gz: !binary |-
+    OWJjYzJhYWMzMzUzNTRkYTQxZGFiNWJjNmZiMWQ4M2YwNjk2YjU5YTY4ZTU4
+    MGRjODMwOWM4MmJhNzM0MDdlOTA4N2FiNjE5NjVjYzRjODg0MzFjN2VlYTRl
+    MDA4M2MyNWZmMzljN2E0NjlmZDJmZmI0NmFjZmM1YzQyYjJiZjE=

data/History.md

@@ -1,5 +1,17 @@
 # Liquid Version History
 
+## 2.5.3 / branch "2.5-stable"
+
+* #232, #234, #237: Fix map filter bugs [Florian Weingarten, fw42]
+
+## 2.5.2 / 2013-09-03 / deleted
+
+Yanked from rubygems, as it contained too many changes that broke compatibility. Those changes will be on following major releases.
+
+## 2.5.1 / 2013-07-24
+
+* #230: Fix security issue with map filter, Use invoke_drop in map filter [Florian Weingarten, fw42]
+
 ## 2.5.0 / 2013-03-06
 
 * Prevent Object methods from being called on drops

data/lib/liquid/drop.rb

@@ -54,7 +54,7 @@ module Liquid
 
     # Check for method existence without invoking respond_to?, which creates symbols
     def self.invokable?(method_name)
-      @invokable_methods ||= Set.new((public_instance_methods - Liquid::Drop.public_instance_methods).map(&:to_s))
+      @invokable_methods ||= Set.new(["to_liquid"] + (public_instance_methods - Liquid::Drop.public_instance_methods).map(&:to_s))
       @invokable_methods.include?(method_name.to_s)
     end
   end

data/lib/liquid/standardfilters.rb

@@ -94,7 +94,14 @@ module Liquid
     def map(input, property)
       ary = [input].flatten
       ary.map do |e|
-        e.respond_to?('[]') ? e[property] : nil
+        e = e.call if e.is_a?(Proc)
+        e = e.to_liquid if e.respond_to?(:to_liquid)
+
+        if property == "to_liquid"
+          e
+        elsif e.respond_to?(:[])
+          e[property]
+        end
       end
     end
 

data/test/liquid/drop_test.rb

@@ -86,6 +86,11 @@ class DropsTest < Test::Unit::TestCase
     assert_equal "", Liquid::Template.parse('{{ product | map: "whatever" }}').render('product' => ProductDrop.new)
   end
 
+  def test_drops_respond_to_to_liquid
+    assert_equal "text1", Liquid::Template.parse("{{ product.to_liquid.texts.text }}").render('product' => ProductDrop.new)
+    assert_equal "text1", Liquid::Template.parse('{{ product | map: "to_liquid" | map: "texts" | map: "text" }}').render('product' => ProductDrop.new)
+  end
+
   def test_text_drop
     output = Liquid::Template.parse( ' {{ product.texts.text }} '  ).render('product' => ProductDrop.new)
     assert_equal ' text1 ', output

data/test/liquid/standard_filter_test.rb

@@ -4,6 +4,27 @@ class Filters
   include Liquid::StandardFilters
 end
 
+class TestThing
+  def initialize
+    @foo = 0
+  end
+
+  def to_s
+    "woot: #{@foo}"
+  end
+
+  def to_liquid
+    @foo += 1
+    self
+  end
+end
+
+class TestDrop < Liquid::Drop
+  def test
+    "testfoo"
+  end
+end
+
 class StandardFiltersTest < Test::Unit::TestCase
   include Liquid
 
@@ -91,6 +112,18 @@ class StandardFiltersTest < Test::Unit::TestCase
     assert_equal "", Liquid::Template.parse('{{ "foo" | map: "inspect" }}').render
   end
 
+  def test_map_calls_to_liquid
+    t = TestThing.new
+    assert_equal "woot: 1", Liquid::Template.parse('{{ foo }}').render("foo" => t)
+  end
+
+  def test_map_over_proc
+    drop = TestDrop.new
+    p = Proc.new{ drop }
+    templ = '{{ procs | map: "test" }}'
+    assert_equal "testfoo", Liquid::Template.parse(templ).render("procs" => [p])
+  end
+
   def test_date
     assert_equal 'May', @filters.date(Time.parse("2006-05-05 10:00:00"), "%B")
     assert_equal 'June', @filters.date(Time.parse("2006-06-05 10:00:00"), "%B")

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 2.5.1
-  prerelease: 
+  version: 2.5.3
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -89,27 +88,26 @@ files:
 - History.md
 homepage: http://www.liquidmarkup.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
 test_files:
 - test/liquid/assign_test.rb