grosser-smusher 0.3.3 → 0.3.4

data/README.markdown

@@ -11,15 +11,17 @@ Solution
 
 Install
 =======
-    install ruby + rubygems + curl
+    install ruby + rubygems
+    sudo gem install httpclient
     sudo gem install grosser-smusher --source http://gems.github.com/
 
 Usage
 =====
 Optimize a single image or a whole folder in the cloud.
 
-converting gif`s to png`s:
- - called with a folder gif`s will not be converted
+converting gif-s to png-s:
+
+ - called with a folder gif-s will not be converted
  - called on a singe .gif, it will be converted if it is optimizeable
 
 Usage:
@@ -39,13 +41,13 @@ or is empty will not be saved.
 Example
 ======
     smusher /apps/ts/public/images
-      sushing /apps/rs/public/images/social/facebook_icon.png
+      smushing /apps/rs/public/images/social/facebook_icon.png
       2887 -> 132                              = 4%
 
-      sushing /apps/rs/public/images/social/myspace_icon.png
+      smushing /apps/rs/public/images/social/myspace_icon.png
       3136 -> 282                              = 8%
 
-      sushing /apps/rs/public/images/dvd/dvd_1.png
+      smushing /apps/rs/public/images/dvd/dvd_1.png
       5045 -> 4                                = 0%
       reverted!
       ...
@@ -53,11 +55,15 @@ Example
 TODO
 ====
  - only optimize 'new' images -> save time when doing on each deploy
- - use ruby library rather than curl
- - support `smusher images/*.png` ?
+ - support wildcars like `smusher images/*.png` ?
+ - convert gifs to png, even if the new size is the same, for consistency (atm only those which get smaller are converted)
+
+ALTERNATIVES
+============
+If you want to lossless reduce images and minify css + js, try [reduce](http://github.com/grosser/reduce).
 
 Author
 ======
 Michael Grosser  
 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.yml

@@ -0,0 +1,4 @@
+---
+:major: 0
+:minor: 3
+:patch: 4

data/lib/smusher.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'rake'
 require 'json'
+require 'open-uri'
+require 'httpclient'
 
 module Smusher
   extend self
@@ -13,7 +15,7 @@ module Smusher
     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)
       success = true
@@ -44,14 +46,14 @@ private
 
   def write_optimized_data(file)
     optimized = optimized_image_data_for(file)
-    
+
     raise "Error: got larger" if size(file) < optimized.size
     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.puts optimized}
   end
-  
+
   def sanitize_folder(folder)
     folder.sub(%r[/$],'')#remove tailing slash
   end
@@ -63,18 +65,18 @@ private
     images.map! {|ext| "#{folder}/**/*.#{ext}"}
     FileList[*images]
   end
-  
+
   def size(file)
     File.exist?(file) ? File.size(file) : 0
   end
 
   def with_logging(file,quiet)
     puts "smushing #{file}" unless quiet
-    
+
     before = size(file)
     begin; yield; rescue; puts $! unless quiet; end
     after = size(file)
-    
+
     unless quiet
       result = "#{(100*after)/before}%"
       puts "#{before} -> #{after}".ljust(40) + " = #{result}"
@@ -83,11 +85,10 @@ private
   end
 
   def optimized_image_data_for(file)
-    #TODO use rest-client --> independent of curl
-    response = JSON.parse(`curl -F files[]=@#{file} http://smush.it/ws.php -s`)
+    response = JSON.parse((HTTPClient.post 'http://smush.it/ws.php', { 'files[]' => File.new(file) }).body.content)
     raise "smush.it: #{response['error']}" if response['error']
     path = response['dest']
     raise "no dest path found" unless path
-    `curl http://smush.it/#{path} -s`
+    open("http://smush.it/#{path}") { |source| source.read() }
   end
-end
+end

data/spec/smusher_spec.rb

@@ -9,17 +9,18 @@ describe :smusher do
   def size
     File.size(@file)
   end
-  
+
   before do
     #prepare output folder
     @out = File.join(ROOT,'out')
     FileUtils.rm_r @out, :force=>true
     FileUtils.mkdir @out
     copy 'people.jpg'
