middleman-more 3.1.0.beta.1 → 3.1.0.beta.2

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

@@ -1,58 +1,42 @@
-# Extensions namespace
-module Middleman
-  module Extensions
+# Automatic Image Sizes extension
+class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
 
-    # Automatic Image Sizes extension
-    module AutomaticImageSizes
+  def initialize(app, options_hash={}, &block)
+    super
 
-      # Setup extension
-      class << self
-
-        # Once registered
-        def registered(app)
-          # Include 3rd-party fastimage library
-          require "middleman-more/extensions/automatic_image_sizes/fastimage"
-
-          # Include methods
-          app.send :include, InstanceMethods
-        end
-
-        alias :included :registered
-      end
-
-      # Automatic Image Sizes Instance Methods
-      module InstanceMethods
-
-        # Override default image_tag helper to automatically calculate and include
-        # image dimensions.
-        #
-        # @param [String] path
-        # @param [Hash] params
-        # @return [String]
-        def image_tag(path, params={})
-          if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
-            params[:alt] ||= ""
-
-            real_path = path
-            real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
-            full_path = File.join(source_dir, real_path)
+    # Include 3rd-party fastimage library
+    require "middleman-more/extensions/automatic_image_sizes/fastimage"
+  end
 
-            if File.exists?(full_path)
-              begin
-                width, height = ::FastImage.size(full_path, :raise_on_failure => true)
-                params[:width]  = width
-                params[:height] = height
-              rescue FastImage::UnknownImageType
-                # No message, it's just not supported
-              rescue
-                warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
-              end
-            end
+  helpers do
+    # Override default image_tag helper to automatically calculate and include
+    # image dimensions.
+    #
+    # @param [String] path
+    # @param [Hash] params
+    # @return [String]
+    def image_tag(path, params={})
+      if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
+        params[:alt] ||= ""
+
+        real_path = path
+        real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
+        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 FastImage::UnknownImageType
+            # No message, it's just not supported
+          rescue
+            warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
           end
-
-          super(path, params)
         end
       end
+
+      super(path, params)
     end
   end
 end

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

@@ -1,70 +1,55 @@
-# Extension namespace
-module Middleman
-  module Extensions
-
-    # The Cache Buster extension
-    module CacheBuster
-
-      # Setup extension
-      class << self
-
-        # Once registered
-        def registered(app)
-          # Add instance methods to context
-          app.send :include, InstanceMethods
-
-          # After compass is setup, make it use the registered cache buster
-          app.compass_config do |config|
-            config.asset_cache_buster do |path, real_path|
-              real_path = real_path.path if real_path.is_a? File
-              real_path = real_path.gsub(File.join(root, build_dir), source)
-              if File.readable?(real_path)
-                File.mtime(real_path).strftime("%s")
-              else
-                logger.warn "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
-              end
-            end
-          end
+# The Cache Buster extension
+class Middleman::Extensions::CacheBuster < ::Middleman::Extension
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    # After compass is setup, make it use the registered cache buster
+    app.compass_config do |config|
+      config.asset_cache_buster do |path, real_path|
+        real_path = real_path.path if real_path.is_a? File
+        real_path = real_path.gsub(File.join(root, build_dir), source)
+        if File.readable?(real_path)
+          File.mtime(real_path).strftime("%s")
+        else
+          logger.warn "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
         end
-        alias :included :registered
       end
+    end
+  end
 
-      # Cache buster instance methods
-      module InstanceMethods
+  helpers do 
+    # asset_url override if we're using cache busting
+    # @param [String] path
+    # @param [String] prefix
+    def asset_url(path, prefix="")
+      http_path = super
+
+      if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
+        http_path
+      else
+        if respond_to?(:http_images_path) && prefix == http_images_path
+          prefix = images_dir
+        end
 
-        # asset_url override if we're using cache busting
-        # @param [String] path
-        # @param [String] prefix
-        def asset_url(path, prefix="")
-          http_path = super
+        real_path_static = File.join(prefix, path)
 
-          if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
-            http_path
+        if build?
+          real_path_dynamic = File.join(build_dir, prefix, path)
+          real_path_dynamic = File.expand_path(real_path_dynamic, root)
+          http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
+        elsif resource = sitemap.find_resource_by_path(real_path_static)
+          if !resource.template?
+            http_path << "?" + File.mtime(resource.source_file).strftime("%s")
           else
-            if respond_to?(:http_images_path) && prefix == http_images_path
-              prefix = images_dir
-            end
-
-            real_path_static = File.join(prefix, path)
-
-            if build?
-              real_path_dynamic = File.join(build_dir, prefix, path)
-              real_path_dynamic = File.expand_path(real_path_dynamic, root)
-              http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
-            elsif resource = sitemap.find_resource_by_path(real_path_static)
-              if !resource.template?
-                http_path << "?" + File.mtime(resource.source_file).strftime("%s")
-              else
-                # It's a template, possible with partials. We can't really
-                # know when it's updated, so generate fresh cache buster every
-                # time during developement
-                http_path << "?" + Time.now.strftime("%s")
-              end
-            end
-
-            http_path
+            # It's a template, possible with partials. We can't really
+            # know when it's updated, so generate fresh cache buster every
+            # time during developement
+            http_path << "?" + Time.now.strftime("%s")
           end
         end
+
+        http_path
       end
     end
   end

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

