smusher 0.4.5 → 0.4.6

data/{README.markdown → Readme.md}

@@ -61,7 +61,8 @@ Authors
 ###Contributors
  - [ahaller](http://ahax.de/)
  - [retr0h](http://geminstallthat.wordpress.com/)
+ - [Nate Pickens](http://github.com/npickens)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...
+Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/smusher.rb

@@ -24,16 +24,9 @@ module Smusher
     Array(files).each do |file|
       check_options(options)
       puts "THIS FILE IS EMPTY!!! #{file}" and return if size(file).zero?
-      success = false
 
       with_logging(file,options[:quiet]) do
         write_optimized_data(file, service)
-        success = true
-      end
-
-      if success and service.converts_gif_to_png?
-        gif = /\.gif$/
-        `mv #{file} #{file.sub(gif,'.png')}` if file =~ gif
       end
     end
   end
@@ -62,7 +55,11 @@ module Smusher
     raise "Error: empty file downloaded" if optimized.size < MINIMUM_IMAGE_SIZE
     raise "cannot be optimized further" if size(file) == optimized.size
 
-    File.open(file,'w') {|f| f.write optimized}
+    File.open(file,'wb') {|f| f.write optimized}
+
+    if service.converts_gif_to_png? && File.extname(file) == ".gif" && optimized[0..2] != "GIF"
+      `mv #{file} #{file.sub(/.gif$/, '.png')}`
+    end
   end
 
   def sanitize_folder(folder)

data/smusher.gemspec

@@ -5,21 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smusher}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-08-20}
+  s.date = %q{2010-09-10}
   s.default_executable = %q{smusher}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["smusher"]
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
   s.files = [
     ".gitignore",
-     "README.markdown",
      "Rakefile",
+     "Readme.md",
      "VERSION",
      "bin/smusher",
      "lib/smusher.rb",

data/spec/smusher/puny_png_spec.rb

@@ -1,10 +1,10 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Smusher::PunyPng do
   describe :optimized_image_data_for do
     it "loads the reduced image" do
       original = File.join(ROOT,'images','add.png')
-      reduced = File.read(File.join(ROOT, 'reduced', 'add_puny.png'))
+      reduced = File.open(File.join(ROOT, 'reduced', 'add_puny.png'), 'rb').read
       received = Smusher::PunyPng.optimized_image_data_for(original)
       received.should == reduced
     end

data/spec/smusher/smush_it_spec.rb

@@ -1,10 +1,10 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Smusher::SmushIt do
   describe :optimized_image_data_for do
     it "loads the reduced image" do
       original = File.join(ROOT,'images','add.png')
-      reduced = File.open(File.join(ROOT,'reduced','add.png')).read
+      reduced = File.open(File.join(ROOT,'reduced','add.png'), 'rb').read
       received = Smusher::SmushIt.optimized_image_data_for(original)
       received.should == reduced
     end

data/spec/smusher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe :smusher do
   def copy(image_name)
@@ -32,7 +32,7 @@ describe :smusher do
       file = File.join(@out, 'add.png')
       Smusher.optimize_image file
       # pure File.read() will omit trailing \n
-      File.readlines(file).last.split('').last.should_not == "\n" 
+      File.readlines(file).last[-1].should_not == "\n"
     end
 
     it "can be called with an array of files" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: smusher
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ executables:
 - smusher
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- README.markdown
 - Rakefile
+- Readme.md
 - VERSION
 - bin/smusher
 - lib/smusher.rb