ruby-oembed 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c357d1b21f61f7339b29510045ad103a0bfa209b
-  data.tar.gz: eb8ddb9df50702ae4778f6993e6d772a1ef66ad0
+  metadata.gz: 19f03cd61c559b50759c1b31807479d1f5b76ff0
+  data.tar.gz: 725aa020d12e61232d57668f0514340c83751319
 SHA512:
-  metadata.gz: 44f5346456a227c3d5293eece8348eb871118aea8b2a9183946a6c69c6d123eba8a1fbdd6c7e2c0f2b5be7d51e4477d1b8ce57948058f252f4b43a74821afe81
-  data.tar.gz: 89d25a9740658a0dc18277eba8927e3cd32af1d5dc8548c16632374ab88d6d22d179798eaca6c1681a572f2089a87519165465963ed952f369a9115fe4076099
+  metadata.gz: a94c2ae8693c6a320acbe086652dac2edecfa51aea4e1387f609c18483cab7f35c478f4d35ecb789e1879073fdb9dca7b7717994936aca9fb326533916ab6dea
+  data.tar.gz: ad9fb9b7ea01016180b828261063f66ca72cad65f71fbc9ce1874b163a5795bd97064f8506188f2625a923658e441c5e96a809fc149ff4804b19a5efd4f589c8

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = CHANGELOG
 
+== 0.8.10 - 6 August 2014
+
+* Add support for specifying a Provider#get `:timeout`; Pull #35 (Blake Thomson)
+* Upgrade to RSpec 3.x
+
 == 0.8.9 - 15 September 2013
 
 * SoundCloud provider supports https URLs; Pull #30 (Greg Tangey)

data/lib/oembed/provider.rb

@@ -78,6 +78,7 @@ module OEmbed
     # The query parameter should be a Hash of values which will be
     # sent as query parameters in this request to the Provider endpoint. The
     # following special cases apply to the query Hash:
+    # :timeout:: specifies the timeout (in seconds) for the http request.
     # :format:: overrides this Provider's default request format.
     # :url:: will be ignored, replaced by the url param.
     def get(url, query = {})
@@ -96,6 +97,8 @@ module OEmbed
       raise OEmbed::NotFound, url unless include?(url)
 
       query = query.merge({:url => ::CGI.escape(url)})
+      query.delete(:timeout)
+
       # TODO: move this code exclusively into the get method, once build is private.
       this_format = (query[:format] ||= @format.to_s).to_s
       
@@ -130,6 +133,7 @@ module OEmbed
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = uri.scheme == 'https'
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.read_timeout = http.open_timeout = query[:timeout] if query[:timeout]
         
         %w{scheme userinfo host port registry}.each { |method| uri.send("#{method}=", nil) }
         res = http.request(Net::HTTP::Get.new(uri.to_s))

data/lib/oembed/version.rb

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

data/ruby-oembed.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   s.email = "arisbartee@gmail.com"
   s.homepage = "http://github.com/judofyr/ruby-oembed"
   s.licenses = ["MIT"]
-  
+
   s.files = `git ls-files`.split("\n")
   s.test_files = s.files.grep(%r{^(test|spec|features,integration_test)/})
-  
+
   s.rdoc_options = ["--main", "README.rdoc", "--title", "ruby-oembed-#{OEmbed::Version}", "--inline-source", "--exclude", "tasks", "CHANGELOG.rdoc"]
   s.extra_rdoc_files = s.files.grep(%r{\.rdoc$}) + %w{LICENSE}