-    
+    copy 'ad.gif'
+
     @file = File.join(@out,'people.jpg')
   end
-  
+
   describe :optimize_image do
     it "stores the image in an reduced size" do
       original_size = size
@@ -47,18 +48,28 @@ describe :smusher do
       Smusher.optimize_image(@file)
       size.should == original_size
     end
-  
+
     describe "gif handling" do
       before do
         copy 'logo.gif'
         @file = File.join(@out,'logo.gif')
         @file_png = File.join(@out,'logo.png')
       end
+
+      pending_it "converts gifs to png even if they have the same size" do
+        copy 'ad.gif'
+        file = File.join(@out,'ad.gif')
+        original_size = size
+        Smusher.optimize_image(file)
+        File.size(File.join(@out,'ad.png')).should == original_size
+      end
+
       it "stores converted .gifs in .png files" do
         Smusher.optimize_image(@file)
         File.exist?(@file).should == false
         File.exist?(@file_png).should == true
       end
+
       it "does not rename gifs, if optimizing failed" do
         Smusher.expects(:optimized_image_data_for).returns File.read(@file)
         Smusher.optimize_image(@file)
@@ -66,7 +77,7 @@ describe :smusher do
         File.exist?(@file_png).should == false
       end
     end
-  
+
     describe 'options' do
       it "does not produce output when :quiet is given" do
         $stdout.expects(:write).never
@@ -78,7 +89,7 @@ describe :smusher do
       end
     end
   end
-  
+
   describe :optimize_images_in_folder do
     before do
       FileUtils.rm @file
@@ -87,9 +98,9 @@ describe :smusher do
         copy image_name
         @files << File.join(@out,image_name)
       end
-      @before = @files.map {|f|File.size(f)} 
+      @before = @files.map {|f|File.size(f)}
     end
-    
+
     it "optimizes all images" do
       Smusher.optimize_images_in_folder(@out)
       new_sizes = @files.map {|f|File.size(f)}
@@ -108,17 +119,17 @@ describe :smusher do
       File.exist?(File.join(@out,'logo.png')).should == true
     end
   end
-  
+
   describe :sanitize_folder do
     it "cleans a folders trailing slash" do
       Smusher.send(:sanitize_folder,"xx/").should == 'xx'
     end
-    
+
     it "does not clean if there is no trailing slash" do
       Smusher.send(:sanitize_folder,"/x/ccx").should == '/x/ccx'
     end
   end
-  
+
   describe :images_in_folder do
     it "finds all non-gif images" do
       folder = File.join(ROOT,'images')
@@ -126,22 +137,22 @@ describe :smusher do
       result = Smusher.send(:images_in_folder,folder)
       (all+result).uniq.size.should == all.size
     end
-    
+
     it "finds nothing if folder is empty" do
       Smusher.send(:images_in_folder,File.join(ROOT,'empty')).should == []
     end
   end
-  
+
   describe :size do
     it "find the size of a file" do
       Smusher.send(:size,@file).should == File.size(@file)
     end
-    
+
     it "returns 0 for missing file" do
       Smusher.send(:size,File.join(ROOT,'xxxx','dssdfsddfs')).should == 0
     end
   end
-  
+
   describe :logging do
     it "yields" do
       val = 0
@@ -149,7 +160,7 @@ describe :smusher do
       val.should == 1
     end
   end
-  
+
   describe :optimized_image_data_for do
     it "loads the reduced image" do
       original = File.join(ROOT,'images','add.png')
@@ -158,4 +169,4 @@ describe :smusher do
       received.should == reduced
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -11,15 +11,9 @@ Spec::Runner.configure do |config|
 end
 
 
-# ---- bugfix
-#`exit?': undefined method `run?' for Test::Unit:Module (NoMethodError)
-#can be solved with require test/unit but this will result in extra test-output
-unless defined? Test::Unit
-  module Test
-    module Unit
-      def self.run?
-        true
-      end
-    end
+# ---- Helpers
+def pending_it(text,&block)
+  it text do
+    pending(&block)
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-smusher
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2009-01-29 15:00:00 -08:00
-default_executable: 
+cert_chain: []
+
+date: 2009-03-13 00:00:00 -07:00
+default_executable: smusher
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -32,8 +33,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
+  name: httpclient
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,44 +42,42 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Automatic Lossless Reduction Of All Your Images
+description: 
 email: grosser.michael@gmail.com
 executables: 
 - smusher
 extensions: []
 
