jekyll-geo-pattern 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 314a921353bc997d73417ae3b78c42e63e128527
-  data.tar.gz: 2dce3f3bef42fedbebc8398c30b7f820705e8ddf
+  metadata.gz: e68b92ed0b6887ef0b9bc4cdacc655b825bdd2f4
+  data.tar.gz: b3277d94027a8ad38eab563b1c9e99d23de16a7a
 SHA512:
-  metadata.gz: df9597592b8b9819f0f17ecb3e5e26a8324e41527478e707bb45b4844d4e57f95f4d358992c024cc22ef75bff2c55b8e909499a7916e59a52ac735f4ea92c3c8
-  data.tar.gz: 901c7b4e203bae0b69bf99dcb480cf8544f716bb8c7984549931a1c28f5820eebfb580249ae8c3c13268c289ab2b7f1800c839a7899335287ca4109175c1d650
+  metadata.gz: ec263b210938b4421705a9cf921d203d1d090dd14e17819ebf61eb3efc1933bdd52c32e8a234502c0a326b5f92d68f496d6d8be7cc5ad07ca6d1e0be4f7428eb
+  data.tar.gz: 439704259b90175b231e5158d378cdc1d1a647295de28dc8c1e29b9839a3f4a6066b1f2290a95605d7be9c038f7431c7a590d9ae4225a8dbc018ca76e3907b2c

data/lib/jekyll-geo-pattern.rb

@@ -2,18 +2,41 @@ require 'geo_pattern'
 
 module Jekyll
   module GeoPatterns
-    HASH_REGEXP = /\{.+?\}/
-    VALID_KEYS = %w(base_color generator text)
+    HASH_REGEXP = /\{(.+?)\}/
+    VALID_KEYS = %w(:base_color :generator :text)
 
     # from a string of options, construct a hash, without using `eval`
     def self.extract_options( input )
       opts = Hash.new
-      input[1..-2].split(/, /).each do |entry|
+      input.split(/, /).each do |entry|
         entryMap = entry.split(/\=>/)
-        key = entryMap[0].strip[1..-1]
+        key = entryMap[0].strip
         next unless VALID_KEYS.include? key
         value = entryMap[1]
-        opts[key.to_sym] = value.nil? ? nil : value.strip[1..-2]
+        opts[key.strip[1..-1].to_sym] = value.nil? ? nil : value.strip
+      end
+      opts
+    end
+
+    # set it up such that variables, like `post.title`, are still processed
+    def self.look_up(context, name)
+      lookup = context
+
+      name.split(".").each do |value|
+        lookup = lookup[value]
+      end
+
+      lookup
+    end
+
+    def self.scrub_options(opts, context)
+      opts.each do |opt, value|
+        value.gsub! /"|'/, ""
+
+        if value =~ /([\w]+(\.[\w]+)*)/i
+          context_val = GeoPatterns.look_up(context, $1)
+          opts[opt] = context_val unless context_val.nil?
+        end
       end
       opts
     end
@@ -21,28 +44,34 @@ module Jekyll
     class Base64GeoPattern < Liquid::Tag
       def initialize(tag_name, text, tokens)
         super
-        if m = HASH_REGEXP.match(text)
-          @opts = GeoPatterns.extract_options(m[0])
-        end
+        @text = text
       end
 
       def render(context)
-        text = @opts.delete(:text)
-        GeoPattern.generate(text, @opts).base64_string
+        m = HASH_REGEXP.match(@text)
+        opts = GeoPatterns.extract_options(m[1])
+
+        raise ArgumentError, "You must have the :text property passed in" if opts[:text].nil?
+
+        opts = GeoPatterns.scrub_options(opts, context)
+        GeoPattern.generate(opts[:text], opts).base64_string
       end
     end
 
     class SVGGeoPattern < Liquid::Tag
       def initialize(tag_name, text, tokens)
         super
-        if m = HASH_REGEXP.match(text)
-          @opts = GeoPatterns.extract_options(m[0])
-        end
+        @text = text
       end
 
       def render(context)
-        text = @opts.delete(:text)
-        GeoPattern.generate(text, @opts).svg_string
+        m = HASH_REGEXP.match(@text)
+        opts = GeoPatterns.extract_options(m[1])
+
+        raise ArgumentError, "You must have the :text property passed in" if opts[:text].nil?
+
+        opts = GeoPatterns.scrub_options(opts, context)
+        GeoPattern.generate(opts[:text], opts).svg_string
       end
     end
   end

metadata

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