ruby-oembed 0.8.1 → 0.8.3

data/lib/oembed/version.rb

@@ -2,7 +2,7 @@ module OEmbed
   class Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 1
+    PATCH = 3
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     
     class << self

data/ruby-oembed.gemspec

@@ -1,99 +1,95 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-oembed}
-  s.version = "0.8.1"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus Holm", "Alex Kessinger", "Aris Bartee", "Marcos Wright Kuhns"]
-  s.date = %q{2011-02-27}
+  s.date = %q{2011-06-26}
   s.description = %q{An oEmbed consumer library written in Ruby, letting you easily get embeddable HTML representations of supported web pages, based on their URLs. See http://oembed.com for more information about the protocol.}
   s.email = %q{arisbartee@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     ".rvmrc",
-     "CHANGELOG.rdoc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "integration_test/test.rb",
-     "integration_test/test_urls.csv",
-     "lib/oembed.rb",
-     "lib/oembed/errors.rb",
-     "lib/oembed/formatter.rb",
-     "lib/oembed/formatter/json.rb",
-     "lib/oembed/formatter/json/backends/activesupportjson.rb",
-     "lib/oembed/formatter/json/backends/jsongem.rb",
-     "lib/oembed/formatter/json/backends/yaml.rb",
-     "lib/oembed/formatter/xml.rb",
-     "lib/oembed/formatter/xml/backends/rexml.rb",
-     "lib/oembed/formatter/xml/backends/xmlsimple.rb",
-     "lib/oembed/provider.rb",
-     "lib/oembed/provider_discovery.rb",
-     "lib/oembed/providers.rb",
-     "lib/oembed/providers/embedly_urls.yml",
-     "lib/oembed/providers/oohembed_urls.yml",
-     "lib/oembed/response.rb",
-     "lib/oembed/response/link.rb",
-     "lib/oembed/response/photo.rb",
-     "lib/oembed/response/rich.rb",
-     "lib/oembed/response/video.rb",
-     "lib/oembed/version.rb",
-     "lib/tasks/oembed.rake",
-     "lib/tasks/rspec.rake",
-     "ruby-oembed.gemspec",
-     "spec/formatter/json/.DS_Store",
-     "spec/formatter/json/jsongem_backend_spec.rb",
-     "spec/formatter/json/yaml_backend_spec.rb",
-     "spec/formatter/xml/rexml_backend_spec.rb",
-     "spec/formatter/xml/xmlsimple_backend_spec.rb",
-     "spec/formatter_spec.rb",
-     "spec/provider_spec.rb",
-     "spec/providers_spec.rb",
-     "spec/response_spec.rb",
-     "spec/spec_helper.rb"
+    ".rvmrc",
+    ".yardopts",
+    "CHANGELOG.rdoc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "integration_test/test.rb",
+    "integration_test/test_urls.csv",
+    "lib/oembed.rb",
+    "lib/oembed/errors.rb",
+    "lib/oembed/formatter.rb",
+    "lib/oembed/formatter/base.rb",
+    "lib/oembed/formatter/json.rb",
+    "lib/oembed/formatter/json/backends/activesupportjson.rb",
+    "lib/oembed/formatter/json/backends/jsongem.rb",
+    "lib/oembed/formatter/json/backends/yaml.rb",
+    "lib/oembed/formatter/xml.rb",
+    "lib/oembed/formatter/xml/backends/rexml.rb",
+    "lib/oembed/formatter/xml/backends/xmlsimple.rb",
+    "lib/oembed/provider.rb",
+    "lib/oembed/provider_discovery.rb",
+    "lib/oembed/providers.rb",
+    "lib/oembed/providers/embedly_urls.yml",
+    "lib/oembed/providers/oohembed_urls.yml",
+    "lib/oembed/response.rb",
+    "lib/oembed/response/link.rb",
+    "lib/oembed/response/photo.rb",
+    "lib/oembed/response/rich.rb",
+    "lib/oembed/response/video.rb",
+    "lib/oembed/version.rb",
+    "lib/tasks/oembed.rake",
+    "lib/tasks/rspec.rake",
+    "ruby-oembed.gemspec",
+    "spec/formatter/ducktype_backend_spec.rb",
+    "spec/formatter/json/.DS_Store",
+    "spec/formatter/json/jsongem_backend_spec.rb",
+    "spec/formatter/json/yaml_backend_spec.rb",
+    "spec/formatter/xml/rexml_backend_spec.rb",
+    "spec/formatter/xml/xmlsimple_backend_spec.rb",
+    "spec/formatter_spec.rb",
+    "spec/provider_spec.rb",
+    "spec/providers_spec.rb",
+    "spec/response_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/judofyr/ruby-oembed}
   s.licenses = ["MIT"]
-  s.rdoc_options = ["--main", "README.rdoc", "--title", "ruby-oembed-0.8.1", "--inline-source", "--exclude", "tasks", "CHANGELOG.rdoc"]
+  s.rdoc_options = ["--main", "README.rdoc", "--title", "ruby-oembed-0.8.3", "--inline-source", "--exclude", "tasks", "CHANGELOG.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{oEmbed for Ruby}
-  s.test_files = [
-    "spec/formatter/json/jsongem_backend_spec.rb",
-     "spec/formatter/json/yaml_backend_spec.rb",
-     "spec/formatter/xml/rexml_backend_spec.rb",
-     "spec/formatter/xml/xmlsimple_backend_spec.rb",
-     "spec/formatter_spec.rb",
-     "spec/provider_spec.rb",
-     "spec/providers_spec.rb",
-     "spec/response_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<xml-simple>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<xml-simple>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<xml-simple>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0"])

data/spec/formatter/ducktype_backend_spec.rb

@@ -0,0 +1,94 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class WorkingDuck
+  # The WorkingDuck Class should work as a Backend
+  class << self
+    # Fakes a correct deocde response
+    def decode(value)
+      {"version"=>1.0, "string"=>"test", "int"=>42, "html"=>"<i>Cool's</i>\n the \"word\"!",}
+    end
+    def parse_error; RuntimeError; end
+  end
+  
+  # A WorkingDuck instance should work as a Backend
+  def decode(value)
+    self.class.decode(value)
+  end
+  def parse_error; RuntimeError; end
+end
+
+class FailingDuckDecode
+  # Fakes an incorrect decode response
+  def decode(value)
+    {}
+  end
+  def parse_error; RuntimeError; end
+end
+
+describe "OEmbed::Formatter::JSON::Backends::DuckType" do
+  include OEmbedSpecHelper
+
+  it "should work with WorkingDuck Class" do
+    lambda {
+      OEmbed::Formatter::JSON.backend = WorkingDuck
+    }.should_not raise_error
+    OEmbed::Formatter::JSON.backend.should equal(WorkingDuck)
+  end
+  
+  it "should work with a WorkingDuck instance" do
+    instance = WorkingDuck.new
+    lambda {
+      OEmbed::Formatter::JSON.backend = instance
+    }.should_not raise_error
+    OEmbed::Formatter::JSON.backend.should equal(instance)
+  end
+  
+  it "should fail with FailingDuckDecode Class" do
+    lambda {
+      OEmbed::Formatter::JSON.backend = FailingDuckDecode
+    }.should raise_error(LoadError)
+    OEmbed::Formatter::JSON.backend.should_not equal(FailingDuckDecode)
+  end
+  
+  it "should fail with a FailingDuckDecode instance" do
+    instance = FailingDuckDecode.new
+    lambda {
+      OEmbed::Formatter::JSON.backend = instance
+    }.should raise_error(LoadError)
+    OEmbed::Formatter::JSON.backend.should_not equal(instance)
+  end
+end
+
+describe "OEmbed::Formatter::XML::Backends::DuckType" do
+  include OEmbedSpecHelper
+
+  it "should work with WorkingDuck Class" do
+    lambda {
+      OEmbed::Formatter::XML.backend = WorkingDuck
+    }.should_not raise_error
+    OEmbed::Formatter::XML.backend.should equal(WorkingDuck)
+  end
+  
+  it "should work with a WorkingDuck instance" do
+    instance = WorkingDuck.new
+    lambda {
+      OEmbed::Formatter::XML.backend = instance
+    }.should_not raise_error
+    OEmbed::Formatter::XML.backend.should equal(instance)
+  end
+  
+  it "should fail with FailingDuckDecode Class" do
+    lambda {
+      OEmbed::Formatter::XML.backend = FailingDuckDecode
+    }.should raise_error(LoadError)
+    OEmbed::Formatter::XML.backend.should_not equal(FailingDuckDecode)
+  end
+  
+  it "should fail with a FailingDuckDecode instance" do
+    instance = FailingDuckDecode.new
+    lambda {
+      OEmbed::Formatter::XML.backend = instance
+    }.should raise_error(LoadError)
+    OEmbed::Formatter::XML.backend.should_not equal(instance)
+  end
+end

data/spec/formatter/json/jsongem_backend_spec.rb

@@ -31,4 +31,28 @@ describe "OEmbed::Formatter::JSON::Backends::JSONGem" do
     decoded.keys.should == valid_response(:object).keys
     decoded.values.map{|v|v.to_s}.should == valid_response(:object).values.map{|v|v.to_s}
   end
+  
+  it "should raise an OEmbed::ParseError when decoding an invalid JSON String" do
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, invalid_response('unclosed_container', :json))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, invalid_response('unclosed_tag', :json))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, invalid_response('invalid_syntax', :json))
+    }.should raise_error(OEmbed::ParseError)
+  end
+  
+  it "should raise an OEmbed::ParseError when decoding fails with an unexpected error" do
+    error_to_raise = ArgumentError
+    OEmbed::Formatter::JSON.backend.parse_error.should_not be_kind_of(error_to_raise)
+    
+    ::JSON.should_receive(:parse).
+      and_raise(error_to_raise.new("unknown error"))
+    
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, valid_response(:json))
+    }.should raise_error(OEmbed::ParseError)
+  end
 end

