grosser-smusher 0.1 → 0.3

data/README.markdown

@@ -11,38 +11,38 @@ Solution
 
 Install
 =======
-    install ruby + rubygems
+    install ruby + rubygems + curl
     sudo gem install grosser-smusher --source http://gems.github.com/
 
 Usage
 =====
-    # your pictures MUST be online in order to be optimized
-    smusher /apps/x/public/images www.x.com/images
-    smusher LOCAL_FOLDER REMOTE_FOLDER
+    smusher /apps/x/public/images # optimize all jpg/png images, NOT gifs
+    smusher /apps/x/public/images/x.png # optimize a single image
+    smusher /apps/x/public/images/x.gif # !!optimize to smaller png, rename it yourself!!
 
 Protection
 ==========
-Smusher makes .backup copies of any image before optimizing.
-Any image that returns a failure code, is larger than before,
+Smusher makes .backup copies of any image before optimizing.  
+Any image that returns a failure code, is larger than before,  
 or is empty will be reverted.
 
 Example
 ======
-  smusher /apps/ts/public/images xx.com/images
-  sushing http://xx.com/images/social/facebook_icon.png -> /apps/rs/public/images/social/facebook_icon.png
-  2887 -> 132                              = 4%
+    smusher /apps/ts/public/images
+      sushing /apps/rs/public/images/social/facebook_icon.png
+      2887 -> 132                              = 4%
 
-  sushing http://xx.com/images/social/myspace_icon.png -> /apps/rs/public/images/social/myspace_icon.png
-  3136 -> 282                              = 8%
+      sushing /apps/rs/public/images/social/myspace_icon.png
+      3136 -> 282                              = 8%
 
-  sushing http://xx.com/images/dvd/dvd_1.png -> /apps/rs/public/images/dvd/dvd_1.png
-  5045 -> 9677                             = 191%
-  reverted!
-  ...
+      sushing /apps/rs/public/images/dvd/dvd_1.png
+      5045 -> 4                                = 0%
+      reverted!
+      ...
 
 TODO
 ====
- - no need for files to be online (direct upload)
+ - use rest-client rather than curl
  - windows support?
 
 Author

data/Rakefile

@@ -1,5 +1,5 @@
 desc "Run all specs in spec directory"
-task :default do |t|
+task :test do |t|
   require 'spec'
   options = "--colour --format progress --loadby --reverse"
   files = FileList['spec/**/*_spec.rb']
@@ -9,7 +9,7 @@ end
 #Gemspec
 require 'echoe'
 porject_name = 'smusher'
-Echoe.new(porject_name , '0.1') do |p|
+Echoe.new(porject_name , '0.3') do |p|
   p.description    = "Automatic Lossless Reduction Of All Your Images"
   p.url            = "http://github.com/grosser/#{porject_name}"
   p.author         = "Michael Grosser"

data/bin/smusher

@@ -2,11 +2,15 @@
 require 'rubygems'
 require 'smusher'
 
-folder, url = ARGV
-if ARGV.length < 2 or not File.directory?(folder)
-  puts "smusher DIRECTORY_TO_SMUSH BASE_URL"
-  puts "smusher /apps/x/public/images www.x.com/images"
+path = ARGV[0]
+if ARGV.length != 1 or not File.exist?(path)
+  puts "smusher DIRECTORY_OR_FILE_TO_OPTIMIZE"
+  puts "smusher /apps/x/public/images"
   exit
 end
 
-Smusher.store_smushed_folder(url,folder)
+if File.directory?(path)
+  Smusher.optimize_images_in_folder(path)
+else
+  Smusher.optimize_image(path)
+end

data/lib/smusher.rb

@@ -1,47 +1,37 @@
 require 'rubygems'
 require 'rake'
+require 'json'
 
 module Smusher
   extend self
-  #http://smushit.com/ws.php?img=http%3A%2F%2Fwww.famfamfam.com%2Flab%2Ficons%2Fsilk%2Ficons%2Fdrink_empty.png&task=89266837334214400&id=paste2
-  SMUSHIT_FAILURE_SIZE = 9667
   EMPTY_FILE_SIZE = 4
-  
-  def store_smushed_image(url,file)
-    url = sanitize_url(url)
+
+  # optimize the given image !!coverts gif to png!!
+  def optimize_image(file)
+    if empty?(file)
+      puts "THIS FILE IS EMPTY!!! #{file}"
+      return
+    end
     with_protection(file) do
-      with_logging(url,file) do
-        write_smushed_data(url,file)
+      with_logging(file) do
+        write_optimized_data(file)
       end
     end
   end
 
-  def store_smushed_folder(base_url,folder)
-    base_url = sanitize_url(base_url)
-    folder = sanitize_folder(folder)
-    
+  # fetch all jpg/png images from  given folder and optimize them
+  def optimize_images_in_folder(folder)
     images_in_folder(folder).each do |file|
-      relative_path_to_folder = file.sub(folder+'/','')
-      url = "#{base_url}/#{relative_path_to_folder}"
-      store_smushed_image(url,file)
+      optimize_image(file)
       puts ''
     end
   end
 
 private
 
