h2o 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/h2o.gemspec

@@ -1,6 +1,6 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor luk"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2011-03-14}
   s.description = %q{h2o is a django inspired template that offers natural template syntax and easy to integrate.}
   s.email = %q{subjective@gmail.com}
   s.extra_rdoc_files = [
@@ -17,80 +17,79 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".autotest",
-     ".gitignore",
-     ".project",
-     "README.md",
-     "Rakefile",
-     "TODO.md",
-     "VERSION",
-     "benchmark/parser.rb",
-     "benchmark/source.html",
-     "example/erb/base.html",
-     "example/h2o/base.html",
-     "example/h2o/index.html",
-     "example/h2o/inherit.html",
-     "example/h2o/layout.html",
-     "example/liquid/base.html",
-     "example/request.html",
-     "example/run.rb",
-     "example/server",
-     "example/server.bat",
-     "example/server.rb",
-     "h2o.gemspec",
-     "init.rb",
-     "lib/.DS_Store",
-     "lib/core_ext/object.rb",
-     "lib/h2o.rb",
-     "lib/h2o/constants.rb",
-     "lib/h2o/context.rb",
-     "lib/h2o/datatype.rb",
-     "lib/h2o/error.rb",
-     "lib/h2o/file_loader.rb",
-     "lib/h2o/filters.rb",
-     "lib/h2o/filters/default.rb",
-     "lib/h2o/nodes.rb",
-     "lib/h2o/parser.rb",
-     "lib/h2o/tags.rb",
-     "lib/h2o/tags/block.rb",
-     "lib/h2o/tags/extends.rb",
-     "lib/h2o/tags/for.rb",
-     "lib/h2o/tags/if.rb",
-     "lib/h2o/tags/with.rb",
-     "lib/h2o/template.rb",
-     "spec/fixtures/_partial.html",
-     "spec/fixtures/a.html",
-     "spec/fixtures/b.html",
-     "spec/fixtures/deep/folder/c.html",
-     "spec/h2o/context_spec.rb",
-     "spec/h2o/default.html",
-     "spec/h2o/file_loader_spec.rb",
-     "spec/h2o/file_loader_spec.rbc",
-     "spec/h2o/filters_spec.rb",
-     "spec/h2o/parser_spec.rb",
-     "spec/h2o/tags/block_spec.rb",
-     "spec/h2o/tags/for_spec.rb",
-     "spec/h2o/tags/if_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".project",
+    "README.md",
+    "Rakefile",
+    "TODO.md",
+    "VERSION",
+    "benchmark/parser.rb",
+    "benchmark/source.html",
+    "example/erb/base.html",
+    "example/h2o/base.html",
+    "example/h2o/index.html",
+    "example/h2o/inherit.html",
+    "example/h2o/layout.html",
+    "example/liquid/base.html",
+    "example/request.html",
+    "example/run.rb",
+    "example/server",
+    "example/server.bat",
+    "example/server.rb",
+    "h2o.gemspec",
+    "init.rb",
+    "lib/.DS_Store",
+    "lib/core_ext/object.rb",
+    "lib/h2o.rb",
+    "lib/h2o/constants.rb",
+    "lib/h2o/context.rb",
+    "lib/h2o/datatype.rb",
+    "lib/h2o/error.rb",
+    "lib/h2o/file_loader.rb",
+    "lib/h2o/filters.rb",
+    "lib/h2o/filters/default.rb",
+    "lib/h2o/nodes.rb",
+    "lib/h2o/parser.rb",
+    "lib/h2o/tags.rb",
+    "lib/h2o/tags/block.rb",
+    "lib/h2o/tags/extends.rb",
+    "lib/h2o/tags/for.rb",
+    "lib/h2o/tags/if.rb",
+    "lib/h2o/tags/raw.rb",
+    "lib/h2o/tags/with.rb",
+    "lib/h2o/template.rb",
+    "spec/fixtures/_partial.html",
+    "spec/fixtures/a.html",
+    "spec/fixtures/b.html",
+    "spec/fixtures/deep/folder/c.html",
+    "spec/h2o/context_spec.rb",
+    "spec/h2o/default.html",
+    "spec/h2o/file_loader_spec.rb",
+    "spec/h2o/file_loader_spec.rbc",
+    "spec/h2o/filters_spec.rb",
+    "spec/h2o/parser_spec.rb",
+    "spec/h2o/tags/block_spec.rb",
+    "spec/h2o/tags/for_spec.rb",
+    "spec/h2o/tags/if_spec.rb",
+    "spec/h2o/tags/raw_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://www.h2o-template.org}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{h2o is a django inspired template}
   s.test_files = [
     "spec/h2o/context_spec.rb",
-     "spec/h2o/file_loader_spec.rb",
-     "spec/h2o/filters_spec.rb",
-     "spec/h2o/parser_spec.rb",
-     "spec/h2o/tags/block_spec.rb",
-     "spec/h2o/tags/for_spec.rb",
-     "spec/h2o/tags/if_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/h2o/file_loader_spec.rb",
+    "spec/h2o/filters_spec.rb",
+    "spec/h2o/parser_spec.rb",
+    "spec/h2o/tags/block_spec.rb",
+    "spec/h2o/tags/for_spec.rb",
+    "spec/h2o/tags/if_spec.rb",
+    "spec/h2o/tags/raw_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/h2o.rb

@@ -21,6 +21,7 @@ module H2o
     require 'h2o/tags/with'
     require 'h2o/tags/block'
     require 'h2o/tags/extends'
+    require 'h2o/tags/raw'
   end
 
   def self.loader

data/lib/h2o/filters/default.rb

@@ -42,6 +42,9 @@ module DefaultFilters
     list.last
   end
 
+  def contain(object, item)
+    object.include?(item)
+  end
 
   H2o::Filters << self
 end

data/lib/h2o/parser.rb

@@ -1,6 +1,6 @@
 module H2o
   class Parser 
-    attr_reader :token, :env
+    attr_reader :token, :env, :source
     attr_accessor :storage
     
     ParseRegex = /\G
@@ -96,7 +96,7 @@ module H2o
             
             tag = Tags[name]
             raise "Unknow tag #{name}" if tag.nil?
-            
+
             nodelist << tag.new(self, args) if tag
           when :comment
             nodelist << CommentNode.new(content)

data/lib/h2o/tags.rb

@@ -9,6 +9,10 @@ module H2o
       def register(tag, name)
         @tags[name] = tag
       end
+      
+      def all
+        @tags
+      end
     end
     
     class Tag < Node; end

data/lib/h2o/tags/if.rb

@@ -10,13 +10,17 @@ module H2o
         @body = parser.parse(:else, :endif)
         @else = parser.parse(:endif) if parser.token.include? 'else'
         @args = Parser.parse_arguments(argstring)
-        
+
         # Negated condition
         first = @args.first
         if first.is_a?(Hash) && first[:operator] && [:"!", :not].include?(first[:operator])
          @negated = true
          @args.shift
         end
+        
+        if @args[1].is_a?(Array)
+          @filters = [@args.pop]
+        end
       end
 
       def render(context, stream)
@@ -30,7 +34,11 @@ module H2o
       def evaluate(context)
         # Implicity evaluation
         if @args.size == 1
+
           object = context.resolve(@args.first)
+
+          object = context.apply_filters(object, @filters) if @filters
+          
           if object == false
             result = false
           elsif object == true

data/lib/h2o/tags/raw.rb

@@ -0,0 +1,19 @@
+module H2o
+  module Tags
+    class Raw < Tag
+      def initialize(parser, argstring)
+        @body = parser.parse(:endraw)
+      end
+      
+      def render(context, stream)
+        raw_body = @body.parser.source.gsub(/\{%\s?(:?end)?raw\s?%\}/sm, '')
+        
+        stream << raw_body
+      end
+      
+      Tags.register(self, :raw)
+    end
+    
+  end
+end
+  

data/spec/h2o/tags/if_spec.rb

@@ -55,4 +55,29 @@ describe H2o::Tags::If do
       parse('{% if ! 2 > 3 %}Y{% endif %}').render.should == 'Y'
     end
   end
+  
+  describe "filter#contain" do
+    context "When array" do
+      it "checks existence of item in a list" do
+        parse(
+          "{% if items|contain 1 %}true{% endif %}"
+        ).render(:items => [1,2,3]).should == "true"
+        parse(
+          "{% if items|contain 4 %}true{% else %}false{%endif%}"
+        ).render(:items => [1,2,3]).should == "false"
+      end      
+    end
+    
+    context "When string" do
+      it "checks existence of item in a list" do
+        parse(
+          "{% if 'test'|contain 'est' %}true{% endif %}"
+        ).render.should == "true"
+        parse(
+          "{% if 'test'|contain 'tet' %}true{% else %}false{%endif%}"
+        ).render.should == "false"
+      end
+    end
+
+  end
 end

data/spec/h2o/tags/raw_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe H2o::Tags::Raw do
+  it "should skip h2o render between raw tag" do
+    result = parse('{% raw %}{{ greeting }}{% endraw %}').render(:greeting => 'hello')
+    
+    result.should_not == 'hello'
+    result.should == '{{ greeting }}'
+  end
+  
+  it "should skip h2o render across multi-line" do
+    result = parse(<<-eos).render(:person => 'john smith')
+      {% raw %}
+      <h1>{{ person }}</h1>
+      {% endraw %}
+    eos
+    result.strip.should == '<h1>{{ person }}</h1>'
+  end
+  
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: h2o
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors: 
 - Taylor luk
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +10:00
+date: 2011-03-14 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +24,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .autotest
-- .gitignore
 - .project
 - README.md
 - Rakefile
@@ -66,6 +61,7 @@ files:
 - lib/h2o/tags/extends.rb
 - lib/h2o/tags/for.rb
 - lib/h2o/tags/if.rb
+- lib/h2o/tags/raw.rb
 - lib/h2o/tags/with.rb
 - lib/h2o/template.rb
 - spec/fixtures/_partial.html
@@ -81,15 +77,15 @@ files:
 - spec/h2o/tags/block_spec.rb
 - spec/h2o/tags/for_spec.rb
 - spec/h2o/tags/if_spec.rb
-- spec/spec.opts
+- spec/h2o/tags/raw_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.h2o-template.org
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -97,21 +93,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: h2o is a django inspired template
@@ -123,4 +115,5 @@ test_files:
 - spec/h2o/tags/block_spec.rb
 - spec/h2o/tags/for_spec.rb
 - spec/h2o/tags/if_spec.rb
+- spec/h2o/tags/raw_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1 +0,0 @@
-*/.DS_STORE

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse