smusher 0.4.2 → 0.4.4

data/README.markdown

@@ -36,6 +36,13 @@ Example
       reverted!
       ...
 
+### PunyPng - usage limit
+The default `Smusher::PunyPng.api_key` is used by all users and
+could already be full when you try to smush some images.
+
+Create a .puny_png_api_key in your home directory with your own
+api key from [PunyPng](http://www.gracepointafterfive.com/punypng).
+
 Protection
 ==========
 Any image that returns a failure code, is larger than before,
@@ -52,6 +59,7 @@ reduce images and minify css + js -> try [reduce](http://github.com/grosser/redu
 Authors
 ======
 ###Contributors
+ - [ahaller](http://ahax.de/)
  - [retr0h](http://geminstallthat.wordpress.com/)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.4

data/lib/smusher.rb

@@ -21,7 +21,7 @@ module Smusher
     service = options[:service] || 'SmushIt'
     service = eval(service)
 
-    files.each do |file|
+    Array(files).each do |file|
       check_options(options)
       puts "THIS FILE IS EMPTY!!! #{file}" and return if size(file).zero?
       success = false

data/lib/smusher/puny_png.rb

@@ -1,17 +1,32 @@
 module Smusher
   class PunyPng
+    DEFAULT_API_KEY = '97b8b70fc59768979e2a0bdaf19df4dfa5536ed4'
+
+    @@api_key = nil
+    def self.api_key=(x); @@api_key = x; end
+    def self.api_key
+      @@api_key ||= (personal_key || DEFAULT_API_KEY)
+    end
+
     def self.converts_gif_to_png?
       false
     end
 
     def self.optimized_image_data_for(file)
-      url = 'http://www.gracepointafterfive.com/punypng_staging/api/optimize'
-      response = HTTPClient.post url, { 'img' => File.new(file), 'key' => 'd1b72ab4813da6b69e1d6018303ac690c014599d'}
+      url = 'http://www.gracepointafterfive.com/punypng/api/optimize'
+      response = HTTPClient.post url, { 'img' => File.new(file), 'key' => api_key}
       response = JSON.parse(response.body.content)
       raise "puny_png: #{response['error']}" if response['error']
       image_url = response['optimized_url']
       raise "no optimized_url found" unless image_url
       open(image_url) { |source| source.read() }
     end
+
+    private
+
+    def self.personal_key
+      key = `cat ~/.puny_png_api_key`.strip
+      key.empty? ? nil : key
+    end
   end
 end

data/smusher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smusher}
-  s.version = "0.4.2"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-11-22}
+  s.date = %q{2010-03-23}
   s.default_executable = %q{smusher}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["smusher"]
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/smusher}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Automatic Lossless Reduction Of All Your Images}
   s.test_files = [
     "spec/spec_helper.rb",

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
-# ---- requirements
 require 'rubygems'
-require 'spec'
 
 $LOAD_PATH << 'lib'
 require 'smusher'
 
+# separate key for testing
+Smusher::PunyPng.api_key = '3cbb0102ca6d000370f2d5b34ca0125d67b801dc'
+
 ROOT = File.expand_path(File.dirname(__FILE__))

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: smusher
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,39 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +01:00
 default_executable: smusher
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: grosser.michael@gmail.com
 executables: 
@@ -90,18 +101,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Automatic Lossless Reduction Of All Your Images