meme_captain 0.0.2 → 0.0.3

data/config.ru

@@ -1,5 +1,10 @@
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
+require 'rack'
+
 require 'meme_captain'
 
+use Rack::ConditionalGet
+use Rack::Sendfile
+
 run MemeCaptain::Server

data/lib/meme_captain/file_body.rb

@@ -0,0 +1,15 @@
+module MemeCaptain
+
+  # A Rack body for an object on the filesystem.
+  class FileBody
+
+    def initialize(path); @to_path = path; end
+
+    def each
+      open(to_path, 'rb') { |f| yield f.read(8192) until f.eof? }
+    end
+
+    attr_reader :to_path
+  end
+
+end

data/lib/meme_captain/filesystem_cache.rb

@@ -5,32 +5,60 @@ module MemeCaptain
 
     def initialize(root_dir); @root_dir = root_dir; end
 
-    # Get data from cache.
+    # Get the data of a file in the cache.
     #
-    # On cache miss, if block given call block to get data from source and
+    # On cache miss, if block given, call block to get data from source and
     # cache it. If no block given return nil on cache miss.
-    def get(id)
-      file_path = id_path(id)
+    #
+    # If suffixes are passed in, loop through them and search for base id +
+    # suffix on filesystem. Return the data of the first found.
+    def get_data(id, suffixes=[''])
+      suffixes.each do |suffix|
+        file_path = id_path(id, suffix)
+        return open(file_path, 'rb') { |f| f.read }  if File.exist?(file_path)
+      end
+
+      # not found in cache
+      if block_given?
+        data = yield
+        put(id, data)
+        data
+      end
+    end
 
-      if File.exist?(file_path)
-        open(file_path, 'rb') { |f| f.read }
-      else
-        put(id, yield)  if block_given?
+    # Get the path of a file in the cache.
+    #
+    # On cache miss, if block given, call block to get data from source and
+    # cache it. If no block given return nil on cache miss.
+    #
+    # If suffixes are passed in, loop through them and search for base id +
+    # suffix on filesystem. Return the first found.
+    def get_path(id, suffixes=[''])
+      suffixes.each do |suffix|
+        file_path = id_path(id, suffix)
+        return file_path  if File.exist?(file_path)
       end
+
+      # not found in cache
+      put(id, yield)  if block_given?
     end
 
-    # Put data in the cache and return it.
+    # Put data in the cache and return its path.
     def put(id, data)
-      open(id_path(id), 'w') do |f|
+      mime_type = MemeCaptain.mime_type(data)
+      file_path = id_path(id, ".#{mime_type.extensions[0]}")
+
+      open(file_path, 'w') do |f|
         f.flock(File::LOCK_EX)
         f.write(data)
         f.flock(File::LOCK_UN)
       end
-      data
+      file_path
     end
 
-    def id_path(id)
-      File.join(root_dir, File.expand_path(id, '/'))
+    # Get the cache file path for an id with optional suffix added.
+    def id_path(id, suffix=nil)
+      File.join(root_dir, File.expand_path(id, '/')) + suffix.to_s
     end
 
     attr_reader :root_dir

data/lib/meme_captain/{content_type.rb → mime_type.rb}

@@ -1,16 +1,20 @@
+require 'mime/types'
+
 module MemeCaptain
 
   module_function
 
-  # Determine content type from blob of image data.
-  def content_type(img_data)
-    if img_data[0,2].unpack('H4')[0] == 'ffd8'
+  # Determine mime type from blob of image data.
+  def mime_type(img_data)
+    mime_type_s = if img_data[0,2].unpack('H4')[0] == 'ffd8'
       'image/jpeg'
     elsif img_data[0,8].unpack('H16')[0] == '89504e470d0a1a0a'
       'image/png'
     elsif %w{474946383961 474946383761}.include?(img_data[0,6].unpack('H12')[0])
       'image/gif'
     end
+
+    MIME::Types[mime_type_s][0]
   end
 
 end

data/lib/meme_captain/server.rb

@@ -9,6 +9,8 @@ module MemeCaptain
 
   class Server < Sinatra::Base
 
+    ImageExts = %w{.jpeg .gif .png}
+
     get '/' do
       @img_tag = if params[:u]
         "<img src=\"#{h request.fullpath.sub(%r{^/}, '/i')}\" />"
@@ -29,22 +31,22 @@ module MemeCaptain
       @source_cache ||= MemeCaptain::FilesystemCache.new('img_cache/source')
 
       processed_id = Digest::SHA1.hexdigest(params.sort.map(&:join).join)
-      processed_img_data = @processed_cache.get(processed_id) {
+      processed_cache_path = @processed_cache.get_path(processed_id, ImageExts) {
         source_id = Digest::SHA1.hexdigest(params[:u])
-        source_img_data = @source_cache.get(source_id) {
+        source_img_data = @source_cache.get_data(source_id, ImageExts) {
           Curl::Easy.perform(params[:u]).body_str
         }
+
         MemeCaptain.meme(source_img_data, params[:tt], params[:tb]).to_blob {
           self.quality = 100
         }
       }
 
       headers = {
-        'Content-Type' => MemeCaptain.content_type(processed_img_data),
-        'ETag' => "\"#{Digest::SHA1.hexdigest(processed_img_data)}\"",
+        'Content-Type' => MIME::Types.type_for(processed_cache_path)[0].to_s,
         }
 
-      [ 200, headers, processed_img_data ]
+      [ 200, headers, MemeCaptain::FileBody.new(processed_cache_path) ]
     end
 
     helpers do

data/lib/meme_captain.rb

@@ -1,4 +1,5 @@
-require 'meme_captain/content_type'
+require 'meme_captain/file_body'
 require 'meme_captain/meme'
+require 'meme_captain/mime_type'
 require 'meme_captain/server'
 require 'meme_captain/filesystem_cache'

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.2'
+  s.version = '0.0.3'
   s.summary = 'create meme images'
   s.description = s.summary
   s.homepage = 'https://github.com/mmb/meme_captain'
@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
 
   %w{
     curb
+    mime-types
+    rack
     rmagick
     sinatra
     }.each { |g| s.add_dependency g }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: meme_captain
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-04-22 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: rmagick
+  name: mime-types
   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: sinatra
+  name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +60,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: create meme images
 email: 
 - matthewm@boedicker.org
@@ -77,9 +105,10 @@ files:
 - img_cache/processed/.gitignore
 - img_cache/source/.gitignore
 - lib/meme_captain.rb
-- lib/meme_captain/content_type.rb
+- lib/meme_captain/file_body.rb
 - lib/meme_captain/filesystem_cache.rb
 - lib/meme_captain/meme.rb
+- lib/meme_captain/mime_type.rb
 - lib/meme_captain/server.rb
 - meme_captain.gemspec
 - views/index.erb