data/spec/formatter/json/yaml_backend_spec.rb

@@ -27,4 +27,28 @@ describe "OEmbed::Formatter::JSON::Backends::Yaml" do
     decoded.keys.should == valid_response(:object).keys
     decoded.values.map{|v|v.to_s}.should == valid_response(:object).values.map{|v|v.to_s}
   end
+  
+  it "should raise an OEmbed::ParseError when decoding an invalid JSON String" do
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, invalid_response('unclosed_container', :json))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, invalid_response('unclosed_tag', :json))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, invalid_response('invalid_syntax', :json))
+    }.should raise_error(OEmbed::ParseError)
+  end
+  
+  it "should raise an OEmbed::ParseError when decoding fails with an unexpected error" do
+    error_to_raise = ArgumentError
+    OEmbed::Formatter::JSON.backend.parse_error.should_not be_kind_of(error_to_raise)
+    
+    OEmbed::Formatter::JSON.backend.should_receive(:convert_json_to_yaml).
+      and_raise(error_to_raise.new("unknown error"))
+    
+    lambda {
+      decode = OEmbed::Formatter.decode(:json, valid_response(:json))
+    }.should raise_error(OEmbed::ParseError)
+  end
 end

data/spec/formatter/xml/rexml_backend_spec.rb

@@ -27,4 +27,28 @@ describe "OEmbed::Formatter::XML::Backends::REXML" do
     decoded.keys.should == valid_response(:object).keys
     decoded.values.map{|v|v.to_s}.should == valid_response(:object).values.map{|v|v.to_s}
   end
