grosser-smusher 0.3 → 0.3.1

data/Rakefile

@@ -9,7 +9,7 @@ end
 #Gemspec
 require 'echoe'
 porject_name = 'smusher'
-Echoe.new(porject_name , '0.3') do |p|
+Echoe.new(porject_name , '0.3.1') do |p|
   p.description    = "Automatic Lossless Reduction Of All Your Images"
   p.url            = "http://github.com/grosser/#{porject_name}"
   p.author         = "Michael Grosser"

data/lib/smusher.rb

@@ -4,7 +4,6 @@ require 'json'
 
 module Smusher
   extend self
-  EMPTY_FILE_SIZE = 4
 
   # optimize the given image !!coverts gif to png!!
   def optimize_image(file)
@@ -31,7 +30,7 @@ private
 
   def write_optimized_data(file)
     data = optimized_image_data_for(file)
-    File.open(file,'w') {|f| f.puts data}
+    File.open(file,'w') {|f| f.puts data} unless data.nil?
   end
   
   def sanitize_folder(folder)
@@ -64,14 +63,14 @@ private
   end
 
   def empty?(file)
-    size(file) <= EMPTY_FILE_SIZE
+    size(file) <= 4 #empty file = 4kb
   end
 
   def with_logging(file)
     puts "sushing #{file}"
     
     before = size(file)
-    yield
+    begin; yield; rescue; puts $!; end
     after = size(file)
     
     result = "#{(100*after)/before}%"
@@ -80,9 +79,10 @@ private
 
   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']
+    response = JSON.parse(`curl -F files[]=@#{file} http://smush.it/ws.php -s`)
+    raise "smush.it: #{response['error']}" if response['error']
+    path = response['dest']
+    raise "no dest path found" unless path
     `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.3"
+  s.version = "0.3.1"
 
   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-25}
+  s.date = %q{2009-01-26}
   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/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.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", "ar.gif", "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

@@ -88,32 +88,12 @@ describe :smusher do
     it "reverts a file that got larger" do
       Smusher.send(:with_protection,@file) do
         write(File.open(@file).read + 'x')
-        @before.should_not == size
       end
       @before.should == size
     end
     
     it "reverts a file that got empty" do
-      Smusher.send(:with_protection,@file) do
-        write nil
-        size.should == Smusher::EMPTY_FILE_SIZE
-      end
-      size.should == @before
-    end
-    
-    it "reverts a file that has error-suggesting size" do
-      write("valid-file-contents")
-      @before = size
-      @before.should > Smusher::EMPTY_FILE_SIZE
-      
-      #gets overwritten by failure data size
-      Smusher.send(:with_protection,@file) do
-        write nil
-        size.should == Smusher::EMPTY_FILE_SIZE
-      end
-      
-      #and should be reverted
-      size.should_not == Smusher::EMPTY_FILE_SIZE
+      Smusher.send(:with_protection,@file){write nil}
       size.should == @before
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-smusher
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: smusher
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - spec/images/water.JPG
 - spec/reduced/fam.png
 - spec/reduced/add.png
+- ar.gif
 - bin/smusher
 - Rakefile
 - README.markdown