.autotest
lib/core_ext/method.rb
@@ -1,17 +1,6 @@
module H2o
require 'pathname'
- class Stream < Array
-
- def << (item)
- unshift item.to_s
- end
-
- def close
- reverse!
- end
- end
-
class Template
attr_reader :context
@@ -42,6 +31,7 @@ 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
@@ -90,9 +90,9 @@ module H2o
def apply_filters(object, filters)
filters.each do |filter|
name, *args = filter
-
filter = Filters[name]
- raise FilterError, "Filter not found" if filter.nil?
+
+ raise FilterError, "Filter(#{name}) not found" if filter.nil?
args.map! do |arg|
if arg.kind_of? Symbol
@@ -101,6 +101,7 @@ module H2o
arg
end
end
+
object = filter.call(object, *args)
end
object
lib/h2o/context.rb
@@ -1,7 +1,11 @@
module H2o
-
- class StreamWriter
+ class Stream < Array
+ def << (item)
+ unshift item.to_s
+ end
+ def close
+ reverse!
+ end
end
-
end
\ No newline at end of file
lib/h2o/datatype.rb
@@ -11,6 +11,8 @@ module H2o
end
class StandardFilters < FilterCollection
+
+ # String filters
def upper value
value.to_s.upcase
end
@@ -30,8 +32,20 @@ module H2o
value.gsub!(/"/, '"') if attribute
value
end
-
+ # Array Filters
+ def join(value, delimiter = ', ')
+ value.join(delimiter)
+ end
+
+ def first(value)
+ value.first
+ end
+
+ def last(value)
+ value.last
+ end
+
def test value, arg1, arg2
"#{value} #{arg1} #{arg2}"
end
lib/h2o/filters.rb
@@ -1,6 +1,37 @@
require 'spec/spec_helper'
require 'pp'
+describe "Filter parameter passing" do
+ it "should pass input object as first param" do
+
+ # try a standard filter
+ parse('{{ "something" | upper }}').render.should == 'SOMETHING'
+
+
+ # try a array input object
+ H2o::Filters.add(:test_filter) do |input|
+ "#{input.inspect}"
+ end
+
+ list = ["man","women"]
+ result = parse('{{ object| test_filter }}').render(:object => list)
+ result.should == list.inspect
+
+ # Try a array subclass
+ list = CustomCollection.new(["man", "woman"])
+
+ result = parse('{{ object| test_filter }}').render(:object => list)
+ result.should == list.inspect
+ end
+
+ it "should be able to pass aditional parameters" do
+ H2o::Filters.add(:test_filter) do |string, param1, param2|
+ "#{string}-#{param1}-#{param2}"
+ end
+ parse('{{ "test"| test_filter 1, 2 }}').render.should == 'test-1-2'
+ end
+end
+
describe 'Standard Filters' do
it "should upcase an string" do
parse('{{ "test" | upper }}').render.should == 'TEST'
@@ -10,4 +41,6 @@ end
def parse src
H2o::Template.parse(src)
-end
\ No newline at end of file
+end
+
+class CustomCollection < Array; end
\ No newline at end of file
spec/filters_spec.rb
ef689895b4a5e887f94636be08872f8af76a2664
speedmax
subjective@gmail.com
http://github.com/speedmax/h2o/commit/a2bfa272f680ed05929b9534deea14c54a136fc8
a2bfa272f680ed05929b9534deea14c54a136fc8
2009-05-31T01:10:52-07:00
2009-05-31T01:10:52-07:00
- Fixed filter argument dispatching issue, patched Method#to_proc with Method#filter_to_proc
- Updated specs
- Cleanup h2o class
- Better filter missing warning
- adding .autotest
09c28c70592afd1904dacd2f088ac115c1788842
speedmax
subjective@gmail.com