image8 0.1 → 0.2

data/Gemfile

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 gem "async_sinatra", "0.1.5"
 gem "em-http-request", "0.2.7"
-gem "rmagick", "2.13.1"
+gem "image_science", "1.2.1"

data/README

@@ -2,7 +2,8 @@
 
 image8 resizes images on-the-fly and stores them in couchdb for later
 retrival and easy replication. image8 should be used behind a varnish
-or squid. <work in progress>.
+or squid. image8 uses rmagick. must be served with thin, because of its
+async nature.
 
 == config.ru
 
@@ -21,6 +22,8 @@ proportionality.
 
 == misc
 
+this has only been tested on ruby 1.9.1.
+
 image8 is released under the mit license. (c) 2010 harry vangberg
 <harry@vangberg.name>, memolane <info@memolane.com>.
 

data/image8.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "image8"
-  s.version  = "0.1"
-  s.date     = "2010-06-01"
+  s.version  = "0.2"
+  s.date     = "2010-06-17"
   s.summary  = "dynamic image resizing."
   s.email    = "harry@vangberg.name"
   s.homepage = "http://github.com/ichverstehe/image8"

data/lib/image8.rb

@@ -15,24 +15,27 @@ class Image8 < Sinatra::Base
       uri += "?#{request.query_string}"
     end
 
-    doc_id   = encode_uri("#{format}/#{uri}")
-    doc_uri  = settings.couchdb + "/#{doc_id}/image"
-    doc_http = EventMachine::HttpRequest.new(doc_uri)
+    doc_id   = encode_uri(uri)
+    doc_uri  = settings.couchdb + "/#{doc_id}"
+    doc_http = EventMachine::HttpRequest.new(doc_uri + "/" + format)
 
     request = doc_http.get(:timeout => 5)
     request.callback {
       expires 31_536_000 # 1 year
       if request.response_header.status == 200
+        p "Serving straight from cache.."
         content_type request.response_header["CONTENT_TYPE"]
         body         request.response
       else
-        resize_image(uri, format) {|img|
-          doc_http.put(
-            :head => {'Content-Type' => img.mime_type},
-            :body => img.to_blob
-          )
-          content_type img.mime_type
-          body         img.to_blob
+        download_original(uri, doc_uri) {|blob|
+          resize_image(blob, format) {|img|
+            doc_http.put(
+              :head => {'Content-Type' => img.mime_type},
+              :body => img.to_blob
+            )
+            content_type img.mime_type
+            body         img.to_blob
+          }
         }
       end
     }
@@ -44,18 +47,36 @@ class Image8 < Sinatra::Base
     uri
   end
 
-  def resize_image uri, format, &block
-    request = EventMachine::HttpRequest.new(uri).get 
+  def download_original uri, doc_uri
+    cache = EventMachine::HttpRequest.new(doc_uri + "/full")
+    request = cache.get
     request.callback {
-      EM.defer {
-        img = Magick::Image.from_blob(request.response).first
-        img.change_geometry!(format) {|width, height|
-          img.resize! width, height
-        }
-        EM.next_tick {
-          block.call(img) if block
+      if request.response_header.status == 200
+        p "Serving original from cache.."
+        yield request.response if block_given?
+      else
+        p "Downloading original.."
+        original = EventMachine::HttpRequest.new(uri).get
+        original.callback {
+          req = cache.put(
+            :head => {'Content-Type' => original.response_header["CONTENT_TYPE"]},
+            :body => original.response
+          )
+          req.callback { yield original.response if block_given? }
         }
-      }
+      end
+    }
+  end
+
+  def resize_image blob, format, &block
+    p "Resizing image.."
+    t1 = Time.now
+    img = Magick::Image.from_blob(blob).first
+    img.change_geometry!(format) {|width, height|
+      img.resize! width, height
     }
+    t2 = Time.now
+    p t2 - t1
+    block.call(img) if block
   end
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +02:00
+date: 2010-06-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency