middleman-core 4.0.0 → 4.1.0.rc.1

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

@@ -2,10 +2,22 @@ module Middleman
   module Sitemap
     module Extensions
       module Traversal
+        def traversal_root
+          root = if !@app.extensions[:i18n]
+            '/'
+          else
+            @app.extensions[:i18n].path_root(::I18n.locale)
+          end
+
+          root.sub(/^\//, '')
+        end
+
         # This resource's parent resource
         # @return [Middleman::Sitemap::Resource, nil]
         def parent
-          parts = path.split('/')
+          root = path.sub(/^#{::Regexp.escape(traversal_root)}/, '')
+          parts = root.split('/')
+
           tail = parts.pop
           is_index = (tail == @app.config[:index_file])
 

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

@@ -38,6 +38,8 @@ module Middleman
       Contract METADATA_HASH
       attr_reader :metadata
 
+      attr_accessor :ignored
+
       # Initialize resource with parent store and URL
       # @param [Middleman::Sitemap::Store] store
       # @param [String] path
@@ -47,6 +49,7 @@ module Middleman
         @store       = store
         @app         = @store.app
         @path        = path
+        @ignored     = false
 
         source = Pathname(source) if source && source.is_a?(String)
 
@@ -173,15 +176,7 @@ module Middleman
       # @return [Boolean]
       Contract Bool
       def ignored?
-        return true if @ignored
-        # Ignore based on the source path (without template extensions)
-        return true if @app.sitemap.ignored?(path)
-        # This allows files to be ignored by their source file name (with template extensions)
-        if !self.is_a?(ProxyResource) && file_descriptor && @app.sitemap.ignored?(file_descriptor[:relative_path].to_s)
-          true
-        else
-          false
-        end
+        @ignored
       end
 
       # The preferred MIME content type for this resource based on extension or metadata

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

@@ -3,12 +3,6 @@ require 'active_support/core_ext/hash/deep_merge'
 require 'monitor'
 require 'hamster'
 
-# Ignores
-Middleman::Extensions.register :sitemap_ignore, auto_activate: :before_configuration do
-  require 'middleman-core/sitemap/extensions/ignores'
-  Middleman::Sitemap::Extensions::Ignores
-end
-
 # Files on Disk
 Middleman::Extensions.register :sitemap_ondisk, auto_activate: :before_configuration do
   require 'middleman-core/sitemap/extensions/on_disk'
@@ -45,6 +39,12 @@ Middleman::Extensions.register :sitemap_move_files, auto_activate: :before_confi
   Middleman::Sitemap::Extensions::MoveFile
 end
 
+# Ignores
+Middleman::Extensions.register :sitemap_ignore, auto_activate: :before_configuration do
+  require 'middleman-core/sitemap/extensions/ignores'
+  Middleman::Sitemap::Extensions::Ignores
+end
+
 require 'middleman-core/contracts'
 
 module Middleman
@@ -108,14 +108,15 @@ module Middleman
           [m[:priority], n]
         end
 
-        rebuild_resource_list!(:registered_new)
+        rebuild_resource_list!(:"registered_new_manipulator_#{name}")
       end
 
       # Rebuild the list of resources from scratch, using registed manipulators
       # @return [void]
       Contract Maybe[Symbol] => Any
-      def rebuild_resource_list!(_name=nil)
+      def rebuild_resource_list!(name=nil)
         @lock.synchronize do
+          @app.logger.debug "== Requesting resource list rebuilding: #{name}"
           @needs_sitemap_rebuild = true
         end
       end
@@ -159,7 +160,7 @@ module Middleman
         end
       end
 
-      # Invalidate our cached view of resource that are not ingnored. If your extension
+      # Invalidate our cached view of resource that are not ignored. If your extension
       # adds ways to ignore files, you should call this to make sure #resources works right.
       def invalidate_resources_not_ignored_cache!
         @resources_not_ignored = nil

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -75,6 +75,10 @@ Then /^the content type should be "([^\"]*)"$/ do |expected|
   expect(page.response_headers['Content-Type']).to start_with expected
 end
 
+Then /^the "([^\"]*)" header should contain "([^\"]*)"$/ do |header, expected|
+  expect(page.response_headers[header]).to include expected
+end
+
 Then /^I should see "([^\"]*)"$/ do |expected|
   expect(page.body).to include expected
 end

data/lib/middleman-core/util.rb

@@ -201,31 +201,32 @@ module Middleman
     Contract IsA['Middleman::Application'], String, String, Hash => String
     def asset_url(app, path, prefix='', options={})
       # Don't touch assets which already have a full path
-      if path.include?('//') || path.start_with?('data:')
-        path
-      else # rewrite paths to use their destination path
-        result = if resource = app.sitemap.find_resource_by_destination_path(url_for(app, path))
+      return path if path.include?('//') || path.start_with?('data:')
+
+      if options[:relative] && !options[:current_resource]
+        raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true'
+      end
+
+      uri = URI(path)
+      path = uri.path
+
+      result = if resource = app.sitemap.find_resource_by_destination_path(url_for(app, path, options))
+        resource.url
+      else
+        path = File.join(prefix, path)
+        if resource = app.sitemap.find_resource_by_path(path)
           resource.url
         else
-          path = File.join(prefix, path)
-          if resource = app.sitemap.find_resource_by_path(path)
-            resource.url
-          else
-            File.join(app.config[:http_prefix], path)
-          end
+          File.join(app.config[:http_prefix], path)
         end
+      end
 
-        if options[:relative] != true
-          result
-        else
-          unless options[:current_resource]
-            raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true'
-          end
+      final_result = URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
 
-          current_dir = Pathname('/' + options[:current_resource].destination_path)
-          Pathname(result).relative_path_from(current_dir.dirname).to_s
-        end
-      end
+      result_uri = URI(final_result)
+      result_uri.query = uri.query
+      result_uri.fragment = uri.fragment
+      result_uri.to_s
     end
 
     # Given a source path (referenced either absolutely or relatively)
@@ -290,9 +291,6 @@ module Middleman
         else
           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
@@ -368,7 +366,7 @@ module Middleman
       case
       when mime.start_with?('text/')
         true
-      when mime.include?('xml')
+      when mime.include?('xml') && !mime.include?('officedocument')
         true
       when mime.include?('json')
         true

data/lib/middleman-core/version.rb

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

data/spec/middleman-core/util_spec.rb

@@ -98,6 +98,15 @@ describe Middleman::Util do
       end
     end
 
+    it "returns path relative to the provided current_resource" do
+      Given.fixture 'clean-dir-app'
+      Given.file 'source/a-path/index.html', ''
+      Given.file 'source/a-path/images/blank.gif', ''
+      @mm = Middleman::Application.new
+      current_resource = @mm.sitemap.find_resource_by_path('a-path/index.html')
+      expect( Middleman::Util.asset_url( @mm, 'images/blank.gif', 'images', current_resource: current_resource ) ).to eq '/a-path/images/blank.gif'
+    end
+
     context "when relative is true" do
 
       before(:each) do
@@ -106,7 +115,7 @@ describe Middleman::Util do
       end
 
       it "returns path relative to the provided current_resource" do
-        current_resource = instance_double("Middleman::Sitemap::Resource", destination_path: 'a-path/index.html')
+        current_resource = instance_double("Middleman::Sitemap::Resource", destination_path: 'a-path/index.html', path: 'a-path/index.html')
         expect( Middleman::Util.asset_url( @mm, 'blank.gif', 'images', current_resource: current_resource,
                                                                        relative: true ) ).to eq '../images/blank.gif'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0.rc.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,6 +314,7 @@ files:
 - features/default-layout.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
+- features/encoding_option.feature
 - features/extension_api_deprecations.feature
 - features/extension_hooks.feature
 - features/extensionless_text_files.feature
@@ -336,6 +337,7 @@ files:
 - features/i18n_builder.feature
 - features/i18n_force_locale.feature
 - features/i18n_link_to.feature
+- features/i18n_mixed_sources.feature
 - features/i18n_partials.feature
 - features/i18n_preview.feature
 - features/ignore.feature
@@ -403,6 +405,7 @@ files:
 - fixtures/asset-hash-app/source/partials.html.erb
 - fixtures/asset-hash-app/source/slim.html.slim
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
+- fixtures/asset-hash-app/source/stylesheets/fragment.css.scss
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_fonts.css
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
@@ -669,6 +672,8 @@ files:
 - fixtures/gzip-app/source/index.html
 - fixtures/gzip-app/source/javascripts/test.js
 - fixtures/gzip-app/source/stylesheets/test.css
+- fixtures/i-8859-1-app/config.rb
+- fixtures/i-8859-1-app/source/index.html.erb
 - fixtures/i18n-alt-root-app/locales/en.yml
 - fixtures/i18n-alt-root-app/locales/es.yml
 - fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
@@ -682,6 +687,15 @@ files:
 - fixtures/i18n-force-locale/locales/es.yml
 - fixtures/i18n-force-locale/locales/fr.yml
 - fixtures/i18n-force-locale/source/index.html.haml
+- fixtures/i18n-mixed-sources/config.rb
+- fixtures/i18n-mixed-sources/locales/en.yml
+- fixtures/i18n-mixed-sources/locales/es.yml
+- fixtures/i18n-mixed-sources/source/a/sub.html.erb
+- fixtures/i18n-mixed-sources/source/b/index.html.erb
+- fixtures/i18n-mixed-sources/source/index.html.erb
+- fixtures/i18n-mixed-sources/source/localizable/a/index.html.erb
+- fixtures/i18n-mixed-sources/source/localizable/b/sub.html.erb
+- fixtures/i18n-mixed-sources/source/localizable/index.html.erb
 - fixtures/i18n-nested-app/locales/en.yml
 - fixtures/i18n-nested-app/locales/en/more.yml
 - fixtures/i18n-nested-app/locales/es.yml
@@ -826,6 +840,7 @@ files:
 - fixtures/indexable-app/source/evil spaces.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
+- fixtures/indexable-app/source/regex_leave_me_alone2.html
 - fixtures/indexable-app/source/regular/index.html
 - fixtures/indexable-app/source/wildcard_leave_me_alone.html
 - fixtures/javascript-app/config.rb
@@ -1411,9 +1426,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -1448,6 +1463,7 @@ test_files:
 - features/default-layout.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
+- features/encoding_option.feature
 - features/extension_api_deprecations.feature
 - features/extension_hooks.feature
 - features/extensionless_text_files.feature
@@ -1470,6 +1486,7 @@ test_files:
 - features/i18n_builder.feature
 - features/i18n_force_locale.feature
 - features/i18n_link_to.feature
+- features/i18n_mixed_sources.feature
 - features/i18n_partials.feature
 - features/i18n_preview.feature
 - features/ignore.feature
@@ -1537,6 +1554,7 @@ test_files:
 - fixtures/asset-hash-app/source/partials.html.erb
 - fixtures/asset-hash-app/source/slim.html.slim
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
+- fixtures/asset-hash-app/source/stylesheets/fragment.css.scss
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_fonts.css
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
@@ -1803,6 +1821,8 @@ test_files:
 - fixtures/gzip-app/source/index.html
 - fixtures/gzip-app/source/javascripts/test.js
 - fixtures/gzip-app/source/stylesheets/test.css
+- fixtures/i-8859-1-app/config.rb
+- fixtures/i-8859-1-app/source/index.html.erb
 - fixtures/i18n-alt-root-app/locales/en.yml
 - fixtures/i18n-alt-root-app/locales/es.yml
 - fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
@@ -1816,6 +1836,15 @@ test_files:
 - fixtures/i18n-force-locale/locales/es.yml
 - fixtures/i18n-force-locale/locales/fr.yml
 - fixtures/i18n-force-locale/source/index.html.haml
+- fixtures/i18n-mixed-sources/config.rb
+- fixtures/i18n-mixed-sources/locales/en.yml
+- fixtures/i18n-mixed-sources/locales/es.yml
+- fixtures/i18n-mixed-sources/source/a/sub.html.erb
+- fixtures/i18n-mixed-sources/source/b/index.html.erb
+- fixtures/i18n-mixed-sources/source/index.html.erb
+- fixtures/i18n-mixed-sources/source/localizable/a/index.html.erb
+- fixtures/i18n-mixed-sources/source/localizable/b/sub.html.erb
+- fixtures/i18n-mixed-sources/source/localizable/index.html.erb
 - fixtures/i18n-nested-app/locales/en.yml
 - fixtures/i18n-nested-app/locales/en/more.yml
 - fixtures/i18n-nested-app/locales/es.yml
@@ -1960,6 +1989,7 @@ test_files:
 - fixtures/indexable-app/source/evil spaces.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
+- fixtures/indexable-app/source/regex_leave_me_alone2.html
 - fixtures/indexable-app/source/regular/index.html
 - fixtures/indexable-app/source/wildcard_leave_me_alone.html
 - fixtures/javascript-app/config.rb