meme_captain 0.0.8 → 0.0.9

data/public/source_images.json

@@ -0,0 +1,142 @@
+{
+  "thumbHeight": 50,
+  "thumbSpritesUrl": "http://memecaptain.com/thumbs.jpg",
+  "images": [
+    {
+      "url": "http://memecaptain.com/all_the_things.jpg",
+      "thumbWidth": 67
+    },
+    {
+      "url": "http://memecaptain.com/all_the_things2.jpg",
+      "thumbWidth": 67
+    },
+    {
+      "url": "http://memecaptain.com/aw_yeah.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/bear_grylls.jpg",
+      "thumbWidth": 45
+    },
+    {
+      "url": "http://memecaptain.com/boromir.jpg",
+      "thumbWidth": 85
+    },
+    {
+      "url": "http://memecaptain.com/business_cat.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/cool_story_bro.jpg",
+      "thumbWidth": 72
+    },
+    {
+      "url": "http://memecaptain.com/courage_wolf.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/dwight_schrute.jpg",
+      "thumbWidth": 73
+    },
+    {
+      "url": "http://memecaptain.com/fry.png",
+      "thumbWidth": 67
+    },
+    {
+      "url": "http://memecaptain.com/good_guy_greg.jpg",
+      "thumbWidth": 51
+    },
+    {
+      "url": "http://memecaptain.com/grandma.jpg",
+      "thumbWidth": 68
+    },
+    {
+      "url": "http://memecaptain.com/insanity_wolf.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/internet_husband.jpg",
+      "thumbWidth": 45
+    },
+    {
+      "url": "http://memecaptain.com/joseph_ducreux.jpg",
+      "thumbWidth": 38
+    },
+    {
+      "url": "http://memecaptain.com/me_gusta.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/most_interesting.jpg",
+      "thumbWidth": 40
+    },
+    {
+      "url": "http://memecaptain.com/ned_stark.jpg",
+      "thumbWidth": 55
+    },
+    {
+      "url": "http://memecaptain.com/ok.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/philosoraptor.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/rage.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/sap.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/scumbag_steve.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/seriously.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/slowpoke.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/success_kid.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/town_crier.jpg",
+      "thumbWidth": 75
+    },
+    {
+      "url": "http://memecaptain.com/troll_face.jpg",
+      "thumbWidth": 55
+    },
+    {
+      "url": "http://memecaptain.com/trolldad.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/trolldad_dancing.png",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/tyler_durden.jpg",
+      "thumbWidth": 50
+    },
+    {
+      "url": "http://memecaptain.com/xzibit.jpg",
+      "thumbWidth": 77
+    },
+    {
+      "url": "http://memecaptain.com/y_u_no.jpg",
+      "thumbWidth": 67
+    },
+    {
+      "url": "http://memecaptain.com/yao_ming.jpg",
+      "thumbWidth": 42
+    }
+  ]
+}

data/script/thumb_sprites.rb

@@ -1,20 +1,33 @@
+require 'json'
 require 'RMagick'
 
 # make a combined thumbnail image from a list of images for use in CSS sprites
+# generate source images description json
 
-puts 'images = ['
+url_prefix = 'http://memecaptain.com/'
+
+data = {
+  :thumbHeight => 50,
+  :thumbSpritesUrl => "#{url_prefix}thumbs.jpg",
+  :images => [],
+}
 
 thumbs = Magick::ImageList.new
 
 ARGV.sort.each do |file|
   image = Magick::ImageList.new(file)
-  image.resize_to_fit!(0, 50)
+  image.resize_to_fit!(0, data[:thumbHeight])
   image.each do |frame|
     thumbs.push frame
-    puts "  ['#{File.basename(file)}', #{frame.columns}],"
+    data[:images] << {
+      :url => "#{url_prefix}#{File.basename(file)}",
+      :thumbWidth => frame.columns
+    }
   end
 end
 
-puts ']'
+open('source_images.json', 'w') do |f|
+  f.write(JSON.pretty_generate(data))
+end
 
 thumbs.append(false).write('thumbs.jpg')

