url_to_media_tag 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/url_to_media_tag.rb

@@ -6,6 +6,16 @@ module UrlToMediaTag
     :height => 480
   }
 
+  def self.video_iframe(url, options)
+    options = {:src => url, :class => "url-to-media-tag-video", :frameborder => 0}.merge(options)
+    tag(:iframe, options)
+  end
+
+  def self.tag(name, options)
+    options = options.map{|k,v| "#{k}=\"#{v}\"" }.sort.join(" ")
+    %{<#{name} #{options}></#{name}>}
+  end
+
   def self.convert(url, options={})
     options = DEFAULTS.merge(options)
 
@@ -17,24 +27,22 @@ module UrlToMediaTag
     # youtube
     when /http:\/\/(www.)?youtube\.com\/watch\?v=([A-Za-z0-9._%-]*)(\&\S+)?|http:\/\/(www.)?youtu\.be\/([A-Za-z0-9._%-]*)?/
       youtube_id = $2 || $5
-      width = options[:width]
-      height = options[:height]
-      frameborder = options[:frameborder]
-      %{<iframe class="youtube-player" type="text/html" width="#{width}" height="#{height}" src="http://www.youtube.com/embed/#{youtube_id}" frameborder="#{frameborder}"></iframe>}
+      video_iframe "http://www.youtube.com/embed/#{youtube_id}", options
 
     # vimeo
     when /http:\/\/(www.)?vimeo\.com\/([A-Za-z0-9._%-]*)((\?|#)\S+)?/
       vimeo_id = $2
-      width = options[:width]
-      height = options[:height]
-      show_title = "title=0" unless options[:show_title]
-      show_byline = "byline=0" unless options[:show_byline]
-      show_portrait = "portrait=0" unless options[:show_portrait]
-      frameborder = options[:frameborder] || 0
+      show_title = "title=0" unless options.delete(:show_title)
+      show_byline = "byline=0" unless options.delete(:show_byline)
+      show_portrait = "portrait=0" unless options.delete(:show_portrait)
       query_string_variables = [show_title, show_byline, show_portrait].compact.join("&")
       query_string = "?" + query_string_variables unless query_string_variables.empty?
 
-      %{<iframe src="http://player.vimeo.com/video/#{vimeo_id}#{query_string}" width="#{width}" height="#{height}" frameborder="#{frameborder}"></iframe>}
+      video_iframe "http://player.vimeo.com/video/#{vimeo_id}#{query_string}", options
+
+    # image
+    when /https?:\/\/\S+\.(jpe?g|gif|png|bmp|tif)(\?\S+)?/i
+      tag(:img, options.merge(:src => $&))
     end
 
     result = result.html_safe if result.respond_to?(:html_safe)

data/spec/url_to_media_tag_spec.rb

@@ -7,15 +7,27 @@ describe UrlToMediaTag do
 
   describe 'convert' do
     it "converts youtube" do
-      expected = "<iframe class=\"youtube-player\" type=\"text/html\" width=\"640\" height=\"480\" src=\"http://www.youtube.com/embed/kW-dS4otEZU\" frameborder=\"\"></iframe>"
+      expected = "<iframe class=\"url-to-media-tag-video\" frameborder=\"0\" height=\"480\" src=\"http://www.youtube.com/embed/kW-dS4otEZU\" width=\"640\"></iframe>"
       UrlToMediaTag.convert('http://www.youtube.com/watch?v=kW-dS4otEZU').should == expected
     end
 
     it "converts vimeo" do
-      expected = "<iframe src=\"http://player.vimeo.com/video/26881896?title=0&byline=0&portrait=0\" width=\"640\" height=\"480\" frameborder=\"0\"></iframe>"
+      expected = "<iframe class=\"url-to-media-tag-video\" frameborder=\"0\" height=\"480\" src=\"http://player.vimeo.com/video/26881896?title=0&byline=0&portrait=0\" width=\"640\"></iframe>"
       UrlToMediaTag.convert('http://vimeo.com/26881896').should == expected
     end
 
+    it "converts images" do
+      UrlToMediaTag.convert('http://foo.com/foo.jpg').should == "<img height=\"480\" src=\"http://foo.com/foo.jpg\" width=\"640\"></img>"
+      UrlToMediaTag.convert('http://foo.com/foo.gif').should == "<img height=\"480\" src=\"http://foo.com/foo.gif\" width=\"640\"></img>"
+      UrlToMediaTag.convert('http://foo.com/foo.png').should == "<img height=\"480\" src=\"http://foo.com/foo.png\" width=\"640\"></img>"
+      UrlToMediaTag.convert('http://foo.com/foo.jpeg').should == "<img height=\"480\" src=\"http://foo.com/foo.jpeg\" width=\"640\"></img>"
+      UrlToMediaTag.convert('http://foo.com/foo.JPG').should == "<img height=\"480\" src=\"http://foo.com/foo.JPG\" width=\"640\"></img>"
+    end
+
+    it "converts images with ?" do
+      UrlToMediaTag.convert('http://foo.com/foo.jpg?foo=bar').should == "<img height=\"480\" src=\"http://foo.com/foo.jpg?foo=bar\" width=\"640\"></img>"
+    end
+
     it "does not convert unknown" do
       UrlToMediaTag.convert('xxx').should == nil
     end

data/url_to_media_tag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{url_to_media_tag}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-08-03}
+  s.date = %q{2011-08-04}
   s.email = %q{michael@grosser.it}
   s.files = [
     "Gemfile",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: url_to_media_tag
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 +02:00
+date: 2011-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: []