reddavis-embedit 0.0.3 → 0.0.4

data/lib/embedit/exceptions.rb

@@ -1,3 +1,6 @@
 module Embedit
   
+  class BadUrl < Exception
+  end
+  
 end

data/lib/embedit/media.rb

@@ -2,11 +2,14 @@ module Embedit
   
   class Media
     
-    attr_accessor :title, :url, :format, :html
+    attr_reader :title, :url, :format, :html
     
     def initialize(url)
+      @valid = true                                                 #Innocent until proven guilty
       @oembed_providers = Providers.new.sites 
       find_provider(url)
+      rescue                                                        #Horrible hack, but flickrs poor status headers == :( if it breaks, its gotta be invalid
+        @valid = false
     end
     
     def title
@@ -24,19 +27,25 @@ module Embedit
     def url
       @media_data.url
     end
-     
+    
+    def valid?
+      @valid    
+    end
+    
+         
     private    
 
   #Find a provider
     def find_provider(url)
-      @oembed_providers.keys.each do |key|      #First search oembed providers for a match
-        if url.match(/#{key}/)
-          return @media_data = Oembed.new(url)
+      @oembed_providers.keys.each do |key|                               #First search oembed providers for a match
+        if url.match(/(\.|\/)#{key}\./) && Validate.new(url).valid?      #URL can be www.vimeo.com || http://vimeo.com
+          return @media_data = Oembed.new(url, key)
         end
       end
-      if url.match(/youtube/)                  #Next up is YouTube
+      if url.match(/(\.|\/)youtube\./) && Validate.new(url).valid?       #Next up is YouTube
         return @media_data = YouTube.new(url)
       end
+        @valid = false
     end
 
   end

data/lib/embedit/oembed.rb

@@ -4,14 +4,13 @@ module Embedit
     
     attr_reader :title, :url, :format, :html
     
-    def initialize(url)
+    def initialize(url, provider)
       @input_url = url
-      @sites = Providers.new.sites 
-      get_info
+      get_info(provider)
     end
 
     def html(size = {})
-      if @format == 'photo'
+      if @format == 'photo'                                                                           #Photos use image tags
         @html.insert(-2, " height=#{size[:height]} ") unless size[:height].nil?
         @html.insert(-2, " width=#{size[:width]}") unless size[:width].nil?
       else
@@ -22,38 +21,30 @@ module Embedit
     end
         
     private    
-    def get_info
-      find_provider
-      url = URI.parse(@base_url + @input_url)
-      http_get = Net::HTTP.get(url)
-      set_attributes(http_get)
+    
+    def get_info(provider)
+      oembed_services = Providers.new.sites                   #Load the oEmbed providers - stored in ../providers/yaml
+      base_url = prepare_url(oembed_services[provider])       #Prepare the base_url
+      url = URI.parse(base_url + @input_url)
+      api_data = Net::HTTP.get(url)                           #Get the data
+      set_attributes(api_data)
     end
-
+    
     def set_attributes(att)
-      parsed_data = JSON.parse(att)
+      parsed_data = JSON.parse(att)                           
       @title = parsed_data['title']
       @url = parsed_data['url'] ||= @input_url
       @format = parsed_data['type']
-      @html = @format == 'video' ? parsed_data['html'] : %{<img src='#{@url}' alt='#{@title}'>}
-    end
-    
-    #find Oembed provider - set in ../providers.yaml
-    def find_provider
-      @sites.keys.each do |key|
-        if @input_url.match(/#{key}/)
-          @base_url = prepare_url(@sites[key])
-          break
-        end
-      end
+      @html = @format == 'video' ? parsed_data['html'] : %{<img src='#{@url}' alt='#{@title}'>}   #Image tags
     end
-    
+        
     #some urls contain format in the middle of the url
     def prepare_url(url)
       if url.match(/format/)
-        @base_url = "#{url.gsub(/\{format\}/, 'json')}" + '?url='
+        return "#{url.gsub(/\{format\}/, 'json')}" + '?url='
       else
         @input_url = @input_url + '&format=json'
-        @base_url = url + '?url='
+        return url + '?url='
       end
     end    
   end

data/lib/embedit/validate.rb

@@ -0,0 +1,40 @@
+class Validate
+  
+  def initialize(url)
+    @url = url
+    @valid = check_url == true ? true : false
+  end
+  
+  def valid?
+    @valid
+  end
+    
+  private
+  
+  def check_url    
+    if check_url_supported == true && check_response == true   #We first check that the url is one actually supported by Embedit
+      return true
+    end
+  end
+  
+  def check_response
+    true if open(@url)    #Header codes are annoying, just check that the page works, the check with Embed::Media will narrow down more
+    rescue 
+      false
+  end
+  
+  def check_url_supported
+    oembed_providers = Embedit::Providers.new.sites
+    oembed_providers.keys.each do |key|                       #First search oembed providers for a match
+      if @url.match(/(\.|\/)#{key}\./)                        #URL can be www.vimeo.com || http://vimeo.com
+        return true
+      end
+    end
+    # Now we go through all services not linked with oEmbed
+    if @url.match(/(\.|\/)youtube\./)                         #All youtube links should end with a .com (Please correct if I'm wrong) they get redirected to jp.youtube.com or whatever                      
+      return true 
+    end
+    return false                                              #Return false if all else fail
+  end
+  
+end

data/lib/embedit.rb

@@ -10,13 +10,15 @@ require 'embedit/providers'
 require 'embedit/media'
 require 'embedit/oembed'
 require 'embedit/youtube'
+require 'embedit/exceptions'
+require 'embedit/validate'
 
 
-#puts a = Embedit::Media.new('http://www.vimeo.com/1263763').format
+#puts a = Embedit::Media.new('http://www.vimeo.com/1263763').valid?
 
-#puts b = Embedit::Media.new('http://www.flickr.com/photos/davidgutierrez/2135724493/').html(:height => 200)
+#puts b = Embedit::Media.new('http://www.flickr.com/photos/kentfield/2735062540/').valid? #.valid #.html(:height => 200)
 
-#puts c = Embedit::Media.new('http://www.viddler.com/explore/winelibrarytv/videos/142/').html(:height => 200, :width => 500)
+#puts c = Embedit::Media.new('http://www.viddler.com/explore/winelibrarytv/videos/14212300/').html(:height => 200, :width => 500)
 
 #puts d = Embedit::Media.new('http://qik.com/video/141977').html(:height => 50)
 
@@ -28,4 +30,5 @@ require 'embedit/youtube'
 
 #puts g = Embedit::Media.new("http://www.youtube.com/watch?v=j3TOT1lnVTA")
 
-#puts Embedit::Media.new("http://www.youtube.com/watch?v=j3TOT1lnVTA")
+#puts Validate.new('http://www.flickr.com/photos/kentfield/2735062540/').valid?
+

data/spec/oembed_spec.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Vimeo oEmbed tests" do
+  
+  it "should properly validate a valid Vimeo url" do
+    media = Embedit::Media.new('http://www.vimeo.com/1263763').valid?
+    media.should == true
+  end
+  
+  it "should validate an invalid (with only numbers) Vimeo url" do
+    media = Embedit::Media.new('http://www.vimeo.com/126007722').valid?
+    media.should == false
+  end
+  
+  it "should validate an invalid (with some letters) Vimeo url" do
+    media = Embedit::Media.new('http://www.vimeo.com/126badurl').valid?
+    media.should == false
+  end
+
+end
+
+describe "Flickr oEmbed tests" do
+  
+  it "should properly validate a valid Flickr url" do
+    media = Embedit::Media.new('http://www.flickr.com/photos/asianmack/2781811902/in/set-72157606856535809/').valid?
+    media.should == true
+  end
+  
+  it "should properly validate an invalid (with only numbers) Flickr url" do
+    media = Embedit::Media.new('http://www.flickr.com/photos/banuelos_ismael/280428728023/').valid?
+    media.should == false
+  end
+  
+  it "should properly validate an invalid (with some letters) Flickr url" do
+    media = Embedit::Media.new('http://www.flickr.com/photos/banuelos_ismael/2804287asd23/').valid?
+    media.should == false
+  end
+  
+  it "should properly validate an invalid (with some letters) Flickr url" do
+    media = Embedit::Media.new('http://www.flickr.com/photos/banuelos_ismael/2804287asd23/').valid?
+    media.should == false
+  end
+  
+  it "should properly validate an invalid Flickr url photos/url-here" do
+    media = Embedit::Media.new('http://www.flickr.com/photos/as').valid?
+    media.should == false
+  end
+  
+end
+
+describe "Viddler oEmbed tests" do
+  it "should properly validate a valid Viddler url" do
+    media = Embedit::Media.new('http://www.viddler.com/explore/winelibrarytv/videos/635/').valid?
+    media.should == true
+  end
+  
+  it "should properly validate an invalid (with only numbers) Viddler url" do
+    media = Embedit::Media.new('http://www.viddler.com/explore/winelibrarytv/videos/635222/').valid?
+    media.should == false
+  end
+  
+end
+
+
+
+
+

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'spec'
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'embedit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reddavis-embedit
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Red Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 08:59:49 -07:00
+date: 2008-08-27 14:41:48 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,9 @@ files:
 - lib/embedit/youtube.rb
 - lib/embedit/oembed.rb
 - lib/embedit/exceptions.rb
+- lib/embedit/validate.rb
+- spec/spec_helper.rb
+- spec/oembed_spec.rb
 has_rdoc: false
 homepage: http://github.com/reddavis/embedit/
 post_install_message: 
@@ -55,6 +58,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Ruby interface for embedding anymedia
+summary: Ruby interface for embedding any media
 test_files: []