octopress-tag-helpers 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac54fc8ad22d4a400991d3fbd96a47d057a2c3be
-  data.tar.gz: ed1179657f6660f4751ad554385b8142f452e3b9
+  metadata.gz: 250e3e9ad4a5034f674789ca9d64462cabeaa117
+  data.tar.gz: 3863551105993718c2c9a81fef0a5308013426a8
 SHA512:
-  metadata.gz: 910a0893d65c34bb12a10c4bf944d6dca8123a7ef6ecee275e5e7a6f00eb808bc8c5e2967ef75eb469fc78ab17585dd90118e2af53289704c77b3132126a881b
-  data.tar.gz: b225dfaf0c9c1a9bf888e7c6bad514b529aede002d87fb0957ea2b316f8ee5eabbd057a2cbe54934bfdfc4c41f17bf3ce919b641162beccb543eb9a794f97e48
+  metadata.gz: aa1b3727e239364339f32ff438b26b25a01552ccbf7c44771de68c3cb22ac2ebc3dd3a622e44a5b150de45eec75c307cb82df8053c270b9c090699bb3a40a067
+  data.tar.gz: 9fed3896cd1c2dd10655f10d11bc85cc49dc44afe6d1de05ed6c2afbe0e767b0b49422e47afc0a92d5520ffe24df5ca5de88059b4243a077f270a3313162eec1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.6 - 2015-05-12
+- Minor: Improvements to regex clarity.
+- Minor: Using `parse` method instead of `new` for Liquid 3 compatibility.
+
 ## 1.0.5 - 2015-05-11
 - Minor: Jekyll 3 is fine.
 

data/lib/octopress-tag-helpers/conditional.rb

@@ -1,17 +1,18 @@
 module Octopress
   module TagHelpers
     module Conditional
-      SYNTAX = /(.*)\s(if|unless)\s(.+)/
+      SYNTAX = /(?<tag>.*)\s(?<condition>if|unless)\s(?<expression>.+)/
 
       def self.parse(markup, context)
-        if markup =~ SYNTAX
-          case $2
+        matched = markup.strip.match(SYNTAX)
+        if matched
+          case matched['condition'].strip
           when 'if'
-            tag = Liquid::If.new('if', $3, ["true","{% endif %}"])
+            tag = Liquid::Template.parse("{% if #{matched['expression']} %}true{% endif %}")
           when 'unless'
-            tag = Liquid::Unless.new('unless', $3, ["true","{% endunless %}"])
+            tag = Liquid::Template.parse("{% unless #{matched['expression']} %}true{% endunless %}")
           end
-          tag.render(context) != '' ? $1 : false
+          tag.render!(context) != '' ? matched['tag'] : false
         else
           markup
         end

data/lib/octopress-tag-helpers/path.rb

@@ -1,10 +1,11 @@
 module Octopress
   module TagHelpers
     module Path
-      FILE = /(\S+)(\s?)(.*)/
+      FILE = /(?<path>\S+)(\s?)(?<other>.*)/
       def self.parse(markup, context)
-        if markup =~ FILE
-          (context[$1].nil? ? $1 : context[$1]) + ' ' + ($3 || '')
+        matched = markup.strip.match(FILE)
+        if matched
+          (context[matched['path']].nil? ? matched['path'] : context[matched['path']]) + ' ' + (matched['other'] || '')
         else
           markup
         end

data/lib/octopress-tag-helpers/var.rb

@@ -1,8 +1,8 @@
 module Octopress
   module TagHelpers
     module Var
-      TERNARY = /(.*?)\(\s*(.+?)\s+\?\s+(.+?)\s+:\s+(.+?)\s*\)(.+)?/
-      HAS_FILTERS = /(.*?)(\s+\|\s+.+)/
+      TERNARY = /(?<markup>.*?)\(\s*(?<condition>.+?)\s+\?\s+(?<trueresult>.+?)\s+:\s+(?<falseresult>.+?)\s*\)(?<other>.+)?/
+      HAS_FILTERS = /(?<markup>.*?)(?<filters>\s+\|\s+.+)/
 
       def self.set_var(var, operator, value, context)
         case operator
@@ -23,10 +23,13 @@ module Octopress
       def self.get_value(vars, context)
         vars = evaluate_ternary(vars, context)
         vars = vars.strip.gsub(/ or /, ' || ')
+
         filters = false
-        if vars =~ HAS_FILTERS
-          vars = $1
-          filters = $2
+
+        matched = vars.strip.match(HAS_FILTERS)
+        if matched
+          vars = matched['markup']
+          filters = matched['filters']
         end
 
         vars = vars.split(/ \|\| /).map { |v|
@@ -45,8 +48,9 @@ module Octopress
       end
 
       def self.evaluate_ternary(markup, context)
-        if markup =~ TERNARY
-          $1 + (Conditional.parse(" if #{$2}", context) ? $3 : $4) + $5
+        if matched = markup.strip.match(TERNARY)
+          condition = Liquid::Template.parse("{% if #{matched['condition']} %}true{% endif %}")
+          "#{matched['markup']} #{(condition.render!(context) != '' ? matched['trueresult'] : matched['falseresult'])} #{matched['other']}"
         else
           markup
         end

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

@@ -1,5 +1,5 @@
 module Octopress
   module TagHelpers
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/octopress-tag-helpers.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Brandon Mathis"]
   spec.email         = ["brandon@imathis.com"]
   spec.summary       = %q{Making it easier to build smart Jekyll/Octopress Liquid tags.}
-  spec.description   = %q{Making it easier to build smart Jekyll/Octopress Liquid tags.}
   spec.homepage      = "https://github.com/octopress/tag-helpers"
   spec.license       = "MIT"
 
@@ -22,4 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+
+  if RUBY_VERSION >= "2"
+    spec.add_development_dependency "pry-byebug"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-tag-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Brandon Mathis
@@ -52,7 +52,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Making it easier to build smart Jekyll/Octopress Liquid tags.
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
 email:
 - brandon@imathis.com
 executables: []