octopress-include-tag 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03549c58c4562c87f8cd15ac4e77470ddf764295
-  data.tar.gz: d790afdfb814d2e87174eb5891c22f5964c88d70
+  metadata.gz: c8f3dbc10b79eb0ad3bbf180840ab99c0252a17d
+  data.tar.gz: fceb136801a8723a4ed806a240db5bc9c1064d1e
 SHA512:
-  metadata.gz: f1a1056e268c4df190f8db75dd6e3cf115da9816539b94730d962c87e8f445230d3b49f187d6c37f65e496a3f2c5672fae7e145382644b359ae5f5d91b202b27
-  data.tar.gz: 52eddae1fe00e1492cbeb09f4261eef7b7a5503eb6c22e92808395f398be3307e0b5812742f0e6e6839f63f06340687d12daefb5d45f20bd64d2d306d029b731
+  metadata.gz: f5669bf4116bbaa83c2de03254037df3906055ebe7fc8f2be23ae68ebd0c2a4e1a2daf230ca4821a2ad93eb4c460e646af375a72d777d558ef60e999360dd509
+  data.tar.gz: 64a34a2a3dbe86244cd1161dce19e2ed5993f411b4aad98ac26474b8e7fdd2a341cdb29cad6d75944e14ee0e9a8087a2cbbae0ef1a732a64c688ff82e041cd78

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.1.3 - 2015-05-15
+- Fix: Better handling of multiple include parameters
+
 ### 1.1.2 - 2015-05-12
 - Fix: Liquid 3 support improved
 - Minor: Now supports Jekyll 2 and 3.

data/lib/octopress-include-tag.rb

@@ -30,17 +30,17 @@ module Octopress
         #
         def safe_markup(markup)
           file = markup.strip.match(/\S+/)[0]
-          params = ''
+          params = []
 
-          if matched = markup.match(VALID_SYNTAX)
-            params = matched[0]
+          markup.scan(Regexp.compile('('+VALID_SYNTAX.to_s+')+')).each do |param|
+            params << param.first
           end
 
           if matched = tag_markup.match(VARIABLE_SYNTAX)
             file = matched['variable']
           end
 
-          [file, params]
+          [file, params.join(' ')]
         end
 
         def render(context)

data/lib/octopress-include-tag/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module Include
-      VERSION = "1.1.2"
+      VERSION = "1.1.3"
     end
   end
 end

data/test/_expected/includes.html

@@ -9,6 +9,7 @@ Testing Include → Testing Include
 
 ## Local var passing
 Testing Include var_test → Testing Include var_test
+Testing Include var_test - another var! → Testing Include var_test - another var!
 
 ## Filter testing
 TESTING INCLUDE → TESTING INCLUDE

data/test/_includes/foo.html

@@ -1 +1 @@
-Testing Include {{ include.some_var }}
+Testing Include {{ include.some_var }}{% if include.another_var == 'awesome' %} - another var!{% endif %}

data/test/includes.html

@@ -12,6 +12,7 @@ Testing Include → {% include {{ page.partial }} %}
 
 ## Local var passing
 Testing Include var_test → {% include foo.html some_var="var_test" %}
+Testing Include var_test - another var! → {% include foo.html some_var="var_test" another_var="awesome" %}
 
 ## Filter testing
 TESTING INCLUDE → {% include foo.html | upcase %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-include-tag
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-tag-helpers