jekyll-geo-pattern 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68b92ed0b6887ef0b9bc4cdacc655b825bdd2f4
-  data.tar.gz: b3277d94027a8ad38eab563b1c9e99d23de16a7a
+  metadata.gz: a70b8b1fdf70a51eb239da2a4ccd6e4c9f8e9824
+  data.tar.gz: 6e851c7a53a09abe62ed81a2e2cdf4b67e9e8b29
 SHA512:
-  metadata.gz: ec263b210938b4421705a9cf921d203d1d090dd14e17819ebf61eb3efc1933bdd52c32e8a234502c0a326b5f92d68f496d6d8be7cc5ad07ca6d1e0be4f7428eb
-  data.tar.gz: 439704259b90175b231e5158d378cdc1d1a647295de28dc8c1e29b9839a3f4a6066b1f2290a95605d7be9c038f7431c7a590d9ae4225a8dbc018ca76e3907b2c
+  metadata.gz: 5866a38c05a4d5c9981079a7a208eb44260046c9b4f17a204cd4a6d18bad873a131750c7d925d7a324784f3b59505d418ac0490c3d9d5c17d2c76455d2ae9d39
+  data.tar.gz: 66c7c92bd0639fca3d17fd627d882a5278e482554b7182b50928eea848b938ca9ebed3f13668595bc1863509d648123a5d5718dadb4c1edee78215548937c9fd

data/lib/jekyll-geo-pattern.rb

@@ -2,18 +2,26 @@ require 'geo_pattern'
 
 module Jekyll
   module GeoPatterns
-    HASH_REGEXP = /\{(.+?)\}/
     VALID_KEYS = %w(:base_color :generator :text)
+    VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
 
     # from a string of options, construct a hash, without using `eval`
     def self.extract_options( input )
-      opts = Hash.new
-      input.split(/, /).each do |entry|
-        entryMap = entry.split(/\=>/)
-        key = entryMap[0].strip
-        next unless VALID_KEYS.include? key
-        value = entryMap[1]
-        opts[key.strip[1..-1].to_sym] = value.nil? ? nil : value.strip
+      opts = {}
+      markup = input
+
+      while match = VALID_SYNTAX.match(markup) do
+        markup = markup[match.end(0)..-1]
+
+        value = if match[2]
+          match[2].gsub(/\\"/, '"')
+        elsif match[3]
+          match[3].gsub(/\\'/, "'")
+        elsif match[4]
+          context[match[4]]
+        end
+
+        opts[match[1].to_sym] = value
       end
       opts
     end
@@ -48,8 +56,7 @@ module Jekyll
       end
 
       def render(context)
-        m = HASH_REGEXP.match(@text)
-        opts = GeoPatterns.extract_options(m[1])
+        opts = GeoPatterns.extract_options(@text)
 
         raise ArgumentError, "You must have the :text property passed in" if opts[:text].nil?
 
@@ -65,8 +72,7 @@ module Jekyll
       end
 
       def render(context)
-        m = HASH_REGEXP.match(@text)
-        opts = GeoPatterns.extract_options(m[1])
+        opts = GeoPatterns.extract_options(@text)
 
         raise ArgumentError, "You must have the :text property passed in" if opts[:text].nil?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geo-pattern
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll