liquify 0.1 → 0.2

data/.gitignore

@@ -1,21 +1,5 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
+pkg/*
+*.gem
+.bundle
 *.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in liquify.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,96 @@
+PATH
+  remote: .
+  specs:
+    liquify (0.2)
+      liquid (>= 2.2.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    liquid (2.2.2)
+    mail (2.2.13)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    rspec-rails (2.3.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.3.0)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  liquid (>= 2.2.2)
+  liquify!
+  rails (~> 3.0.1)
+  rspec (~> 2.3.0)
+  rspec-rails (~> 2.3.0)

data/README.textile

@@ -0,0 +1,5 @@
+h1. Liquify
+
+The Liquify gem is a wrapper to the very popular Liquid templating engine.
+The goal of this project is to make working with Liquid templates, drops, tags, etc.
+as easy as possible.

data/Rakefile

@@ -1,49 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "liquify"
-    gem.version = "0.1"
-    gem.summary = %Q{Liquify is a wrapper to Liquid Markup to make it easier to use}
-    gem.description = gem.summary
-    gem.email = "dane.harrigan@gmail.com"
-    gem.homepage = "http://github.com/daneharrigan/liquify"
-    gem.authors = ["Dane Harrigan"]
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_dependency "liquid", "2.1.2"
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = ['--exclude', 'gem,spec']
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "liquify #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/init.rb

@@ -0,0 +1 @@
+require 'liquify'

data/lib/generators/liquify/install_generator.rb

@@ -0,0 +1,12 @@
+module Liquify
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      desc 'Copy Liquify installation files'
+      source_root File.expand_path('../templates', __FILE__)
+
+      def copy_initializers
+        copy_file 'liquify.rb', 'config/initializers/liquify.rb'
+      end
+    end
+  end
+end

data/lib/generators/liquify/templates/liquify.rb

@@ -0,0 +1,11 @@
+Liquify.setup do |config|
+  # A tag is a class that inherits from Liquify::Tag or Liquid::Tag
+  # config.register_tag :tag_name, TagClass
+
+  # A drop is a class that inherits from Liquify::Drop or Liquid::Drop
+  # config.register_drop :drop_name, DropClass
+
+  # A filter is a method within a module. Multiple filters can be registered
+  # at once within a single module.
+  # config.register_filters FiltersModule
+end

data/lib/liquify/drop.rb

@@ -0,0 +1,5 @@
+module Liquify
+  class Drop < Liquid::Drop
+    include Liquify::Methods
+  end
+end

data/lib/liquify/methods.rb

@@ -0,0 +1,48 @@
+module Liquify
+  module Methods
+    def self.included(base)
+      base.send(:include, Liquify::InstanceMethods)
+      base.send(:extend, Liquify::ClassMethods)
+    end
+  end
+
+  module ClassMethods
+    protected
+      def liquify_method(*args)
+        liquify_args = instance_variable_get :@liquify_args
+        liquify_args ||= {}
+
+        args.each do |arg|
+          key, value = arg, :self
+
+          if Hash === arg
+            arg.each { |k, v| liquify_args[k.to_s] = v }
+          else
+            liquify_args[key.to_s] = value
+          end
+        end
+        instance_variable_set :@liquify_args, liquify_args
+      end
+  end
+
+  module InstanceMethods
+    unless method_defined? :to_liquid
+      def to_liquid #:nodoc:
+        liquify_args = self.class.instance_variable_get(:@liquify_args) || {}
+        liquify_output = instance_variable_get(:@liquify_output) || {}
+
+        if liquify_output.empty?
+          liquify_args.each do |key, value|
+            if value.respond_to?(:call)
+              liquify_output[key] = value.arity.zero? ? value.call : value.call(self)
+            else
+              liquify_output[key] = self.send(key)
+            end
+          end
+        end
+
+        liquify_output
+      end
+    end
+  end
+end

data/lib/liquify/parameter.rb

@@ -0,0 +1,35 @@
+module Liquify
+  class Parameter < Array
+    def initialize(markup, context={})
+      markup = markup.split(',')
+      args = []
+      options = {}
+
+      markup.each do |arg|
+        key, value = arg.split(':')
+        key = strip_quotes(key.strip)
+
+        if value
+          value = (value =~ /("|')/) ? strip_quotes(value.strip) : context[value.strip]
+          options[key] = value
+        else
+          args << key
+        end
+      end
+      args << options unless options.empty?
+
+      super(args)
+    end
+
+    unless self.instance_methods.include? :extract_options!
+      def extract_options!
+        last.is_a?(Hash) ? pop : {}
+      end
+    end
+
+    private
+      def strip_quotes(value)
+        value.strip.gsub(/^('|")|('|")$/,'')
+      end
+  end
+end

data/lib/liquify/tag.rb

@@ -1,20 +1,14 @@
-class Liquify
+module Liquify
   class Tag < Liquid::Tag
-    def initialize(tag_name, markup, tokens)
-      @_params = Liquify.parameters(markup)
-    end
-
     def render(context)
-      invoke if respond_to? :invoke
-    end
-
-    private
-    def parameters
-      return @_params
-    end
+      return unless respond_to? :invoke
 
-    def parameter
-      parameters.first
+      if method(:invoke).arity == 0
+        invoke
+      else
+        params = Liquify::Parameter.new(@markup, context)
+        invoke(params)
+      end
     end
   end
-end
+end

data/lib/liquify/version.rb

@@ -0,0 +1,3 @@
+module Liquify
+  VERSION = "0.2"
+end

data/lib/liquify.rb

@@ -1,100 +1,81 @@
 require 'liquid'
+require 'liquify/methods'
+require 'liquify/parameter'
+require 'liquify/drop'
+require 'liquify/tag'
 
-class Liquify
+if defined?(Rails) && Rails.version >= '3'
+  require File.expand_path(File.dirname(__FILE__) + '/rails/active_record_hook.rb')
+end
+
+module Liquify
+  @@tags = {}
   @@filters = []
   @@drops = {}
-  @@tags = {}
-  @@template_root = nil
 
   class << self
-    def setup(&block)
-      new.instance_eval(&block)
-      @@filters.each { |filter| Liquid::Template.register_filter(filter) }
-      @@tags.each { |tag, klass| Liquid::Template.register_tag(tag, klass) }
+    # setup - This method allows you to register tags, drops and filters.
+    # to Liquify in one place.
+    #
+    #   Liquify.setup do |config|
+    #     ...
+    #   end
+    def setup
+      yield self
     end
 
-    def render(args)
-      source = case
-        when String === args
-          args
-        when args[:template]
-          path = [@@template_root, args[:template]].compact.join('/')
-          File.read(path) if File.exist? path
-      end
-  
-      Liquid::Template.parse(source).render(@@drops)
+    # register_tag - This method is used to make tags available to your
+    # Liquid templates. It accepts a symbol for the tag name and the tag class.
+    #
+    #   Liquify.setup do |config|
+    #     config.register_tag :tag_name, NameTag
+    #   end
+    def register_tag(name, klass)
+      @@tags[name] = klass
     end
 
-    def parameters(params)
-      return if params.nil?
-      params = params.split(',')
-      params.map! { |param| param.strip.gsub(/(^('|")|('|")$)/,'') }
+    # register_filters - This method is used to make filters available to
+    # your Liquid templates. It accepts a module of methods. Each method
+    # becomes a Liquid filter.
+    #
+    #   Liquify.setup do |config|
+    #     config.register_filters CustomFilters
+    #   end
+    def register_filters(mod)
+      @@filters << mod
     end
 
-    def parameter(params)
-      params = parameters(params)
-      params.first if params
+    # register_drop - This method is used to make drops available to
+    # your Liquid templates. It accepts a symbol for the drop name and
+    # your drop class or a lambda if processing has to be done at time
+    # time of rendering the Liquid template.
+    #
+    #   Liquify.setup do |config|
+    #     config.register_drop :drop_name, NameDrop
+    #     # with a lamda
+    #     config.register_drop :special_name, lambda { Foo.first }
+    #   end
+    def register_drop(name, klass)
+      @@drops[name] = klass
     end
-  end
-
-  # +register_filter+ - This method accepts a module and is used to add
-  # Liquid filters.
-  #   Liquify.setup do
-  #     register_filter MyFilters
-  #   end
-  #
-  # A filter is a method stored in a module. The +MyFilters+ would be
-  # setup like this:
-  #   module MyFilters
-  #     def bold_text(text)
-  #       "<strong>#{text}</strong>"
-  #     end
-  #   end
-  #
-  # The +MyFilters+ methods will be available in any liquid source
-  # rendered with +Liquify.render+.
-  # 
-  #   Liquify.render("{{ 'my sample' | bold_text }}")
-  #   # or read from a file
-  #   Liquify.render(:template => 'path/to/file.liquid')
-  #   # => <strong>my sample</strong>
-  def register_filter(mod)
-    @@filters << mod unless @@filters.include? mod
-  end
 
-  def register_drop(name, klass)
-    @@drops[name.to_s] ||= klass.new
-  end
-
-  # +register_tag+ - This method accepts two arguments, a symbol
-  # of the tag name used within the Liquid source and the custom
-  # tag class made by you.
-  #
-  #   Liquify.setup do
-  #     register_tag :include, IncludeDrop
-  #   end
-  #
-  # A tag is a class that inherits from the class +Liquid::Tag+
-  # or +<tt>Liquify::Tag</tt>+. 
-  # setup like this:
-  #   class IncludeTag < Liquify::Tag
-  #     def invoke
-  #       # your impressive ruby code here
-  #     end
-  #   end
-  #
-  # The +MyFilters+ methods will be available in any liquid source
-  # rendered with +Liquify.render+.
-  # 
-  #   Liquify.render("{{ 'my sample' | bold_text }}")
-  #   # or read from a file
-  #   Liquify.render(:template => 'path/to/file.liquid')
-  #   # => <strong>my sample</strong>
-  def register_tag(name, klass)
-    @@tags[name.to_s] ||= klass
-  end
+    # invoke = This method handles to rendering of the Liquid template with
+    # all of the registered drops, tags and filters. It accepts the Liquid
+    # template as a string.
+    #
+    #  template = '{{ drop_name.method }}'
+    #  Liquify.invoke(template) # => Rendered Liquid template
+    def invoke(template)
+      args = {}
+      @@drops.each { |name, klass| args[name.to_s] = klass.respond_to?(:call) ? klass.call : klass.new }
+      @@filters.each { |filter| Liquid::Template.register_filter(filter) }
+      @@tags.each { |tag, klass| Liquid::Template.register_tag(tag, klass) }
+      Liquid::Template.parse(template).render(args)
+    end
 
-  def template_root(path)
-    @@template_root = path
+    def render(template)
+      warn 'DEPRECATED: render has been replaced with invoke'
+      invoke(template)
+    end
   end
-end
+end

data/lib/rails/active_record_hook.rb

@@ -0,0 +1,3 @@
+ActiveSupport.on_load(:active_record) do
+  include Liquify::Methods
+end

data/liquify.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "liquify/version"
+
+Gem::Specification.new do |s|
+  s.name        = "liquify"
+  s.version     = Liquify::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Dane Harrigan"]
+  s.email       = ["dane.harrigan@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{A wrapper for Liquid Markup to make it easier to use}
+  s.description = s.summary
+
+  s.rubyforge_project = "liquify"
+  s.add_dependency 'liquid', '>= 2.2.2'
+  s.add_development_dependency 'rspec', '~> 2.3.0'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/spec/liquify/active_record_hook_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'active_record_hook' do
+  describe '.liquify_method' do
+    it 'responds to liquify_method' do
+      Foo.respond_to?(:liquify_method).should == true
+    end
+  end
+end

data/spec/liquify/drop_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Liquify::Methods do
+  describe '.liquify_method' do
+    before(:each) do
+      Liquify.setup do |config|
+        config.register_drop :bar, BarDrop
+      end
+    end
+
+    it 'returns the value of a method on the drop instance' do
+      template = '{{ bar.first_name }} {{ bar.last_name }}'
+      Liquify.invoke(template).should == 'Foo Bar'
+    end
+
+    it 'returns the output of a labmda with an argument passed' do
+      Liquify.invoke('{{ bar.full_name }}').should == 'Foo Bar'
+    end
+
+    it 'returns the output of a labmda without an argument passed' do
+      Liquify.invoke('{{ bar.age }}').should == '25'
+    end
+  end
+end

data/spec/liquify/parameter_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Liquify::Parameter do
+  it 'parses a string into an array' do
+    parameters = Liquify::Parameter.new('"a", "b", "c"')
+    parameters.should == %W(a b c)
+  end
+
+  it 'parses a string into an array with a hash' do
+    parameters = Liquify::Parameter.new('"a", "b", foo: "bar", baz: "cux"')
+    parameters.should == ['a', 'b', {'foo' => 'bar', 'baz' => 'cux'}]
+  end
+
+  context 'when a hash is passed in referencing a context value' do
+    it 'assigns the context value to the hash entry' do
+      parameters = Liquify::Parameter.new('"a", foo: bar', { 'bar' => {:cux => 'qux'} })
+      parameters.should == ['a', {'foo' => {:cux => 'qux'} }]
+    end
+  end
+
+  describe '#extract_options!' do
+    context 'when a hash is available' do
+      before(:each) do
+        @parameters = Liquify::Parameter.new('"a", "b", foo: "bar", baz: "cux"')
+        @options = @parameters.extract_options!
+      end
+
+      it 'returns the hash' do
+        @options.should == {'foo' => 'bar', 'baz' => 'cux'}
+      end
+
+      it 'pulls the hash out of the parameters array' do
+        @parameters.should == %W(a b)
+      end
+    end
+
+    context 'when there is no hash' do
+      before(:each) do
+        @parameters = Liquify::Parameter.new('"a", "b", "c"')
+        @options = @parameters.extract_options!
+      end
+
+      it 'returns an empty hash' do
+        @options.should == {}
+      end
+
+      it 'should leave the parameters array untouched' do
+        @parameters.should == %W(a b c)
+      end
+    end
+  end
+end

data/spec/liquify/tag_spec.rb

@@ -1,13 +1,31 @@
-require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
+require 'spec_helper'
 
-describe "Liquify::Tag" do
-  it "should parse parameters" do
-    tag = Liquify::Tag.new('tag_name',"'param-1', 'param-2'", nil)
-    tag.send(:parameters).should == %W{param-1 param-2}
+describe Liquify::Tag do
+  before(:each) do
+    Liquify.setup do |config|
+      config.register_tag :foo, FooTag
+      config.register_drop :bar, BarDrop
+    end
   end
 
-  it "should parse a single parameter" do
-    tag = Liquify::Tag.new('tag_name',"'param-1'", nil)
-    tag.send(:parameter).should == 'param-1'
+  context 'when a single argument is passed in' do
+    it 'returns the argument' do
+      template = '{% foo "bar" %}'
+      Liquify.invoke(template).should == 'bar'
+    end
   end
-end
+
+  context 'when an argument and a hash is passed in' do
+    it 'returns the argument and the hash value' do
+      template = '{% foo "bar", bar: "baz" %}'
+      Liquify.invoke(template).should == 'bar baz'
+    end
+  end
+
+  context 'when an argument is not quoted' do
+    it 'returns the context value that matches the name' do
+      template = '{% foo "bar", user: bar %}'
+      Liquify.invoke(template).should == 'bar Foo'
+    end
+  end
+end

data/spec/liquify_spec.rb

@@ -1,93 +1,55 @@
-path = File.expand_path(File.dirname(__FILE__))
-require "#{path}/spec_helper"
+require 'spec_helper'
 
-describe "Liquify" do
-  it "should have a setup method" do
-    Liquify.respond_to?(:setup).should == true
-  end
-
-  it "should return an array of parameters" do
-    # extra white space is intentional
-    output = Liquify.parameters("'param-1', 'param-2', 'param-3' ")
-    output.should == %W{param-1 param-2 param-3}
-  end
-
-  it "should return a single parameter" do
-    # extra white space is intentional
-    Liquify.parameter("'param-1' ").should == 'param-1'
-  end
+describe Liquify do
+  describe '.register_tag' do
+    it 'adds a tag to liquify' do
+      Liquify.setup do |config|
+        config.register_tag :foo, FooTag
+      end
 
-  context "when rendering a liquid template" do
-    it "should render the source" do
-      Liquify.render("{{ 'sample text' }}").should =~ /^sample text$/
+      Liquify.class_variable_get(:@@tags).include?(:foo).should == true
     end
+  end
 
-    it "should render the template" do
-      Liquify.render(:template => "#{path}/liquid/templates/sample.liquid").should =~ /^sample text$/
-    end
+  describe '.register_filters' do
+    it 'adds a set of filters to liquify' do
+      Liquify.setup do |config|
+        config.register_filters FooFilters
+      end
 
-    it "should render nil" do
-      Liquify.render(:template => "#{path}/does_not_exist.liquid").should be_empty
+      Liquify.class_variable_get(:@@filters).include?(FooFilters).should == true
     end
+  end
 
-    it "should render the template as a relative path" do
-      Liquify.setup do
-        template_root path
+  describe '.register_drop' do
+    it 'adds a drop  to liquify' do
+      Liquify.setup do |config|
+        config.register_drop :foo, FooDrop
       end
 
-      Liquify.render(:template => 'liquid/templates/sample.liquid')
+      Liquify.class_variable_get(:@@drops).include?(:foo).should == true
     end
   end
 
-  context "when adding a filter" do
-    before(:all) do
-      Liquify.setup do
-        register_filter SpecFilter
-      end      
-    end
-  
-    it "should render bold text" do
-      output = Liquify.render("{{ 'sample text' | bold_text }}")
-      output.should =~ /^\<strong\>sample text\<\/strong\>$/
-    end
-  end
+  describe '.invoke' do
+    context 'when a drop is registered as a class' do
+      before(:each) do
+        foo_drop = mock(FooDrop, :to_liquid => {'first_name' => 'Foo'})
+        FooDrop.should_receive(:new).and_return(foo_drop)
+        @template = '{{ foo.first_name }}'
 
-  context "when adding a drop" do
-    before(:all) do
-      Liquify.setup do
-        register_drop :item, SpecDrop
+        Liquify.setup do |config|
+          config.register_drop :foo, FooDrop
+        end
       end
-    end
-
-    it "should render the name" do
-      Liquify.render("{{ item.name }}").should =~ /Spec Drop/
-    end
-  end
 
-  context "when adding a tag" do
-    before(:all) do
-      Liquify.setup do
-        register_tag :tag_name, SpecTag
+      it 'makes a new instance of the FooDrop' do
+        Liquify.invoke(@template)
       end
-    end
 
-    it "should render tag_name" do
-      Liquify.render("{% tag_name 'dane' %}").should =~ /Spec Tag: Dane/
+      it 'renders "Foo" as the first name in the template' do
+        Liquify.invoke(@template).should == 'Foo'
+      end
     end
   end
 end
-
-# # initializer.rb
-# Liquify.setup do
-#   register_filter SomeFilters
-#   register_tag :include, MyInclude
-#   register_drop :site, SiteDrop
-#   template_root ''
-# end
-
-# liquify :file => 'my/path/to/file'
-# liquify '{{ my_source_code }}'
-# liquify :template => 'dane/file'
-
-# Liquify.render(:file => "my/path/to/file")
-# Liquify.render("{{ this is my whatever }}")

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+#$:.unshift(File.dirname(__FILE__))
+#$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rails'
+require 'active_record'
+require 'liquid'
+require 'liquid/tag'
 require 'liquify'
-require 'liquify/tag'
 
-require 'liquid/spec_filter'
-require 'liquid/spec_tag'
-require 'liquid/spec_drop'
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/support/liquid/foo_drop.rb

@@ -0,0 +1,9 @@
+class FooDrop < Liquid::Drop
+  def foo
+    "foo"
+  end
+
+  def bar
+    "bar"
+  end
+end

data/spec/support/liquid/foo_filters.rb

@@ -0,0 +1,9 @@
+module FooFilters
+  def foo(value)
+    value
+  end
+
+  def bar(value)
+    value
+  end
+end

data/spec/support/liquify/bar_drop.rb

@@ -0,0 +1,14 @@
+class BarDrop
+  include Liquify::Methods
+  liquify_method :first_name, :last_name,
+    :full_name => lambda { |drop| "#{drop.first_name} #{drop.last_name}" },
+    :age => lambda { '25' }
+
+  def first_name
+    'Foo'
+  end
+
+  def last_name
+    'Bar'
+  end
+end

data/spec/support/liquify/foo_tag.rb

@@ -0,0 +1,9 @@
+class FooTag < Liquify::Tag
+  def invoke(params)
+    options = params.extract_options!
+    output = params.first
+    output << ' ' << options['bar'] if options['bar']
+    output << ' ' << options['user']['first_name'] if options['user']
+    return output
+  end
+end

data/spec/support/rails/foo.rb

@@ -0,0 +1 @@
+class Foo < ActiveRecord::Base; end

data/spec/v0.1/liquify/active_record_hook_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'active_record_hook' do
+  describe '.liquify_method' do
+    it 'responds to liquify_method' do
+      Foo.respond_to?(:liquify_method).should == true
+    end
+  end
+end

data/spec/v0.1/liquify/drop_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Liquify::Methods do
+  describe '.liquify_method' do
+    before(:each) do
+      Liquify.setup do |config|
+        config.register_drop :bar, BarDrop
+      end
+    end
+
+    it 'returns the value of a method on the drop instance' do
+      template = '{{ bar.first_name }} {{ bar.last_name }}'
+      Liquify.render(template).should == 'Foo Bar'
+    end
+
+    it 'returns the output of a labmda with an argument passed' do
+      Liquify.render('{{ bar.full_name }}').should == 'Foo Bar'
+    end
+
+    it 'returns the output of a labmda without an argument passed' do
+      Liquify.render('{{ bar.age }}').should == '25'
+    end
+  end
+end

data/spec/v0.1/liquify_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Liquify do
+  describe '.register_tag' do
+    it 'adds a tag to liquify' do
+      Liquify.setup do |config|
+        config.register_tag :foo, FooTag
+      end
+
+      Liquify.class_variable_get(:@@tags).include?(:foo).should == true
+    end
+  end
+
+  describe '.register_filters' do
+    it 'adds a set of filters to liquify' do
+      Liquify.setup do |config|
+        config.register_filters FooFilters
+      end
+
+      Liquify.class_variable_get(:@@filters).include?(FooFilters).should == true
+    end
+  end
+
+  describe '.register_drop' do
+    it 'adds a drop  to liquify' do
+      Liquify.setup do |config|
+        config.register_drop :foo, FooDrop
+      end
+
+      Liquify.class_variable_get(:@@drops).include?(:foo).should == true
+    end
+  end
+
+  describe '.render' do
+    context 'when a drop is registered as a class' do
+      before(:each) do
+        foo_drop = mock(FooDrop, :to_liquid => {'first_name' => 'Foo'})
+        FooDrop.should_receive(:new).and_return(foo_drop)
+        @template = '{{ foo.first_name }}'
+
+        Liquify.setup do |config|
+          config.register_drop :foo, FooDrop
+        end
+      end
+
+      it 'makes a new instance of the FooDrop' do
+        Liquify.render(@template)
+      end
+
+      it 'renders "Foo" as the first name in the template' do
+        Liquify.render(@template).should == 'Foo'
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: liquify
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+  prerelease: 
+  version: "0.2"
 platform: ruby
 authors: 
 - Dane Harrigan
@@ -14,72 +10,78 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 -04:00
+date: 2011-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: liquid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
+        version: 2.2.2
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: liquid
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
+        version: 2.3.0
+  type: :development
   version_requirements: *id002
-description: Liquify is a wrapper to Liquid Markup to make it easier to use
-email: dane.harrigan@gmail.com
+description: A wrapper for Liquid Markup to make it easier to use
+email: 
+- dane.harrigan@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
 - .gitignore
-- LICENSE
-- README.rdoc
+- Gemfile
+- Gemfile.lock
+- README.textile
 - Rakefile
+- init.rb
+- lib/generators/liquify/install_generator.rb
+- lib/generators/liquify/templates/liquify.rb
 - lib/liquify.rb
+- lib/liquify/drop.rb
+- lib/liquify/methods.rb
+- lib/liquify/parameter.rb
 - lib/liquify/tag.rb
-- spec/liquid/spec_drop.rb
-- spec/liquid/spec_filter.rb
-- spec/liquid/spec_tag.rb
-- spec/liquid/templates/sample.liquid
+- lib/liquify/version.rb
+- lib/rails/active_record_hook.rb
+- liquify.gemspec
+- spec/liquify/active_record_hook_spec.rb
+- spec/liquify/drop_spec.rb
+- spec/liquify/parameter_spec.rb
 - spec/liquify/tag_spec.rb
 - spec/liquify_spec.rb
 - spec/spec_helper.rb
+- spec/support/liquid/foo_drop.rb
+- spec/support/liquid/foo_filters.rb
+- spec/support/liquify/bar_drop.rb
+- spec/support/liquify/foo_tag.rb
+- spec/support/rails/foo.rb
+- spec/v0.1/liquify/active_record_hook_spec.rb
+- spec/v0.1/liquify/drop_spec.rb
+- spec/v0.1/liquify_spec.rb
 has_rdoc: true
-homepage: http://github.com/daneharrigan/liquify
+homepage: ""
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -87,30 +89,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: liquify
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Liquify is a wrapper to Liquid Markup to make it easier to use
+summary: A wrapper for Liquid Markup to make it easier to use
 test_files: 
-- spec/liquid/spec_drop.rb
-- spec/liquid/spec_filter.rb
-- spec/liquid/spec_tag.rb
+- spec/liquify/active_record_hook_spec.rb
+- spec/liquify/drop_spec.rb
+- spec/liquify/parameter_spec.rb
 - spec/liquify/tag_spec.rb
 - spec/liquify_spec.rb
 - spec/spec_helper.rb
+- spec/support/liquid/foo_drop.rb
+- spec/support/liquid/foo_filters.rb
+- spec/support/liquify/bar_drop.rb
+- spec/support/liquify/foo_tag.rb
+- spec/support/rails/foo.rb
+- spec/v0.1/liquify/active_record_hook_spec.rb
+- spec/v0.1/liquify/drop_spec.rb
+- spec/v0.1/liquify_spec.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Dane Harrigan
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,64 +0,0 @@
-= liquify
-
-Liquify is a wrapper to Tobi's <a href="http://rubygems/liquid">Liquid Markup</a> gem.
-
-== Examples
-
-  ## configuring Liquify
-  Liquify.setup do
-    register_filter MyFilters
-    register_tag :include, IncludeTag
-    register_drop :page, PageDrop
-  end
-
-  # Any filter, tag or drop registered to Liquify is available anything
-  # rendered through +Liquify.render+.
-
-  ## Using Liquify
-  # rendering source
-  Liquify.render("{{ page.name }}")
-
-  # rendering from a file (from a full path)
-  Liquify.render(:template => '/path/to/file.liquid')
-  
-  # rendering from a file (from a relative path)
-  # setup template root location
-  Liquify.setup do
-    template_root '/path/to/templates'
-  end
-
-  Liquify.render(:template => 'relative/path/file.liquid')
-
-  ## my_filters.rb
-  module MyFilters
-    def bold_text(text)
-      text = Liquify.parameter(text)
-      "<strong>#{text}</strong>"
-    end
-  end
-
-  ## include_tag.rb
-  class IncludeTag < Liquify::Tag
-    def invoke
-      Liquify.render("#{parameter}.liquid")
-    end
-  end
-
-== Todo
-
-Make a helpful classes that improve on Liquid's Drop and Block class.
-
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Dane Harrigan. See LICENSE for details.

data/spec/liquid/spec_drop.rb

@@ -1,5 +0,0 @@
-class SpecDrop < Liquid::Drop
-  def name
-    "Spec Drop: #{param}"
-  end
-end

data/spec/liquid/spec_filter.rb

@@ -1,6 +0,0 @@
-module SpecFilter
-  def bold_text(text)
-    text = Liquify.parameter(text)
-    "<strong>#{text}</strong>"
-  end
-end

data/spec/liquid/spec_tag.rb

@@ -1,5 +0,0 @@
-class SpecTag < Liquify::Tag
-  def invoke
-    "Spec Tag: #{parameter.capitalize}"
-  end
-end

data/spec/liquid/templates/sample.liquid

@@ -1 +0,0 @@
-{{ 'sample text' }}