-  def write_smushed_data(url,file)
-    File.open(file,'w') do |f|
-      data = smushed_image_data_for(url)
-      raise data if data =~ /<html>/i
-      f.puts data
-    end
-  end
-
-  def sanitize_url(url)
-    url = url.sub(%r[/$],'')#remove tailing slash
-    url = url.sub(url,"http://#{url}") unless url.include?('://')#add http if protocol is missing
-    url
+  def write_optimized_data(file)
+    data = optimized_image_data_for(file)
+    File.open(file,'w') {|f| f.puts data}
   end
   
   def sanitize_folder(folder)
@@ -49,31 +39,23 @@ private
   end
 
   def images_in_folder(folder)
+    folder = sanitize_folder(folder)
     images = %w[png jpg jpeg JPG].map {|ext| "#{folder}/**/*.#{ext}"}
     FileList[*images]
   end
   
   def with_protection(file)
-    if File.exist?(file)
-      backup = "#{file}.backup"
-      FileUtils.cp(file,backup)#backup
-      
-      before = size(file)
-      yield
-      after = size(file)
-      
-      if after == EMPTY_FILE_SIZE or after == SMUSHIT_FAILURE_SIZE or after > before
-        FileUtils.mv(backup,file,:force=>true)#revert
-        puts "reverted!"
-      else
-        FileUtils.rm(backup)
-      end
-    else#is created
-      yield
-      after = size(file) 
-      if after == SMUSHIT_FAILURE_SIZE or after == EMPTY_FILE_SIZE
-        FileUtils.rm file
-      end
+    backup = "#{file}.backup"
+    FileUtils.cp(file,backup)
+
+    before = size(file)
+    yield
+
+    if empty?(file) or size(file) >= before
+      FileUtils.mv(backup,file,:force=>true)#revert
+      puts "reverted!"
+    else
+      FileUtils.rm(backup)
     end
   end
   
@@ -81,34 +63,26 @@ private
     File.exist?(file) ? File.size(file) : 0
   end
 
-  def with_logging(url,file)
-    puts "sushing #{url} -> #{file}"
+  def empty?(file)
+    size(file) <= EMPTY_FILE_SIZE
+  end
+
+  def with_logging(file)
+    puts "sushing #{file}"
     
     before = size(file)
     yield
     after = size(file)
     
-    result = before == 0 ?  "CREATED" : "#{(100*after)/before}%"
+    result = "#{(100*after)/before}%"
     puts "#{before} -> #{after}".ljust(40) + " = #{result}"
   end
 
-  def smushed_image_data_for(url)
-    require 'cgi'
-    url = CGI.escape url
-    
-    require 'net/http'
-    require 'net/https'
-    require 'rubygems'
-    require 'json'
-    
-    http = Net::HTTP.new('smushit.com')
-    path = "/ws.php?img=#{url}&task=89266837334214400&id=paste2"
-    
-    resp, data = http.get(path, nil)
-    raise "oops #{resp}" unless resp.is_a? Net::HTTPOK
-    
-    path = "/#{JSON.parse(data)['dest']}"
-    resp, data = http.get(path, nil)
-    data
+  def optimized_image_data_for(file)
+    #TODO use rest-client --> independent of curl
+    response = `curl -F files[]=@#{file} http://smush.it/ws.php -s`
+    return nil if response['error']
+    path = JSON.parse(response)['dest']
+    `curl http://smush.it/#{path} -s`
   end
 end

data/smusher.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smusher}
-  s.version = "0.1"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-01-24}
+  s.date = %q{2009-01-25}
   s.default_executable = %q{smusher}
   s.description = %q{Automatic Lossless Reduction Of All Your Images}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["smusher"]
   s.extra_rdoc_files = ["lib/smusher.rb", "bin/smusher", "README.markdown"]
-  s.files = ["Manifest", "nbproject/private/rake-d.txt", "nbproject/project.xml", "nbproject/project.properties", "lib/smusher.rb", "spec/out/people.jpg", "spec/spec_helper.rb", "spec/smusher_spec.rb", "spec/images/logo.gif", "spec/images/woman.jpeg", "spec/images/add.png", "spec/images/drink_empty.png", "spec/images/people.jpg", "spec/images/water.JPG", "spec/reduced/fam.png", "bin/smusher", "Rakefile", "README.markdown", "smusher.gemspec"]
+  s.files = ["Manifest", "nbproject/private/private.xml", "nbproject/private/rake-d.txt", "nbproject/project.xml", "nbproject/project.properties", "lib/smusher.rb", "spec/out/people.jpg", "spec/spec_helper.rb", "spec/smusher_spec.rb", "spec/images/logo.gif", "spec/images/woman.jpeg", "spec/images/add.png", "spec/images/drink_empty.png", "spec/images/people.jpg", "spec/images/water.JPG", "spec/reduced/fam.png", "spec/reduced/add.png", "bin/smusher", "Rakefile", "README.markdown", "smusher.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/grosser/smusher}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Smusher", "--main", "README.markdown"]

