nathanhoad-moredown 1.0.3 → 1.0.4

data/lib/moredown.rb

@@ -1,7 +1,7 @@
 require 'rdiscount'
 
 class Moredown < RDiscount
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   
   # Don't use inline CSS for styling
   attr_accessor :has_stylesheet
@@ -55,18 +55,25 @@ class Moredown < RDiscount
   def to_html    
     html = super
     
-    # youtube
-    html.gsub!(/<img src="youtube:(.*)?" alt="(.*)?" \/>/) do |match|
-      flash_tag "http://www.youtube.com/v/#{$1}", :width => 425, :height => 350
-    end
-    
-    # flash movies
-    html.gsub!(/<img src="flash:(.*?)"\s?(?:title="(.*?)")? alt="(.*)" \/>/) do |match|
-      if $2
-        sizes = $2.split(' ')
+    # flash movies (including youtube)
+    html.gsub!(/<img src="(flash|youtube):(.*?)"\s?(?:title="(.*?)")? alt="(.*)" \/>/) do |match|
+      # grab width and height
+      if $3
+        sizes = $3.split(' ')
         sizes = { :width => sizes[0], :height => sizes[1] }
+      else
+        sizes = {}
       end
-      flash_tag $1, (sizes || {})
+      
+      # check the source
+      if $1.downcase == "youtube"
+        url = "http://www.youtube.com/v/#{$2}"
+        sizes = { :width => 425, :height => 350 }.merge sizes
+      else
+        url = $2
+      end
+      
+      flash_tag url, sizes
     end
     
     # image alignments
@@ -110,7 +117,7 @@ class Moredown < RDiscount
       end
       
       # html seems to need to go after the swfobject javascript
-      html = "<script type=\"text/javascript\" src=\"#{@swfobject[:src]}\"></script><script type=\"text/javascript\">\n//<![CDATA[\n#{swfobjects}//]]>\n</script>\n#{html}"
+      html = "<script type=\"text/javascript\" src=\"#{@swfobject[:src]}\"></script><script type=\"text/javascript\">\n/*<![CDATA[*/\n#{swfobjects}/*]]>*/\n</script>\n#{html}"
     end
     
     html

data/moredown.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'moredown'
-  s.version = '1.0.3'
+  s.version = '1.0.4'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-09-08'
+  s.date = '2009-09-12'
   s.email = 'nathan@nathanhoad.net'
   s.homepage = 'http://github.com/nathanhoad/moredown'
   s.has_rdoc = true

data/test/moredown_test.rb

@@ -23,6 +23,10 @@ class MoredownTest < Test::Unit::TestCase
     html = "<p><object id=\"swf-1\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\"425\" height=\"350\"><param name=\"movie\" value=\"http://www.youtube.com/v/12345678\" /><!--[if !IE]>--><object type=\"application/x-shockwave-flash\" data=\"http://www.youtube.com/v/12345678\" width=\"425\" height=\"350\"><!--<![endif]--><a href=\"http://www.youtube.com/v/12345678\"><img src=\"http://img.youtube.com/vi/12345678/default.jpg\" alt=\"\" /></a><!--[if !IE]>--></object><!--<![endif]--></object></p>\n"
     assert_equal html, Moredown.text_to_html(text)
     
+    text = "![Video](youtube:12345678 \"200 100\")"
+    html = 'width="200" height="100"'
+    assert Moredown.text_to_html(text).include?(html), "Width should be 200 and height should be 100"
+    
     text = <<TEXT
 Here is a video:
     
@@ -138,8 +142,8 @@ TEXT
     assert_equal html, Moredown.text_to_html(text)
     
     text = '![Flash](flash:movieclip.swf "800 600")'
-    html = "<p><object id=\"swf-1\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\"800\" height=\"600\"><param name=\"movie\" value=\"movieclip.swf\" /><!--[if !IE]>--><object type=\"application/x-shockwave-flash\" data=\"movieclip.swf\" width=\"800\" height=\"600\"><!--<![endif]-->Flash is not available.<!--[if !IE]>--></object><!--<![endif]--></object></p>\n"
-    assert_equal html, Moredown.text_to_html(text)
+    html = 'width="800" height="600"'
+    assert Moredown.text_to_html(text).include?(html), "Width should be 800 and height should be 600"
   end
   
   def test_swfobject
@@ -151,10 +155,10 @@ TEXT
 
 And that's all."
     html = "<script type=\"text/javascript\" src=\"./swfobject.js\"></script><script type=\"text/javascript\">
-//<![CDATA[
+/*<![CDATA[*/
 swfobject.registerObject(\"swf-1\", \"10\");
 swfobject.registerObject(\"swf-2\", \"10\");
-//]]>
+/*]]>*/
 </script>
 <p>Here is some flash:</p>
 
@@ -163,6 +167,6 @@ swfobject.registerObject(\"swf-2\", \"10\");
 <p><object id=\"swf-2\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\"400\" height=\"300\"><param name=\"movie\" value=\"movieclip.swf\" /><!--[if !IE]>--><object type=\"application/x-shockwave-flash\" data=\"movieclip.swf\" width=\"400\" height=\"300\"><!--<![endif]-->No Flash<!--[if !IE]>--></object><!--<![endif]--></object></p>
 
 <p>And that's all.</p>\n"
-    assert_equal html, Moredown.text_to_html(text, :swfobject => { :js_src => './swfobject.js', :version => '10', :fallback => 'No Flash' })  
+    assert_equal html, Moredown.text_to_html(text, :swfobject => { :src => './swfobject.js', :version => '10', :fallback => 'No Flash' })  
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nathanhoad-moredown
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Nathan Hoad
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,7 @@ files:
 - test/rdiscount_test.rb
 has_rdoc: true
 homepage: http://github.com/nathanhoad/moredown
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Fast Implementation of Gruber's Markdown in C