middleman 1.1.1.a → 1.1.2

data/lib/middleman/features.rb

@@ -64,10 +64,6 @@ module Middleman::Features
   # will attempt to generate a `sitemap.html` file from your project.
   autoload :Slickmap,            "middleman/features/slickmap"
 
-  # SmushPngs uses Yahoo's Smush.it API to compresses PNGs and JPGs. Often times
-  # the service can decrease the size of Photoshop-exported images by 30-50%
-  autoload :SmushPngs,           "middleman/features/smush_pngs"
-
   # CodeRay is a syntax highlighter.
   autoload :CodeRay,             "middleman/features/code_ray"
 

data/lib/middleman/templates/default/config.tt

@@ -49,9 +49,6 @@ configure :build do
   # Minify Javascript on build
   # activate :minify_javascript
   
-  # Shrink/smush PNG/JPEGs on build
-  # activate :smush_pngs
-  
   # Enable cache buster
   # activate :cache_buster
 

data/lib/middleman/templates/html5/config.tt

@@ -37,9 +37,6 @@ configure :build do
   # Minify Javascript on build
   # activate :minify_javascript
   
-  # Shrink/smush PNG/JPEGs on build
-  # activate :smush_pngs
-  
   # Enable cache buster
   # activate :cache_buster
 

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.1.a"
+  VERSION = "1.1.2"
 end

data/middleman.gemspec

@@ -34,8 +34,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("compass", ["0.11.beta.6"])
   s.add_runtime_dependency("chunky_png", ["~> 1.1.0"])
   s.add_runtime_dependency("oily_png", ["~> 1.0"]) unless defined?(JRUBY_VERSION)
-  s.add_runtime_dependency("json", [">= 0"])
-  s.add_runtime_dependency("smusher", ["~> 0.4.5"])
   s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])
   s.add_runtime_dependency("less", ["~> 1.2.0"])

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 54
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  - a
-  version: 1.1.1.a
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 -07:00
+date: 2011-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -262,40 +261,10 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: smusher
-  prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
-        version: 0.4.5
-  type: :runtime
-  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: compass-slickmap
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -307,11 +276,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -323,11 +292,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -339,11 +308,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id020
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -355,11 +324,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id021
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -369,11 +338,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id022
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -383,7 +352,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id023
+  version_requirements: *id021
 description: 
 email: 
 - tdreyno@gmail.com
@@ -475,7 +444,6 @@ files:
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/slickmap.rb
 - lib/middleman/features/slickmap/template.html.haml
-- lib/middleman/features/smush_pngs.rb
 - lib/middleman/features/ugly_haml.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/sass.rb
@@ -531,14 +499,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: middleman

data/lib/middleman/features/smush_pngs.rb

@@ -1,48 +0,0 @@
-module Middleman::Features::SmushPngs
-  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
-      end
-    end
-  end
-end