Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable

middleman-core/lib/middleman-core/cli/build.rb

@@ -233,7 +233,7 @@ module Middleman::Cli
 
       paths = ::Middleman::Util.all_files_under(@destination)
       @cleaning_queue += paths.select do |path|
-        !path.to_s.match(/\/\./) || path.to_s.match(/\.htaccess|\.htpasswd/)
+        path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
     end
 

middleman-core/lib/middleman-core/core_extensions/data.rb

@@ -25,11 +25,11 @@ module Middleman
         # parsing config.rb
         def initialize
           self.files.changed DataStore.matcher do |file|
-            self.data.touch_file(file) if file.match(%r{^#{self.data_dir}\/})
+            self.data.touch_file(file) if file.start_with?("#{self.data_dir}/")
           end
 
           self.files.deleted DataStore.matcher do |file|
-            self.data.remove_file(file) if file.match(%r{^#{self.data_dir}\/})
+            self.data.remove_file(file) if file.start_with?("#{self.data_dir}/")
           end
 
           super

middleman-core/lib/middleman-core/core_extensions/file_watcher.rb

@@ -145,7 +145,8 @@ module Middleman
         # @param [Pathname] path
         # @return [Boolean]
         def ignored?(path)
-          IGNORE_LIST.any? { |r| path.to_s.match(r) }
+          path = path.to_s
+          IGNORE_LIST.any? { |r| path =~ r }
         end
 
         # Notify callbacks for a file given an array of callbacks

middleman-core/lib/middleman-core/core_extensions/rendering.rb

@@ -408,7 +408,7 @@ module Middleman
           # Find the path by searching or using the cache
           request_path = request_path.to_s
           cache.fetch(:resolve_template, request_path, options) do
-            relative_path = request_path.sub(%r{^/}, "")
+            relative_path = Util.strip_leading_slash(request_path)
             on_disk_path  = File.expand_path(relative_path, self.source_dir)
 
             # By default, any engine will do

middleman-core/lib/middleman-core/preview_server.rb

@@ -185,7 +185,7 @@ module Middleman
 
         paths.any? do |path|
           match_against.any? do |matcher|
-            path.match(matcher)
+            path =~ matcher
           end
         end
       end

middleman-core/lib/middleman-core/sitemap.rb

@@ -25,18 +25,18 @@ module Middleman
         # Setup callbacks which can exclude paths from the sitemap
         app.set :ignored_sitemap_matchers, {
           # dotfiles and folders in the root
-          :root_dotfiles => proc { |file| file.match(%r{^\.}) },
+          :root_dotfiles => proc { |file| file.start_with?('.') },
 
           # Files starting with an dot, but not .htaccess
           :source_dotfiles => proc { |file|
-            file.match(%r{/\.}) && !file.match(%r{/\.htaccess|\.htpasswd})
+            file =~ %r{/\.} && file !~ %r{/\.(htaccess|htpasswd)}
           },
 
           # Files starting with an underscore, but not a double-underscore
-          :partials => proc { |file| file.match(%r{/_}) && !file.match(%r{/__}) },
+          :partials => proc { |file| file =~ %r{/_} && file !~ %r{/__} },
 
           :layout => proc { |file|
-            file.match(%r{^source/layout\.}) || file.match(%r{^source/layouts/})
+            file.start_with?('source/layout.') || file.start_with?('source/layouts/')
           }
         }
 

middleman-core/lib/middleman-core/sitemap/store.rb

@@ -108,7 +108,7 @@ module Middleman
         blank_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
 
         provides_metadata.inject(blank_metadata) do |result, (callback, matcher)|
-          next result if !matcher.nil? && !source_file.match(matcher)
+          next result if matcher && !source_file.match(matcher)
 
           metadata = callback.call(source_file)
 
@@ -146,9 +146,9 @@ module Middleman
         @_cached_metadata[request_path] = provides_metadata_for_path.inject(blank_metadata) do |result, (callback, matcher)|
           case matcher
           when Regexp
-            next result unless request_path.match(matcher)
+            next result unless request_path =~ matcher
           when String
-            next result unless File.fnmatch("/" + matcher.sub(%r{^/}, ''), "/#{request_path}")
+            next result unless File.fnmatch("/" + Util.strip_leading_slash(matcher), "/#{request_path}")
           end
 
           metadata = callback.call(request_path)

middleman-core/lib/middleman-core/util.rb

@@ -83,7 +83,13 @@ module Middleman
     # @return [String]
     def self.normalize_path(path)
       # The tr call works around a bug in Ruby's Unicode handling
-      path.sub(/^\//, "").tr('','')
+      path.sub(%r{^/}, "").tr('','')
+    end
+
+    # This is a separate method from normalize_path in case we
+    # change how we normalize paths
+    def self.strip_leading_slash(path)
+      path.sub(%r{^/}, "")
     end
 
     # Extract the text of a Rack response as a string.

middleman-core/middleman-core-x86-mingw32.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", [">= 0.15.4", "~> 0.15"])
+  s.add_dependency("thor", ["~> 0.15.4"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])

middleman-core/middleman-core.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", [">= 0.15.4", "~> 0.15"])
+  s.add_dependency("thor", ["~> 0.15.4"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])

middleman-more/features/i18n_preview.feature

@@ -104,6 +104,51 @@ Feature: i18n Preview
     When I go to "/spanish/hola.html"
     Then I should see "Hola World"
 
+  Scenario: Running localize with a non-English mount config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n, :mount_at_root => :es
+      """
+    Given the Server is running at "i18n-test-app"
+    When I go to "/en/index.html"
+    Then I should see "Howdy"
+    When I go to "/en/hello.html"
+    Then I should see "Hello World"
+    When I go to "/"
+    Then I should see "Como Esta?"
+    When I go to "/hola.html"
+    Then I should see "Hola World"
+    When I go to "/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/es/index.html"
+    Then I should see "File Not Found"
+    When I go to "/es/hola.html"
+    Then I should see "File Not Found"
+
+  Scenario: Running localize with a non-English lang subset
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n, :langs => :es
+      """
+    Given the Server is running at "i18n-test-app"
+    When I go to "/en/index.html"
+    Then I should see "File Not Found"
+    When I go to "/en/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/"
+    Then I should see "Como Esta?"
+    When I go to "/hola.html"
+    Then I should see "Hola World"
+    When I go to "/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/es/index.html"
+    Then I should see "File Not Found"
+    When I go to "/es/hola.html"
+    Then I should see "File Not Found"
+    
+    
   Scenario: Running localize with the no mount config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:

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

@@ -64,7 +64,7 @@ module Middleman
           # If the basename of the request as no extension, assume we are serving a
           # directory and join index_file to the path.
           path = File.join(asset_dir, current_path)
-          path = path.gsub(File.extname(path), ".#{asset_ext}")
+          path = path.sub(/#{File.extname(path)}$/, ".#{asset_ext}")
 
           yield path if sitemap.find_resource_by_path(path)
         end
@@ -74,11 +74,11 @@ module Middleman
         # @return [String]
         def page_classes
           path = current_path.dup
-          path << index_file if path.match(%r{/$})
+          path << index_file if path.end_with?('/')
-          path = path.gsub(%r{^/}, '')
+          path = Util.strip_leading_slash(path)
 
           classes = []
-          parts = path.split('.')[0].split('/')
+          parts = path.split('.').first.split('/')
           parts.each_with_index { |path, i| classes << parts.first(i+1).join('_') }
 
           classes.join(' ')
@@ -90,19 +90,18 @@ module Middleman
         # @param [String] source The path to the file
         # @return [String]
         def asset_path(kind, source)
-          return source if source =~ /^http/
+          return source if source.to_s.include?('//')
           asset_folder  = case kind
             when :css    then css_dir
             when :js     then js_dir
             when :images then images_dir
             else kind.to_s
           end
-          source = source.to_s.gsub(/\s/, '')
+          source = source.to_s.tr(' ', '')
           ignore_extension = (kind == :images) # don't append extension
-          source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
+          source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
-          if source =~ %r{^/} # absolute path
+          asset_folder = "" if source.start_with?('/') # absolute path
-            asset_folder = ""
+
-          end
           asset_url(source, asset_folder)
         end
 

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

@@ -26,9 +26,10 @@ module Middleman
 
         def initialize(app, options={})
           @app = app
-          @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml}")
+          @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml,yaml}")
 
-          regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml}", "rb|yml")
+          # File.fnmatch doesn't support brackets: {rb,yml}
+          regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "rb|ya?ml")
           @locales_regex = %r{^#{regex}}
 
           @maps = {}
@@ -43,7 +44,7 @@ module Middleman
           @mount_at_root = @options.has_key?(:mount_at_root) ? @options[:mount_at_root] : langs.first
 
           if !@app.build?
-            logger.info "== Locales: #{langs.join(", ")}"
+            logger.info "== Locales: #{langs.join(", ")} (Default #{@mount_at_root})"
           end
 
           # Don't output localizable files
@@ -52,15 +53,20 @@ module Middleman
           @app.sitemap.provides_metadata_for_path do |url|
             if d = get_localization_data(url)
               lang, page_id = d
-              instance_vars = Proc.new {
-                ::I18n.locale = lang
-                @lang         = lang
-                @page_id      = page_id
-              }
-              { :blocks => [instance_vars] }
             else
-              {}
+              # Default to the @mount_at_root lang
+              page_id = nil
+              lang = @mount_at_root
             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 }
           end
 
           @app.sitemap.register_resource_list_manipulator(
@@ -73,15 +79,17 @@ module Middleman
         end
 
         def on_file_changed(file)
-          if @locales_regex.match(file)
+          if @locales_regex =~ file
             ::I18n.reload!
           end
         end
 
         def langs
-          @options[:langs] || begin
+          if @options[:langs]
+            Array(@options[:langs]).map(&:to_sym)
+          else
             Dir[File.join(@app.root, @locales_glob)].map { |file|
-              File.basename(file).sub(/\.yml$/, "").sub(/\.rb$/, "")
+              File.basename(file).sub(/\.ya?ml$/, "").sub(/\.rb$/, "")
             }.sort.map(&:to_sym)
           end
         end

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

@@ -38,7 +38,7 @@ module Middleman
             params[:alt] ||= ""
 
             real_path = path
-            real_path = File.join(images_dir, real_path) unless real_path =~ %r{^/}
+            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

vendor.yml

@@ -0,0 +1,2 @@
+- fixtures
+- templates