middleman-smusher 0.0.3 → 0.1.0

data/lib/middleman-smusher.rb

@@ -1,51 +1,28 @@
 module Middleman
   module Features
     module Smusher
-      module ThorActions
-        def smush_pngs
-          # Read cache
-          cache_file = File.join(Middleman::Server.root, ".smush-cache")
-          cache_data = if File.exists?(cache_file)
-            Marshal.restore(File.read(cache_file))
-          else
-            {}
-          end
-
-          smush_dir = File.join(Middleman::Server.build_dir, Middleman::Server.images_dir)
-
-          files = ::Smusher.class_eval do
-            images_in_folder(smush_dir)
-          end
-
-          files.each do |file|
-            ::Smusher.class_eval do
-              original_file_size = size(file)
-              return if original_file_size.zero?
-              return if cache_data[file] && cache_data[file] == original_file_size
-
-              with_logging(file, true) do
-                write_optimized_data(file)
-                cache_data[file] = size(file) # Add or update cache
-                File.open(cache_file, "w") { |f| f.write Marshal.dump(cache_data) } # Write cache
-              end
-            end
-
-            say_status :smushed, file.gsub(Middleman::Server.build_dir+"/", "")
-          end
-        end
-      end
-
       class << self
         def registered(app)
-          require "middleman/builder"
           require "smusher"
-          require "json/pure"
-
-          Middleman::Builder.send :include, ThorActions
-          Middleman::Builder.after_run "smush_pngs" do
-            smush_pngs
+          
+          app.after_build do          
+            smush_dir = File.join(app.build_dir, app.images_dir)
+          
+            files = ::Smusher.class_eval do
+              images_in_folder(smush_dir)
+            end
+          
+            files.each do |file|
+              ::Smusher.optimize_image(
+                [file],
+                { :service => 'PunyPng', :quiet => true }
+              )
+              
+              say_status :smushed, file.gsub(app.build_dir+"/", "")
+            end
           end
-        end
+        end  
+        alias :included :registered
       end
     end
   end

data/lib/middleman-smusher/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Smusher
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/middleman-smusher.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency("middleman", ["~> 1.2.0"])
-  s.add_runtime_dependency("smusher", ["~> 0.4.6"])
+  s.add_runtime_dependency("middleman", ["~> 2.0.0"])
+  s.add_runtime_dependency("smusher", ["~> 0.4.8"])
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman-smusher
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -07:00
-default_executable: 
+date: 2011-08-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: middleman
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
-        - 1
         - 2
         - 0
-        version: 1.2.0
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 0
         - 4
-        - 6
-        version: 0.4.6
+        - 8
+        version: 0.4.8
   type: :runtime
   version_requirements: *id002
 description: Compress images in your Middleman project
@@ -66,7 +65,6 @@ files:
 - lib/middleman-smusher.rb
 - lib/middleman-smusher/version.rb
 - middleman-smusher.gemspec
-has_rdoc: true
 homepage: https://github.com/tdreyno/middleman-smusher
 licenses: []
 
@@ -96,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: middleman-smusher
-rubygems_version: 1.5.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Compress images in your Middleman project