liquid 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b38ad40486ed2c0f9af07847fd0328c1ebcd76
-  data.tar.gz: 1bf5887d011005c058d0ed524d03e40926c96d59
+  metadata.gz: 764c2e81dc860fd817e71e6fd689b45a66bfee70
+  data.tar.gz: 2340fffb775ff15bfac14cb84df48a5a5556225f
 SHA512:
-  metadata.gz: 176f0aa1184d56a180447e3353d90dc31a24b7c203c107dd80446520667b4f87a9f91eed07c7f0cfbd53c9f69572f2d818201d98d11b3ba1c21e4635f657a8ca
-  data.tar.gz: 81da9c0069bccfc02de2e5da4e78d1b8dddf2b382018c5e50d7c32a5a56c6df0b1f06187c78274b7e6f170d8d5d475e776f31f903663a861df636565c946e567
+  metadata.gz: 6315676f23fbe9883c76df24f32ff92668febe745cb7d632004b77d07938fab98d76ed62a1afea594a1ff1c341cc1c1d83dbe13754064aedb1c2c947a1f62db4
+  data.tar.gz: 5516c2fe89c5e55fdfa788521cc7b3973e47ef9a206c942d2d8c1e3c184ed692ef65dcca596f273ef84b3b568c013a7275852d120d41008472cb8160aa36278b

data/lib/liquid/tags/capture.rb

@@ -11,7 +11,7 @@ module Liquid
   # in a sidebar or footer.
   #
   class Capture < Block
-    Syntax = /(\w+)/
+    Syntax = /(#{VariableSignature}+)/o
 
     def initialize(tag_name, markup, options)
       super

data/lib/liquid/tags/table_row.rb

@@ -42,7 +42,6 @@ module Liquid
             'index0'.freeze    => index,
             'col'.freeze       => col + 1,
             'col0'.freeze      => col,
-            'index0'.freeze    => index,
             'rindex'.freeze    => length - index,
             'rindex0'.freeze   => length - index - 1,
             'first'.freeze     => (index == 0),

data/lib/liquid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Liquid
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/integration/assign_test.rb

@@ -3,6 +3,16 @@ require 'test_helper'
 class AssignTest < Minitest::Test
   include Liquid
 
+  def test_assign_with_hyphen_in_variable_name
+    template_source = <<-END_TEMPLATE
+    {% assign this-thing = 'Print this-thing' %}
+    {{ this-thing }}
+    END_TEMPLATE
+    template = Template.parse(template_source)
+    rendered = template.render!
+    assert_equal "Print this-thing", rendered.strip
+  end
+
   def test_assigned_variable
     assert_template_result('.foo.',
                            '{% assign foo = values %}.{{ foo[0] }}.',

data/test/integration/capture_test.rb

@@ -7,6 +7,16 @@ class CaptureTest < Minitest::Test
     assert_template_result("test string", "{% capture 'var' %}test string{% endcapture %}{{var}}", {})
   end
 
+  def test_capture_with_hyphen_in_variable_name
+    template_source = <<-END_TEMPLATE
+    {% capture this-thing %}Print this-thing{% endcapture %}
+    {{ this-thing }}
+    END_TEMPLATE
+    template = Template.parse(template_source)
+    rendered = template.render!
+    assert_equal "Print this-thing", rendered.strip
+  end
+
   def test_capture_to_variable_from_outer_scope_if_existing
     template_source = <<-END_TEMPLATE
     {% assign var = '' %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,53 +161,53 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
 test_files:
-- test/unit/tags/for_tag_unit_test.rb
-- test/unit/tags/if_tag_unit_test.rb
-- test/unit/tags/case_tag_unit_test.rb
-- test/unit/parser_unit_test.rb
-- test/unit/condition_unit_test.rb
-- test/unit/file_system_unit_test.rb
-- test/unit/regexp_unit_test.rb
-- test/unit/tag_unit_test.rb
-- test/unit/i18n_unit_test.rb
-- test/unit/tokenizer_unit_test.rb
-- test/unit/strainer_unit_test.rb
-- test/unit/template_unit_test.rb
-- test/unit/module_ex_unit_test.rb
-- test/unit/lexer_unit_test.rb
-- test/unit/block_unit_test.rb
-- test/unit/context_unit_test.rb
-- test/unit/variable_unit_test.rb
-- test/test_helper.rb
+- test/fixtures/en_locale.yml
+- test/integration/assign_test.rb
+- test/integration/blank_test.rb
+- test/integration/capture_test.rb
+- test/integration/context_test.rb
+- test/integration/drop_test.rb
+- test/integration/error_handling_test.rb
+- test/integration/filter_test.rb
+- test/integration/hash_ordering_test.rb
+- test/integration/output_test.rb
+- test/integration/parsing_quirks_test.rb
+- test/integration/render_profiling_test.rb
+- test/integration/security_test.rb
+- test/integration/standard_filter_test.rb
+- test/integration/tags/break_tag_test.rb
+- test/integration/tags/continue_tag_test.rb
 - test/integration/tags/for_tag_test.rb
 - test/integration/tags/if_else_tag_test.rb
 - test/integration/tags/include_tag_test.rb
-- test/integration/tags/continue_tag_test.rb
+- test/integration/tags/increment_tag_test.rb
 - test/integration/tags/raw_tag_test.rb
-- test/integration/tags/table_row_test.rb
 - test/integration/tags/standard_tag_test.rb
-- test/integration/tags/increment_tag_test.rb
-- test/integration/tags/unless_else_tag_test.rb
 - test/integration/tags/statements_test.rb
-- test/integration/tags/break_tag_test.rb
-- test/integration/filter_test.rb
-- test/integration/render_profiling_test.rb
-- test/integration/parsing_quirks_test.rb
-- test/integration/drop_test.rb
-- test/integration/hash_ordering_test.rb
-- test/integration/capture_test.rb
-- test/integration/assign_test.rb
-- test/integration/output_test.rb
-- test/integration/error_handling_test.rb
-- test/integration/blank_test.rb
+- test/integration/tags/table_row_test.rb
+- test/integration/tags/unless_else_tag_test.rb
 - test/integration/template_test.rb
-- test/integration/security_test.rb
 - test/integration/variable_test.rb
-- test/integration/standard_filter_test.rb
-- test/integration/context_test.rb
-- test/fixtures/en_locale.yml
+- test/test_helper.rb
+- test/unit/block_unit_test.rb
+- test/unit/condition_unit_test.rb
+- test/unit/context_unit_test.rb
+- test/unit/file_system_unit_test.rb
+- test/unit/i18n_unit_test.rb
+- test/unit/lexer_unit_test.rb
+- test/unit/module_ex_unit_test.rb
+- test/unit/parser_unit_test.rb
+- test/unit/regexp_unit_test.rb
+- test/unit/strainer_unit_test.rb
+- test/unit/tag_unit_test.rb
+- test/unit/tags/case_tag_unit_test.rb
+- test/unit/tags/for_tag_unit_test.rb
+- test/unit/tags/if_tag_unit_test.rb
+- test/unit/template_unit_test.rb
+- test/unit/tokenizer_unit_test.rb
+- test/unit/variable_unit_test.rb