-extra_rdoc_files: 
-- bin/smusher
-- lib/smusher.rb
-- README.markdown
+extra_rdoc_files: []
+
 files: 
+- VERSION.yml
+- README.markdown
 - bin/smusher
 - lib/smusher.rb
-- README.markdown
-- spec/reduced/fam.png
-- spec/reduced/add.png
-- spec/images/drink_empty.png
+- spec/out
+- spec/out/ad.gif
+- spec/out/people.jpg
+- spec/empty
+- spec/spec_helper.rb
+- spec/smusher_spec.rb
+- spec/images
 - spec/images/logo.gif
-- spec/images/people.jpg
-- spec/images/add.png
 - spec/images/woman.jpeg
+- spec/images/add.png
+- spec/images/drink_empty.png
+- spec/images/ad.gif
+- spec/images/people.jpg
 - spec/images/water.JPG
-- spec/smusher_spec.rb
-- spec/out/people.jpg
-- spec/spec_helper.rb
-- Manifest
-- Rakefile
-- smusher.gemspec
+- spec/reduced
+- spec/reduced/fam.png
+- spec/reduced/add.png
 has_rdoc: true
 homepage: http://github.com/grosser/smusher
 post_install_message: 
 rdoc_options: 
-- --line-numbers
 - --inline-source
-- --title
-- Smusher
-- --main
-- README.markdown
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,11 +90,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
-rubyforge_project: smusher
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2

data/Rakefile

@@ -1,21 +0,0 @@
-desc "Run all specs in spec directory"
-task :test do |t|
-  require 'spec'
-  options = "--colour --format progress --loadby --reverse"
-  files = FileList['spec/**/*_spec.rb']
-  system("spec #{options} #{files}")
-end
-
-#Gemspec
-require 'echoe'
-project_name = 'smusher'
-Echoe.new(project_name , '0.3.3') do |p|
-  p.description    = "Automatic Lossless Reduction Of All Your Images"
-  p.url            = "http://github.com/grosser/#{project_name}"
-  p.author         = "Michael Grosser"
-  p.email          = "grosser.michael@gmail.com"
-  p.ignore_pattern = ["nbproject/*", "nbproject/*/*"]
-  p.dependencies   = %w[rake json]
-end
-
-task :update_gemspec => [:manifest, :build_gemspec]

data/smusher.gemspec

@@ -1,106 +0,0 @@
-
-# Gem::Specification for Smusher-0.3.3
-# Originally generated by Echoe
-
---- !ruby/object:Gem::Specification 
-name: smusher
-version: !ruby/object:Gem::Version 
-  version: 0.3.3
-platform: ruby
-authors: 
-- Michael Grosser
-autorequire: 
-bindir: bin
-
-date: 2009-01-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: Automatic Lossless Reduction Of All Your Images
-email: grosser.michael@gmail.com
-executables: 
-- smusher
-extensions: []
-
-extra_rdoc_files: 
-- bin/smusher
-- lib/smusher.rb
-- README.markdown
-files: 
-- bin/smusher
-- lib/smusher.rb
-- README.markdown
-- spec/reduced/fam.png
-- spec/reduced/add.png
-- spec/images/drink_empty.png
-- spec/images/logo.gif
-- spec/images/people.jpg
-- spec/images/add.png
-- spec/images/woman.jpeg
-- spec/images/water.JPG
-- spec/smusher_spec.rb
-- spec/out/people.jpg
-- spec/spec_helper.rb
-- Manifest
-- Rakefile
-- smusher.gemspec
-has_rdoc: true
-homepage: http://github.com/grosser/smusher
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Smusher
-- --main
-- README.markdown
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
-
-rubyforge_project: smusher
-rubygems_version: 1.3.1
-specification_version: 2
-summary: Automatic Lossless Reduction Of All Your Images
-test_files: []