meme_captain 0.0.3 → 0.0.4

data/lib/meme_captain/meme.rb

@@ -36,13 +36,17 @@ module MemeCaptain
     line2_caption[0].resize!(line2_caption[0].columns / 2,
       line2_caption[0].rows / 2, Magick::LanczosFilter, 1.25)
 
-    img.each do |frame|
-      frame.composite!(line1_caption[0], Magick::NorthGravity,
-        Magick::OverCompositeOp)
+    text_layer = Magick::Image.new(img[0].columns, img[0].rows) {
+      self.background_color = 'none'
+    }
+    text_layer.composite!(line1_caption[0], Magick::NorthGravity,
+      Magick::OverCompositeOp)
+    text_layer.composite!(line2_caption[0], Magick::SouthGravity,
+      Magick::OverCompositeOp)
 
-      frame.composite!(line2_caption[0], Magick::SouthGravity,
+    img.each do |frame|
+      frame.composite!(text_layer, -frame.page.x, -frame.page.y,
         Magick::OverCompositeOp)
-
       frame.strip!
     end
     img

data/lib/meme_captain/server.rb

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+require 'uri'
 
 require 'curb'
 require 'sinatra/base'
@@ -12,10 +13,10 @@ module MemeCaptain
     ImageExts = %w{.jpeg .gif .png}
 
     get '/' do
-      @img_tag = if params[:u]
-        "<img src=\"#{h request.fullpath.sub(%r{^/}, '/i')}\" />"
-      else
-        ''
+      @img_url = if params[:u]
+        uri = URI(request.url)
+        uri.path += 'i'
+        uri.to_s
       end
 
       @u = params[:u]
@@ -37,8 +38,15 @@ module MemeCaptain
           Curl::Easy.perform(params[:u]).body_str
         }
 
-        MemeCaptain.meme(source_img_data, params[:tt], params[:tb]).to_blob {
+        meme_img = MemeCaptain.meme(source_img_data, params[:tt], params[:tb])
+        current_format = meme_img.format
+
+        meme_img.to_blob {
           self.quality = 100
+          # convert non-animated gifs to png
+          if current_format == 'GIF' and meme_img.size == 1
+            self.format = 'PNG'  
+          end
         }
       }
 

data/meme_captain.gemspec

@@ -4,7 +4,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 Gem::Specification.new do |s|
   s.name = 'meme_captain'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.summary = 'create meme images'
   s.description = s.summary
   s.homepage = 'https://github.com/mmb/meme_captain'

data/views/index.erb

@@ -12,7 +12,10 @@
 
 <p>Add text to images from the internet.</p>
 
-<%= @img_tag %>
+<% if @img_url %>
+<p><a href="<%= h @img_url %>"><img src="<%= h @img_url %>" /></a></p>
+<p><a href="<%= h @img_url %>"><%= h @img_url %></a></p>
+<% end %>
 
 <form action="" method="get">
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meme_captain
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -04:00
+date: 2011-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency