liquify 0.2.2 → 0.2.3

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 *.swp
 .rvmrc
+spec/watchr.script

data/lib/liquify/block.rb

@@ -0,0 +1,73 @@
+module Liquify
+  # Creating a block with Liquify is as simple as creating a Ruby
+  # class.
+  #
+  #   class FooBlock < Liquify::Block
+  #     def bar(params)
+  #      ...
+  #     end
+  #
+  #     def baz
+  #      ...
+  #     end
+  #   end 
+  #
+  #   Liquify.setup do |config|
+  #     config.register_tag :foo_block, FooBlock
+  #   end
+  #
+  #   {% foo_block as: 'f' %}
+  #     {{ f.bar 'arg1', key: 'value' }}
+  #     {{ f.baz }}
+  #   {% endfoo_block %}
+  #
+  # If you need wrapper content override the invoke method
+  # and call yield within it.
+  #
+  class Block < Liquid::Block
+    def initialize(tag_name, markup, tokens) # :nodoc:
+      @tokens = tokens.dup
+      super(tag_name, markup, tokens)
+    end
+
+    def render(context) # :nodoc:
+      params = Liquify::Parameter.new(@markup, context)
+      options = params.dup.extract_options!
+      drop_tokens = @tokens.grep /\{\{\s*#{options['as']}\..*\}\}/
+
+      context[options['as']] = Liquify::Block::Drop.new(self, drop_tokens, context)
+
+      args = []
+      args << params if method(:invoke).arity == 1
+
+      context.stack do
+        invoke(*args) do
+          render_all(@nodelist, context).join
+        end
+      end
+    end
+
+    class Drop < Liquid::Drop
+      def initialize(obj, tokens, context) # :nodoc:
+        @obj = obj
+        @params = {}
+
+        tokens.each do |t|
+          match, key, value = t.match(/\{\{\s*f\.(\w+)(.*)\}\}/).to_a
+
+          @params[key] ||= []
+          @params[key] << Liquify::Parameter.new(value, context)
+        end
+      end
+
+      def invoke_drop(key) # :nodoc:
+        allowed_methods = @obj.public_methods(false) - [:invoke]
+        return unless allowed_methods.include?(key.to_sym)
+
+        @obj.method(key).arity == 1 ? @obj.send(key, @params[key].pop) : @obj.send(key)
+      end
+
+      alias :[] :invoke_drop
+    end
+  end
+end

data/lib/liquify/version.rb

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

data/lib/liquify.rb

@@ -3,6 +3,7 @@ require 'liquify/methods'
 require 'liquify/parameter'
 require 'liquify/drop'
 require 'liquify/tag'
+require 'liquify/block'
 
 if defined?(Rails) && Rails.version >= '3'
   require File.expand_path(File.dirname(__FILE__) + '/rails/active_record_hook.rb')

data/spec/liquify/foo_block_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe FooBlock do
+  before(:each) do
+    Liquify.setup do |c|
+      c.register_tag :foo_block, FooBlock
+    end
+
+    @content = <<-STR
+      {% foo_block as: 'f' %}
+        <p>{{ f.name 'foo' }}</p>
+        <p>{{ f.name }}</p> <!-- intentionally blank -->
+        <p>{{ f.name 'bar' }}</p>
+        <p>{{ f.email }}</p>
+        <p>{{ f.foo with: 'foo' }}</p>
+      {% endfoo_block %}
+    STR
+    @output = Liquify.invoke(@content)
+  end
+
+  it 'has wrapper html' do
+    @output.should =~ /<div id="block-wrapper">.*<\/div>/m
+  end
+
+  it 'has an email field and does not take arguments' do
+    @output.should =~ /<p>foo\.bar@baz\.com<\/p>/m
+  end
+
+  it 'has a name field of "foo"' do
+    @output.should =~ /<p>foo<\/p>/
+  end
+
+  it 'has a second name field of "bar"' do
+    @output.should =~ /<p>bar<\/p>/
+  end
+
+  it 'has a span with the word "foo"' do
+    @output.should =~ /<p><span>foo<\/span><\/p>/
+  end
+end

data/spec/support/liquify/foo_block.rb

@@ -0,0 +1,18 @@
+class FooBlock < Liquify::Block
+  def invoke
+    "<div id=\"block-wrapper\">#{yield}</div>"
+  end
+
+  def name(params)
+    "<p>#{params.first}</p>"
+  end
+
+  def email
+    "<p>foo.bar@baz.com</p>"
+  end
+
+  def foo(params)
+    options = params.extract_options!
+    "<span>#{options['with']}</span>"
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: liquify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dane Harrigan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -04:00
+date: 2011-04-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/generators/liquify/install_generator.rb
 - lib/generators/liquify/templates/liquify.rb
 - lib/liquify.rb
+- lib/liquify/block.rb
 - lib/liquify/drop.rb
 - lib/liquify/methods.rb
 - lib/liquify/parameter.rb
@@ -63,6 +64,7 @@ files:
 - liquify.gemspec
 - spec/liquify/active_record_hook_spec.rb
 - spec/liquify/drop_spec.rb
+- spec/liquify/foo_block_spec.rb
 - spec/liquify/liquify_methods_spec.rb
 - spec/liquify/liquify_methods_with_lambdas_spec.rb
 - spec/liquify/parameter_spec.rb
@@ -74,6 +76,7 @@ files:
 - spec/support/liquify/bar_drop.rb
 - spec/support/liquify/baz_drop.rb
 - spec/support/liquify/cux_drop.rb
+- spec/support/liquify/foo_block.rb
 - spec/support/liquify/foo_tag.rb
 - spec/support/rails/foo.rb
 - spec/v0.1/liquify/active_record_hook_spec.rb
@@ -103,13 +106,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: liquify
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A wrapper for Liquid Markup to make it easier to use
 test_files: 
 - spec/liquify/active_record_hook_spec.rb
 - spec/liquify/drop_spec.rb
+- spec/liquify/foo_block_spec.rb
 - spec/liquify/liquify_methods_spec.rb
 - spec/liquify/liquify_methods_with_lambdas_spec.rb
 - spec/liquify/parameter_spec.rb
@@ -121,6 +125,7 @@ test_files:
 - spec/support/liquify/bar_drop.rb
 - spec/support/liquify/baz_drop.rb
 - spec/support/liquify/cux_drop.rb
+- spec/support/liquify/foo_block.rb
 - spec/support/liquify/foo_tag.rb
 - spec/support/rails/foo.rb
 - spec/v0.1/liquify/active_record_hook_spec.rb