lib/oembed/formatters.rb @@ -1,21 +1,9 @@ $:.unshift File.dirname(__FILE__) -%w(json/ext json).each do |lib| - begin - require lib - break - rescue LoadError - end -end - -begin - require 'xmlsimple' -rescue LoadError -end - require 'net/http' require 'oembed/errors' +require 'oembed/formatters' require 'oembed/provider' require 'oembed/providers' require 'oembed/response' lib/oembed.rb @@ -2,34 +2,11 @@ module OEmbed class Provider attr_accessor :format, :name, :url, :urls, :endpoint - def initialize(endpoint, format = nil) + def initialize(endpoint, format = OEmbed::Formatters::DEFAULT) @endpoint = endpoint @urls = [] # Try to use the best available format - available_formats = [ - [:json, lambda { - begin - JSON.respond_to?(:load) - rescue NameError - false - end - }], - [:xml, lambda { - begin - XmlSimple.respond_to?(:xml_in) - rescue NameError - false - end - }], - ] - if format && to_try = available_formats.assoc(format) - available_formats.delete(to_try) - @format = format if to_try[1].call - end - available_formats.each do |format, to_try| - break unless @format.nil? - @format = format if to_try.call - end + @format = OEmbed::Formatters.verify?(format) end def <<(url) lib/oembed/provider.rb @@ -4,19 +4,8 @@ module OEmbed attr_reader :fields, :provider, :format def self.create_for(raw, provider, format = :json) - begin - fields = case format - when :json - JSON.load(raw) - when :xml - XmlSimple.xml_in(raw, {'ForceArray'=>false}) - else - raise OEmbed::FormatNotSupported, format.inspect - end - rescue NameError - raise OEmbed::FormatNotSupported, format.inspect - end - + fields = OEmbed::Formatters.convert(format, raw) + resp_type = case fields['type'] when 'photo' : OEmbed::Response::Photo when 'video' : OEmbed::Response::Video lib/oembed/response.rb @@ -4,6 +4,7 @@ describe OEmbed::Provider do include OEmbedSpecHelper before(:all) do + @default = OEmbed::Formatters::DEFAULT @flickr = OEmbed::Provider.new("http://www.flickr.com/services/oembed/") @qik = OEmbed::Provider.new("http://qik.com/api/oembed.{format}", :xml) @viddler = OEmbed::Provider.new("http://lab.viddler.com/services/oembed/", :json) @@ -14,8 +15,8 @@ describe OEmbed::Provider do @viddler << "http://*.viddler.com/*" end - it "should default to json" do - @flickr.format.should == :json + it "should by default use OEmbed::Formatters::DEFAULT" do + @flickr.format.should == @default end it "should allow xml" do @@ -27,8 +28,8 @@ describe OEmbed::Provider do end it "should not allow random formats" do - @hulu = OEmbed::Provider.new("http://www.hulu.com/api/oembed.{format}", :yml) - @hulu.format.should == :json + proc { OEmbed::Provider.new("http://www.hulu.com/api/oembed.{format}", :yml) }. + should raise_error(OEmbed::FormatNotSupported) end it "should add URL schemes" do @@ -151,8 +152,8 @@ describe OEmbed::Provider do it "should send the provider's format if none is specified" do @flickr.should_receive(:raw). - with(url(:flickr), :format=>:json). - and_return(valid_response(:json)) + with(url(:flickr), :format => @default). + and_return(valid_response(@default)) @flickr.get(url(:flickr)) @qik.should_receive(:raw). @@ -167,7 +168,7 @@ describe OEmbed::Provider do end it "should return OEmbed::Response" do - @flickr.stub!(:raw).and_return(valid_response(:json)) + @flickr.stub!(:raw).and_return(valid_response(@default)) @flickr.get(url(:flickr)).is_a?(OEmbed::Response).should be_true end end spec/provider_spec.rb ec9607d4c5908c8dbebff49cad2d0824c8d0ef80 Magnus Holm judofyr@gmail.com http://github.com/judofyr/ruby-oembed/commit/4db06591d2743c774b5f3f427947a5a9a99cb222 4db06591d2743c774b5f3f427947a5a9a99cb222 2009-01-30T12:10:20-08:00 2009-01-30T12:10:20-08:00 Adding OEmbed::Formatters ddace3038e937ba675e0e7a8d8c8585231274999 Magnus Holm judofyr@gmail.com