reddavis-embedit 0.0.9 → 0.1.0

data/README

@@ -5,6 +5,8 @@ Embedit is an embedding tool written in Ruby.
 
 We are currently re-writing dothegreenthing.com and allow users to add media from pretty much anywhere. Handling all the different embed codes/api's validations and everything else that comes with this functionality can be/is a pain.
 
+Embedit is the backbone to the web service http://embedit.me. Embedit.me also has its only ruby lib over at http://github.com/reddavis/embedit_ruby/tree/master
+
 Embedit is extremely simple to use. You have the url? Just plonk it in here =>
 
 media = Embedit::Media.new('here')
@@ -26,10 +28,20 @@ At the moment Embedit supports:
   - oEmbed family (http://www.oembed.com/) 
   - YouTube (http://youtube.com)
   - OVI (http://share.ovi.com/)
-  - Local files, I've had some problems with Rails (files not found), but using http://pandastream.com it works perfectly fine
+  - Google Video
+  - Sevenload Video
+  - .[jpg|gif|png] URL
+  - Twitter (twictur.es)
+  - Myspace Images
+  - FLV video stored where ever
   
 Sites To Support:
   - Facebook
   - Image shack
   - Screen shot of a website (user puts in url, if nothing matches take screen shot)
-  - Email me any other suggestions with links to the site at reddavis [[+@+]] gmail *.* com
+  - Email me any other suggestions with links to the site at reddavis [[+@+]] gmail *.* com
+  
+  Credits:
+
+  Red Davis (http://redwriteshere.com/) (http://github.com/reddavis/embedit/tree/master)
+  Michael Bumann - railslove.com

data/lib/embedit/media.rb

@@ -2,56 +2,41 @@ module Embedit
   
   class Media
     
-    attr_reader :title, :url, :format, :html
+    attr_accessor :title, :url, :format, :html, :provider
+    
+    
+    #delegate :title, :html, :format, :to => :provider
     
     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 == :( 
-      #  @valid = false                                              #if it breaks, its gotta be invalid, I suggest removing when debugging                                                 
+      @valid    = true
+      @url      = url
+      @provider = Provider.find(url)
+      # The validation does a expensive GET request. needs to be fixed. (request only the headers?!) 
+      if !@provider || !Validate.new(@url).valid?
+        @valid = false
+        return
+      end 
+
+    rescue #Horrible hack, but flickrs poor status headers == :( 
+      @valid = false #if it breaks, its gotta be invalid, I suggest removing when debugging                                                 
     end
     
     def title
-      @media_data.title
+      self.provider.title if self.provider
     end
     
-    def html(size = {})
-      @media_data.html(size)
+    def html(args={})
+      args = {} if args.nil?
+      self.provider.html(args) if self.provider    
     end
     
     def format
-      @media_data.format
-    end
-    
-    def url
-      @media_data.url
+      self.provider.format if self.provider
     end
     
     def valid?
       @valid    
     end
     
-         
-    private    
-
-  #Find a provider
-    def find_provider(url)
-      return @valid = false unless Validate.new(url).valid?
-
-      @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 @media_data = Oembed.new(url, key)
-        end
-      end
-      if url.match(/(\.|\/)youtube\./)                                  #Next up is YouTube
-        return @media_data = YouTube.new(url)
-      elsif url.match(/share\.ovi\.com/)
-        return @media_data = Ovi.new(url)
-      elsif File.extname(url) != "" || nil
-        return @media_data = Player.new(url)
-      end
-        @valid = false
-    end
   end
 end

data/lib/embedit/provider.rb

@@ -0,0 +1,32 @@
+require "active_support"
+
+module Embedit
+  class Provider
+    attr_reader :title, :url, :format, :html
+    
+    # require all providers and collect the names
+    @@list = Dir["#{File.dirname(__FILE__)}/providers/*.rb"].collect {|file| require(file); "Embedit::#{File.basename(file,'.rb').classify}".constantize }
+    
+    class << self
+      def all
+        @@list
+      end
+    
+      def each
+        all.each do |provider|
+          yield provider
+        end
+      end
+      
+      def find(url)
+        each do |provider|
+          return provider.new(url) if provider.match(url)
+        end
+        nil # if no provider found
+      end
+      
+    end
+    
+  end
+end
+

data/lib/embedit/providers/flv.rb

@@ -0,0 +1,30 @@
+module Embedit
+  
+  class Flv
+    
+    attr_reader :title, :url, :format
+    
+    def initialize(url)
+      @url = url
+      @format = "video"
+      self.html = url
+    end
+    
+    def html(options = {})
+      @html.gsub!(/height="\d+"/, %{height="#{options[:height].to_s}"}) unless options[:height].nil?
+      @html.gsub!(/width="\d+"/, %{width="#{options[:width].to_s}"}) unless options[:width].nil?
+      @html
+    end
+    
+    def html=(url)
+      @html = %{<embed src="http://s3.amazonaws.com/panda-test/player.swf" width="400" height="300" 
+      allowfullscreen="true" allowscriptaccess="always" 
+      flashvars="&displayheight=300&file=#{url}&width=400&height=300" />}
+    end
+    
+    def self.match(url)
+      url.match(/(.+\.flv$)/)
+    end
+  end
+  
+end

data/lib/embedit/providers/google_video.rb

@@ -0,0 +1,32 @@
+module Embedit
+
+  class GoogleVideo
+  
+    attr_reader :title, :url, :format
+  
+    def initialize(url)
+      @url = url
+      @format = "video"
+    end
+    
+    def html(options={})
+      options.reverse_merge!(:width=>400, :height=>326)
+      %{<embed id="VideoPlayback" src="http://video.google.com/googleplayer.swf?docid=#{doc_id}&hl=en&fs=true" style="width:#{options[:width]}px;height:#{options[:height]}px" allowFullScreen="true" allowScriptAccess="always" type="application/x-shockwave-flash"> </embed>}
+    end
+    
+    def doc_id
+      @url[/video\.google\.com\/videoplay\?docid=(\w+)/,1]
+    end
+    
+    def title
+      return @title if @title
+      @page = Hpricot(open(@url))
+      @title = @page.at("title").inner_html if @page.at("title")
+    end
+    
+    def self.match(url)
+      url.match(/video\.google\.com\/videoplay\?docid=(\w+)/)
+    end
+  end
+
+end

data/lib/embedit/providers/image.rb

@@ -0,0 +1,23 @@
+module Embedit
+  
+  class Image
+    
+    attr_reader :title, :url, :format
+    
+    def initialize(url)
+      @url = url
+    end
+    
+    def html(options = {})
+      attributes = options.collect {|k,v| "#{k}=\"#{v}\" "}.join(" ")
+      %{
+        <a href="#{@url}"><img src="#{@url}" #{attributes}/></a>
+      } 
+    end
+    
+    def self.match(url)
+      url.match(/(.+\.(gif|jpg|png)$)/)
+    end
+  end
+  
+end

data/lib/embedit/providers/ipernity.rb

@@ -0,0 +1,15 @@
+module Embedit
+
+  class Ipernity
+  
+    attr_reader :title, :url, :format
+  
+    def initialize(url)
+      @url = url
+      
+    end
+    def self.match(url)
+    end
+  end
+
+end

data/lib/embedit/providers/myspace.rb

@@ -0,0 +1,35 @@
+module Embedit
+  
+  class Myspace
+    
+    attr_reader :url, :title, :format
+    
+    def initialize(url)
+      @url = url
+      @format = 'picture'
+    end
+    
+    def title
+      @title ||= page.at("div#caption span").inner_html
+    end
+    
+    def html(size = {})
+      attributes = size.collect {|k,v| "#{k}=\"#{v}\" "}.join(" ")
+      puts src = page.at("img#userImage").to_s.slice(/src=.+\.\w+/)
+      %{
+        <a href="#{@url}"><img src="#{src}" #{attributes}/></a>
+      }
+    end
+    
+    def self.match(url)
+      url.match(/viewmorepics\.myspace\.com/)
+    end
+    
+    private
+    
+    def page
+      @page ||= Hpricot(open(@url))
+    end
+    
+  end
+end

data/lib/embedit/providers/oembed.rb

@@ -0,0 +1,79 @@
+module Embedit
+  
+  class Oembed
+    
+    @@list = {
+      /flickr\.com\/photos\/(\S+)\/([0-9A-Za-z]+)/xi => { :name => "flickr", :api_url => "http://www.flickr.com/services/oembed" },
+      /pownce/ => { :name => "pownce", :api_url => "http://api.pownce.com/2.1/oembed.{format}" },
+      /revision3/ => { :name => "pownce", :api_url => "http://revision3.com/api/oembed/" },
+      /qik\.com\/video\/(\d+)/xi => { :name => "qik", :api_url => "http://qik.com/api/oembed.{format}" },
+      /viddler\.com(\/explore)?\/([^\/,\s]+)\/videos\/([^\/,\s]+)/xi => { :name => "viddler", :api_url => "http://lab.viddler.com/services/oembed/" },
+      /vimeo\.com\/(\d+)/xi => { :name => "vimeo", :api_url => "http://www.vimeo.com/api/oembed.{format}" },
+      /slideshare/ => {:name => "slideshare", :api_url => "http://oohembed.com/oohembed/"},
+      /amazon\.(com|co.uk|de|ca|jp)\/(.*)(gp\/product|o\/ASIN|obidos\/ASIN|dp)\/(.*)/ => {:name => "amazon", :api_url => "http://oohembed.com/oohembed/"}
+    }
+    
+    attr_reader :title, :url, :format, :html
+    
+    def initialize(url)
+      @input_url = url
+
+      get_provider_for(url)
+      get_info
+    end
+
+    def html(size = {})
+      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
+        @html.gsub!(/height="\d+"/, %{height="#{size[:height].to_s}"}) unless size[:height].nil?
+        @html.gsub!(/width="\d+"/, %{width="#{size[:width].to_s}"}) unless size[:width].nil?
+      end
+      @html
+    end
+    
+    def self.match(url)
+      @@list.keys.each do |regex|
+        m = url.match(regex)
+        return m if m
+      end
+      nil # if none matches
+    end
+    
+    private    
+    
+    def get_provider_for(url)
+      @@list.each do |regex, provider|
+        @provider = provider and break if url.match(regex)
+      end
+      @provider
+    end
+    
+    def get_info
+      base_url = prepare_url(@provider[:api_url])       #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)                           
+      @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}'>}   #Image tags
+    end
+        
+    #some urls contain format in the middle of the url
+    def prepare_url(url)
+      if url.match(/format/)
+        return "#{url.gsub(/\{format\}/, 'json')}" + '?url='
+      else
+        @input_url = @input_url + '&format=json'
+        return url + '?url='
+      end
+    end    
+  end
+  
+end

data/lib/embedit/providers/ovi.rb

@@ -0,0 +1,49 @@
+#http://share.ovi.com - They have no API so screen scrape probably best solution here
+module Embedit
+  
+  class Ovi
+    
+    attr_reader :title, :url, :format
+    
+    def initialize(url)
+      @url = url
+    end
+    
+    def html(size = {})
+      @html = original_html
+      @html.gsub!(/height="\d+"/, %{height="#{size[:height]}"}) if size[:height]
+      @html.gsub!(/width="\d+"/, %{width="#{size[:width]}"}) if size[:width]
+      @html
+    end
+    
+    def title
+      @title ||= page.at("h2.pagetitle").inner_html.strip
+    end
+    
+    def format
+      @format ||= case self.original_html
+        when /flash\/player\.aspx\?media/ then 'video'
+        when /flash\/audioplayer\.aspx\?media/ then 'audio'
+        when /<img src/ then 'photo'
+      end
+    end
+  
+    def self.match(url)
+      url.match(/share\.ovi\.com/)
+    end
+    
+    def page
+      @page ||= Hpricot(open(@url))
+    end
+
+    def original_html
+      return @original_html if @original_html
+      @original_html = page.search("tr#M_sidebar_uimediaembed_uifp1 td input").first.attributes['value'] rescue nil  #We first search for video or audio, if not its got to be image (hopfully)
+      if @original_html.nil?
+        @original_html = page.search("div#M_sidebar_uimediaembed_uiip td input#M_sidebar_uimediaembed_uihtml2").first.attributes['value'].gsub(/<a \S+>/, '').gsub(/<\/a>/, '')  #Follow Embedit convention, images should not be surrounded a a <a href></a>
+      end
+      @original_html
+    end
+    
+  end
+end

data/lib/embedit/providers/sevenload_video.rb

@@ -0,0 +1,47 @@
+module Embedit
+
+  class SevenloadVideo
+  
+    attr_reader :title, :url, :format, :video_id, :lang
+  
+    def initialize(url)
+      @format = 'video'
+      @url = url
+      get_info
+    end
+    
+    def html(options = {})
+      options.reverse_merge!({:width=>445,:height=>364})
+      %{
+        <object type="application/x-shockwave-flash" data="http://#{lang}.sevenload.com/pl/#{video_id}/#{options[:width]}x#{options[:height]}/swf" width="#{options[:width]}" height="#{options[:height]}">
+          <param name="allowFullscreen" value="true" />
+          <param name="allowScriptAccess" value="always" />
+          <param name="movie" value="http://#{lang}.sevenload.com/pl/#{video_id}/#{options[:width]}x#{options[:height]}/swf" />
+        </object>
+      }
+    end
+    
+    def title
+      page.at("#itemTitle").inner_html
+    end
+    
+    def self.match(url)
+      url.match(/(\w+)\.sevenload\.\S{2,}\/(videos|videolar|filmy|video)?\/(\w+)[\/]?([\S]+)/xi) || url.match(/(\w+)\.sevenload\.\S{2,}\/(shows|sendungen|yayinlar|emissions|trasmissione|audycje)?\/(\S+)\/(episodes|folgen|bolumler|puntate)?\/(\w+)[\/]?([\S]+)/xi)
+    end
+    
+    private
+    
+    def page
+      @page ||= Hpricot(open(@url))
+    end
+    
+    def get_info
+      match = self.class.match(@url)
+      @lang = match[1]
+      # the video id is always the second last match
+      @video_id = match[-2]
+    end
+    
+  end
+
+end

data/lib/embedit/providers/twitter.rb

@@ -0,0 +1,36 @@
+module Embedit
+
+  class Twitter
+  
+    attr_reader :title, :url, :format
+  
+    def initialize(url)
+      @format = 'photo'
+      @url = url
+    end
+    
+    def html(options = {})
+      attributes = options.collect {|k,v| "#{k}=\"#{v}\" "}.join(" ")
+      %{<img src="http://twictur.es/i/#{status_id}.gif" #{attributes} />}
+    end
+    
+    def status_id
+      @status_id ||= url[/twitter\.com\/(\S+)\/statuses\/(\d+)/,2]
+    end
+    
+    def title
+      @title ||= page.at("title").inner_html
+    end
+        
+    def self.match(url)
+      url.match(/twitter\.com\/(\S+)\/statuses\/(\d+)/)
+    end
+  
+    private
+      
+      def page
+        @page ||= Hpricot(open(@url))
+      end
+  end
+
+end

data/lib/embedit/{youtube → providers}/youtube.rb

@@ -1,46 +1,44 @@
 module Embedit
 
-  class YouTube
+  class Youtube
   
     attr_reader :title, :url, :format
   
     def initialize(url)
       @format = 'video'
       @url = url
-      get_info
     end
     
-    def html(size = {})
-      @html.gsub!(/height="\d+"/, %{height="#{size[:height].to_s}"}) unless size[:height].nil?
-      @html.gsub!(/width="\d+"/, %{width="#{size[:width].to_s}"}) unless size[:width].nil?
-      @html
-    end
-    
-    def html=(video_id)
-      #Add &ap=%2526fmt%3D18 to end of YouTube embed url to gain access to higher quality videos
+    def html(options = {})
+      options.reverse_merge!({:width=>425,:height=>350})
       @html = %{
-        <object width="425" height="350">
+        <object width="#{options[:width]}" height="#{options[:height]}">
           <param name="movie" value="http://www.youtube.com/v/#{video_id}"></param>
           <param name="wmode" value="transparent"></param>
           <embed src="http://www.youtube.com/v/#{video_id}" 
             type="application/x-shockwave-flash" wmode="transparent" 
-            width="425" height="350">
+            width="#{options[:width]}" height="#{options[:height]}">
           </embed>
         </object>
       }
     end
-        
-    private
     
-    def get_info
-      video_id = extract_id(@url)
+    def video_id
+      @video_id ||= url[/v=([\w\d\-]+)/,1]
+    end
+    
+    def title
+      return @title if @title
       data = REXML::Document.new(open("http://gdata.youtube.com/feeds/videos/#{video_id}"))
       @title = REXML::XPath.first(data, "//title").text
-      self.html = video_id
     end
-    
-    def extract_id(url)
-      url.scan(/v=([\w\d]+)/)
+        
+    def self.match(url)
+      url.match(/youtube\.com\/watch\?v=(\S+)/xi)
+    end
+  
+    def reverse_merge!(other_hash)
+      replace(reverse_merge(other_hash))
     end
   
   end

data/lib/embedit/validate.rb

@@ -1,44 +1,22 @@
-class Validate
+module Embedit
+  class Validate
   
-  def initialize(url)
-    @url = url
-    @valid = check_url == true ? true : false
-  end
-  
-  def valid?
-    @valid
-  end
-    
-  private
+    def initialize(url)
+      @url = url
+      @valid = accessible? # && add more tests here if needed
+    end
   
-  def check_url    
-    if (check_url_supported == true && check_response == true) || (File.extname(@url) != "" || nil && check_url_supported)    #We first check that the url is one actually supported by Embedit
-      return true
+    def valid?
+      @valid
     end
-  end
+    
+    private
   
-  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
+    def accessible?
+      true if @url.match(/(flv|jpg|png|gif|mp3)$/) || 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 
-    elsif @url.match(/share\.ovi\.com/)
-      return true
-    elsif File.extname(@url) != "" || nil
-      return true
-    end
-    return false                                              #Return false if all else fail
-  end
   
+  end
 end

data/lib/embedit.rb

@@ -3,20 +3,21 @@ require 'json'
 require 'rexml/document'
 require 'net/http'
 require 'open-uri'
+require 'hpricot'
 require 'yaml'
 
 #Files
-require 'embedit/oembed/providers'
+require 'embedit/provider'
 require 'embedit/media'
-require 'embedit/oembed/oembed'
-require 'embedit/youtube/youtube'
-require 'embedit/ovi/ovi'
 require 'embedit/exceptions'
 require 'embedit/validate'
-require 'embedit/player/player'
+
+module Embedit
+end
 
 # Oembed
-#puts a = Embedit::Media.new('http://www.vimeo.com/1260077').title
+
+#puts a = Embedit::Media.new('http://www.vimeo.com/1263763').html
 
 #puts b = Embedit::Media.new('http://www.flickr.com/photos/reddavis999/2692043113/').html #valid? #.valid #.html(:height => 200)
 
@@ -42,6 +43,8 @@ require 'embedit/player/player'
 
 # Flash Player
 
-#puts a = Embedit::Media.new('../test.flv').html
+#puts a = Embedit::Media.new('http://twitter.com/kastner/statuses/939873832').html
+
+# MySpace Pictures
 
-#puts File.exists?(File.expand_path('test.flv'))
+#puts a = Embedit::Media.new('http://viewmorepics.myspace.com/index.cfm?fuseaction=viewImage&friendID=152417109&albumID=0&imageID=8797852').html(:height => 20)

data/spec/google_video_spec.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Google Video" do
+  
+  it "should show true on valid url" do
+    Embedit::Media.new("http://video.google.com/videoplay?docid=9190313294638554619&hl=en").should be_valid
+  end
+  
+  it "should have the title of 'Full Democratic Debate - Austin TX - Feb 21, 2008'" do
+    Embedit::Media.new("http://video.google.com/videoplay?docid=9190313294638554619&hl=en").title.should eql("Full Democratic Debate - Austin TX - Feb 21, 2008")
+  end
+  
+  it "should show format as video" do
+    Embedit::Media.new("http://video.google.com/videoplay?docid=9190313294638554619&hl=en").format.should eql("video")
+  end
+  
+  it "should width and height options for embeded code" do
+    embed = Embedit::Media.new("http://video.google.com/videoplay?docid=9190313294638554619&hl=en").html(:width=>200, :height => 100)
+    embed.match(/width:200px/).should_not be_nil
+    embed.match(/height:100px/).should_not be_nil
+  end
+  
+  it "should return correct embeded code" do
+    embed = Embedit::Media.new("http://video.google.com/videoplay?docid=9190313294638554619&hl=en").html
+    embed.should eql(%{<embed id="VideoPlayback" src="http://video.google.com/googleplayer.swf?docid=9190313294638554619&hl=en&fs=true" style="width:400px;height:326px" allowFullScreen="true" allowScriptAccess="always" type="application/x-shockwave-flash"> </embed>})
+  end
+  
+end

data/spec/sevenload_video_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Sevenload Video" do
+  
+  def videos
+    [
+      { :url => "http://de.sevenload.com/videos/NWwrZzk-Flugzeug-Rennen", :title => "Flugzeug Rennen" },
+      { :url => "http://de.sevenload.com/sendungen/Pferdeverstehen/folgen/LDvQYeZ-Vorfuehrung-Freiheitsdressur", :title => "Vorführung Freiheitsdressur" },
+      { :url => "http://en.sevenload.com/videos/06Ae3BE-No-risk-no-fun-3", :title => "No risk, no fun 3" },
+      { :url => "http://en.sevenload.com/shows/Wine-Library-TV/episodes/1sHBywY-Sippin-Some-Tequila-With-a-Guest-Episode-529", :title => "Sippin’ Some Tequila With a Guest - Episode #529" },
+      { :url => "http://fr.sevenload.com/videos/Z8EMpxo-The-Bounce-Effect", :title => "The Bounce Effect" } ,
+      { :url => "http://fr.sevenload.com/emissions/huberbuam/episodes/f5ZpMoT-Am-Limit-Trailer-Film-Trailer-On-the-Limit", :title => 'Am Limit Trailer/Film Trailer "On the Limit"' }
+    ]
+  end
+  
+  it "should show true on valid url" do
+    videos.each do |v|
+      Embedit::Media.new(v[:url]).should be_valid
+    end
+  end
+  
+  it "should match the different urls" do
+    videos.each do |v|
+      Embedit::SevenloadVideo.match(v[:url]).should_not be_nil
+    end
+  end
+  
+  it "should return the correct titles of the different urls" do
+    videos.each do |v|
+      Embedit::Media.new(v[:url]).title.should eql(v[:title])
+    end
+  end
+  
+  it "should show format as video" do
+    videos.each do |v|
+      Embedit::Media.new(v[:url]).format.should eql("video")
+    end
+  end
+  
+  it "should accept width and height options for embeded code" do
+    embed = Embedit::Media.new("http://de.sevenload.com/videos/vNAluQj-MacBookAirPl0gbariPhone").html(:width=>200, :height => 100)
+    embed.match(/200x100\/swf/).should_not be_nil
+    embed.match(/width="200"/).should_not be_nil
+    embed.match(/height="100"/).should_not be_nil
+  end
+  
+end

data/spec/twitter_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Twitter" do
+  
+  it "should show true on valid url" do
+    Embedit::Media.new("http://twitter.com/Bumi/statuses/937196371").should be_valid
+  end
+  
+  it "should return the correct title" do
+    Embedit::Media.new("http://twitter.com/Bumi/statuses/937196371").title.should eql("Twitter / Michael Bumann: I love github!")
+  end
+  
+  it "should show format as photo" do
+    Embedit::Media.new("http://twitter.com/Bumi/statuses/937196371").format.should eql("photo")
+  end
+  
+  it "should accept width and height options for embeded code" do
+    embed = Embedit::Media.new("http://twitter.com/Bumi/statuses/937196371").html(:width=>200, :height => 100)
+    embed.match(/width="200"/).should_not be_nil
+    embed.match(/height="100"/).should_not be_nil
+  end
+  
+  it "should return correct the embed code" do
+    Embedit::Media.new("http://twitter.com/Bumi/statuses/937196371").html.should eql('<img src="http://twictur.es/i/937196371.gif"  />')
+  end
+  
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: reddavis-embedit
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Red Davis
+- Michael Bumann
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-28 07:22:17 -07:00
+date: 2008-10-02 17:19:11 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,24 +23,31 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
-- lib/embedit.rb
-- lib/providers.yaml
-- lib/embedit/media.rb
-- lib/embedit/oembed/providers.rb
-- lib/embedit/youtube/youtube.rb
-- lib/embedit/oembed/oembed.rb
 - lib/embedit/exceptions.rb
+- lib/embedit/media.rb
+- lib/embedit/provider.rb
+- lib/embedit/providers/flv.rb
+- lib/embedit/providers/google_video.rb
+- lib/embedit/providers/image.rb
+- lib/embedit/providers/ipernity.rb
+- lib/embedit/providers/myspace.rb
+- lib/embedit/providers/oembed.rb
+- lib/embedit/providers/ovi.rb
+- lib/embedit/providers/sevenload_video.rb
+- lib/embedit/providers/twitter.rb
+- lib/embedit/providers/youtube.rb
 - lib/embedit/validate.rb
-- lib/embedit/ovi/ovi.rb
-- lib/embedit/player/player.rb
-- spec/spec_helper.rb
+- lib/embedit.rb
+- README
+- spec/google_video_spec.rb
 - spec/oembed_spec.rb
-- spec/youtube_spec.rb
 - spec/ovi_spec.rb
 - spec/player_spec.rb
+- spec/sevenload_video_spec.rb
+- spec/twitter_spec.rb
+- spec/youtube_spec.rb
 has_rdoc: false
-homepage: http://github.com/reddavis/embedit/
+homepage: http://github.com/reddavis/embedit
 post_install_message: 
 rdoc_options: []
 
@@ -63,6 +71,12 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Ruby interface for embedding a range of media
-test_files: []
-
+summary: Ruby interface for embedding a range of media.
+test_files: 
+- spec/google_video_spec.rb
+- spec/oembed_spec.rb
+- spec/ovi_spec.rb
+- spec/player_spec.rb
+- spec/sevenload_video_spec.rb
+- spec/twitter_spec.rb
+- spec/youtube_spec.rb

data/lib/embedit/oembed/oembed.rb

@@ -1,52 +0,0 @@
-module Embedit
-  
-  class Oembed
-    
-    attr_reader :title, :url, :format, :html
-    
-    def initialize(url, provider)
-      @input_url = url
-      get_info(provider)
-    end
-
-    def html(size = {})
-      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
-        @html.gsub!(/height="\d+"/, %{height="#{size[:height].to_s}"}) unless size[:height].nil?
-        @html.gsub!(/width="\d+"/, %{width="#{size[:width].to_s}"}) unless size[:width].nil?
-      end
-      @html
-    end
-        
-    private    
-    
-    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)                           
-      @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}'>}   #Image tags
-    end
-        
-    #some urls contain format in the middle of the url
-    def prepare_url(url)
-      if url.match(/format/)
-        return "#{url.gsub(/\{format\}/, 'json')}" + '?url='
-      else
-        @input_url = @input_url + '&format=json'
-        return url + '?url='
-      end
-    end    
-  end
-  
-end

data/lib/embedit/oembed/providers.rb

@@ -1,21 +0,0 @@
-module Embedit
-  class Providers
-    
-    attr_accessor :sites
-    
-    def initialize
-      @sites = {}
-      add_default_providers
-    end
-    
-    private
-    def add_default_providers
-      load_providers
-    end
-    
-    def load_providers
-      providers = YAML.load_file("#{File.dirname(__FILE__)}/../../providers.yaml")
-      providers.each {|d| @sites.merge!(d[0] => d[1])}
-    end
-  end
-end

data/lib/embedit/ovi/ovi.rb

@@ -1,42 +0,0 @@
-#http://share.ovi.com - They have no API so screen scrape probably best solution here
-
-module Embedit
-  
-  class Ovi
-    require 'hpricot'
-    
-    attr_reader :title, :url, :format
-    
-    def initialize(url)
-      page = Hpricot(open(url))
-      @url= url
-      work_out_html(page)
-      work_out_format(@html)
-      @title = page.search("h2.pagetitle").inner_html.strip
-    end
-    
-    def html(size = {})
-      @html.gsub!(/height="\d+"/, %{height="#{size[:height]}"}) if size[:height]
-      @html.gsub!(/width="\d+"/, %{width="#{size[:width]}"}) if size[:width]
-      @html
-    end
-    
-    private
-    
-    def work_out_html(page)
-      @html = page.search("tr#M_sidebar_uimediaembed_uifp1 td input").first.attributes['value'] rescue nil  #We first search for video or audio, if not its got to be image (hopfully)
-      if @html.nil?
-        @html = page.search("div#M_sidebar_uimediaembed_uiip td input#M_sidebar_uimediaembed_uihtml2").first.attributes['value'].gsub(/<a \S+>/, '').gsub(/<\/a>/, '')  #Follow Embedit convention, images should not be surrounded a a <a href></a>
-      end
-    end
-    
-    def work_out_format(html)
-      case html
-        when /flash\/player\.aspx\?media/ then @format = 'video'
-        when /flash\/audioplayer\.aspx\?media/ then @format = 'audio'
-        when /<img src/ then @format = 'photo'
-      end
-    end
-    
-  end
-end

data/lib/embedit/player/player.rb

@@ -1,27 +0,0 @@
-# TODO Having problems with using in rails (files not being found), need to look into. But works perfectly find with www.pandastream.com
-module Embedit
-  
-  class Player
-  
-    attr_reader :title, :url, :format
-    
-    def initialize(url)
-      @url = url
-    end
-            
-    def html(size = {})
-      self.html = @url  # Reset measurements, incase if hmtl is called twice on the same object
-      @html.gsub!(/400/, size[:width].to_s) unless size[:width].nil?
-      @html.gsub!(/300/, size[:height].to_s) unless size[:height].nil?
-      @html
-    end
-    
-    def html=(url)
-      @html = %(<embed src="http://s3.amazonaws.com/panda-test/player.swf" width="400" height="300" 
-      allowfullscreen="true" allowscriptaccess="always" 
-      flashvars="&displayheight=300&file=#{url}&width=400&height=300" />)
-    end
-    
-  end
-  
-end

data/lib/providers.yaml

@@ -1,13 +0,0 @@
-flickr: http://www.flickr.com/services/oembed
-  
-vimeo: http://www.vimeo.com/api/oembed.{format}
-
-viddler: http://lab.viddler.com/services/oembed/
-
-qik: http://qik.com/api/oembed.{format}
-
-pownce: http://api.pownce.com/2.1/oembed.{format}
-
-revision3: http://revision3.com/api/oembed/
-
-# hulu: http://www.hulu.com/api/oembed.{format} - No UK service

data/spec/spec_helper.rb

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