ruby-oembed 0.8.8 → 0.8.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c357d1b21f61f7339b29510045ad103a0bfa209b
+  data.tar.gz: eb8ddb9df50702ae4778f6993e6d772a1ef66ad0
+SHA512:
+  metadata.gz: 44f5346456a227c3d5293eece8348eb871118aea8b2a9183946a6c69c6d123eba8a1fbdd6c7e2c0f2b5be7d51e4477d1b8ce57948058f252f4b43a74821afe81
+  data.tar.gz: 89d25a9740658a0dc18277eba8927e3cd32af1d5dc8548c16632374ab88d6d22d179798eaca6c1681a572f2089a87519165465963ed952f369a9115fe4076099

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = CHANGELOG
 
+== 0.8.9 - 15 September 2013
+
+* SoundCloud provider supports https URLs; Pull #30 (Greg Tangey)
+* Address rspec DEPRECATION warnings; Pull metavida#3 (Marcos Wright Kuhns)
+
 == 0.8.8 - 18 November 2012
 
 * OEmbed::Response::Photo#html now includes alt attribute; Pull #23 & #25 (François de Metz)

data/lib/oembed/providers.rb

@@ -253,6 +253,7 @@ module OEmbed
     # http://developers.soundcloud.com/docs/oembed
     SoundCloud = OEmbed::Provider.new("http://soundcloud.com/oembed", :json)
     SoundCloud << "http://*.soundcloud.com/*"
+    SoundCloud << "https://*.soundcloud.com/*"
     add_official_provider(SoundCloud)
 
     # Provider for skitch.com

data/lib/oembed/version.rb

@@ -2,9 +2,9 @@ module OEmbed
   class Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 8
+    PATCH = 9
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
-    
+
     class << self
       # A String representing the current version of the OEmbed gem.
       def inspect
@@ -13,6 +13,6 @@ module OEmbed
       alias_method :to_s, :inspect
     end
   end
-  
+
   VERSION = Version::STRING
 end

data/spec/formatter/json/jsongem_backend_spec.rb

