middleman-more 3.0.0 → 3.0.1.pre

data/lib/middleman-more/core_extensions/default_helpers.rb

@@ -8,7 +8,7 @@ module Middleman
         # @private
         def registered(app)
           require 'padrino-helpers'
-      
+
           app.helpers ::Padrino::Helpers::OutputHelpers
           app.helpers ::Padrino::Helpers::TagHelpers
           app.helpers ::Padrino::Helpers::AssetTagHelpers
@@ -124,7 +124,7 @@ module Middleman
           if url = args[url_arg_index]
             options = args[options_index] || {}
             relative = options.delete(:relative)
-            
+
             # Handle Resources, which define their own url method
             if url.respond_to? :url
               args[url_arg_index] = url.url
@@ -139,7 +139,7 @@ module Middleman
               url = current_source_dir.join(path).to_s if path.relative?
 
               resource = sitemap.find_resource_by_path(url)
-              
+
               # Allow people to turn on relative paths for all links with set :relative_links, true
               # but still override on a case by case basis with the :relative parameter.
               effective_relative = relative || false

data/lib/middleman-more/core_extensions/i18n.rb

@@ -1,45 +1,49 @@
 module Middleman
   module CoreExtensions
-    
+
     # i18n Namespace
     module Internationalization
 
       # Setup extension
       class << self
-    
+
         # Once registerd
         def registered(app, options={})
           app.set :locales_dir, "locales"
-      
+
           # Needed for helpers as well
           app.after_configuration do
             ::I18n.load_path += Dir[File.join(root, locales_dir, "*.yml")]
             ::I18n.reload!
-            
+
             Localizer.new(self, options)
           end
         end
         alias :included :registered
       end
-  
+
+      # Central class for managing i18n extension
       class Localizer
+        attr_reader :app
+        delegate :logger, :to => :app
+
         def initialize(app, options={})
           @app = app
           @maps = {}
           @options = options
-      
+
           @lang_map      = @options[:lang_map]      || {}
           @path          = @options[:path]          || "/:locale/"
           @templates_dir = @options[:templates_dir] || "localizable"
           @mount_at_root = @options.has_key?(:mount_at_root) ? @options[:mount_at_root] : langs.first
-      
+
           if !@app.build?
-            puts "== Locales: #{langs.join(", ")}"
+            logger.info "== Locales: #{langs.join(", ")}"
           end
-      
+
           # Don't output localizable files
           @app.ignore File.join(@templates_dir, "**")
-      
+
           @app.sitemap.provides_metadata_for_path do |url|
             if d = get_localization_data(url)
               lang, page_id = d
@@ -53,44 +57,44 @@ module Middleman
               {}
             end
           end
-      
+
           @app.sitemap.register_resource_list_manipulator(
             :i18n,
             self
           )
         end
-    
+
         def langs
           @options[:langs] || begin
-            Dir[File.join(@app.root, @app.locales_dir, "*.yml")].map { |file| 
-              File.basename(file).gsub(".yml", "") 
+            Dir[File.join(@app.root, @app.locales_dir, "*.yml")].map { |file|
+              File.basename(file).gsub(".yml", "")
             }.sort.map(&:to_sym)
           end
         end
-    
+
         def get_localization_data(path)
           @_localization_data ||= {}
           @_localization_data[path]
         end
-    
+
         # Update the main sitemap resource list
         # @return [void]
         def manipulate_resource_list(resources)
           @_localization_data = {}
-      
+
           new_resources = []
-      
+
           resources.each do |resource|
             next unless File.fnmatch(File.join(@templates_dir, "**"), resource.path)
-        
+
             page_id = File.basename(resource.path, File.extname(resource.path))
-      
+
             langs.map do |lang|
               ::I18n.locale = lang
-        
+
               localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id)
               path = resource.path.sub(@templates_dir, "")
-          
+
               # Build lang path
               if @mount_at_root == lang
                 prefix = "/"
@@ -98,23 +102,23 @@ module Middleman
                 replacement = @lang_map.has_key?(lang) ? @lang_map[lang] : lang
                 prefix = @path.sub(":locale", replacement.to_s)
               end
-          
+
               path = ::Middleman::Util.normalize_path(
                 File.join(prefix, path.sub(page_id, localized_page_id))
               )
-          
+
               @_localization_data[path] = [lang, path, localized_page_id]
-          
+
               p = ::Middleman::Sitemap::Resource.new(
                 @app.sitemap,
                 path
               )
               p.proxy_to(resource.path)
-          
+
               new_resources << p
             end
           end
-      
+
           resources + new_resources
         end
       end

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

@@ -5,13 +5,13 @@ module Middleman
         def registered(app, options={})
           require 'digest/sha1'
           exts = options[:exts] || %w(.jpg .jpeg .png .gif .js .css)
-        
+
           # Allow specifying regexes to ignore, plus always ignore apple touch icons
           ignore = Array(options[:ignore]) << /^apple-touch-icon/
 
           app.ready do
             sitemap.register_resource_list_manipulator(
-              :asset_hash, 
+              :asset_hash,
               AssetHashManager.new(self, exts, ignore)
             )
             use Middleware, :exts => exts, :middleman_app => self, :ignore => ignore
@@ -20,20 +20,21 @@ module Middleman
         alias :included :registered
       end
 
+      # Central class for managing asset_hash extension
       class AssetHashManager
         def initialize(app, exts, ignore)
           @app = app
           @exts = exts
           @ignore = ignore
         end
