@@ -108,7 +108,16 @@ module Elementor def content return unless doc_ready? - @content ||= context.send(opts[:from] || :body) + @content ||= content_from + end + + def content_from + from = opts[:from] || :body + if from.is_a?(Proc) + from.call + else + context.send(from) + end end end end lib/elementor/result.rb @@ -193,6 +193,19 @@ describe Elementor do result.should have(2).headers result.should have(4).tags end + + it "calls the proc to get the markup" do + meta_eval { alias_method :other_body, :body } + + @result = elements(:from => proc { other_body }) do |tag| + tag.headers "h1" + tag.tags ".tag-cloud a" + tag.user_links "#user-links" + end + + result.should have(2).headers + result.should have(4).tags + end it "works when the HTML isn't present until after the #elements call" do mock(self).deferred_source.once.returns(HTML_DOCUMENT.dup) spec/elementor_spec.rb 2e55b7fc1bfe6c5f8dd8fbc2c9b717afc7e17505 Les Hill leshill@gmail.com http://github.com/nakajima/elementor/commit/9d4e4577d958de6da265ffd8e037f98d87321fa1 9d4e4577d958de6da265ffd8e037f98d87321fa1 2009-03-14T07:48:42-07:00 2009-03-14T07:48:42-07:00 Allow proc with :from option e907b5caf122568b267e874a9ad7b88716caf335 Les Hill leshill@gmail.com