data/views/404.erb

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Meme Captain meme generator - Not Found</title>
+</head>
+
+<body>
+
+<h1>Not Found</h1>
+
+<p><a href="<%= h @root_url %>"><%= h @root_url %></a></p>
+
+</body>
+
+</html>

data/views/index.erb

@@ -1,28 +1,35 @@
 <!DOCTYPE html>
-<html lan="en" xmlns:fb="https://www.facebook.com/2008/fbml">
+<html lang="en" xmlns:fb="https://www.facebook.com/2008/fbml">
 
 <head>
-<title>Meme Captain</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Meme Captain meme generator</title>
 <style type="text/css">
+body {
+  font-family : verdana, helvetica, arial, sans-serif;
+}
+
 #sourceImages {
   background-color : #eee;
-  border-top : 1px solid #ccc;
-  border-bottom : 1px solid #ccc;
+  border : 1px solid #ccc;
   padding : 0em 1em 0.5em 1em;
   margin : 1em 0em 1em 0em;
 }
 
 img.thumb {
-  background-image : url('thumbs.jpg');
-  height : 50px;
+  margin : 2px;
+}
+
+#heading {
+  font-size : 1em;
+  font-weight : normal;
 }
 </style>
 </head>
 
 <body>
 
-<p><a href="/">Meme Captain</a> - add text to images from the internet</p>
+<h1 id="heading"><a href="<%= h @root_url %>">Meme Captain</a> - make memes with images and text</h1>
 
 <div id="img"></div>
 
@@ -31,17 +38,17 @@ img.thumb {
 <table>
 
 <tr>
-<td><label for="u" />Source image URL: </label></td>
+<td><label for="u">Source image URL: </label></td>
 <td><input type="text" id="u" name="u" size="64" value="<%= h @u %>"/></td>
 </tr>
 
 <tr>
-<td><label for="tt" />Top text: </label></td>
+<td><label for="tt">Top text: </label></td>
 <td><input type="text" id="tt" name="tt" size="64" value="<%= h @tt %>" /></td>
 </tr>
 
 <tr>
-<td><label for="tb" />Bottom text: </label></td>
+<td><label for="tb">Bottom text: </label></td>
 <td><input type="text" id="tb" name="tb" size="64" value="<%= h @tb %>" /></td>
 </tr>
 
@@ -56,73 +63,31 @@ img.thumb {
 
 <div id="sourceImages">
 
-<p>Locally hosted source images or search Bing for source images (click thumbnail to use):</p>
-
-<%
-
-images = [
-  ['all_the_things.jpg', 67],
-  ['bear_grylls.jpg', 45],
-  ['business_cat.jpg', 50],
-  ['courage_wolf.jpg', 50],
-  ['dwight_schrute.jpg', 73],
-  ['fry.png', 67],
-  ['good_guy_greg.jpg', 51],
-  ['grandma.jpg', 68],
-  ['insanity_wolf.jpg', 50],
-  ['internet_husband.jpg', 45],
-  ['joseph_ducreux.jpg', 38],
-  ['me_gusta.png', 50],
-  ['most_interesting.jpg', 40],
-  ['ok.png', 50],
-  ['philosoraptor.jpg', 50],
-  ['rage.png', 50],
-  ['sap.jpg', 50],
-  ['scumbag_steve.jpg', 50],
-  ['seriously.png', 50],
-  ['slowpoke.jpg', 50],
-  ['success_kid.jpg', 50],
-  ['town_crier.jpg', 75],
-  ['troll_face.jpg', 55],
-  ['trolldad.png', 50],
-  ['trolldad_dancing.png', 50],
-  ['tyler_durden.jpg', 50],
-  ['xzibit.jpg', 77],
-  ['y_u_no.jpg', 67],
-  ['yao_ming.jpg', 42],
-]
-
-pos = 0
-images.each do |name, offset|
-%>
-<img src="1.gif" class="thumb" style="width : <%= offset %>px; background-position : <%= pos %>px 0px;" onClick="$('#u').val('http://memecaptain.com/<%= name %>'); return false;" />
-<%
-  pos -= offset
-end
-%>
-
-<div id="bingImageResults"></div>
+<p>Locally hosted source images or search for source images (click thumbnail to use):</p>
+
+<div id="imageSearchResults"></div>
 
 <form action="" method="get">
-<input type="text" id="bingSearch" />
-<input type="button" id="bingButton" value="Bing Image Search" />
+<input type="text" id="imageSearch" />
+<input type="button" id="imageSearchButton" value="Image Search" /> powered by Bing and Google
 </form>
 
 </div>
 
-<p>by Matthew M. Boedicker <a href="mailto:matthewm@boedicker.org">matthewm@boedicker.org</a></p>
+<p>
+Contact: Matthew M. Boedicker <a href="mailto:matthewm@boedicker.org">matthewm@boedicker.org</a> |
+<a href="http://twitter.com/memecaptain">@memecaptain</a>
+</p>
 
 <p><a href="https://github.com/mmb/meme_captain">source code and API</a></p>
 
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 <script>
 function showBingImages(resp) {
-    var div = $('#bingImageResults'),
+    var div = $('#imageSearchResults'),
         searchResponse = resp.SearchResponse,
         image = searchResponse.Image;
 
-    div.empty();
-
     if (image.Total > 0) {
         $.each(image.Results, function (i, img) {
             div.append($('<img />').attr('src', img.Thumbnail.Url).click(
@@ -131,23 +96,39 @@ function showBingImages(resp) {
         });
     } else {
         div.append($('<p />').append(
-            'No results for "' + searchResponse.Query.SearchTerms + '".'));
+            'No Bing results for "' + searchResponse.Query.SearchTerms + '".'));
+    }
+}
+
+function showGoogleImages(resp) {
+    var div = $('#imageSearchResults'),
+        searchResults = resp.responseData.results;
+
+    if (searchResults.length > 0) {
+        $.each(searchResults, function (i, img) {
+            div.append($('<img />').attr('src', img.tbUrl).click(
+                function () { $('#u').val(img.url); }
+            ));
+        });
+    } else {
+        div.append($('<p />').append('No Google results.'));
     }
 }
 
-function bingImageSearch() {
-    var bingSearch = $('#bingSearch'),
-        bingSearchVal = bingSearch.val();
+function imageSearch() {
+    var imageSearch = $('#imageSearch'),
+        imageSearchVal = imageSearch.val();
 
-    if (bingSearchVal.match(/[^\s]/)) {
-        bingSearch.val('');
+    if (imageSearchVal.match(/[^\s]/)) {
+        imageSearch.val('');
+        $('#imageSearchResults').empty();
 
         $.ajax({
             type : 'GET',
             url : 'http://api.bing.net/json.aspx',
             data : {
                 AppId : 'A120380275E87F0071F163210211F0592D0E964C',
-                Query : bingSearchVal + ' imagesize:Medium',
+                Query : imageSearchVal + ' imagesize:Medium',
                 Sources : 'Image',
                 Version : '2.0',
                 Market : 'en-us',
@@ -159,14 +140,49 @@ function bingImageSearch() {
             jsonpCallback : 'showBingImages',
             jsonp : 'JsonCallback'
         });
+
+        $.ajax({
+            type : 'GET',
+            url : 'http://ajax.googleapis.com/ajax/services/search/images',
+            data : {
+                imgsz : 'large',
+                key : 'ABQIAAAA-E0uJIHoMJX6M6atCgYANRS1DzXPXMqKnKNRJm2Z_PRWxvtqGBSOvBqyXOwxGZU5jLxExg_5ym69rw',
+                q : imageSearchVal,
+                rsz : '5',
+                v : '1.0',
+            },
+            dataType : 'jsonp',
+            jsonpCallback : 'showGoogleImages',
+        });
     }
 }
 
+function loadSourceImages() {
+    $.get('source_images.json', function(data) {
+        var pos = 0,
+            div = $('#imageSearchResults');
+
+        $.each(data.images, function (i, img) {
+            div.before($('<img />').attr('src', '1.gif').addClass('thumb').css({
+                'background-image' : 'url(' + data.thumbSpritesUrl + ')',
+                'background-position' : pos + 'px 0px',
+                height : data.thumbHeight,
+                width : img.thumbWidth + 'px',
+            }).click(function() {
+                $('#u').val(img.url);
+            }));
+
+            pos -= img.thumbWidth;
+        });
+    });
+}
+
 $(function () {
-    var bingSearch,
-        bingSearchVal,
+    var image,
         imgDiv;
 
+    loadSourceImages();
+
     if (window.location.search.match(/u=[^&$]/)) {
         $('#tt').focus();
 
@@ -175,9 +191,10 @@ $(function () {
         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),
+            var img = $('<img />').attr('src', data.permUrl),
+            imgLink = $('<a />').attr('href', data.permUrl).append(data.permUrl),
+            templateLink = $('<a />').attr('href', data.templateUrl).append(
+                data.templateUrl),
             tweetLink = $('<a />').attr({
                 href : 'http://twitter.com/share',
                 'class' : 'twitter-share-button',
@@ -188,9 +205,9 @@ $(function () {
 
             imgDiv.empty().append(
                 img).append(
-                $('<p />').append('Temporary image url: ').append(tempLink)).append(
-                $('<p />').append('Permanent image url: ').append(permLink)).append(
-                $('<p />').append('Temporary url not guaranteed to work forever. Permanent url should work as long as source image exists.')).append(
+                $('<p />').append('Image: ').append(imgLink)).append(
+                $('<p />').append('Template: ').append(
+                    templateLink)).append(
                 $('<p />').append(tweetLink).append($('<script />').attr('src',
                     'http://platform.twitter.com/widgets.js')));
 
@@ -198,7 +215,7 @@ $(function () {
             imgDiv.append(
                 $('<div />').attr('id', 'fb-root')).append(
                 $('<fb:like />').attr({
-                    href : data.tempUrl,
+                    href : data.permUrl,
                     send : 'true',
                     width : '450',
                     show_faces : 'true',
@@ -223,14 +240,14 @@ $(function () {
         $('#u').focus();
     }
 
-    $('#bingSearch').keypress(function (event) {
-        if (event.which == 13) {
+    $('#imageSearch').keypress(function (event) {
+        if (event.which === 13) {
             event.preventDefault();
-            bingImageSearch();
+            imageSearch();
         }
     });
 
-    $('#bingButton').click(bingImageSearch);
+    $('#imageSearchButton').click(imageSearch);
 });
 </script>
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meme_captain
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 -05:00
+date: 2012-01-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: curb
+  name: bson_ext
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: curb
   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: mime-types
+  name: json
   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: rack
+  name: mime-types
   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: rmagick
+  name: mongo
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -89,7 +89,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: mongo_mapper
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,11 +102,53 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
 description: create meme images
 email: 
 - matthewm@boedicker.org
-executables: []
-
+executables: 
+- memecaptain
 extensions: []
 
 extra_rdoc_files: []
@@ -116,24 +158,31 @@ files:
 - COPYING
 - ChangeLog
 - README.md
+- bin/memecaptain
 - config.ru
-- img_cache/source/.gitignore
 - lib/meme_captain.rb
 - lib/meme_captain/caption.rb
 - lib/meme_captain/caption_choice.rb
 - lib/meme_captain/draw.rb
 - lib/meme_captain/file_body.rb
-- lib/meme_captain/filesystem_cache.rb
+- lib/meme_captain/image_list.rb
+- lib/meme_captain/image_list/cache.rb
+- lib/meme_captain/image_list/fetch.rb
+- lib/meme_captain/image_list/source_image.rb
+- lib/meme_captain/image_list/watermark.rb
 - lib/meme_captain/meme.rb
-- lib/meme_captain/mime_type.rb
+- lib/meme_captain/meme_data.rb
 - lib/meme_captain/server.rb
 - lib/meme_captain/version.rb
 - meme_captain.gemspec
 - public/1.gif
+- public/source_images.json
 - public/thumbs.jpg
 - public/tmp/.gitignore
 - script/thumb_sprites.rb
+- views/404.erb
 - views/index.erb
+- watermark.png
 has_rdoc: true
 homepage: https://github.com/mmb/meme_captain
 licenses: []