middleman-more 3.0.14 → 3.1.0.beta.1

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

@@ -1,3 +1,6 @@
+require "i18n"
+require "i18n/backend/fallbacks"
+
 module Middleman
   module CoreExtensions
 
@@ -9,12 +12,23 @@ module Middleman
 
         # Once registerd
         def registered(app, options={})
-          app.set :locales_dir, "locales"
+          app.config.define_setting :locales_dir, "locales", 'The directory holding your locale configurations'
 
           # Needed for helpers as well
           app.after_configuration do
             Localizer.new(self, options)
           end
+
+          app.helpers do
+            def t(*args)
+              ::I18n.t(*args)
+            end
+          end
+
+          # See https://github.com/svenfuchs/i18n/wiki/Fallbacks
+          unless options[:no_fallbacks]
+            ::I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+          end
         end
         alias :included :registered
       end
@@ -28,7 +42,7 @@ module Middleman
           @app = app
           @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml,yaml}")
 
-          # File.fnmatch doesn't support brackets: {rb,yml}
+          # File.fnmatch doesn't support brackets: {rb,yml,yaml}
           regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "rb|ya?ml")
           @locales_regex = %r{^#{regex}}
 
@@ -43,6 +57,12 @@ module Middleman
           @templates_dir = @options[:templates_dir] || "localizable"
           @mount_at_root = @options.has_key?(:mount_at_root) ? @options[:mount_at_root] : langs.first
 
+          ::I18n.default_locale = @mount_at_root
+          # Reset fallbacks to fall back to our new default
+          if ::I18n.respond_to? :fallbacks
+            ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new
+          end
+
           if !@app.build?
             logger.info "== Locales: #{langs.join(", ")} (Default #{@mount_at_root})"
           end
@@ -60,13 +80,15 @@ module Middleman
             end
 
             instance_vars = Proc.new do
-              ::I18n.locale = lang
               @lang         = lang
               @page_id      = page_id
             end
 
-            locals = { :lang => lang, :page_id => page_id }
-            { :blocks => [instance_vars], :locals => locals }
+            locals = { :lang => lang,
+              :page_id => page_id }
+            { :blocks => [instance_vars],
+              :locals => locals,
+              :options => { :lang => lang } }
           end
 
           @app.sitemap.register_resource_list_manipulator(
@@ -111,10 +133,11 @@ module Middleman
 
             page_id = File.basename(resource.path, File.extname(resource.path))
 
+            old_locale = ::I18n.locale
             langs.map do |lang|
               ::I18n.locale = lang
 
-              localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id)
+              localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id, :fallback => [])
               path = resource.path.sub(@templates_dir, "")
 
               # Build lang path
@@ -139,6 +162,8 @@ module Middleman
 
               new_resources << p
             end
+            ::I18n.locale = old_locale
+
           end
 
           resources + new_resources

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

@@ -1,27 +1,29 @@
 module Middleman
   module Extensions
     module AssetHash
-      class << self
-        def registered(app, options={})
+      class Extension < ::Middleman::Extension
+        option :exts, %w(.jpg .jpeg .png .gif .js .css .otf .woff .eot .ttf .svg), "List of extensions that get asset hashes appended to them."
+        option :ignore, [], "Regexes of filenames to skip adding asset hashes to"
+
+        def initialize(app, options_hash={})
+          super
+
           require 'digest/sha1'
           require 'rack/test'
           require 'uri'
+        end
 
-          exts = options[:exts] || %w(.jpg .jpeg .png .gif .js .css .otf .woff .eot .ttf .svg)
-
+        def after_configuration
           # Allow specifying regexes to ignore, plus always ignore apple touch icons
-          ignore = Array(options[:ignore]) << /^apple-touch-icon/
+          ignore = Array(options.ignore) + [/^apple-touch-icon/]
 
-          app.ready do
-            sitemap.register_resource_list_manipulator(
-              :asset_hash,
-              AssetHashManager.new(self, exts, ignore)
-            )
+          app.sitemap.register_resource_list_manipulator(
+            :asset_hash,
+            AssetHashManager.new(app, options.exts, ignore)
+          )
 
-            use Middleware, :exts => exts, :middleman_app => self, :ignore => ignore
-          end
+          app.use Middleware, :exts => options.exts, :middleman_app => app, :ignore => ignore
         end
-        alias :included :registered
       end
 
       # Central class for managing asset_hash extension
@@ -35,13 +37,24 @@ module Middleman
         # Update the main sitemap resource list
         # @return [void]
         def manipulate_resource_list(resources)
-          resources.each do |resource|
+          # Process resources in order: binary images and fonts, then SVG, then JS/CSS.
+          # This is so by the time we get around to the text files (which may reference
+          # images and fonts) the static assets' hashes are already calculated.
+          rack_client = ::Rack::Test::Session.new(@app.class.to_rack_app)
+          resources.sort_by do |a|
+            if %w(.svg).include? a.ext
+              0
+            elsif %w(.js .css).include? a.ext
+              1
+            else
+              -1
+            end
+          end.each do |resource|
             next unless @exts.include? resource.ext
             next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
 
             # Render through the Rack interface so middleware and mounted apps get a shot
-            rack_client = ::Rack::Test::Session.new(@app.class)
-            response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => true })
+            response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => "true" })
             raise "#{resource.path} should be in the sitemap!" unless response.status == 200
 
             digest = Digest::SHA1.hexdigest(response.body)[0..7]
@@ -66,7 +79,7 @@ module Middleman
           status, headers, response = @rack_app.call(env)
 
           # We don't want to use this middleware when rendering files to figure out their hash!
-          return [status, headers, response] if env["bypass_asset_hash"]
+          return [status, headers, response] if env["bypass_asset_hash"] == 'true'
 
           path = @middleman_app.full_path(env["PATH_INFO"])
           dirpath = Pathname.new(File.dirname(path))

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

@@ -9,9 +9,12 @@ module Middleman
       class << self
 
         # Once registered
-        def registered(app)
-          # Default to no host
-          app.set :asset_host, false
+        def registered(app, options={})
+          app.config.define_setting :asset_host, false, 'The asset host to use, or false for no asset host, or a Proc to determine asset host'
+
+          if options[:host]
+            config[:asset_host] = options[:host]
+          end
 
           # Include methods
           app.send :include, InstanceMethods
@@ -30,12 +33,12 @@ module Middleman
         # @return [String]
         def asset_url(path, prefix="")
           original_output = super
-          return original_output unless asset_host
+          return original_output unless config[:asset_host]
 
-          asset_prefix = if asset_host.is_a?(Proc)
-            asset_host.call(original_output)
-          elsif asset_host.is_a?(String)
-            asset_host
+          asset_prefix = if config[:asset_host].is_a?(Proc)
+            config[:asset_host].call(original_output)
+          elsif config[:asset_host].is_a?(String)
+            config[:asset_host]
           end
 
           File.join(asset_prefix, original_output)

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

@@ -30,29 +30,25 @@ module Middleman
         # @param [Hash] params
         # @return [String]
         def image_tag(path, params={})
-          params[:supported_extensions] ||= %w(.png .jpg .jpeg .bmp .gif)
-          
-          if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://") &&
-            params[:supported_extensions].include?(File.extname(path).downcase)
-            
+          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
+            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
           end
-          
-          params = params.delete_if {|key| key == :supported_extensions }
 
           super(path, params)
         end

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

@@ -40,13 +40,10 @@ module Middleman
                     File.extname(index_file) != resource.ext
 
             # Check if frontmatter turns directory_index off
-            d = resource.data
-            next if d && d["directory_index"] == false
+            next if resource.data[: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
+            next if resource.metadata[:options][:directory_index] == false
 
             resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
           end

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

@@ -15,34 +15,33 @@ module Middleman::Extensions
   # Pass the :exts options to customize which file extensions get zipped (defaults
   # to .html, .htm, .js and .css.
   #
-  module Gzip
-    class << self
-      def registered(app, options={})
-        exts = options[:exts] || %w(.js .css .html .htm)
+  class Gzip < ::Middleman::Extension
+    option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
 
-        app.after_build do |builder|
+    def initialize(app, options_hash={})
+      super
 
-          paths = ::Middleman::Util.all_files_under(self.class.inst.build_dir)
-          paths.each do |path|
-            next unless exts.include? path.extname
+      gzip_ext = self
 
-            output_filename, old_size, new_size = Middleman::Extensions::Gzip.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
 
-            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
+          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
         end
       end
-
-      alias :included :registered
     end
 
-    def self.gzip_file(path)
+    def gzip_file(path)
       input_file = File.open(path, 'rb').read
       output_filename = path + '.gz'
       input_file_time = File.mtime(path)

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

@@ -10,15 +10,14 @@ module Middleman
 
         # Once registered
         def registered(app, options={})
-          app.set :css_compressor, false
+          app.config.define_setting :css_compressor, nil, 'Set the CSS compressor to use. Deprecated in favor of the :compressor option when activating :minify_css'
 
           ignore = Array(options[:ignore]) << /\.min\./
           inline = options[:inline] || false
 
           app.after_configuration do
-            chosen_compressor = css_compressor || options[:compressor] || begin
-              require "middleman-more/extensions/minify_css/rainpress"
-              ::Rainpress
+            chosen_compressor = config[:css_compressor] || options[:compressor] || begin
+              ::Middleman::Extensions::MinifyCss::SassCompressor
             end
 
             # Setup Rack middleware to minify CSS
@@ -30,6 +29,14 @@ module Middleman
         alias :included :registered
       end
 
+      class SassCompressor
+        def self.compress(style, options = {})
+          root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
+          root_node.options = { :style => :compressed }
+          root_node.render.strip
+        end
+      end
+
       # Rack middleware to look for CSS and compress it
       class Rack
 

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

@@ -10,7 +10,7 @@ module Middleman
 
         # Once registered
         def registered(app, options={})
-          app.set :js_compressor, false
+          app.config.define_setting :js_compressor, nil, 'Set the JS compressor to use. Deprecated in favor of the :compressor option when activating :minify_js'
 
           ignore = Array(options[:ignore]) << /\.min\./
           inline = options[:inline] || false

data/lib/middleman-more/templates/smacss/source/_footer.haml

@@ -1 +1 @@
-%footer © 2012
+%footer © 2013

data/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown

@@ -0,0 +1,11 @@
+# SMACSS
+
+### Base
+
+> A Base rule is applied to an element using an element selector, a descendent selector, or a child selector, along with any pseudo-classes. It doesn’t include any class or ID selectors. It is defining the default styling for how that element should look in all occurrences on the page.
+
+> - SMACSS, Jonathan Snook
+
+Place files here that impact top-level elements to apply global styles.
+
+This template includes [`normalize.css`](http://necolas.github.com/normalize.css/) to give consistent base styles for all browsers.

data/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss

@@ -0,0 +1 @@
+// Placeholder