@@ -352,7 +352,7 @@ class OEmbed txt.gsub!(u, response.to_s) else yield(response, u) - txt.gsub!(u, response.rendered_content) + (response.has_rendered?) ? txt.gsub!(u, response.rendered_content) : txt end else if block.nil? @@ -360,7 +360,7 @@ class OEmbed else response = OEmbed::Response.new("", u, {}) yield(response, u) - txt.gsub!(u, response.rendered_content) + (response.has_rendered?) ? txt.gsub!(u, response.rendered_content) : txt end end end lib/oembed_links.rb @@ -80,6 +80,10 @@ class OEmbed end end + def has_rendered? + !@rendered.nil? + end + private # Needlessly stupid priority for rendering. @@ -95,9 +99,6 @@ class OEmbed end end - def has_rendered? - !@rendered.nil? - end def render_content(*args, &block) options = (args.last.is_a?(Hash)) ? args.last : { } lib/oembed_links/response.rb @@ -166,7 +166,13 @@ describe OEmbed, "transforming functions" do r.hedgehog? { |v| "hedgey"} r.from?(:test2) { |t| "test2" } r.matches?(/baz/) { |m| "regex" } - end.should == "foo" + end.should == "http://test1.net/foo" + end + + it "should transform only urls which have registered providers" do + OEmbed.transform("http://test1.net/foo and http://not.a.valid.url.host/fake are urls") do |r, url| + r.video? { |v| "video" } + end.should == "video and http://not.a.valid.url.host/fake are urls" end it "should pass control to the .none? block if no scheme matched" do spec/oembed_links_spec.rb fc55499f97e90ca23fcecf706040df4cec969eb7 netshade netshade@gmail.com http://github.com/netshade/oembed_links/commit/924be813e7ab499f81cb2306e8721da8f1bcc56c 924be813e7ab499f81cb2306e8721da8f1bcc56c 2009-06-09T07:07:50-07:00 2009-06-09T07:07:50-07:00 fix bad transform attempt when rendered content is nil: 0153c0138d6e439b37d3b51f01c2038a72a4d732 netshade netshade@gmail.com