+  
+  it "should raise an OEmbed::ParseError when decoding an invalid XML String" do
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, invalid_response('unclosed_container', :xml))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, invalid_response('unclosed_tag', :xml))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, invalid_response('invalid_syntax', :xml))
+    }.should raise_error(OEmbed::ParseError)
+  end
+  
+  it "should raise an OEmbed::ParseError when decoding fails with an unexpected error" do
+    error_to_raise = ArgumentError
+    OEmbed::Formatter::XML.backend.parse_error.should_not be_kind_of(error_to_raise)
+    
+    ::REXML::Document.should_receive(:new).
+      and_raise(error_to_raise.new("unknown error"))
+    
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, valid_response(:xml))
+    }.should raise_error(OEmbed::ParseError)
+  end
 end

data/spec/formatter/xml/xmlsimple_backend_spec.rb

@@ -31,4 +31,28 @@ describe "OEmbed::Formatter::XML::Backends::XmlSimple" do
     decoded.keys.should == valid_response(:object).keys
     decoded.values.map{|v|v.to_s}.should == valid_response(:object).values.map{|v|v.to_s}
   end
+  
+  it "should raise an OEmbed::ParseError when decoding an invalid XML String" do
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, invalid_response('unclosed_container', :xml))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, invalid_response('unclosed_tag', :xml))
+    }.should raise_error(OEmbed::ParseError)
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, invalid_response('invalid_syntax', :xml))
+    }.should raise_error(OEmbed::ParseError)
+  end
+  
+  it "should raise an OEmbed::ParseError when decoding fails with an unexpected error" do
+    error_to_raise = ArgumentError
+    OEmbed::Formatter::XML.backend.parse_error.should_not be_kind_of(error_to_raise)
+    
+    ::XmlSimple.should_receive(:xml_in).
+      and_raise(error_to_raise.new("unknown error"))
+    
+    lambda {
+      decode = OEmbed::Formatter.decode(:xml, valid_response(:xml))
+    }.should raise_error(OEmbed::ParseError)
+  end
 end