-      
+
         # Update the main sitemap resource list
         # @return [void]
         def manipulate_resource_list(resources)
           resources.each do |resource|
             next unless @exts.include? resource.ext
             next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
-              
+
             if resource.template? # if it's a template, render it out
               digest = Digest::SHA1.hexdigest(resource.render)[0..7]
             else # if it's a static file, just hash it
@@ -70,17 +71,17 @@ module Middleman
               body.gsub! /([=\'\"\(]\s*)([^\s\'\"\)]+(#{@exts_regex_text}))/ do |match|
                 opening_character = $1
                 asset_path = $2
-                
+
                 relative_path = Pathname.new(asset_path).relative?
 
                 asset_path = dirpath.join(asset_path).to_s if relative_path
-                
+
                 if @ignore.any? { |r| asset_path.match(r) }
                   match
                 elsif asset_page = @middleman_app.sitemap.find_resource_by_path(asset_path)
                   replacement_path = "/#{asset_page.destination_path}"
                   replacement_path = Pathname.new(replacement_path).relative_path_from(dirpath).to_s if relative_path
-                  
+
                   "#{opening_character}#{replacement_path}"
                 else
                   match

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

@@ -1,28 +1,28 @@
 # Extensions namespace
 module Middleman
   module Extensions
-  
+
     # Asset Host module
     module AssetHost
-    
+
       # Setup extension
       class << self
-      
+
         # Once registered
         def registered(app)
           # Default to no host
           app.set :asset_host, false
-      
+
           # Include methods
           app.send :include, InstanceMethods
         end
-      
+
         alias :included :registered
       end
-  
+
       # Asset Host Instance Methods
       module InstanceMethods
-      
+
         # Override default asset url helper to include asset hosts
         #
         # @param [String] path
@@ -37,10 +37,10 @@ module Middleman
           elsif asset_host.is_a?(String)
             asset_host
           end
-        
+
           File.join(asset_prefix, original_output)
         end
       end
     end
   end
-end
+end

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

@@ -1,13 +1,13 @@
 # Extensions namespace
 module Middleman
   module Extensions
-  
+
     # Automatic Image Sizes extension
     module AutomaticImageSizes
-    
+
       # Setup extension
       class << self
-      
+
         # Once registered
         def registered(app)
           # Include 3rd-party fastimage library
@@ -16,13 +16,13 @@ module Middleman
           # 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.
         #

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

@@ -3,7 +3,7 @@
 # It does this by using a feature of Net::HTTP that yields strings from the resource being fetched
 # as soon as the packets arrive.
 #
-# No external libraries such as ImageMagick are used here, this is a very lightweight solution to 
+# No external libraries such as ImageMagick are used here, this is a very lightweight solution to
 # finding image information.
 #
 # FastImage knows about GIF, JPEG, BMP and PNG files.
@@ -47,7 +47,7 @@ class FastImage
   end
 
   DefaultTimeout = 2
-  
+
   LocalFileChunkSize = 256
 
   # Returns an array containing the width and height of the image.
@@ -148,7 +148,7 @@ class FastImage
       end
     end
     raise SizeNotFound if options[:raise_on_failure] && @property == :size && !@size
-  rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET, 
+  rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET,
     ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT
     raise ImageFetchFailure if options[:raise_on_failure]
   rescue NoMethodError  # 1.8.7p248 can raise this due to a net/http bug
@@ -192,7 +192,7 @@ class FastImage
     @strpos = 0
     begin
       result = send("parse_#{@property}")
-      if result 
+      if result
         instance_variable_set("@#{@property}", result)
         true
       end
@@ -257,7 +257,7 @@ class FastImage
         get_chars(2)
         :started
       when :started
-        get_byte == 0xFF ? :sof : :started          
+        get_byte == 0xFF ? :sof : :started
       when :sof
         c = get_byte
         if (0xe0..0xef).include?(c)
@@ -284,4 +284,4 @@ class FastImage
     d = get_chars(29)[14..28]
     d.unpack("C")[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
   end
-end
+end

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

@@ -1,37 +1,37 @@
 # 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") 
+                File.mtime(real_path).strftime("%s")
               else
-                $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+                logger.warn "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
               end
             end
           end
         end
         alias :included :registered
       end
-  
+
       # Cache buster instance methods
       module InstanceMethods
-      
+
         # asset_url override if we're using cache busting
         # @param [String] path
         # @param [String] prefix
@@ -46,7 +46,7 @@ module Middleman
             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)
@@ -61,11 +61,11 @@ module Middleman
                 http_path << "?" + Time.now.strftime("%s")
               end
             end
-        
+
             http_path
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,18 +1,18 @@
 # Extensions namespace
 module Middleman
   module Extensions
-  
+
     # Directory Indexes extension
     module DirectoryIndexes
-    
+
       # Setup extension
       class << self
-      
+
         # Once registered
         def registered(app)
           app.ready do
             sitemap.register_resource_list_manipulator(
-              :directory_indexes, 
+              :directory_indexes,
               DirectoryIndexManager.new(self)
             )
           end
@@ -20,37 +20,38 @@ module Middleman
 
         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.path == index_file || 
-                    resource.path.end_with?(new_index_path) || 
+            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
             d = resource.data
             next if d && d["directory_index"] == false
-        
+
             # Check if file metadata (options set by "page" in config.rb) turns directory_index off
             if resource.metadata[:options] && resource.metadata[:options][:directory_index] == false
               next
             end
-          
+
             resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
           end
         end
       end
     end
   end
-end
+end