liquify 0.2.3 → 0.2.5

data/lib/liquify/block.rb

@@ -35,7 +35,7 @@ module Liquify
       options = params.dup.extract_options!
       drop_tokens = @tokens.grep /\{\{\s*#{options['as']}\..*\}\}/
 
-      context[options['as']] = Liquify::Block::Drop.new(self, drop_tokens, context)
+      context[options['as']] = Liquify::Block::Drop.new(self, drop_tokens, context, options['as'])
 
       args = []
       args << params if method(:invoke).arity == 1
@@ -48,12 +48,12 @@ module Liquify
     end
 
     class Drop < Liquid::Drop
-      def initialize(obj, tokens, context) # :nodoc:
+      def initialize(obj, tokens, context, as) # :nodoc:
         @obj = obj
         @params = {}
 
         tokens.each do |t|
-          match, key, value = t.match(/\{\{\s*f\.(\w+)(.*)\}\}/).to_a
+          match, key, value = t.match(/\{\{\s*#{as}\.(\w+)(.*)\}\}/).to_a
 
           @params[key] ||= []
           @params[key] << Liquify::Parameter.new(value, context)

data/lib/liquify/parameter.rb

@@ -2,18 +2,18 @@ module Liquify
   class Parameter < Array
     def initialize(markup, context={})
       markup = markup.split(',')
+      @markup = markup
       args = []
       options = {}
 
       markup.each do |arg|
         key, value = arg.split(':')
-        key = strip_quotes(key.strip)
+        key = key.strip
 
         if value
-          value = (value =~ /("|')/) ? strip_quotes(value.strip) : context[value.strip]
-          options[key] = value
+          options[key] = find_from_context_or_value(value, context)
         else
-          args << key
+          args << find_from_context_or_value(key, context)
         end
       end
       args << options unless options.empty?
@@ -31,5 +31,9 @@ module Liquify
       def strip_quotes(value)
         value.strip.gsub(/^('|")|('|")$/,'')
       end
+
+      def find_from_context_or_value(value, context)
+        value =~ /("|')/ ? strip_quotes(value.strip) : context[value.strip]
+      end
   end
 end

data/lib/liquify/version.rb

@@ -1,3 +1,3 @@
 module Liquify
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/spec/liquify/foo_block_spec.rb

@@ -4,10 +4,11 @@ describe FooBlock do
   before(:each) do
     Liquify.setup do |c|
       c.register_tag :foo_block, FooBlock
+      c.register_drop :item, lambda { 'Item Text' }
     end
 
     @content = <<-STR
-      {% foo_block as: 'f' %}
+      {% foo_block item, as: 'f' %}
         <p>{{ f.name 'foo' }}</p>
         <p>{{ f.name }}</p> <!-- intentionally blank -->
         <p>{{ f.name 'bar' }}</p>
@@ -19,7 +20,7 @@ describe FooBlock do
   end
 
   it 'has wrapper html' do
-    @output.should =~ /<div id="block-wrapper">.*<\/div>/m
+    @output.should =~ /<div id="block-wrapper" data-value="Item Text">.*<\/div>/m
   end
 
   it 'has an email field and does not take arguments' do

data/spec/support/liquify/foo_block.rb

@@ -1,6 +1,7 @@
 class FooBlock < Liquify::Block
-  def invoke
-    "<div id=\"block-wrapper\">#{yield}</div>"
+  def invoke(params)
+    options = params.extract_options!
+    "<div id=\"block-wrapper\" data-value=\"#{params.first}\">#{yield}</div>"
   end
 
   def name(params)

metadata

@@ -2,7 +2,7 @@
 name: liquify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors: 
 - Dane Harrigan