data/spec/spec_helper.rb

@@ -65,4 +65,32 @@ module OEmbedSpecHelper
       XML
     end
   end
+  
+  def invalid_response(case_name, format)
+    format = format.to_s
+    valid = valid_response(format)
+    case case_name.to_s
+    when 'unclosed_container'
+      case format
+      when 'json'
+        valid_response(format).gsub(/\}\s*\z/, '')
+      when 'xml'
+        valid_response(format).gsub(%r{</oembed[^>]*>}, '')
+      end
+    when 'unclosed_tag'
+      case format
+      when 'json'
+        valid_response(format).gsub('"photo"', '"photo')
+      when 'xml'
+        valid_response(format).gsub('</type>', '')
+      end
+    when 'invalid_syntax'
+      case format
+      when 'json'
+        valid_response(format).gsub('"type"', '"type":')
+      when 'xml'
+        valid_response(format).gsub('type', 'ty><pe')
+      end
+    end
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oembed
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: 
-  version: 0.8.1
+  segments: 
+  - 0
+  - 8
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Magnus Holm
@@ -13,42 +18,80 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -06:00
+date: 2011-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  name: jeweler
+  prerelease: false
   type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  name: json
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: xml-simple
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id003
+  requirement: *id005
 description: An oEmbed consumer library written in Ruby, letting you easily get embeddable HTML representations of supported web pages, based on their URLs. See http://oembed.com for more information about the protocol.
 email: arisbartee@gmail.com
 executables: []
@@ -59,8 +102,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - .rvmrc
+- .yardopts
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -72,6 +115,7 @@ files:
 - lib/oembed.rb
 - lib/oembed/errors.rb
 - lib/oembed/formatter.rb
+- lib/oembed/formatter/base.rb
 - lib/oembed/formatter/json.rb
 - lib/oembed/formatter/json/backends/activesupportjson.rb
 - lib/oembed/formatter/json/backends/jsongem.rb
@@ -93,6 +137,7 @@ files:
 - lib/tasks/oembed.rake
 - lib/tasks/rspec.rake
 - ruby-oembed.gemspec
+- spec/formatter/ducktype_backend_spec.rb
 - spec/formatter/json/.DS_Store
 - spec/formatter/json/jsongem_backend_spec.rb
 - spec/formatter/json/yaml_backend_spec.rb
@@ -112,7 +157,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- ruby-oembed-0.8.1
+- ruby-oembed-0.8.3
 - --inline-source
 - --exclude
 - tasks
@@ -124,27 +169,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: oEmbed for Ruby
-test_files: 
-- spec/formatter/json/jsongem_backend_spec.rb
-- spec/formatter/json/yaml_backend_spec.rb
-- spec/formatter/xml/rexml_backend_spec.rb
-- spec/formatter/xml/xmlsimple_backend_spec.rb
-- spec/formatter_spec.rb
-- spec/provider_spec.rb
-- spec/providers_spec.rb
-- spec/response_spec.rb
-- spec/spec_helper.rb
+test_files: []
+