-  
+
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.19"
   s.summary = "oEmbed for Ruby"
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<xml-simple>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
       s.add_development_dependency(%q<vcr>, ["~> 1.0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<xml-simple>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.0"])
       s.add_dependency(%q<vcr>, ["~> 1.0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
     end
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<xml-simple>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.0"])
     s.add_dependency(%q<vcr>, ["~> 1.0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
   end

data/spec/provider_spec.rb

@@ -58,60 +58,58 @@ describe OEmbed::Provider do
   it "should allow no URI schema to be given" do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
 
-    provier.include?("http://foo.com/1").should be_true
-    provier.include?("http://bar.foo.com/1").should be_true
-    provier.include?("http://bar.foo.com/show/1").should be_true
-    provier.include?("https://bar.foo.com/1").should be_true
-    provier.include?("http://asdf.com/1").should be_true
-    provier.include?("asdf").should be_true
+    provier.include?("http://foo.com/1").should be_truthy
+    provier.include?("http://bar.foo.com/1").should be_truthy
+    provier.include?("http://bar.foo.com/show/1").should be_truthy
+    provier.include?("https://bar.foo.com/1").should be_truthy
+    provier.include?("http://asdf.com/1").should be_truthy
+    provier.include?("asdf").should be_truthy
   end
 
   it "should allow a String as a URI schema" do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
     provier << "http://bar.foo.com/*"
 
-    provier.include?("http://bar.foo.com/1").should be_true
-    provier.include?("http://bar.foo.com/show/1").should be_true
+    provier.include?("http://bar.foo.com/1").should be_truthy
+    provier.include?("http://bar.foo.com/show/1").should be_truthy
 
-    provier.include?("https://bar.foo.com/1").should be_false
-    provier.include?("http://foo.com/1").should be_false
+    provier.include?("https://bar.foo.com/1").should be_falsey
+    provier.include?("http://foo.com/1").should be_falsey
   end
 
   it "should allow multiple path wildcards in a String URI schema" do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
     provier << "http://bar.foo.com/*/show/*"
 
-    provier.include?("http://bar.foo.com/photo/show/1").should be_true
-    provier.include?("http://bar.foo.com/video/show/2").should be_true
-    provier.include?("http://bar.foo.com/help/video/show/2").should be_true
+    provier.include?("http://bar.foo.com/photo/show/1").should be_truthy
+    provier.include?("http://bar.foo.com/video/show/2").should be_truthy
+    provier.include?("http://bar.foo.com/help/video/show/2").should be_truthy
 
-    provier.include?("https://bar.foo.com/photo/show/1").should be_false
-    provier.include?("http://foo.com/video/show/2").should be_false
-    provier.include?("http://bar.foo.com/show/1").should be_false
-    provier.include?("http://bar.foo.com/1").should be_false
+    provier.include?("https://bar.foo.com/photo/show/1").should be_falsey
+    provier.include?("http://foo.com/video/show/2").should be_falsey
+    provier.include?("http://bar.foo.com/show/1").should be_falsey
+    provier.include?("http://bar.foo.com/1").should be_falsey
   end
 
-  it "should NOT allow multiple domain wildcards in a String URI schema" do
+  it "should NOT allow multiple domain wildcards in a String URI schema", :pending => true do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
 
-    pending("We don't yet validate URL schema strings") do
-      proc { provier << "http://*.com/*" }.
-      should raise_error(ArgumentError)
-    end
+    proc { provier << "http://*.com/*" }.
+    should raise_error(ArgumentError)
 
-    provier.include?("http://foo.com/1").should be_false
+    provier.include?("http://foo.com/1").should be_falsey
   end
 
   it "should allow a sub-domain wildcard in String URI schema" do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
     provier << "http://*.foo.com/*"
 
-    provier.include?("http://bar.foo.com/1").should be_true
-    provier.include?("http://foo.foo.com/2").should be_true
-    provier.include?("http://foo.com/3").should be_true
+    provier.include?("http://bar.foo.com/1").should be_truthy
+    provier.include?("http://foo.foo.com/2").should be_truthy
+    provier.include?("http://foo.com/3").should be_truthy
 
-    provier.include?("https://bar.foo.com/1").should be_false
-    provier.include?("http://my.bar.foo.com/1").should be_false
+    provier.include?("https://bar.foo.com/1").should be_falsey
+    provier.include?("http://my.bar.foo.com/1").should be_falsey
 
     provier << "http://my.*.foo.com/*"
   end
@@ -120,48 +118,46 @@ describe OEmbed::Provider do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
     provier << "http://*.my.*.foo.com/*"
 
-    provier.include?("http://my.bar.foo.com/1").should be_true
-    provier.include?("http://my.foo.com/2").should be_true
-    provier.include?("http://bar.my.bar.foo.com/3").should be_true
+    provier.include?("http://my.bar.foo.com/1").should be_truthy
+    provier.include?("http://my.foo.com/2").should be_truthy
+    provier.include?("http://bar.my.bar.foo.com/3").should be_truthy
 
-    provier.include?("http://bar.foo.com/1").should be_false
-    provier.include?("http://foo.bar.foo.com/1").should be_false
+    provier.include?("http://bar.foo.com/1").should be_falsey
+    provier.include?("http://foo.bar.foo.com/1").should be_falsey
   end
 
-  it "should NOT allow a scheme wildcard in a String URI schema" do
+  it "should NOT allow a scheme wildcard in a String URI schema", :pending => true do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
 
-    pending("We don't yet validate URL schema strings") do
-      proc { provier << "*://foo.com/*" }.
-      should raise_error(ArgumentError)
-    end
+    proc { provier << "*://foo.com/*" }.
+    should raise_error(ArgumentError)
 
-    provier.include?("http://foo.com/1").should be_false
+    provier.include?("http://foo.com/1").should be_falsey
   end
 
   it "should allow a scheme other than http in a String URI schema" do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
     provier << "https://foo.com/*"
 
-    provier.include?("https://foo.com/1").should be_true
+    provier.include?("https://foo.com/1").should be_truthy
 
     gopher_url = "gopher://foo.com/1"
-    provier.include?(gopher_url).should be_false
+    provier.include?(gopher_url).should be_falsey
     provier << "gopher://foo.com/*"
-    provier.include?(gopher_url).should be_true
+    provier.include?(gopher_url).should be_truthy
   end
 
   it "should allow a Regexp as a URI schema" do
     provier = OEmbed::Provider.new("http://foo.com/oembed")
     provier << %r{^https?://([^\.]*\.)?foo.com/(show/)?\d+}
 
-    provier.include?("http://bar.foo.com/1").should be_true
-    provier.include?("http://bar.foo.com/show/1").should be_true
-    provier.include?("http://foo.com/1").should be_true
-    provier.include?("https://bar.foo.com/1").should be_true
+    provier.include?("http://bar.foo.com/1").should be_truthy
+    provier.include?("http://bar.foo.com/show/1").should be_truthy
+    provier.include?("http://foo.com/1").should be_truthy
+    provier.include?("https://bar.foo.com/1").should be_truthy
 
-    provier.include?("http://bar.foo.com/video/1").should be_false
-    provier.include?("gopher://foo.com/1").should be_false
+    provier.include?("http://bar.foo.com/video/1").should be_falsey
+    provier.include?("gopher://foo.com/1").should be_falsey
   end
 
   it "should by default use OEmbed::Formatter.default" do
@@ -204,8 +200,8 @@ describe OEmbed::Provider do
   end
 
   it "should match URLs" do
-    @flickr.include?(example_url(:flickr)).should be_true
-    @qik.include?(example_url(:qik)).should be_true
+    @flickr.include?(example_url(:flickr)).should be_truthy
+    @qik.include?(example_url(:qik)).should be_truthy
   end
 
   it "should raise error if the URL is invalid" do
@@ -218,13 +214,13 @@ describe OEmbed::Provider do
       uri = @flickr.send(:build, example_url(:flickr))
       uri.host.should == "www.flickr.com"
       uri.path.should == "/services/oembed/"
-      uri.query.include?("format=#{@flickr.format}").should be_true
-      uri.query.include?("url=#{CGI.escape 'http://flickr.com/photos/bees/2362225867/'}").should be_true
+      uri.query.include?("format=#{@flickr.format}").should be_truthy
+      uri.query.include?("url=#{CGI.escape 'http://flickr.com/photos/bees/2362225867/'}").should be_truthy
 
       uri = @qik.send(:build, example_url(:qik))
       uri.host.should == "qik.com"
       uri.path.should == "/api/oembed.xml"
-      uri.query.include?("format=#{@qik.format}").should be_false
+      uri.query.include?("format=#{@qik.format}").should be_falsey
       uri.query.should == "url=#{CGI.escape 'http://qik.com/video/49565'}"
     end
 
@@ -235,10 +231,10 @@ describe OEmbed::Provider do
         :format => :xml,
         :another => "test")
 
-      uri.query.include?("maxwidth=600").should be_true
-      uri.query.include?("maxheight=200").should be_true
-      uri.query.include?("format=xml").should be_true
-      uri.query.include?("another=test").should be_true
+      uri.query.include?("maxwidth=600").should be_truthy
+      uri.query.include?("maxheight=200").should be_truthy
+      uri.query.include?("format=xml").should be_truthy
+      uri.query.include?("another=test").should be_truthy
     end
 
     it "should build correctly when format is in the endpoint URL" do
@@ -250,11 +246,20 @@ describe OEmbed::Provider do
       provider = OEmbed::Provider.new('http://www.youtube.com/oembed?scheme=https')
       provider << 'http://*.youtube.com/*'
       url = 'http://youtube.com/watch?v=M3r2XDceM6A'
-      provider.include?(url).should be_true
+      provider.include?(url).should be_truthy
 
       uri = provider.send(:build, url)
-      uri.query.include?("scheme=https").should be_true
-      uri.query.include?("url=#{CGI.escape url}").should be_true
+      uri.query.include?("scheme=https").should be_truthy
+      uri.query.include?("url=#{CGI.escape url}").should be_truthy
+    end
+
+    it "should not include the :timeout parameter in the query string" do
+      uri = @flickr.send(:build, example_url(:flickr),
+        :timeout => 5,
+        :another => "test")
+
+      uri.query.include?("timeout=5").should be_falsey
+      uri.query.include?("another=test").should be_truthy
     end
   end
 
@@ -364,5 +369,11 @@ describe OEmbed::Provider do
         and_return(valid_response(:json))
       @viddler.get(example_url(:viddler))
     end
+
+    it "handles the :timeout option" do
+      Net::HTTP.any_instance.should_receive(:open_timeout=).with(5)
+      Net::HTTP.any_instance.should_receive(:read_timeout=).with(5)
+      @flickr.get(example_url(:flickr), :timeout => 5)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oembed
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Magnus Holm
@@ -17,98 +17,98 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An oEmbed consumer library written in Ruby, letting you easily get embeddable
@@ -122,10 +122,10 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files:
-- .gitignore
-- .rvmrc
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rvmrc"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -181,29 +181,29 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --title
-- ruby-oembed-0.8.9
-- --inline-source
-- --exclude
+- "--title"
+- ruby-oembed-0.8.10
+- "--inline-source"
+- "--exclude"
 - tasks
 - CHANGELOG.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: oEmbed for Ruby