RubyGems - h2o - Versions diffs - 0.2 → 0.3.0 - Mend

h2o 0.2 → 0.3.0

Files changed (47) hide show

data/.autotest +11 -0
data/.gitignore +1 -0
data/.project +17 -0
data/README.md +0 -0
data/Rakefile +32 -0
data/TODO.md +5 -0
data/VERSION +1 -0
data/benchmark/parser.rb +57 -0
data/benchmark/source.html +4212 -0
data/example/h2o/base.html +0 -1
data/example/h2o/index.html +10 -0
data/example/h2o/layout.html +11 -0
data/example/request.html +0 -0
data/example/server +1 -1
data/h2o.gemspec +101 -41
data/init.rb +1 -0
data/lib/.DS_Store +0 -0
data/lib/core_ext/object.rb +0 -0
data/lib/h2o.rb +29 -39
data/lib/h2o/constants.rb +2 -2
data/lib/h2o/context.rb +3 -10
data/lib/h2o/error.rb +9 -0
data/lib/h2o/filters/default.rb +0 -0
data/lib/h2o/nodes.rb +5 -1
data/lib/h2o/tags.rb +1 -6
data/lib/h2o/tags/block.rb +0 -30
data/lib/h2o/tags/extends.rb +33 -0
data/lib/h2o/tags/for.rb +7 -6
data/lib/h2o/tags/with.rb +0 -0
data/lib/h2o/template.rb +33 -0
data/spec/fixtures/_partial.html +0 -0
data/spec/fixtures/a.html +1 -0
data/spec/fixtures/b.html +0 -0
data/spec/fixtures/deep/folder/c.html +0 -0
data/spec/h2o/context_spec.rb +134 -0
data/spec/h2o/default.html +93 -0
data/spec/h2o/file_loader_spec.rb +35 -0
data/spec/h2o/filters_spec.rb +57 -0
data/spec/h2o/parser_spec.rb +78 -0
data/spec/h2o/tags/block_spec.rb +26 -0
data/spec/h2o/tags/for_spec.rb +65 -0
data/spec/h2o/tags/if_spec.rb +58 -0
data/spec/spec.opts +4 -0
data/spec/spec_helper.rb +24 -0
metadata +81 -27
data/lib/h2o/errors.rb +0 -7
data/lib/h2o/tags/recurse.rb +0 -55

@@ -75,7 +75,6 @@ ohoh
 {% endif %}
 {% block body %}
-  {% block.super %}
   something here
   <h1>{{ page.title | test "", adsf }}</h1>
   <small> {{ page.description }} </small>

data/example/h2o/index.html ADDED

@@ -0,0 +1,10 @@
+{% extends 'base.html' %}
+{% block title %}{{ block.super }} - child page{% endblock %}
+{% block body %}
+  {{ block.super }}
+  extended body
+{% endblock %}

data/example/h2o/layout.html ADDED

@@ -0,0 +1,11 @@
+<html>
+<head>
+  <title>{% block title }web page{% endblock %}</title>
+</head>
+<body>
+  {% block body %}
+    default content
+  {% endblock %}
+</body>
+</html>

data/example/request.html CHANGED

File without changes

data/example/server CHANGED

@@ -1,3 +1,3 @@
 #!/bin/sh
 cd $PWD/example/
-ruby run.rb 8080
+ruby run.rb 888

data/h2o.gemspec CHANGED

@@ -1,43 +1,103 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
-  s.name     = "h2o"
-  s.version  = "0.2"
-  s.date     = "2008-09-5"
-  s.summary  = "Django inspired template markup"
-  s.email    = "taylor.luk@idealian.net"
-  s.homepage = "http://github.com/speedmax/h2o"
-  s.description = "h2o is a django inspired template that offers natural template syntax and easy to integrate."
-  s.has_rdoc = true
-  s.authors  = ["Taylor Luk"]
-  s.files    = ["README.md",
-		"h2o.gemspec",
-		"lib/h2o.rb",
-		"lib/h2o/",
-		"lib/h2o/constants.rb",
-		"lib/h2o/context.rb",
-		"lib/h2o/datatype.rb",
-		"lib/h2o/errors.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/for.rb",
-		"lib/h2o/tags/if.rb",
-		"lib/h2o/tags/with.rb",
-		"lib/h2o/tags/recurse.rb",
-		"lib/core_ext/object.rb",
-		"example/server.rb",
-		"example/run.rb",
-		"example/server",
-		"example/server.bat",
-		"example/request.html",
-		"example/erb/base.html",
-		"example/h2o/base.html",
-		"example/h2o/inherit.html",
-		"example/liquid/base.html",
-		]
-  s.test_files = []
-  s.rdoc_options = ["--main", "README.md"]
-  s.extra_rdoc_files = ["README.md"]
+  s.name = %q{h2o}
+  s.version = "0.3.0"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Taylor luk"]
+  s.date = %q{2010-08-30}
+  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 = [
+    "README.md"
+  ]
+  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/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/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"
+  ]
+  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.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"
+  ]
+  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
+      s.add_runtime_dependency(%q<schacon-git>, [">= 0"])
+    else
+      s.add_dependency(%q<schacon-git>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<schacon-git>, [">= 0"])
+  end
 end

