rack-smusher 0.0.2 → 0.0.3

data/README.md

@@ -8,16 +8,24 @@ It is intended to be used with [serve](http://github.com/jlong/serve), but it ma
 
 ## Why?
 
-Because I like to save my Fireworks editable files in the public folder while designing / prototyping. That, and it seemed like a fun miniproject.
+I like to save Fireworks editable files inside my serve project, and store them in the git repository. Thus, collaborators have access to the source files and can make changes, history is preserved, and life is good.
+
+That, and it seemed like a fun miniproject :)
 
 
 ## Usage
 
+Put this in your config.ru:
+
     gem 'rack-smusher'
     require 'rack/smusher'
     
     use Rack::Smusher, {
-      :cache_path => "cache",
-      :image_path => "public"
+      :source => "app/images",
+      :target => "public/images",
+      :base_url => "/images/"
     }
 
+Now, you can save your editable files in `app/images`, and rack-smusher will compress and copy them to `public/images` when the browser requests them. Folder structure will be preserved, so a file saved in `app/images/foo/bar.png` will be saved to `public/images/foo/bar.png`.
+
+If for some reason your app uses a different path for images (say, `/img/`) you can specify it in the `:base_url` option.

data/lib/rack/smusher.rb

@@ -2,43 +2,64 @@ require "rack"
 require "smusher"
 require 'digest/md5'
 
+class String
+  def - arg
+    copy = self.dup
+    copy[arg] = ""
+    return copy
+  end
+end
+
 class Rack::Smusher
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
   def initialize(app, options = {}, &block)
     @app = app
     @options = {
-      :cache => true,
-      :cache_path => ".cache",
-      :image_path => "public"
+      :source => "public/images/source",
+      :target => "public/images",
+      :base_url => "/images/"
     }.merge(options)
-    if !File.exist? @options[:cache_path]
-      mkdir @options[:cache_path]
-    end
     instance_eval(&block) if block_given?
   end
 
   def call(env)
     status, headers, body = @app.call(env)
 
-    type = headers['Content-Type']
+    if env['PATH_INFO'][/png/]
+      should_compress = false
+      source_path = @options[:source] + '/' + (env['PATH_INFO'] - @options[:base_url])
+      target_path = @options[:target] + '/' + (env['PATH_INFO'] - @options[:base_url])
 
-    if type == 'image/png'
-      file = @options[:image_path] + env['PATH_INFO']
-      file_hash = Digest::MD5.hexdigest(File.read(file))
+      there_is_a_source_file = File.exist?(source_path)
+      there_is_a_target_file = File.exist?(target_path)
 
-      target = @options[:cache_path] + '/' + file_hash + '_' + File.basename(file)
-      if !File.exist? target || @options[:cache] == false
-        cp_r file, target, { :verbose => false }
-        %x(smusher #{target})
+      if there_is_a_source_file && there_is_a_target_file
+        if File.mtime(source_path) > File.mtime(target_path)
+          should_compress = true
+        end
       end
 
-      body = File.read(target)
+      if !there_is_a_target_file && there_is_a_source_file
+        should_compress = true
+      end
+
+      if should_compress
+        status, body = compress source_path, target_path
+      end
     end
 
     @response = Rack::Response.new(body, status, headers)
     @response.to_a
   end
 
+  def compress source, target
+    puts "compressing #{source}"
+    mkdir_p File.dirname(target), { :verbose => false }
+    cp_r source, target, { :verbose => false }
+    %x(smusher #{target})
+    [200, File.read(target)]
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-smusher
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Ale Mu\xC3\xB1oz"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 +01:00
+date: 2010-12-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency