image8 0.3.1 → 0.3.2

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
-gem "async_sinatra", "0.1.5"
+gem "async_sinatra", "0.2.1"
 gem "em-http-request", "0.2.7"
-gem "image_science", "1.2.1"
+gem "em-synchrony", "0.1.5"
+gem "json", ">= 1.2.4"
+gem "rmagick", "2.13.1"

data/image8.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "image8"
-  s.version  = "0.3.1"
-  s.date     = "2010-06-18"
+  s.version  = "0.3.2"
+  s.date     = "2010-06-24"
   s.summary  = "dynamic image resizing."
   s.email    = "harry@vangberg.name"
   s.homepage = "http://github.com/ichverstehe/image8"
@@ -14,8 +14,10 @@ Gem::Specification.new do |s|
 		"lib/image8.rb",
   ]
   s.add_dependency "sinatra", ">= 1.0"
-  s.add_dependency "async_sinatra", ">= 0.1.5"
+  s.add_dependency "async_sinatra", ">= 0.2.1"
   s.add_dependency "em-http-request", ">= 0.2.7"
+  s.add_dependency "em-synchrony", ">= 0.1.5"
+  s.add_dependency "json"
   s.add_dependency "rmagick", ">= 2.13.1"
 end
 

data/lib/image8.rb

@@ -1,6 +1,9 @@
 require "uri"
 require "sinatra/async"
-require "em-http"
+require "em-synchrony"
+require "em-synchrony/em-http"
+require "fiber"
+require "json"
 require "RMagick"
 
 class Image8 < Sinatra::Base
@@ -9,79 +12,97 @@ class Image8 < Sinatra::Base
 
   register Sinatra::Async
 
-  aget %r|/([0-9x]+)/(.*)| do |format, uri|
-    if uri.strip.empty?
-      status 404
-      body "No such image."
-    end
+  aget %r[/(resize|crop)/([0-9x]+)/(.*)] do |action, format, uri|
+    EM.synchrony do
+      puts "uri: #{uri.inspect} - #{uri.class}"
+
+      if uri.strip.empty?
+        status 404
+        body "No such image."
+      else
+        # This is retarded.
+        uri = append_query_string(uri)
+        doc = doc_uri(uri, format, action)
 
-    puts "uri: #{uri.inspect} - #{uri.class}"
+        expires 31_536_000 # 1 year
+        request = EM::HttpRequest.new(doc).get(:timeout => 5)
+        if request.response_header.status == 200
+          puts "Serving straight from cache.."
+          content_type request.response_header["CONTENT_TYPE"]
+          body         request.response
+        else
+          original, rev = download_original(uri)
+          image         = transform_image(original, action, format)
 
-    # This is retarded.
+          http = EM::HttpRequest.new "#{doc}?rev=#{rev}"
+          http.aput(
+            :head   => {'Content-Type' => image.mime_type},
+            :body   => image.to_blob,
+            :params => {:rev => rev}
+          )
+          content_type image.mime_type
+          body         image.to_blob
+        end
+      end
+    end
+  end
+
+  def append_query_string uri
     if !request.query_string.empty?
       uri += "?#{request.query_string}"
     end
-    uri = URI.encode(uri)
-
-    doc_id   = encode_uri_for_couchdb(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
-        puts "Serving straight from cache.."
-        content_type request.response_header["CONTENT_TYPE"]
-        body         request.response
-      else
-        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
-    }
+    uri
   end
 
-  def encode_uri_for_couchdb uri
+  def doc_id uri
     uri = URI.encode(uri)
     uri.gsub! "/", "%2F"
     uri
   end
 
-  def download_original uri, doc_uri
-    cache = EventMachine::HttpRequest.new(doc_uri + "/full")
+  def doc_uri uri, format=nil, action=nil
+    format = "#{action}/#{format}" if action
+    [settings.couchdb, doc_id(uri), format].compact.join("/")
+  end
+
+  def download_original uri
+    cache = EM::HttpRequest.new doc_uri(uri, "full")
     request = cache.get
-    request.callback {
-      if request.response_header.status == 200
-        puts "Serving original from cache.."
-        yield request.response if block_given?
-      else
-        puts "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
-    }
+
+    if request.response_header.status == 200
+      puts "Serving original from cache.."
+      blob = request.response
+      rev  = request.response_header["ETAG"][1..-2]
+    else
+      puts "Downloading original.."
+      original = EM::HttpRequest.new(uri).get
+      request = cache.put(
+        :head => {'Content-Type' => original.response_header["CONTENT_TYPE"]},
+        :body => original.response
+      )
+      blob = original.response
+      rev  = JSON.parse(request.response)["rev"]
+    end
+
+    [blob, rev]
   end
 
-  def resize_image blob, format, &block
-    puts "Resizing image.."
-    img = Magick::Image.from_blob(blob).first
-    img.change_geometry!(format) {|width, height|
-      img.resize! width, height
-    }
-    block.call(img) if block
+  def format_response request
+    rev  = etag[1..-2]
+    [blob, rev]
+  end
+
+  def transform_image blob, action, format
+    puts "#{action} image.."
+    image = Magick::Image.from_blob(blob).first
+    case action
+    when "resize" then
+      image.change_geometry!(format) {|width, height|
+        image.resize! width, height
+      }
+    when "crop" then
+      image.resize_to_fill! format.to_i
+    end
+    image
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +02:00
+date: 2010-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,9 +39,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 2
         - 1
-        - 5
-        version: 0.1.5
+        version: 0.2.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,9 +59,35 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: em-synchrony
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 5
+        version: 0.1.5
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -71,7 +97,7 @@ dependencies:
         - 1
         version: 2.13.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 description: dynamic image resizing.
 email: harry@vangberg.name
 executables: []