middleman-core 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed1b1a474f6f5d9d5e43de77009f7947ef7a5fec
-  data.tar.gz: 7a888c6d6df7c7440bb72d285dddc3d670aeb7cb
+  metadata.gz: 41014115c7f4bc10a1ec3505cc1f0f2ed07489b9
+  data.tar.gz: 8d5141b21cc59bf1b41a0d16408b913ddb7e15a5
 SHA512:
-  metadata.gz: 93f8a14b2bc4de24b434b549edce082ece2db0a249f367577afcfb5f58838f4c788ebca0d64be8af6ec29777dc52dd34ee4bd8c306c28d0a9760fc4ec07f31cf
-  data.tar.gz: d0115d1631abfb529dc0ee2a4a5d9e56a8b2d69ba45f0d166e5e2c41946a9e663337f7d6eea57e38d04e9685b423353dc570a3d355b518a23640c0fbe3517cf6
+  metadata.gz: 5b95f67885b1aa847fdbfd4813d8f8ccd3c40e0bb02adb3206efc2d7df3d5d1f9305c2b018bff97d692b8ef1be96587df038f154124a4d1ac1376d2fbfd058ab
+  data.tar.gz: baf1f6c0c2b2679e920c89eea23898bab033187aaf0699f2411b7eb43c779bd45aa949012e6f7ff60f9216d94c2be54fabfd251ebeb919ece1ce4864290f693c

data/features/i18n_builder.feature

@@ -22,6 +22,8 @@ Feature: i18n Builder
       | password.txt                                  |
     Then the following files should not exist:
       | en/index.html                                 |
+      | defaults_en/index.html                        |
+      | en_defaults/index.html                        |
     And the file "index.html" should contain "Howdy"  
     And the file "hello.html" should contain "Hello World"
     And the file "morning.html" should contain "Good morning"

data/features/i18n_preview.feature

@@ -16,10 +16,14 @@ Feature: i18n Preview
     Then I should see "Good morning"
     When I go to "/one.html"
     Then I should see "Only one"
+    When I go to "/defaults_en/index.html"
+    Then I should see "File Not Found"
     When I go to "/en/index.html"
     Then I should see "File Not Found"
     When I go to "/en/morning.html"
     Then I should see "File Not Found"
+    When I go to "/defaults_es/index.html"
+    Then I should see "File Not Found"
     When I go to "/es/index.html"
     Then I should see "Como Esta?"
     When I go to "/es/hola.html"

data/features/more-implied_extensions.feature

@@ -12,12 +12,16 @@ Feature: More default extensions
     Then I should see "HELLO"
     When I go to "/javascripts/app.js"
     Then I should see "derp"
+    Then I should not see "I am in the layout"
     When I go to "/stylesheets/style.css"
     Then I should see "section"
+    Then I should not see "I am in the layout"
     When I go to "/stylesheets/style2.css"
     Then I should see "section"
+    Then I should not see "I am in the layout"
     When I go to "/stylesheets/style3.css"
     Then I should see "color"
+    Then I should not see "I am in the layout"
   
   Scenario: Default extensions build
     Given a fixture app "more-implied-extensions-app"
@@ -37,6 +41,10 @@ Feature: More default extensions
     And the file "test3.html" should contain "Howdy"
     And the file "test4.html" should contain "HELLO"
     And the file "javascripts/app.js" should contain "derp"
+    And the file "javascripts/app.js" should not contain "I am in the layout"
     And the file "stylesheets/style.css" should contain "section"
+    And the file "stylesheets/style.css" should not contain "I am in the layout"
     And the file "stylesheets/style2.css" should contain "section"
-    And the file "stylesheets/style3.css" should contain "color"
+    And the file "stylesheets/style2.css" should not contain "I am in the layout"
+    And the file "stylesheets/style3.css" should contain "color"
+    And the file "stylesheets/style3.css" should not contain "I am in the layout"

data/features/redirects.feature

@@ -0,0 +1,60 @@
+Feature: Meta redirects
+
+  Scenario: Redirect to unknown file
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    redirect "hello.html", :to => "world.html"
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/hello.html"
+    Then I should see '<meta http-equiv=refresh content="0; url=world.html"'
+
+  Scenario: Redirect to external site
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    redirect "hello.html", :to => "http://example.com"
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/hello.html"
+    Then I should see '<meta http-equiv=refresh content="0; url=http://example.com"'
+
+  Scenario: Redirect to a resource
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    ready do
+      r = sitemap.find_resource_by_path("static.html")
+      redirect "hello.html", :to => r
+    end
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/hello.html"
+    Then I should see '<meta http-equiv=refresh content="0; url=/static.html"'
+
+  Scenario: Redirect to a path with directory index
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    activate :directory_indexes
+    redirect "hello.html", :to => "link_test.html"
+    redirect "hello2.html", :to => "services/index.html"
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/hello/index.html"
+    Then I should see '<meta http-equiv=refresh content="0; url=/link_test/"'
+    When I go to "/hello2/index.html"
+    Then I should see '<meta http-equiv=refresh content="0; url=/services/"'
+
+  Scenario: Redirect with custom html
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    redirect "hello.html", :to => "world.html" do |from, to|
+      "#{from} to #{to}"
+    end
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/hello.html"
+    Then I should see 'hello.html to world.html'

data/fixtures/more-implied-extensions-app/source/layouts/layout.erb

@@ -0,0 +1,3 @@
+I am in the layout
+
+<%= yield %>

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

@@ -7,13 +7,13 @@ module Middleman
     module FileWatcher
 
       IGNORE_LIST = [
+        /^bin\//,
         /^\.bundle\//,
         /^vendor\//,
         /^\.sass-cache\//,
         /^\.git\//,
         /^\.gitignore$/,
         /\.DS_Store/,
-        /^build\//,
         /^\.rbenv-.*$/,
         /^Gemfile$/,
         /^Gemfile\.lock$/,
@@ -36,6 +36,10 @@ module Middleman
             files.reload_path(config[:data_dir])
           end
 
+          app.after_configuration do
+            config[:file_watcher_ignore] << %r{^#{config[:build_dir]}\/}
+          end
+
           # After config, load everything else
           app.ready do
             files.reload_path('.')

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

@@ -154,11 +154,8 @@ module Middleman
             end
           end
 
-          # Certain output file types don't use layouts
-          needs_layout = !%w(.js .json .css .txt).include?(File.extname(path))
-
           # If we need a layout and have a layout, use it
-          if needs_layout && layout_path = fetch_layout(engine, opts)
+          if layout_path = fetch_layout(engine, opts)
             content = render_individual_file(layout_path, locs, opts, context) { content }
           end
 

data/lib/middleman-core/sitemap.rb

@@ -2,6 +2,7 @@ require "middleman-core/sitemap/store"
 require "middleman-core/sitemap/resource"
 
 require "middleman-core/sitemap/extensions/on_disk"
+require "middleman-core/sitemap/extensions/redirects"
 require "middleman-core/sitemap/extensions/request_endpoints"
 require "middleman-core/sitemap/extensions/proxies"
 require "middleman-core/sitemap/extensions/ignores"
@@ -20,6 +21,7 @@ module Middleman
         app.register Middleman::Sitemap::Extensions::RequestEndpoints
         app.register Middleman::Sitemap::Extensions::Proxies
         app.register Middleman::Sitemap::Extensions::Ignores
+        app.register Middleman::Sitemap::Extensions::Redirects
 
         # Set to automatically convert some characters into a directory
         app.config.define_setting :automatic_directory_matcher, nil, 'Set to automatically convert some characters into a directory'

data/lib/middleman-core/sitemap/extensions/redirects.rb

@@ -0,0 +1,124 @@
+module Middleman
+
+  module Sitemap
+
+    module Extensions
+
+      module Redirects
+
+        # Setup extension
+        class << self
+
+          # Once registered
+          def registered(app)
+            # Include methods
+            app.send :include, InstanceMethods
+          end
+
+          alias :included :registered
+        end
+
+        module InstanceMethods
+          def redirect_manager
+            @_redirect_manager ||= RedirectManager.new(self)
+          end
+
+          def redirect(*args, &block)
+            redirect_manager.create_redirect(*args, &block)
+          end
+        end
+
+        # Manages the list of proxy configurations and manipulates the sitemap
+        # to include new resources based on those configurations
+        class RedirectManager
+          def initialize(app)
+            @app = app
+            @redirects = {}
+          end
+
+          # Setup a redirect from a path to a target
+          # @param [String] path
+          # @param [Hash] The :to value gives a target path
+          # @return [void]
+          def create_redirect(path, opts={}, &block)
+            if block_given?
+              opts[:template] = block
+            end
+
+            @redirects[path] = opts
+
+            @app.sitemap.rebuild_resource_list!(:added_redirect)
+          end
+
+          # Update the main sitemap resource list
+          # @return [void]
+          def manipulate_resource_list(resources)
+            resources + @redirects.map do |path, opts|
+              r = RedirectResource.new(
+                @app.sitemap,
+                path,
+                opts[:to]
+              )
+              r.output = opts[:template] if opts[:template]
+              r
+            end
+          end
+        end
+
+        class RedirectResource < ::Middleman::Sitemap::Resource
+          attr_accessor :output
+
+          def initialize(store, path, target)
+            @request_path = target
+
+            super(store, path)
+          end
+
+          def template?
+            true
+          end
+      
+          def render(*args, &block)
+            url = ::Middleman::Util.url_for(store.app, @request_path, :relative => false, :find_resource => true)
+
+            if output
+              output.call(path, url)
+            else
+              <<-END
+                <html>
+                  <head>
+                    <meta http-equiv=refresh content="0; url=#{url}" />
+                    <meta name="robots" content="noindex,follow" />
+                  </head>
+                  <body>
+                  </body>
+                </html>
+              END
+            end
+          end
+
+          # def request_path
+          #   @request_path
+          # end
+
+          def binary?
+            false
+          end
+
+          def raw_data
+            {}
+          end
+
+          def ignored?
+            false
+          end
+
+          def metadata
+            @local_metadata.dup
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/middleman-core/sitemap/extensions/request_endpoints.rb

@@ -11,8 +11,6 @@ module Middleman
 
           # Once registered
           def registered(app)
-            # ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
-
             # Include methods
             app.send :include, InstanceMethods
           end
@@ -20,65 +18,6 @@ module Middleman
           alias :included :registered
         end
 
-        # module ResourceInstanceMethods
-        #   # Whether this page is a proxy
-        #   # @return [Boolean]
-        #   def proxy?
-        #     !!@proxied_to
-        #   end
-
-        #   # Set this page to proxy to a target path
-        #   # @param [String] target
-        #   # @return [void]
-        #   def proxy_to(target)
-        #     target = ::Middleman::Util.normalize_path(target)
-        #     raise "You can't proxy #{path} to itself!" if target == path
-        #     @proxied_to = target
-        #   end
-
-        #   # The path of the page this page is proxied to, or nil if it's not proxied.
-        #   # @return [String]
-        #   def proxied_to
-        #     @proxied_to
-        #   end
-
-        #   # The resource for the page this page is proxied to. Throws an exception
-        #   # if there is no resource.
-        #   # @return [Sitemap::Resource]
-        #   def proxied_to_resource
-        #     proxy_resource = store.find_resource_by_path(proxied_to)
-
-        #     unless proxy_resource
-        #       raise "Path #{path} proxies to unknown file #{proxied_to}:#{store.resources.map(&:path)}"
-        #     end
-
-        #     if proxy_resource.proxy?
-        #       raise "You can't proxy #{path} to #{proxied_to} which is itself a proxy."
-        #     end
-
-        #     proxy_resource
-        #   end
-
-        #   def get_source_file
-        #     if proxy?
-        #       proxied_to_resource.source_file
-        #     else
-        #       super
-        #     end
-        #   end
-
-        #   def content_type
-        #     mime_type = super
-        #     return mime_type if mime_type
-
-        #     if proxy?
-        #       proxied_to_resource.content_type
-        #     else
-        #       nil
-        #     end
-        #   end
-        # end
-
         module InstanceMethods
           def endpoint_manager
             @_endpoint_manager ||= EndpointManager.new(self)

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

@@ -141,6 +141,12 @@ module Middleman
           blocks << block if block_given?
 
           app.current_path ||= self.destination_path
+
+          # Certain output file types don't use layouts
+          if !opts.has_key?(:layout)
+            opts[:layout] = false if %w(.js .json .css .txt).include?(self.ext)
+          end
+
           app.render_template(source_file, locs, opts, blocks)
         end
       end

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

@@ -41,6 +41,9 @@ module Middleman
 
         # Proxies
         register_resource_list_manipulator(:proxies, @app.proxy_manager)
+
+        # Redirects
+        register_resource_list_manipulator(:redirects, @app.redirect_manager)
       end
 
       # Register a klass which can manipulate the main site map list. Best to register

data/lib/middleman-core/templates/shared/gitignore

@@ -12,3 +12,6 @@
 
 # Ignore Sass' cache
 /.sass-cache
+
+# Ignore .DS_store file
+.DS_Store

data/lib/middleman-core/util.rb

@@ -146,5 +146,81 @@ module Middleman
         end
       end.flatten.compact
     end
+
+    # Given a source path (referenced either absolutely or relatively)
+    # or a Resource, this will produce the nice URL configured for that
+    # path, respecting :relative_links, directory indexes, etc.
+    def self.url_for(app, path_or_resource, options={})
+      # Handle Resources and other things which define their own url method
+      url = path_or_resource.respond_to?(:url) ? path_or_resource.url : path_or_resource
+
+      begin
+        uri = URI(url)
+      rescue URI::InvalidURIError
+        # Nothing we can do with it, it's not really a URI
+        return url
+      end
+
+      relative = options.delete(:relative)
+      raise "Can't use the relative option with an external URL" if relative && uri.host
+
+      # 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
+      effective_relative = true if relative.nil? && app.config[:relative_links]
+
+      # Try to find a sitemap resource corresponding to the desired path
+      this_resource = app.current_resource # store in a local var to save work
+
+      if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
+        resource = path_or_resource
+        resource_url = url
+      elsif this_resource && uri.path
+        # Handle relative urls
+        url_path = Pathname(uri.path)
+        current_source_dir = Pathname('/' + this_resource.path).dirname
+        url_path = current_source_dir.join(url_path) if url_path.relative?
+        resource = app.sitemap.find_resource_by_path(url_path.to_s)
+        resource_url = resource.url if resource
+      elsif options[:find_resource] && uri.path
+        resource = app.sitemap.find_resource_by_path(uri.path)
+        resource_url = resource.url if resource
+      end
+
+      if resource
+        # Switch to the relative path between this_resource and the given resource
+        # if we've been asked to.
+        if effective_relative
+          # Output urls relative to the destination path, not the source path
+          current_dir = Pathname('/' + this_resource.destination_path).dirname
+          relative_path = Pathname(resource_url).relative_path_from(current_dir).to_s
+
+          # Put back the trailing slash to avoid unnecessary Apache redirects
+          if resource_url.end_with?('/') && !relative_path.end_with?('/')
+            relative_path << '/'
+          end
+
+          uri.path = relative_path
+        else
+          uri.path = resource_url
+        end
+      else
+        # If they explicitly asked for relative links but we can't find a resource...
+        raise "No resource exists at #{url}" if relative
+      end
+
+      # Support a :query option that can be a string or hash
+      if query = options.delete(:query)
+        uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
+      end
+
+      # Support a :fragment or :anchor option just like Padrino
+      fragment = options.delete(:anchor) || options.delete(:fragment)
+      uri.fragment = fragment.to_s if fragment
+
+      # Finally make the URL back into a string
+      uri.to_s
+    end
   end
 end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.1.1' unless const_defined?(:VERSION)
+  VERSION = '3.1.2' unless const_defined?(:VERSION)
 end

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

@@ -189,72 +189,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
     def url_for(path_or_resource, options={})
-      # Handle Resources and other things which define their own url method
-      url = path_or_resource.respond_to?(:url) ? path_or_resource.url : path_or_resource
-
-      begin
-        uri = URI(url)
-      rescue URI::InvalidURIError
-        # Nothing we can do with it, it's not really a URI
-        return url
-      end
-
-      relative = options.delete(:relative)
-      raise "Can't use the relative option with an external URL" if relative && uri.host
-
-      # 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
-      effective_relative = true if relative.nil? && config[:relative_links]
-
-      # Try to find a sitemap resource corresponding to the desired path
-      this_resource = current_resource # store in a local var to save work
-      if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
-        resource = path_or_resource
-        resource_url = url
-      elsif this_resource && uri.path
-        # Handle relative urls
-        url_path = Pathname(uri.path)
-        current_source_dir = Pathname('/' + this_resource.path).dirname
-        url_path = current_source_dir.join(url_path) if url_path.relative?
-        resource = sitemap.find_resource_by_path(url_path.to_s)
-        resource_url = resource.url if resource
-      end
-
-      if resource
-        # Switch to the relative path between this_resource and the given resource
-        # if we've been asked to.
-        if effective_relative
-          # Output urls relative to the destination path, not the source path
-          current_dir = Pathname('/' + this_resource.destination_path).dirname
-          relative_path = Pathname(resource_url).relative_path_from(current_dir).to_s
-
-          # Put back the trailing slash to avoid unnecessary Apache redirects
-          if resource_url.end_with?('/') && !relative_path.end_with?('/')
-            relative_path << '/'
-          end
-
-          uri.path = relative_path
-        else
-          uri.path = resource_url
-        end
-      else
-        # If they explicitly asked for relative links but we can't find a resource...
-        raise "No resource exists at #{url}" if relative
-      end
-
-      # Support a :query option that can be a string or hash
-      if query = options.delete(:query)
-        uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
-      end
-
-      # Support a :fragment or :anchor option just like Padrino
-      fragment = options.delete(:anchor) || options.delete(:fragment)
-      uri.fragment = fragment.to_s if fragment
-
-      # Finally make the URL back into a string
-      uri.to_s
+      ::Middleman::Util.url_for(self, path_or_resource, options)
     end
 
     # Overload the regular link_to to be sitemap-aware - if you

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

@@ -93,7 +93,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   
   def convert_glob_to_regex(glob)
     # File.fnmatch doesn't support brackets: {rb,yml,yaml}
-    regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "rb|ya?ml")
+    regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "(rb|ya?ml)")
     %r{^#{regex}}
   end
 

data/middleman-core.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 1.1.6"])
+  s.add_dependency("listen", ["~> 1.2.2"])
 
   # i18n
   s.add_dependency("i18n", ["~> 0.6.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +215,7 @@ files:
 - features/preview_changes.feature
 - features/proxy_pages.feature
 - features/queryable.feature
+- features/redirects.feature
 - features/relative_assets.feature
 - features/request_params.feature
 - features/sass-assets-paths.feature
@@ -494,6 +495,9 @@ files:
 - fixtures/i18n-nested-app/locales/es.yml
 - fixtures/i18n-nested-app/locales/es/mucho.yml
 - fixtures/i18n-nested-app/source/localizable/index.html.erb
+- fixtures/i18n-test-app/data/defaults_en.yml
+- fixtures/i18n-test-app/data/defaults_es.yml
+- fixtures/i18n-test-app/data/en_defaults.yml
 - fixtures/i18n-test-app/locales/en.yml
 - fixtures/i18n-test-app/locales/es.yml
 - fixtures/i18n-test-app/source/CNAME
@@ -628,6 +632,7 @@ files:
 - fixtures/more-ignore-app/source/reports/index.html
 - fixtures/more-implied-extensions-app/config.rb
 - fixtures/more-implied-extensions-app/source/javascripts/app.coffee
+- fixtures/more-implied-extensions-app/source/layouts/layout.erb
 - fixtures/more-implied-extensions-app/source/stylesheets/style.scss
 - fixtures/more-implied-extensions-app/source/stylesheets/style2.sass
 - fixtures/more-implied-extensions-app/source/stylesheets/style3.less
@@ -950,6 +955,7 @@ files:
 - lib/middleman-core/sitemap/extensions/ignores.rb
 - lib/middleman-core/sitemap/extensions/on_disk.rb
 - lib/middleman-core/sitemap/extensions/proxies.rb
+- lib/middleman-core/sitemap/extensions/redirects.rb
 - lib/middleman-core/sitemap/extensions/request_endpoints.rb
 - lib/middleman-core/sitemap/extensions/traversal.rb
 - lib/middleman-core/sitemap/queryable.rb
@@ -1416,6 +1422,7 @@ test_files:
 - features/preview_changes.feature
 - features/proxy_pages.feature
 - features/queryable.feature
+- features/redirects.feature
 - features/relative_assets.feature
 - features/request_params.feature
 - features/sass-assets-paths.feature
@@ -1695,6 +1702,9 @@ test_files:
 - fixtures/i18n-nested-app/locales/es.yml
 - fixtures/i18n-nested-app/locales/es/mucho.yml
 - fixtures/i18n-nested-app/source/localizable/index.html.erb
+- fixtures/i18n-test-app/data/defaults_en.yml
+- fixtures/i18n-test-app/data/defaults_es.yml
+- fixtures/i18n-test-app/data/en_defaults.yml
 - fixtures/i18n-test-app/locales/en.yml
 - fixtures/i18n-test-app/locales/es.yml
 - fixtures/i18n-test-app/source/CNAME
@@ -1829,6 +1839,7 @@ test_files:
 - fixtures/more-ignore-app/source/reports/index.html
 - fixtures/more-implied-extensions-app/config.rb
 - fixtures/more-implied-extensions-app/source/javascripts/app.coffee
+- fixtures/more-implied-extensions-app/source/layouts/layout.erb
 - fixtures/more-implied-extensions-app/source/stylesheets/style.scss
 - fixtures/more-implied-extensions-app/source/stylesheets/style2.sass
 - fixtures/more-implied-extensions-app/source/stylesheets/style3.less