@@ -17,7 +17,7 @@ describe "OEmbed::Formatter::JSON::Backends::JSONGem" do
 
   it "should support JSON" do
     proc { OEmbed::Formatter.supported?(:json) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    should_not raise_error
   end
   
   it "should be using the JSONGem backend" do

data/spec/formatter/json/yaml_backend_spec.rb

@@ -13,7 +13,7 @@ describe "OEmbed::Formatter::JSON::Backends::Yaml" do
 
   it "should support JSON" do
     proc { OEmbed::Formatter.supported?(:json) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    should_not raise_error
   end
   
   it "should be using the Yaml backend" do

data/spec/formatter/xml/nokogiri_backend_spec.rb

@@ -17,7 +17,7 @@ describe "OEmbed::Formatter::XML::Backends::Nokogiri" do
 
   it "should support XML" do
     proc { OEmbed::Formatter.supported?(:xml) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    should_not raise_error
   end
   
   it "should be using the Nokogiri backend" do

data/spec/formatter/xml/rexml_backend_spec.rb

@@ -13,7 +13,7 @@ describe "OEmbed::Formatter::XML::Backends::REXML" do
 
   it "should support XML" do
     proc { OEmbed::Formatter.supported?(:xml) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    should_not raise_error
   end
   
   it "should be using the XmlSimple backend" do

data/spec/formatter/xml/xmlsimple_backend_spec.rb

@@ -17,7 +17,7 @@ describe "OEmbed::Formatter::XML::Backends::XmlSimple" do
 
   it "should support XML" do
     proc { OEmbed::Formatter.supported?(:xml) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    should_not raise_error
   end
   
   it "should be using the XmlSimple backend" do

data/spec/formatter_spec.rb

@@ -4,14 +4,14 @@ describe OEmbed::Formatter do
   include OEmbedSpecHelper
 
   it "should support JSON" do
-    proc { OEmbed::Formatter.support?(:json) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    proc { OEmbed::Formatter.supported?(:json) }.
+    should_not raise_error
   end
-  
+
   it "should default to JSON" do
     OEmbed::Formatter.default.should == 'json'
   end
-  
+
   it "should decode a JSON String" do
     decoded = OEmbed::Formatter.decode(:json, valid_response(:json))
     # We need to compare keys & values separately because we don't expect all
@@ -19,12 +19,12 @@ describe OEmbed::Formatter 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 support XML" do
-    proc { OEmbed::Formatter.support?(:xml) }.
-    should_not raise_error(OEmbed::FormatNotSupported)
+    proc { OEmbed::Formatter.supported?(:xml) }.
+    should_not raise_error
   end
-  
+
   it "should decode an XML String" do
     decoded = OEmbed::Formatter.decode(:xml, valid_response(:xml))
     # We need to compare keys & values separately because we don't expect all

data/spec/provider_spec.rb

@@ -14,7 +14,7 @@ describe OEmbed::Provider do
   after(:all) do
     VCR.eject_cassette
   end
-  
+
   include OEmbedSpecHelper
 
   before(:all) do
@@ -31,17 +31,17 @@ describe OEmbed::Provider do
 
   it "should require a valid endpoint for a new instance" do
     proc { OEmbed::Provider.new("http://foo.com/oembed/") }.
-    should_not raise_error(ArgumentError)
-    
+    should_not raise_error
+
     proc { OEmbed::Provider.new("https://foo.com/oembed/") }.
-    should_not raise_error(ArgumentError)
+    should_not raise_error
   end
-  
+
   it "should allow a {format} string in the endpoint for a new instance" do
     proc { OEmbed::Provider.new("http://foo.com/oembed.{format}/get") }.
-    should_not raise_error(ArgumentError)
+    should_not raise_error
   end
-  
+
   it "should raise an ArgumentError given an invalid endpoint for a new instance" do
     [
       "httpx://foo.com/oembed/",
@@ -57,7 +57,7 @@ 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
@@ -69,82 +69,82 @@ describe OEmbed::Provider do
   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?("https://bar.foo.com/1").should be_false
     provier.include?("http://foo.com/1").should be_false
   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?("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
   end
-  
+
   it "should NOT allow multiple domain wildcards in a String URI schema" 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
-    
+
     provier.include?("http://foo.com/1").should be_false
   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?("https://bar.foo.com/1").should be_false
     provier.include?("http://my.bar.foo.com/1").should be_false
-    
+
     provier << "http://my.*.foo.com/*"
   end
-  
+
   it "should allow multiple sub-domain wildcards in a String URI schema" 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://bar.foo.com/1").should be_false
     provier.include?("http://foo.bar.foo.com/1").should be_false
   end
-  
+
   it "should NOT allow a scheme wildcard in a String URI schema" 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
-    
+
     provier.include?("http://foo.com/1").should be_false
   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
-    
+
     gopher_url = "gopher://foo.com/1"
     provier.include?(gopher_url).should be_false
     provier << "gopher://foo.com/*"
@@ -154,12 +154,12 @@ describe OEmbed::Provider do
   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/video/1").should be_false
     provier.include?("gopher://foo.com/1").should be_false
   end
@@ -183,16 +183,16 @@ describe OEmbed::Provider do
     }.
     should_not raise_error
   end
-  
+
   it "should not allow random formats to be parsed" do
     yaml_provider = OEmbed::Provider.new("http://foo.com/api/oembed.{format}", :yml)
     yaml_provider << "http://foo.com/*"
     yaml_url = "http://foo.com/video/1"
-    
+
     yaml_provider.should_receive(:raw).
       with(yaml_url, {:format=>:yml}).
       and_return(valid_response(:json))
-    
+
     proc { yaml_provider.get(yaml_url) }.
     should raise_error(OEmbed::FormatNotSupported)
   end
@@ -245,13 +245,13 @@ describe OEmbed::Provider do
       uri = @qik.send(:build, example_url(:qik), :format => :json)
       uri.path.should == "/api/oembed.json"
     end
-    
+
     it "should build correctly with query parameters in the endpoint URL" 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
-      
+
       uri = provider.send(:build, url)
       uri.query.include?("scheme=https").should be_true
       uri.query.include?("url=#{CGI.escape url}").should be_true
@@ -263,53 +263,45 @@ describe OEmbed::Provider do
       res = @flickr.send(:raw, example_url(:flickr))
       res.should == example_body(:flickr)
     end
-    
+
     it "should return the body on 200 even over https" do
       @vimeo_ssl = OEmbed::Provider.new("https://vimeo.com/api/oembed.{format}")
       @vimeo_ssl << "http://*.vimeo.com/*"
       @vimeo_ssl << "https://*.vimeo.com/*"
 
-      proc do
+      expect {
         @vimeo_ssl.send(:raw, example_url(:vimeo_ssl)).should == example_body(:vimeo_ssl)
-      end.should_not raise_error
+      }.not_to raise_error
     end
 
     it "should raise an UnknownFormat error on 501" do
       # Note: This test relies on a custom-written VCR response in the
       # cassettes/OEmbed_Provider.yml file.
-      
-      proc do
+
+      expect {
         @flickr.send(:raw, File.join(example_url(:flickr), '501'))
-      end.should raise_error(OEmbed::UnknownFormat)
+      }.to raise_error(OEmbed::UnknownFormat)
     end
 
     it "should raise a NotFound error on 404" do
       # Note: This test relies on a custom-written VCR response in the
       # cassettes/OEmbed_Provider.yml file.
-      
-      proc do
+
+      expect {
         @flickr.send(:raw, File.join(example_url(:flickr), '404'))
-      end.should raise_error(OEmbed::NotFound)
+      }.to raise_error(OEmbed::NotFound)
     end
 
     it "should raise an UnknownResponse error on other responses" do
       # Note: This test relies on a custom-written VCR response in the
       # cassettes/OEmbed_Provider.yml file.
-      
+
       statuses_to_check = ['405', '500']
-      
-      statuses_to_check.each do |status|
-        proc do
-          proc do
-            @flickr.send(:raw, File.join(example_url(:flickr), status))
-          end.should_not raise_error(OEmbed::NotFound)
-        end.should_not raise_error(OEmbed::UnknownResponse)
-      end
-      
+
       statuses_to_check.each do |status|
-        proc do
+        expect {
           @flickr.send(:raw, File.join(example_url(:flickr), status))
-        end.should raise_error(OEmbed::UnknownResponse)
+        }.to raise_error(OEmbed::UnknownResponse)
       end
     end
   end
@@ -326,31 +318,31 @@ describe OEmbed::Provider do
         and_return(valid_response(:xml))
       @flickr.get(example_url(:flickr), :format=>:xml)
 
-      lambda do
+      expect {
         @flickr.should_receive(:raw).
           with(example_url(:flickr), {:format=>:yml}).
           and_return(valid_response(:json))
         @flickr.get(example_url(:flickr), :format=>:yml)
-      end.should raise_error(OEmbed::FormatNotSupported)
+      }.to raise_error(OEmbed::FormatNotSupported)
     end
-    
+
     it "should return OEmbed::Response" do
-      @flickr.stub!(:raw).and_return(valid_response(@default))
+      @flickr.stub(:raw).and_return(valid_response(@default))
       @flickr.get(example_url(:flickr)).should be_a(OEmbed::Response)
     end
 
     it "should be calling OEmbed::Response#create_for internally" do
-      @flickr.stub!(:raw).and_return(valid_response(@default))
+      @flickr.stub(:raw).and_return(valid_response(@default))
       OEmbed::Response.should_receive(:create_for).
         with(valid_response(@default), @flickr, example_url(:flickr), @default.to_s)
       @flickr.get(example_url(:flickr))
 
-      @qik.stub!(:raw).and_return(valid_response(:xml))
+      @qik.stub(:raw).and_return(valid_response(:xml))
       OEmbed::Response.should_receive(:create_for).
         with(valid_response(:xml), @qik, example_url(:qik), 'xml')
       @qik.get(example_url(:qik))
 
-      @viddler.stub!(:raw).and_return(valid_response(:json))
+      @viddler.stub(:raw).and_return(valid_response(:json))
       OEmbed::Response.should_receive(:create_for).
         with(valid_response(:json), @viddler, example_url(:viddler), 'json')
       @viddler.get(example_url(:viddler))

data/spec/response_spec.rb

@@ -50,7 +50,7 @@ describe OEmbed::Response do
       "url" => "http://foo.com/bar",
     }
   }
-  
+
   let(:expected_skipped) {
     {
       "fields" => "hello",
@@ -59,7 +59,7 @@ describe OEmbed::Response do
       "to_s" => "random string",
     }
   }
-  
+
   let(:all_expected) {
     expected_helpers.merge(expected_skipped)
   }
@@ -106,31 +106,31 @@ describe OEmbed::Response do
 
   describe "create_for" do
     it "should only allow JSON or XML" do
-      lambda do
+      expect {
         OEmbed::Response.create_for(valid_response(:json), flickr, example_url(:flickr), :json)
-      end.should_not raise_error(OEmbed::FormatNotSupported)
+      }.not_to raise_error
 
-      lambda do
+      expect {
         OEmbed::Response.create_for(valid_response(:xml), flickr, example_url(:flickr), :xml)
-      end.should_not raise_error(OEmbed::FormatNotSupported)
+      }.not_to raise_error
 
-      lambda do
+      expect {
         OEmbed::Response.create_for(valid_response(:yml), flickr, example_url(:flickr), :yml)
-      end.should raise_error(OEmbed::FormatNotSupported)
+      }.to raise_error(OEmbed::FormatNotSupported)
     end
 
     it "should not parse the incorrect format" do
-      lambda do
+      expect {
         OEmbed::Response.create_for(valid_response(:object), example_url(:flickr), flickr, :json)
-      end.should raise_error(OEmbed::ParseError)
+      }.to raise_error(OEmbed::ParseError)
 
-      lambda do
+      expect {
         OEmbed::Response.create_for(valid_response(:xml), example_url(:flickr), viddler, :json)
-      end.should raise_error(OEmbed::ParseError)
+      }.to raise_error(OEmbed::ParseError)
 
-      lambda do
+      expect {
         OEmbed::Response.create_for(valid_response(:json), example_url(:flickr), viddler, :xml)
-      end.should raise_error(OEmbed::ParseError)
+      }.to raise_error(OEmbed::ParseError)
     end
   end
 
@@ -202,7 +202,7 @@ describe OEmbed::Response do
         response = OEmbed::Response.create_for(example_body(:flickr), example_url(:flickr), flickr, :json)
         response.should respond_to(:title)
         response.title.should_not be_empty
-        
+
         response.html.should_not be_nil
         response.html.should match(/alt='#{response.title}'/)
       end
@@ -210,7 +210,7 @@ describe OEmbed::Response do
       it "should work just fine, without a title" do
         response = OEmbed::Response.create_for(example_body(:skitch), example_url(:skitch), skitch, :json)
         response.should_not respond_to(:title)
-        
+
         response.html.should_not be_nil
         response.html.should match(/alt=''/)
       end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oembed
 version: !ruby/object:Gem::Version
-  version: 0.8.8
-  prerelease: 
+  version: 0.8.9
 platform: ruby
 authors:
 - Magnus Holm
@@ -17,87 +16,76 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,7 +93,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,17 +100,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An oEmbed consumer library written in Ruby, letting you easily get embeddable
@@ -193,12 +178,13 @@ files:
 homepage: http://github.com/judofyr/ruby-oembed
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
 - README.rdoc
 - --title
-- ruby-oembed-0.8.8
+- ruby-oembed-0.8.9
 - --inline-source
 - --exclude
 - tasks
@@ -206,20 +192,18 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 3
 summary: oEmbed for Ruby