data/init.rb ADDED

	@@ -0,0 +1 @@
1	+ require File.dirname(__FILE__) + '/lib/h2o'

data/lib/.DS_Store ADDED

Binary file

data/lib/core_ext/object.rb CHANGED

File without changes

data/lib/h2o.rb CHANGED

@@ -1,43 +1,33 @@
-module H2o
-  require 'pathname'
+require 'pathname'
+require 'core_ext/object'
+require 'h2o/constants'
-  class Template
-    attr_reader :context
-    def initialize (filename, env = {})
-      @file = Pathname.new(filename)
-      env[:search_path] = @file.dirname
-      @nodelist = Template.load(@file, env)
-    end
-    def render (context = {})
-      @context = Context.new(context)
-      output_stream = []
-      @nodelist.render(@context, output_stream)
-      output_stream.join
-    end
+$:.unshift File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
-    def self.parse source, env = {}
-      parser = Parser.new(source, false, env)
-      parsed = parser.parse
-    end
-    def self.load file, env = {}
-      file = env[:search_path] + file if file.is_a? String
-      parser = Parser.new(file.read, file, env)
-      parser.parse
-    end
+module H2o
+  autoload :Template,   'h2o/template'
+  autoload :FileLoader, 'h2o/file_loader'
+  autoload :Error,      'h2o/error'
+  autoload :Context,    'h2o/context'
+  autoload :Parser,     'h2o/parser'
+  autoload :Node,       'h2o/nodes'
+  autoload :DataObject, 'h2o/context'
+  autoload :Filters,    'h2o/filters'
+  autoload :Tags,       'h2o/tags'
+  module Tags
+    require 'h2o/tags/if'
+    require 'h2o/tags/for'
+    require 'h2o/tags/with'
+    require 'h2o/tags/block'
+    require 'h2o/tags/extends'
   end
-end
-require File.dirname(__FILE__) + '/core_ext/object'
-require File.dirname(__FILE__) + '/h2o/constants'
-require File.dirname(__FILE__) + '/h2o/errors'
-require File.dirname(__FILE__) + '/h2o/nodes'
-require File.dirname(__FILE__) + '/h2o/tags'
-require File.dirname(__FILE__) + '/h2o/parser'
-require File.dirname(__FILE__) + '/h2o/context'
-require File.dirname(__FILE__) + '/h2o/filters'
+  def self.loader
+    @loader
+  end
+  def self.loader=(loader)
+    @loader = loader
+  end
+end

data/lib/h2o/constants.rb CHANGED

@@ -4,8 +4,8 @@ module H2o
   BLOCK_END = '%}'
   VAR_START = '{{'
   VAR_END = '}}'
-  COMMENT_START = '{*'
-  COMMENT_END = '*}'
+  COMMENT_START = '{#'
+  COMMENT_END = '#}'
   PIPE_RE = /\|/
   SEPERATOR_RE = /,/

data/lib/h2o/context.rb CHANGED

@@ -111,7 +111,7 @@ module H2o
   class DataObject
     INTERNAL_METHOD = /^__/
-    @@required_methods = [:__send__, :__id__, :object_id, :respond_to?, :extend, :methods, :class, :nil?, :is_a?]
+    @@required_methods = [:__send__, :__id__, :object_id, :respond_to?, :extend, :methods, :class, :nil?, :is_a?, :to_h2o]
     def respond_to?(method)
       method_name = method.to_s
@@ -129,21 +129,14 @@ module H2o
   end
   class BlockContext < DataObject
-    def self.h2o_safe_methods
-      [:super]
-    end
-    def to_h2o
-      self
-    end
+    h2o_expose :super, :depth, :name
     def initialize(block, context, stream, index)
       @block, @context, @stream, @index = block, context, stream, index
     end
     def super
-      @block.parent.render(@context, @stream, @index-1) if @block.parent and @block.parent.stack_size > @index.abs
+      @block.parent.render(@context, @stream, @index-1) if @block.parent.stack_size > @index.abs
       nil
     end

data/lib/h2o/error.rb ADDED

@@ -0,0 +1,9 @@
+module H2o
+  class Error < Exception; end
+  class RuntimeError < Error ;end
+  class SyntaxError < Error ;end
+  class TemplateNotFound < Error ;end
+  class ParserError < Error ;end
+  class FilterError < Error ;end
+end

data/lib/h2o/filters/default.rb CHANGED

File without changes

data/lib/h2o/nodes.rb CHANGED

@@ -63,6 +63,10 @@ module H2o
   end
   class CommentNode < Node
+    def initialize()
+    end
+    def render(context, stream)
+    end
   end
 end

data/lib/h2o/tags.rb CHANGED

@@ -12,11 +12,6 @@ module H2o
     end
     class Tag < Node; end
   end
 end
-require File.dirname(__FILE__) + '/tags/if'
-require File.dirname(__FILE__) + '/tags/for'
-require File.dirname(__FILE__) + '/tags/block'
-require File.dirname(__FILE__) + '/tags/with'
-require File.dirname(__FILE__) + '/tags/recurse'

data/lib/h2o/tags/block.rb CHANGED

@@ -30,35 +30,5 @@ module H2o
       end
       Tags.register(self, :block)
     end
-    class Extends < Tag
-      Syntax = /\"(.*?)\"|\'(.*?)\'/
-      def initialize parser, argstring
-        unless parser.first?
-          raise SyntaxError, "extend tag needs to be at the beginning of the document"
-        end
-        # parser the entire subtemplate
-        parser.parse()
-        # load the parent template into nodelist
-        @nodelist = Template.load(argstring[1...-1], parser.env)
-        blocks = @nodelist.parser.storage[:blocks] || {}
-        (parser.storage[:blocks] || []).each do |name, block|
-          if blocks.include? name
-            blocks[name].add_layer(block)
-            block.parent =  blocks[name]
-          end
-        end
-      end
-      def render context, stream
-       @nodelist.render(context, stream)
-      end
-      Tags.register(self, :extends)
-    end
   end
 end

data/lib/h2o/tags/extends.rb ADDED

@@ -0,0 +1,33 @@
+module H2o
+  module Tags
+    class Extends < Tag
+      Syntax = /\"(.*?)\"|\'(.*?)\'/
+      def initialize parser, argstring
+        unless parser.first?
+          raise SyntaxError, "extend tag needs to be at the beginning of the document"
+        end
+        # parser the entire subtemplate
+        parser.parse()
+        # load the parent template into nodelist
+        @nodelist = Template.load(argstring[1...-1], parser.env)
+        blocks = @nodelist.parser.storage[:blocks] || {}
+        (parser.storage[:blocks] || []).each do |name, block|
+          if blocks.include? name
+            blocks[name].add_layer(block)
+            block.parent =  blocks[name]
+          end
+        end
+      end
+      def render context, stream
+       @nodelist.render(context, stream)
+      end
+      Tags.register(self, :extends)
+    end
+  end
+end

data/lib/h2o/tags/for.rb CHANGED

@@ -29,20 +29,20 @@ module H2o
         length = 0
         if iteratable.respond_to?(:each)
-          length = iteratable.size || iterabe.length
+          length = iteratable.size || iteratable.length
         end
         if length > 0
           parent = context[:loop]
+          index = 0
           # Main iteration
           context.stack do
-            iteratable.each_with_index do |*args|
-              value, index = args
-              if args.first.is_a? Array
-                key, value = value
+            iteratable.each do |item|
+              if item.is_a?(Array)
+                key, value = item
               else
                 key = index
+                value = item
               end
               is_even = index % 2 != 0
@@ -61,6 +61,7 @@ module H2o
                 :odd => !is_even
               }
               @body.render(context, stream)
+              index += 1
             end
           end
         else