h2o 0.3.0 → 0.3.1

data/Rakefile

@@ -15,8 +15,6 @@ begin
     s.email = "subjective@gmail.com"
     s.homepage = "http://www.h2o-template.org"
     s.authors = ["Taylor luk"]
-    s.add_dependency 'schacon-git'
-    
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/h2o.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{h2o}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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.date = %q{2010-09-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 = [
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "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",
@@ -63,6 +64,7 @@ Gem::Specification.new do |s|
      "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",
@@ -92,12 +94,9 @@ Gem::Specification.new do |s|
     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/lib/h2o/context.rb

@@ -111,7 +111,7 @@ module H2o
   
   class DataObject
     INTERNAL_METHOD = /^__/
-    @@required_methods = [:__send__, :__id__, :object_id, :respond_to?, :extend, :methods, :class, :nil?, :is_a?, :to_h2o]
+    @@required_methods = [:__send__, :__id__, :object_id, :respond_to?, :extend, :methods, :class, :nil?, :is_a?, :to_h2o, :respond_to_missing?]
 
     def respond_to?(method)
       method_name = method.to_s

data/lib/h2o/file_loader.rb

@@ -0,0 +1,20 @@
+module H2o
+  class FileLoader
+    attr_accessor :path
+    
+    def initialize(path)
+      raise "Search path not found" unless File.exist?(path)
+      
+      self.path = Pathname.new(path)
+    end
+
+    def read(file)
+      raise "Template not found" unless exist?(file)
+      File.read(self.path + file)
+    end
+    
+    def exist?(file)
+      File.exist?(self.path + file)
+    end
+  end
+end

data/spec/fixtures/deep/folder/c.html

@@ -0,0 +1 @@
+hello

data/spec/h2o/file_loader_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe H2o::FileLoader do
   before do
-    path = File.expand_path("../../fixtures", __FILE__)
-    @loader = H2o::FileLoader.new(path)
+    @path = File.expand_path("../../fixtures", __FILE__)
+    @loader = H2o::FileLoader.new(@path)
   end
   
   it "search for template on a search path on file system" do
@@ -19,9 +19,13 @@ describe H2o::FileLoader do
   it "raises error when template doesn't exist" do
     expect { @loader.read('non-existence.html') }.should raise_error
   end
+  
+  it "should be able to it from template class" do
+    H2o::Template.load('deep/folder/c.html', :searchpath => @path).render.should == 'hello'
+  end
 end
 
-describe "H2o::HashLoader" do
+describe H2o::HashLoader do
   it "read file on the same namespace in a hash" do
     H2o.loader = H2o::HashLoader.new(
       'base.html' => '{% block content %}test{% endblock %}',

data/spec/h2o/file_loader_spec.rbc

@@ -0,0 +1,1051 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+35
+5
+7
+0
+64
+47
+49
+1
+1
+15
+5
+45
+2
+3
+43
+4
+56
+5
+47
+50
+6
+1
+15
+5
+7
+7
+64
+56
+8
+47
+50
+6
+1
+15
+2
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+9
+s
+11
+spec_helper
+x
+7
+require
+x
+3
+H2o
+n
+x
+10
+FileLoader
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+41
+5
+56
+0
+47
+50
+1
+0
+15
+5
+7
+2
+64
+56
+3
+47
+50
+4
+1
+15
+5
+7
+5
+64
+56
+6
+47
+50
+4
+1
+15
+5
+7
+7
+64
+56
+8
+47
+50
+4
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+9
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+47
+45
+0
+1
+7
+2
+64
+65
+48
+3
+49
+4
+2
+19
+0
+15
+45
+5
+6
+43
+7
+13
+71
+8
+47
+9
+39
+47
+48
+9
+13
+20
+0
+47
+49
+10
+1
+15
+8
+44
+20
+0
+49
+8
+1
+38
+11
+11
+I
+5
+I
+1
+I
+0
+I
+0
+I
+-2
+p
+12
+x
+4
+File
+n
+s
+14
+../../fixtures
+x
+11
+active_path
+x
+11
+expand_path
+x
+3
+H2o
+n
+x
+10
+FileLoader
+x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+x
+7
+@loader
+p
+7
+I
+0
+I
+4
+I
+0
+I
+5
+I
+f
+I
+6
+I
+2f
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+1
+x
+4
+path
+x
+6
+before
+s
+51
+search for template on a search path on file system
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+42
+39
+0
+7
+1
+64
+49
+2
+1
+48
+3
+2
+83
+4
+15
+39
+0
+7
+5
+64
+49
+2
+1
+48
+3
+2
+83
+4
+15
+39
+0
+7
+6
+64
+49
+2
+1
+48
+3
+3
+83
+4
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+7
+x
+7
+@loader
+s
+6
+a.html
+x
+6
+exist?
+x
+6
+should
+x
+2
+==
+s
+18
+deep/folder/c.html
+s
+18
+non-existence.html
+p
+9
+I
+0
+I
+9
+I
+0
+I
+a
+I
+e
+I
+b
+I
+1c
+I
+c
+I
+2a
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+x
+2
+it
+s
+32
+read for files on the searchpath
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+16
+39
+0
+7
+1
+64
+49
+2
+1
+48
+3
+7
+4
+64
+83
+5
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+6
+x
+7
+@loader
+s
+6
+a.html
+x
+4
+read
+x
+6
+should
+s
+11
+{{ hello }}
+x
+2
+==
+p
+5
+I
+0
+I
+f
+I
+0
+I
+10
+I
+10
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+s
+40
+raises error when template doesn't exist
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+15
+5
+56
+0
+47
+50
+1
+0
+5
+47
+48
+2
+49
+3
+1
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+4
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+9
+39
+0
+7
+1
+64
+49
+2
+1
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+3
+x
+7
+@loader
+s
+18
+non-existence.html
+x
+4
+read
+p
+3
+I
+0
+I
+14
+I
+9
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+x
+6
+expect
+x
+11
+raise_error
+x
+6
+should
+p
+5
+I
+0
+I
+13
+I
+0
+I
+14
+I
+f
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+p
+11
+I
+0
+I
+3
+I
+0
+I
+4
+I
+8
+I
+9
+I
+13
+I
+f
+I
+1e
+I
+13
+I
+29
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+x
+8
+describe
+s
+15
+H2o::HashLoader
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+11
+5
+7
+0
+64
+56
+1
+47
+50
+2
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+3
+s
+41
+read file on the same namespace in a hash
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+195
+45
+0
+1
+45
+0
+2
+43
+3
+13
+71
+4
+47
+9
+54
+47
+48
+5
+13
+44
+43
+6
+80
+49
+7
+1
+13
+7
+8
+64
+7
+9
+64
+49
+10
+2
+15
+13
+7
+11
+64
+7
+12
+64
+49
+10
+2
+15
+47
+49
+13
+1
+15
+8
+86
+44
+43
+6
+80
+49
+7
+1
+13
+7
+8
+64
+7
+9
+64
+49
+10
+2
+15
+13
+7
+11
+64
+7
+12
+64
+49
+10
+2
+15
+49
+4
+1
+13
+18
+2
+49
+14
+1
+15
+15
+45
+0
+15
+48
+16
+7
+8
+64
+49
+17
+1
+48
+18
+7
+9
+64
+83
+19
+15
+45
+0
+20
+43
+21
+13
+71
+4
+47
+9
+138
+47
+48
+5
+13
+7
+8
+64
+47
+49
+13
+1
+15
+8
+144
+7
+8
+64
+49
+4
+1
+48
+22
+48
+18
+7
+23
+64
+83
+19
+15
+45
+0
+24
+43
+21
+13
+71
+4
+47
+9
+179
+47
+48
+5
+13
+7
+11
+64
+47
+49
+13
+1
+15
+8
+185
+7
+11
+64
+49
+4
+1
+48
+22
+48
+18
+7
+25
+64
+83
+19
+11
+I
+8
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+26
+x
+3
+H2o
+n
+n
+x
+10
+HashLoader
+x
+3
+new
+x
+8
+allocate
+x
+4
+Hash
+x
+16
+new_from_literal
+s
+9
+base.html
+s
+37
+{% block content %}test{% endblock %}
+x
+3
+[]=
+s
+6
+a.html
+s
+63
+{% extends 'base.html' %}{% block content %}test2{% endblock %}
+x
+10
+initialize
+x
+7
+loader=
+n
+x
+6
+loader
+x
+4
+read
+x
+6
+should
+x
+2
+==
+n
+x
+8
+Template
+x
+6
+render
+s
+4
+test
+n
+s
+5
+test2
+p
+21
+I
+0
+I
+19
+I
+0
+I
+1a
+I
+12
+I
+1c
+I
+1a
+I
+1b
+I
+25
+I
+1c
+I
+3e
+I
+1b
+I
+49
+I
+1c
+I
+5e
+I
+1e
+I
+71
+I
+20
+I
+9a
+I
+21
+I
+c3
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+x
+2
+it
+p
+5
+I
+0
+I
+18
+I
+0
+I
+19
+I
+b
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0
+p
+7
+I
+0
+I
+1
+I
+9
+I
+3
+I
+16
+I
+18
+I
+23
+x
+43
+/workspace/h2o/spec/h2o/file_loader_spec.rb
+p
+0

data/spec/h2o/tags/block_spec.rb

@@ -7,7 +7,7 @@ describe H2o::Tags::Block do
   end
   
   
-  context "block variable" do
+  describe "block variable" do
     it "should return block name" do
       parse(block(:something, '{{ block.name }}')).render.should == 'something'
     end
@@ -17,7 +17,8 @@ describe H2o::Tags::Block do
       parse(source).render.should == "1"
     end
     
-    it "should return parent block content"
+    it "should return parent block content" do
+    end
   end
 
   def block(name, content)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Taylor luk
@@ -14,22 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +10:00
+date: 2010-09-14 00:00:00 +10:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: schacon-git
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: h2o is a django inspired template that offers natural template syntax and easy to integrate.
 email: subjective@gmail.com
 executables: []
@@ -68,6 +56,7 @@ files:
 - 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
@@ -86,6 +75,7 @@ files:
 - 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