middleman-core 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56d4346f7e637375c81e78637eb685379d71afdc
-  data.tar.gz: 49168cf55df8f81be1c53ccff538bd36916089a4
+  metadata.gz: 07f3019963e912c90ffd23f7781a1e2708916d99
+  data.tar.gz: 390ae3524c422182a88efcc01cf84b99406819b2
 SHA512:
-  metadata.gz: 3b13b9ee36f2d9e64a56569d167d81d5b4fc8cfd3fb71d653640cd9ec59ef352ba80f01ed6bb353a413d96ea96b747b1a2fe7a258491ef81174228ef3a0d0f2b
-  data.tar.gz: af98ca1aa0717fa1d25258324e42a3cafc38e8f4d813ae9286321b24fed8a18a0a884d6738de5db9b1a692a0753da725468f6d4490403d9e9a3c2136f5f2daf7
+  metadata.gz: 808225bf5afa002a4ce07c597bcc3bf9db8896214701b7d07ca279c3a5549101a147617b3c285c9d912d4edad6aa2d8315cc0e026e9f68cb7105b8e464520371
+  data.tar.gz: 6252c9056ac15fac4b34ad46a7853b0855a0d7d89ad1fffc605b2eaa23a78e240af0bba31dcb3d6f96a65951f728c4422f665a3d0771e5ff4b10c0ce42cbc81f

data/features/partials.feature

@@ -5,25 +5,30 @@ Feature: Provide Sane Defaults for Partial Behavior
     When I go to "/index.html"
     Then I should see "Header"
     And I should see "Footer"
-    
+
   Scenario: Finds shared partials relative to the root (sub)
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
     Then I should see "Header"
     And I should see "Footer"
-    
+
+  Scenario: Flags error when partial is not found
+    Given the Server is running at "partials-app"
+    When I go to "/index_missing.html"
+    Then I should see "Error: Could not locate partial"
+
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/index.html"
     Then I should see "ERb Main"
-  
+
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/second.html"
     Then I should see "Str Main"
     And I should see "Header"
     And I should see "Footer"
-    
+
   Scenario: Finds partial relative to template
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
@@ -33,7 +38,7 @@ Feature: Provide Sane Defaults for Partial Behavior
     Given the Server is running at "partials-app"
     When I go to "/locals.html"
     Then I should see "Local var is bar"
-  
+
   Scenario: Partial and Layout use different engines
     Given the Server is running at "different-engine-partial"
     When I go to "/index.html"

data/fixtures/partials-app/source/index_missing.html.erb

@@ -0,0 +1,3 @@
+<%= partial "shared/header" %>
+<%= partial "i_do_not_exist" %>
+<%= partial "shared/footer" %>

data/lib/middleman-core/application.rb

@@ -96,6 +96,10 @@ module Middleman
     # @return [String]
     define_setting :source, 'source', 'Name of the source directory'
 
+    # If we should not run the sitemap.
+    # @return [Boolean]
+    define_setting :disable_sitemap, false, 'If we should not run the sitemap.'
+
     # If we should exit before ready event.
     # @return [Boolean]
     define_setting :exit_before_ready, false, 'If we should exit before ready event.'
@@ -106,7 +110,7 @@ module Middleman
 
     # Middleman environment. Defaults to :development
     # @return [String]
-    define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development'
+    define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development', import: proc { |s| s.to_sym }
 
     # Which file should be used for directory indexes
     # @return [String]

data/lib/middleman-core/builder.rb

@@ -117,7 +117,13 @@ module Middleman
                       .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
 
       if @glob
-        resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
+        resources = resources.select do |resource|
+          if defined?(::File::FNM_EXTGLOB)
+            File.fnmatch(@glob, resource.destination_path, ::File::FNM_EXTGLOB)
+          else
+            File.fnmatch(@glob, resource.destination_path)
+          end
+        end
       end
 
       output_resources(resources)

data/lib/middleman-core/extensions.rb

@@ -52,7 +52,7 @@ module Middleman
       def register(name, extension_class=nil, options={}, &block)
         raise 'Extension name must be a symbol' unless name.is_a?(Symbol)
         # If we've already got an extension registered under this name, bail out
-        raise "There is already an extension registered with the name '#{name}'" if registered.key?(name)
+        # raise "There is a already an extension registered with the name '#{name}'" if registered.key?(name)
 
         # If the extension is defined with a block, grab options out of the "extension_class" parameter.
         if extension_class && block_given? && options.empty? && extension_class.is_a?(Hash)

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

@@ -11,16 +11,22 @@ class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
     index_file = app.config[:index_file]
     new_index_path = "/#{index_file}"
 
+    extensions = %w(.htm .html .php)
+
     resources.each do |resource|
       # Check if it would be pointless to reroute
       next if resource.destination_path == index_file ||
               resource.destination_path.end_with?(new_index_path) ||
-              File.extname(index_file) != resource.ext
+              !extensions.include?(resource.ext)
 
       # Check if file metadata (options set by "page" in config.rb or frontmatter) turns directory_index off
       next if resource.options[:directory_index] == false
 
-      resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
+      extensions.each do |ext|
+        resource.destination_path = resource.destination_path.chomp(ext)
+      end
+
+      resource.destination_path += new_index_path
     end
   end
 end

data/lib/middleman-core/preview_server.rb

@@ -18,12 +18,13 @@ module Middleman
 
       # Start an instance of Middleman::Application
       # @return [void]
-      def start(opts={})
+      def start(opts={}, cli_options={})
         # Do not buffer output, otherwise testing of output does not work
         $stdout.sync = true
         $stderr.sync = true
 
         @options = opts