data/spec/smusher_spec.rb

@@ -1,9 +1,6 @@
 ROOT = File.expand_path(File.dirname(__FILE__))
 require File.join(ROOT,"spec_helper")
 
-URL = "http://famfamfam.com/lab/icons/silk/icons/drink_empty.png"
-ESCAPED_URL = "http%3A%2F%2Fwww.famfamfam.com%2Flab%2Ficons%2Fsilk%2Ficons%2Fdrink_empty.png"
-
 describe :smusher do
   def size
     File.size(@file)
@@ -19,20 +16,15 @@ describe :smusher do
     @file = File.join(@out,'people.jpg')
   end
   
-  describe :store_smushed_image do
+  describe :optimize_image do
     it "stores the image in an reduced size" do
       original_size = size
-      Smusher.store_smushed_image(URL,@file)
+      Smusher.optimize_image(@file)
       size.should < original_size
     end
-    
-    it "uses cleaned url" do
-      Smusher.expects(:write_smushed_data).with("http://xx",@file)
-      Smusher.store_smushed_image('xx',@file)
-    end
   end
   
-  describe :store_smushed_folder do
+  describe :optimize_images_in_folder do
     before do
       FileUtils.rm @file
       @files = []
@@ -45,23 +37,13 @@ describe :smusher do
     end
     
     it "smushes all images" do
-      Smusher.store_smushed_folder(File.dirname(URL),@out)
+      Smusher.optimize_images_in_folder(@out)
       new_sizes = @files.map {|f|File.size(f)}
       puts new_sizes * ' x '
       new_sizes.size.times {|i| new_sizes[i].should < @before[i]}
     end
   end
   
-  describe :sanitize_url do
-    it "cleans a url" do
-      Smusher.send(:sanitize_url,'xx').should == "http://xx"
-    end
-    
-    it "does not cleans a url if it contains a protocol" do
-      Smusher.send(:sanitize_url,'ftp://xx').should == "ftp://xx"
-    end
-  end
-  
   describe :sanitize_folder do
     it "cleans a folders trailing slash" do
       Smusher.send(:sanitize_folder,"xx/").should == 'xx'
@@ -111,15 +93,6 @@ describe :smusher do
       @before.should == size
     end
     
-    it "does not revert a file that got created" do
-      FileUtils.rm @file
-      File.exist?(@file).should be_false
-      Smusher.send(:with_protection,@file) do
-        copy
-      end
-      File.exist?(@file).should be_true
-    end
-    
     it "reverts a file that got empty" do
       Smusher.send(:with_protection,@file) do
         write nil
@@ -129,30 +102,20 @@ describe :smusher do
     end
     
     it "reverts a file that has error-suggesting size" do
-      #a file larger that failure data
-      write(failure_data+failure_data)
+      write("valid-file-contents")
       @before = size
-      @before.should > Smusher::SMUSHIT_FAILURE_SIZE
+      @before.should > Smusher::EMPTY_FILE_SIZE
       
       #gets overwritten by failure data size
       Smusher.send(:with_protection,@file) do
-        write failure_data
-        size.should == Smusher::SMUSHIT_FAILURE_SIZE
+        write nil
+        size.should == Smusher::EMPTY_FILE_SIZE
       end
       
       #and should be reverted
-      size.should_not == Smusher::SMUSHIT_FAILURE_SIZE
+      size.should_not == Smusher::EMPTY_FILE_SIZE
       size.should == @before
     end
-
-    it "reverts a file that got created and has error suggesting size" do
-      FileUtils.rm @file
-      Smusher.send(:with_protection,@file) do
-        write failure_data
-        File.exist?(@file).should be_true
-      end
-      File.exist?(@file).should be_false
-    end
   end
   
   describe :size do
@@ -168,16 +131,17 @@ describe :smusher do
   describe :logging do
     it "yields" do
       val = 0
-      Smusher.send(:with_logging,URL,@file) {val = 1}
+      Smusher.send(:with_logging,@file) {val = 1}
       val.should == 1
     end
   end
   
-  describe :smushed_image_data_for do
+  describe :optimized_image_data_for do
     it "loads the reduced image" do
-      expected_result = File.join(ROOT,'reduced','fam.png')
-      received = (Smusher.send(:smushed_image_data_for,URL)+"\n")
-      received.should == File.open(expected_result).read
+      original = File.join(ROOT,'images','add.png')
+      reduced = File.open(File.join(ROOT,'reduced','add.png')).read
+      received = (Smusher.send(:optimized_image_data_for,original))
+      received.should == reduced
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-smusher
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.3"
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-24 00:00:00 -08:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: smusher
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - Manifest
+- nbproject/private/private.xml
 - nbproject/private/rake-d.txt
 - nbproject/project.xml
 - nbproject/project.properties
@@ -65,6 +66,7 @@ files:
 - spec/images/people.jpg
 - spec/images/water.JPG
 - spec/reduced/fam.png
+- spec/reduced/add.png
 - bin/smusher
 - Rakefile
 - README.markdown