@@ -1,54 +1,24 @@
-# Extensions namespace
-module Middleman
-  module Extensions
-
-    # Directory Indexes extension
-    module DirectoryIndexes
-
-      # Setup extension
-      class << self
-
-        # Once registered
-        def registered(app)
-          app.after_configuration do
-            sitemap.register_resource_list_manipulator(
-              :directory_indexes,
-              DirectoryIndexManager.new(self)
-            )
-          end
-        end
-
-        alias :included :registered
-      end
-
-      # Central class for managing the directory indexes extension
-      class DirectoryIndexManager
-        def initialize(app)
-          @app = app
-        end
-
-        # Update the main sitemap resource list
-        # @return [void]
-        def manipulate_resource_list(resources)
-          index_file = @app.index_file
-          new_index_path = "/#{index_file}"
-
-          resources.each do |resource|
-            # Check if it would be pointless to reroute
-            next if resource.destination_path == index_file ||
-                    resource.destination_path.end_with?(new_index_path) ||
-                    File.extname(index_file) != resource.ext
-
-            # Check if frontmatter turns directory_index off
-            next if resource.data[:directory_index] == false
-
-            # Check if file metadata (options set by "page" in config.rb) turns directory_index off
-            next if resource.metadata[:options][:directory_index] == false
-
-            resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
-          end
-        end
-      end
+# Directory Indexes extension
+class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
+  # Update the main sitemap resource list
+  # @return [void]
+  def manipulate_resource_list(resources)
+    index_file = app.index_file
+    new_index_path = "/#{index_file}"
+
+    resources.each do |resource|
+      # Check if it would be pointless to reroute
+      next if resource.destination_path == index_file ||
+              resource.destination_path.end_with?(new_index_path) ||
+              File.extname(index_file) != resource.ext
+
+      # Check if frontmatter turns directory_index off
+      next if resource.data[:directory_index] == false
+
+      # Check if file metadata (options set by "page" in config.rb) turns directory_index off
+      next if resource.metadata[:options][:directory_index] == false
+
+      resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
     end
   end
 end

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

@@ -1,73 +1,70 @@
-require 'zlib'
-require 'stringio'
-require 'find'
+# This extension Gzips assets and pages when building.
+# Gzipped assets and pages can be served directly by Apache or
+# Nginx with the proper configuration, and pre-zipping means that we
+# can use a more agressive compression level at no CPU cost per request.
+#
+# Use Nginx's gzip_static directive, or AddEncoding and mod_rewrite in Apache
+# to serve your Gzipped files whenever the normal (non-.gz) filename is requested.
+#
+# Pass the :exts options to customize which file extensions get zipped (defaults
+# to .html, .htm, .js and .css.
+#
+class Middleman::Extensions::Gzip < ::Middleman::Extension
+  option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
 
-module Middleman::Extensions
+  def initialize(app, options_hash={})
+    super
+    
+    require 'zlib'
+    require 'stringio'
+    require 'find'
 
-  # This extension Gzips assets and pages when building.
-  # Gzipped assets and pages can be served directly by Apache or
-  # Nginx with the proper configuration, and pre-zipping means that we
-  # can use a more agressive compression level at no CPU cost per request.
-  #
-  # Use Nginx's gzip_static directive, or AddEncoding and mod_rewrite in Apache
-  # to serve your Gzipped files whenever the normal (non-.gz) filename is requested.
-  #
-  # Pass the :exts options to customize which file extensions get zipped (defaults
-  # to .html, .htm, .js and .css.
-  #
-  class Gzip < ::Middleman::Extension
-    option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
+    gzip_ext = self
 
-    def initialize(app, options_hash={})
-      super
+    app.after_build do |builder|
+      paths = ::Middleman::Util.all_files_under(self.class.inst.build_dir)
+      paths.each do |path|
+        next unless gzip_ext.options.exts.include? path.extname
 
-      gzip_ext = self
+        output_filename, old_size, new_size = gzip_ext.gzip_file(path.to_s)
 
-      app.after_build do |builder|
-        paths = ::Middleman::Util.all_files_under(self.class.inst.build_dir)
-        paths.each do |path|
-          next unless gzip_ext.options.exts.include? path.extname
-
-          output_filename, old_size, new_size = gzip_ext.gzip_file(path.to_s)
-
-          if output_filename
-            size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
-            old_locale = I18n.locale
-            I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
-            builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
-            I18n.locale = old_locale
-          end
+        if output_filename
+          size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+          old_locale = I18n.locale
+          I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
+          builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
+          I18n.locale = old_locale
         end
       end
     end
+  end
 
-    def gzip_file(path)
-      input_file = File.open(path, 'rb').read
-      output_filename = path + '.gz'
-      input_file_time = File.mtime(path)
+  def gzip_file(path)
+    input_file = File.open(path, 'rb').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
+    # 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, 'wb') do |f|
-        gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
-        gz.mtime = input_file_time.to_i
-        gz.write input_file
-        gz.close
-      end
+    File.open(output_filename, 'wb') do |f|
+      gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+      gz.mtime = input_file_time.to_i
+      gz.write input_file
+      gz.close
+    end
 
-      # 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)
+    # 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)
 
-      old_size = File.size(path)
-      new_size = File.size(output_filename)
+    old_size = File.size(path)
+    new_size = File.size(output_filename)
 
-      [output_filename, old_size, new_size]
-    end
+    [output_filename, old_size, new_size]
   end
 end