meme_captain 0.0.5 → 0.0.6

data/config.ru

@@ -7,4 +7,6 @@ require 'meme_captain'
 use Rack::ConditionalGet
 use Rack::Sendfile
 
+use Rack::Static, :urls => %w{/tmp}, :root => 'public'
+
 run MemeCaptain::Server

data/lib/meme_captain/meme.rb

@@ -15,8 +15,9 @@ module MemeCaptain
     end
 
     options = {
+      :density => 144,
       :fill => 'white',
-      :font => 'Impact',
+      :font => 'Impact-Regular',
       :gravity => Magick::CenterGravity,
       :size => "#{img.page.width * 1.8}x#{img.page.height / 2}",
       :stroke => 'black',
@@ -27,14 +28,12 @@ module MemeCaptain
     line1_caption = Magick::Image.read("caption:#{line1.to_s.upcase}") {
       options.each { |k,v| self.send("#{k}=", v) }
     }
-    line1_caption[0].resize!(line1_caption[0].columns / 2,
-      line1_caption[0].rows / 2, Magick::LanczosFilter, 1.25)
+    line1_caption[0].resize!(0.5)
 
     line2_caption = Magick::Image.read("caption:#{line2.to_s.upcase}") {
       options.each { |k,v| self.send("#{k}=", v) }
     }
-    line2_caption[0].resize!(line2_caption[0].columns / 2,
-      line2_caption[0].rows / 2, Magick::LanczosFilter, 1.25)
+    line2_caption[0].resize!(0.5)
 
     text_layer = Magick::Image.new(img.page.width, img.page.height) {
       self.background_color = 'none'

data/lib/meme_captain/server.rb

@@ -2,6 +2,7 @@ require 'digest/sha1'
 require 'uri'
 
 require 'curb'
+require 'json'
 require 'sinatra/base'
 
 require 'meme_captain'
@@ -13,12 +14,6 @@ module MemeCaptain
     ImageExts = %w{.jpeg .gif .png}
 
     get '/' do
-      @img_url = if params[:u]
-        uri = URI(request.url)
-        uri.path += 'i'
-        uri.to_s
-      end
-
       @u = params[:u]
       @tt= params[:tt]
       @tb = params[:tb]
@@ -26,16 +21,18 @@ module MemeCaptain
       erb :index
     end
 
-    get '/i' do
-      @processed_cache ||= MemeCaptain::FilesystemCache.new(
-        'img_cache/processed')
+    def gen(params)
+      @processed_cache ||= MemeCaptain::FilesystemCache.new('public/tmp')
       @source_cache ||= MemeCaptain::FilesystemCache.new('img_cache/source')
 
       processed_id = Digest::SHA1.hexdigest(params.sort.map(&:join).join)
-      processed_cache_path = @processed_cache.get_path(processed_id, ImageExts) {
+      @processed_cache.get_path(processed_id, ImageExts) {
         source_id = Digest::SHA1.hexdigest(params[:u])
         source_img_data = @source_cache.get_data(source_id, ImageExts) {
-          Curl::Easy.perform(params[:u]).body_str
+          curl = Curl::Easy.perform(params[:u]) do |c|
+            c.useragent = 'Meme Captain http://memecaptain.com/'
+          end
+          curl.body_str
         }
 
         meme_img = MemeCaptain.meme(source_img_data, params[:tt], params[:tb])
@@ -49,12 +46,32 @@ module MemeCaptain
           end
         }
       }
+    end
 
-      headers = {
-        'Content-Type' => MIME::Types.type_for(processed_cache_path)[0].to_s,
-        }
+    get '/g' do
+      content_type :json
+
+      processed_cache_path = gen(params)
+
+      temp_url = URI(request.url)
+      temp_url.path = processed_cache_path.sub('public', '')
+      temp_url.query = nil
+
+      perm_url = URI(request.url)
+      perm_url.path = '/i'
+
+      {
+        'tempUrl' => temp_url.to_s,
+        'permUrl' => perm_url.to_s,
+      }.to_json
+    end
+
+    get '/i' do
+      processed_cache_path = gen(params)
+
+      content_type MIME::Types.type_for(processed_cache_path)[0].to_s
 
-      [ 200, headers, MemeCaptain::FileBody.new(processed_cache_path) ]
+      MemeCaptain::FileBody.new(processed_cache_path)
     end
 
     helpers do

data/meme_captain.gemspec

@@ -4,17 +4,16 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 Gem::Specification.new do |s|
   s.name = 'meme_captain'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.summary = 'create meme images'
   s.description = s.summary
   s.homepage = 'https://github.com/mmb/meme_captain'
   s.authors = ['Matthew M. Boedicker']
   s.email = %w{matthewm@boedicker.org}
 
-  s.required_rubygems_version = '>= 1.3.6'
-
   %w{
     curb
+    json
     mime-types
     rack
     rmagick

data/views/index.erb

@@ -12,10 +12,7 @@
 
 <p>Add text to images from the internet.</p>
 
-<% 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 %>
+<div id="img"></div>
 
 <form action="" method="get">
 
@@ -45,10 +42,48 @@
 
 </form>
 
+<img src="http://memecaptain.com/bear_grylls_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/bear_grylls.jpg'); return false;" />
+
+<img src="http://memecaptain.com/most_interesting_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/most_interesting.jpg'); return false;" />
+
+<img src="http://memecaptain.com/philosoraptor_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/philosoraptor.jpg'); return false;" />
+
+<img src="http://memecaptain.com/scumbag_steve_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/scumbag_steve.jpg'); return false;" />
+
+<img src="http://memecaptain.com/town_crier_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/town_crier.jpg'); return false;" />
+
+<img src="http://memecaptain.com/troll_face_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/troll_face.jpg'); return false;" />
+
+<img src="http://memecaptain.com/yao_ming_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/yao_ming.jpg'); return false;" />
+
+<img src="http://memecaptain.com/y_u_no_thumb.jpg" onClick="$('#u').val('http://memecaptain.com/y_u_no.jpg'); return false;" />
+
 <p>by Matthew M. Boedicker <a href="mailto:matthewm@boedicker.org">matthewm@boedicker.org</a></p>
 
 <p><a href="https://github.com/mmb/meme_captain">source code</a></p>
 
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script>
+<script>
+$(function () {
+    if (window.location.search.match(/u=[^&$]/)) {
+        var imgDiv = $('#img');
+
+        imgDiv.append($('<p />').append('Creating image ...'));
+
+        $.get('/g' + window.location.search, function(data) {
+            var img = $('<img />').attr('src', data.tempUrl),
+            tempLink = $('<a />').attr('href', data.tempUrl).append(data.tempUrl),
+            permLink = $('<a />').attr('href', data.permUrl).append(data.permUrl);
+
+            imgDiv.empty().append(
+                img).append(
+                $('<p />').append('Temporary image url: ').append(tempLink)).append(
+                $('<p />').append('Permanent image url: ').append(permLink));
+        });
+    }
+});
+</script>
+
 </body>
 
 </html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meme_captain
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: mime-types
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,7 +75,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rmagick
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,6 +88,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: create meme images
 email: 
 - matthewm@boedicker.org
@@ -102,7 +116,6 @@ files:
 - COPYING
 - README.textile
 - config.ru
-- img_cache/processed/.gitignore
 - img_cache/source/.gitignore
 - lib/meme_captain.rb
 - lib/meme_captain/file_body.rb
@@ -111,6 +124,7 @@ files:
 - lib/meme_captain/mime_type.rb
 - lib/meme_captain/server.rb
 - meme_captain.gemspec
+- public/tmp/.gitignore
 - views/index.erb
 has_rdoc: true
 homepage: https://github.com/mmb/meme_captain
@@ -135,12 +149,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: