@@ -1,5 +1,5 @@ class Object - def self.h2o_safe(*attrs) + def self.h2o_expose(*attrs) @h2o_safe = attrs end @@ -7,4 +7,7 @@ class Object @h2o_safe end + def to_h2o + self + end end \ No newline at end of file lib/core_ext/object.rb @@ -31,7 +31,6 @@ module H2o end require File.dirname(__FILE__) + '/core_ext/object' -require File.dirname(__FILE__) + '/core_ext/method' require File.dirname(__FILE__) + '/h2o/constants' require File.dirname(__FILE__) + '/h2o/errors' lib/h2o.rb @@ -3,7 +3,6 @@ module H2o def initialize(context ={}) @stack = [context] - @filter_env = Filters.build(self) end @@ -59,12 +58,12 @@ module H2o rescue return nil end - object = result + object = result.to_h2o # Array and Hash like objects elsif part.match(/^-?\d+$/) if (object.respond_to?(:has_key?) || object.respond_to?(:fetch)) && value = object[part.to_i] - object = value + object = value.to_h2o else return nil end @@ -72,11 +71,11 @@ module H2o # H2o::DataObject Type elsif (object.is_a?(DataObject) || object.class.h2o_safe_methods && object.class.h2o_safe_methods.include?(part_sym) )&& \ object.respond_to?(part_sym) - object = object.__send__(part_sym) + object = object.__send__(part_sym).to_h2o # Sweet array shortcuts elsif object.respond_to?(part_sym) && [:first, :length, :size, :last].include?(part_sym) - object = object.__send__(part_sym) + object = object.__send__(part_sym).to_h2o else return nil end @@ -102,9 +101,7 @@ module H2o arg end end - - - + object = @filter_env.__send__(name, object, *args) end object lib/h2o/context.rb @@ -1,9 +1,11 @@ module H2o class Node def initialize(parser, position = 0) + raise "Subclass should implement initialize method" end def render(context, stream) + raise "Subclass should implement method method" end end lib/h2o/nodes.rb @@ -1,11 +1,19 @@ require 'spec/spec_helper' class User - h2o_safe :name, :age + h2o_expose :name, :age attr_accessor :name, :age + def initialize name, age @name, @age = name, age end + + def to_h2o + { + :name => self.name, + :age => self.age + } + end end scope = { @@ -65,7 +73,6 @@ describe "Resolve name" do # Cached inline context.resolve(:'procs.generation').usec.should == result.usec - context.resolve(:'procs.generation').usec.should == result.usec end end spec/context_spec.rb lib/core_ext/method.rb 291ae6e137ba26dec4800aa97396aed940b14093 speedmax subjective@gmail.com http://github.com/speedmax/h2o/commit/8a51bc2a0f668e8f3ad066348a4d6e5b259ee5a1 8a51bc2a0f668e8f3ad066348a4d6e5b259ee5a1 2009-08-03T23:11:44-07:00 2009-08-03T23:11:44-07:00 - removed previous method core_ext to fix Method#to_proc issue - renamed Object#h2o_safe to Object#h2o_expose - adding Object#to_h2o method for optional custom template data object 5e86117e0ba215f4939ad93cd16ac1804f8a5843 speedmax subjective@gmail.com