<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/embedit/oembed/oembed.rb</filename>
    </added>
    <added>
      <filename>lib/embedit/oembed/providers.rb</filename>
    </added>
    <added>
      <filename>lib/embedit/ovi/ovi.rb</filename>
    </added>
    <added>
      <filename>lib/embedit/youtube/youtube.rb</filename>
    </added>
    <added>
      <filename>spec/player_spec.rb</filename>
    </added>
    <added>
      <filename>test.flv</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,2 @@
 oembed-with-ruby-0.0.1.gem
-video.flv
 .DS_Store
\ No newline at end of file</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -8,13 +8,14 @@ require 'yaml'
 #Files
 require 'embedit/providers'
 require 'embedit/media'
-require 'embedit/oembed'
-require 'embedit/youtube'
-require 'embedit/ovi'
+require 'embedit/oembed/oembed'
+require 'embedit/youtube/youtube'
+require 'embedit/ovi/ovi'
 require 'embedit/exceptions'
 require 'embedit/validate'
 require 'embedit/player/player'
 
+# Oembed
 
 #puts a = Embedit::Media.new('http://www.vimeo.com/1263763').html
 
@@ -28,13 +29,11 @@ require 'embedit/player/player'
 
 #puts f = Embedit::Media.new('http://revision3.com/trs/blockoland/').html(:height =&gt; 500)
 
-#YouTUBE
+# YouTUBE
 
-#puts g = Embedit::Media.new(&quot;http://www.youtube.com/watch?v=j3TOT1lnVTA&quot;).html
+#puts g = Embedit::Media.new(&quot;http://www.youtube.com/watch?v=j3TOT1lnVTA&quot;).valid?
 
-#puts Validate.new('http://www.flickr.com/photos/kentfield/2735062540/').valid?
-
-#OVI
+# OVI
 
 #puts a = Embedit::Media.new('http://share.ovi.com/media/PangeaDay.TEDTalks/PangeaDay.10054').html(:height =&gt; 900, :width =&gt; 100)
 
@@ -44,4 +43,4 @@ require 'embedit/player/player'
 
 # Flash Player
 
-puts a = Embedit::Media.new('../video.flv').url
\ No newline at end of file
+#puts a = Embedit::Media.new('../video.flv').html(:height =&gt; 900)
\ No newline at end of file</diff>
      <filename>lib/embedit.rb</filename>
    </modified>
    <modified>
      <diff>@@ -17,7 +17,7 @@ module Embedit
     end
     
     def html(size = {})
-      @media_data.html
+      @media_data.html(size)
     end
     
     def format</diff>
      <filename>lib/embedit/media.rb</filename>
    </modified>
    <modified>
      <diff>@@ -10,7 +10,6 @@ module Embedit
     
     def initialize(url)
       self.url = url
-      self.html = @url
     end
     
     def url=(path)
@@ -18,6 +17,9 @@ module Embedit
     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
     </diff>
      <filename>lib/embedit/player/player.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>lib/embedit/oembed.rb</filename>
    </removed>
    <removed>
      <filename>lib/embedit/ovi.rb</filename>
    </removed>
    <removed>
      <filename>lib/embedit/providers.rb</filename>
    </removed>
    <removed>
      <filename>lib/embedit/youtube.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>e14c37f12a3714d61c6da6fba931444ccae054f7</id>
    </parent>
  </parents>
  <author>
    <name>Red Davis</name>
    <email>reddavis@gmail.com</email>
  </author>
  <url>http://github.com/reddavis/embedit/commit/05bf4ddf00c8578675fdd801877141a90fe264a2</url>
  <id>05bf4ddf00c8578675fdd801877141a90fe264a2</id>
  <committed-date>2008-09-24T05:51:04-07:00</committed-date>
  <authored-date>2008-09-24T05:51:04-07:00</authored-date>
  <message>file organisation and player spec, not enough tho :P</message>
  <tree>e0fde284944ca51ea4502f94a0c66d45ddf14895</tree>
  <committer>
    <name>Red Davis</name>
    <email>reddavis@gmail.com</email>
  </committer>
</commit>