+        @cli_options = cli_options
         @server_information = ServerInformation.new
         @server_information.https = (@options[:https] == true)
 
@@ -131,6 +132,7 @@ module Middleman
 
       def initialize_new_app
         opts = @options.dup
+        cli_options = @cli_options.dup
 
         ::Middleman::Logger.singleton(
           opts[:debug] ? 0 : 1,
@@ -138,17 +140,14 @@ module Middleman
         )
 
         app = ::Middleman::Application.new do
-          config[:environment] = opts[:environment].to_sym if opts[:environment]
-          config[:watcher_disable] = opts[:disable_watcher]
-          config[:watcher_force_polling] = opts[:force_polling]
-          config[:watcher_latency] = opts[:latency]
-
-          config[:port] = opts[:port] if opts[:port]
-          config[:bind_address]    = opts[:bind_address]
-          config[:server_name]     = opts[:server_name]
-          config[:https]           = opts[:https] unless opts[:https].nil?
-          config[:ssl_certificate] = opts[:ssl_certificate] if opts[:ssl_certificate]
-          config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
+          cli_options.each do |k, v|
+            setting = config.setting(k.to_sym)
+            next unless setting
+
+            v = setting.options[:import].call(v) if setting.options[:import]
+
+            config[k.to_sym] = v
+          end
 
           ready do
             unless config[:watcher_disable]

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

@@ -23,8 +23,8 @@ module Middleman
         ImportPathDescriptor = Struct.new(:from, :renameProc) do
           def execute_descriptor(app, resources)
             resources + ::Middleman::Util.glob_directory(File.join(from, '**/*'))
-                        .reject { |path| File.directory?(path) }
-                        .map do |path|
+                                         .reject { |path| File.directory?(path) }
+                                         .map do |path|
                           target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
 
                           ::Middleman::Sitemap::Resource.new(

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

@@ -216,6 +216,8 @@ module Middleman
       # rebuild_resource_list! since the last time it was run. This is
       # very expensive!
       def ensure_resource_list_updated!
+        return if @app.config[:disable_sitemap]
+
         @lock.synchronize do
           return unless @needs_sitemap_rebuild
 
@@ -237,7 +239,16 @@ module Middleman
                 # Rebuild cache
                 @resources.each do |resource|
                   @_lookup_by_path[resource.path] = resource
+                end
+
+                @resources.each do |resource|
                   @_lookup_by_destination_path[resource.destination_path] = resource
+                end
+
+                # NB: This needs to be done after the previous two steps,
+                # since some proxy resources are looked up by path in order to
+                # get their metadata and subsequently their page_id.
+                @resources.each do |resource|
                   @_lookup_by_page_id[resource.page_id.to_sym] = resource
                 end
 

data/lib/middleman-core/sources.rb

@@ -116,7 +116,8 @@ module Middleman
     Contract Or[Symbol, HANDLER], Maybe[Hash] => HANDLER
     def watch(type_or_handler, options={})
       handler = if type_or_handler.is_a? Symbol
-        SourceWatcher.new(self, type_or_handler, options.delete(:path), options)
+        path = File.expand_path(options.delete(:path), app.root)
+        SourceWatcher.new(self, type_or_handler, path, options)
       else
         type_or_handler
       end

data/lib/middleman-core/sources/source_watcher.rb

@@ -92,7 +92,7 @@ module Middleman
     # @return [void]
     Contract String => Any
     def update_path(directory)
-      @directory = Pathname(directory)
+      @directory = Pathname(File.expand_path(directory, app.root))
 
       stop_listener! if @listener
 
@@ -133,6 +133,7 @@ module Middleman
       return nil if p.absolute? && !p.to_s.start_with?(@directory.to_s)
 
       p = @directory + p if p.relative?
+
       if glob
         @extensionless_files[p]
       else

data/lib/middleman-core/template_context.rb

@@ -104,7 +104,6 @@ module Middleman
 
       partial_file = locate_partial(name, false) || locate_partial(name, true)
 
-      return '' unless partial_file
       raise ::Middleman::TemplateRenderer::TemplateNotFound, "Could not locate partial: #{name}" unless partial_file
 
       source_path = sitemap.file_to_path(partial_file)

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
-  s.add_dependency("addressable", ["~> 2.4.0"])
+  s.add_dependency("addressable", ["~> 2.3"])
 
   # Watcher
   s.add_dependency('listen', ['~> 3.0'])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n', ['~> 0.7.0'])
 
   # Automatic Image Sizes
-  s.add_dependency('fastimage', ['~> 1.8'])
+  s.add_dependency('fastimage', ['~> 1.7'])
 
   # Minify CSS
   s.add_dependency('sass', ['>= 3.4'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,14 +136,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -192,14 +192,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -1202,6 +1202,7 @@ files:
 - fixtures/partials-app/source/block.html.erb
 - fixtures/partials-app/source/images/tiger.svg
 - fixtures/partials-app/source/index.html.erb
+- fixtures/partials-app/source/index_missing.html.erb
 - fixtures/partials-app/source/locals.html.erb
 - fixtures/partials-app/source/second.html.str
 - fixtures/partials-app/source/shared/_footer.erb
@@ -2356,6 +2357,7 @@ test_files:
 - fixtures/partials-app/source/block.html.erb
 - fixtures/partials-app/source/images/tiger.svg
 - fixtures/partials-app/source/index.html.erb
+- fixtures/partials-app/source/index_missing.html.erb
 - fixtures/partials-app/source/locals.html.erb
 - fixtures/partials-app/source/second.html.str
 - fixtures/partials-app/source/shared/_footer.erb