@@ -43,18 +43,29 @@ module Comma class DataExtractor < Extractor def method_missing(sym, *args, &block) - @results << @instance.send(sym).to_s if args.blank? + if args.blank? + result = block ? yield(@instance.send(sym)) : @instance.send(sym) + @results << result.to_s + end args.each do |arg| case arg when Hash arg.each do |k, v| - @results << (@instance.send(sym).nil? ? '' : @instance.send(sym).send(k).to_s ) + if block + @results << (@instance.send(sym).nil? ? '' : yield(@instance.send(sym).send(k)).to_s ) + else + @results << (@instance.send(sym).nil? ? '' : @instance.send(sym).send(k).to_s ) + end end when Symbol + if block + @results << (@instance.send(sym).nil? ? '' : yield(@instance.send(sym).send(arg)).to_s) + else @results << ( @instance.send(sym).nil? ? '' : @instance.send(sym).send(arg).to_s ) + end when String - @results << @instance.send(sym).to_s + @results << (block ? yield(@instance.send(sym)) : @instance.send(sym)).to_s else raise "Unknown data symbol #{arg.inspect}" end lib/comma/extractors.rb @@ -151,6 +151,34 @@ describe Comma, 'to_comma data/headers object extensions' do end end + + describe 'with block' do + before do + class Foo + attr_accessor :content, :time + comma do + time('Date') {|i| i.strftime("%Y/%m/%d") } + content {|i| i ? i : '---' } + content('Truncated Content') {|i| i && i.length > 10 ? i[0..10] : '---' } + end + + def initialize(content) + @content = content + @time = Time.mktime(2009, 9, 8, 12, 44, 40) + end + end + + @foo = Foo.new('content ' * 5) + @bar = Foo.new nil + end + + it 'should return yielded values by block' do + header, foo, bar = [@foo, @bar].to_comma.split("\n") + foo.should == "2009/09/08,content content content content content ,content con" + bar.should == "2009/09/08,---,---" + end + + end describe 'on an object with no comma declaration' do spec/comma/comma_spec.rb 08ecf5d555036abaae79fb5442d9a4cb9832d3e2 swdyh youhei@gmail.com http://github.com/crafterm/comma/commit/66f3a877c0def5e5597663971e75fb833795ba95 66f3a877c0def5e5597663971e75fb833795ba95 2009-09-07T22:03:19-07:00 2009-09-07T22:03:19-07:00 Enabled definition to give a block. 8cd35f299f410c8d6717d90fc3c748549eab10b0 swdyh youhei@gmail.com