middleman-more 3.0.0.rc.4 → 3.0.0

data/lib/middleman-more/extensions/automatic_image_sizes.rb

@@ -32,25 +32,25 @@ module Middleman
         def image_tag(path, params={})
           if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
             params[:alt] ||= ""
-            http_prefix = http_images_path rescue images_dir
 
-            begin
-              real_path = File.join(source, images_dir, path)
-              full_path = File.expand_path(real_path, root)
-              http_prefix = http_images_path rescue images_dir
-              if File.exists? full_path
-                dimensions = ::FastImage.size(full_path, :raise_on_failure => true)
-                params[:width]  = dimensions[0]
-                params[:height] = dimensions[1]
+            real_path = path
+            real_path = File.join(images_dir, real_path) unless real_path =~ %r{^/}
+            full_path = File.join(source_dir, real_path)
+
+            if File.exists? full_path
+              begin
+                width, height = ::FastImage.size(full_path, :raise_on_failure => true)
+                params[:width]  = width
+                params[:height] = height
+              rescue
+                warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
               end
-            rescue
-              # $stderr.puts params.inspect
             end
           end
-      
+
           super(path, params)
         end
       end
     end
   end
-end
+end

data/lib/middleman-more/extensions/gzip.rb

@@ -19,14 +19,18 @@ module Middleman::Extensions
     class << self
       def registered(app, options={})
         exts = options[:exts] || %w(.js .css .html .htm)
-        
-        app.send :include, InstanceMethods
 
         app.after_build do |builder|
-          Find.find(self.class.inst.build_dir) do |path|
-            next if File.directory? path
-            if exts.include? File.extname(path)
-              new_size = gzip_file(path, builder)
+          
+          paths = ::Middleman::Util.all_files_under(self.class.inst.build_dir)
+          paths.each do |path|
+            next unless exts.include? path.extname
+            
+            output_filename, old_size, new_size = Middleman::Extensions::Gzip.gzip_file(path.to_s)
+ 
+            if output_filename
+              size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+              builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
             end
           end
         end
@@ -35,37 +39,33 @@ module Middleman::Extensions
       alias :included :registered
     end
 
-    module InstanceMethods
-      def gzip_file(path, builder)
-        input_file = File.open(path, 'r').read
-        output_filename = path + '.gz'
-        input_file_time = File.mtime(path)
-
-        # Check if the right file's already there
-        if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
-          return
-        end
-
-        File.open(output_filename, 'w') do |f|
-          gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
-          gz.mtime = input_file_time.to_i
-          gz.write input_file
-          gz.close
-        end
+    def self.gzip_file(path)
+      input_file = File.open(path, 'r').read
+      output_filename = path + '.gz'
+      input_file_time = File.mtime(path)
 
-        # Make the file times match, both for Nginx's gzip_static extension
-        # and so we can ID existing files. Also, so even if the GZ files are
-        # wiped out by build --clean and recreated, we won't rsync them over
-        # again because they'll end up with the same mtime.
-        File.utime(File.atime(output_filename), input_file_time, output_filename)
+      # Check if the right file's already there
+      if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
+        return
+      end
 
-        old_size = File.size(path)
-        new_size = File.size(output_filename)
+      File.open(output_filename, 'w') do |f|
+        gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+        gz.mtime = input_file_time.to_i
+        gz.write input_file
+        gz.close
+      end
 
-        size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+      # Make the file times match, both for Nginx's gzip_static extension
+      # and so we can ID existing files. Also, so even if the GZ files are
+      # wiped out by build --clean and recreated, we won't rsync them over
+      # again because they'll end up with the same mtime.
+      File.utime(File.atime(output_filename), input_file_time, output_filename)
 
-        builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
-      end
+      old_size = File.size(path)
+      new_size = File.size(output_filename)
+      
+      [output_filename, old_size, new_size]
     end
   end
 end

data/middleman-more.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("compass", [">= 0.12.2"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("coffee-script-source", ["~> 1.3.3"])
-  s.add_dependency("execjs", ["~> 1.3.2"])
+  s.add_dependency("execjs", ["~> 1.4.0"])
   s.add_dependency("maruku", ["~> 0.6.0"])
   s.add_dependency("i18n", ["~> 0.6.0"])
   s.add_dependency("padrino-helpers", ["0.10.7"])

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.4
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.4
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.4
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
@@ -604,16 +604,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4292106129124880582
+      hash: -34936377537429209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -34936377537429209
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development