middleman-core 4.0.0.alpha.2 → 4.0.0.alpha.3

data/lib/middleman-core/core_extensions.rb

@@ -52,6 +52,11 @@ Middleman::Extensions.register :routing, auto_activate: :before_configuration do
   Middleman::CoreExtensions::Routing
 end
 
+Middleman::Extensions.register :collections, auto_activate: :before_configuration do
+  require 'middleman-core/core_extensions/collections'
+  Middleman::CoreExtensions::Collections::CollectionsExtension
+end
+
 ###
 # Setup Optional Extensions
 ###

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

@@ -0,0 +1,82 @@
+require 'middleman-core/core_extensions/collections/pagination'
+require 'middleman-core/core_extensions/collections/step_context'
+require 'middleman-core/core_extensions/collections/lazy_root'
+require 'middleman-core/core_extensions/collections/lazy_step'
+
+# Super "class-y" injection of array helpers
+class Array
+  include Middleman::Pagination::ArrayHelpers
+end
+
+module Middleman
+  module CoreExtensions
+    module Collections
+      class CollectionsExtension < Extension
+        # This should run after most other sitemap manipulators so that it
+        # gets a chance to modify any new resources that get added.
+        self.resource_list_manipulator_priority = 110
+
+        attr_accessor :root_collector, :leaves
+
+        def initialize(app, options_hash={}, &block)
+          super
+
+          @leaves = Set.new
+          @collectors_by_name = {}
+          @values_by_name = {}
+
+          @root_collector = LazyCollectorRoot.new(self)
+        end
+
+        Contract None => Any
+        def before_configuration
+          @leaves.clear
+
+          app.add_to_config_context :resources, &method(:root_collector)
+          app.add_to_config_context :collection, &method(:register_collector)
+        end
+
+        Contract Symbol, LazyCollectorStep => Any
+        def register_collector(label, endpoint)
+          @collectors_by_name[label] = endpoint
+        end
+
+        Contract Symbol => Any
+        def collector_value(label)
+          @values_by_name[label]
+        end
+
+        Contract ResourceList => ResourceList
+        def manipulate_resource_list(resources)
+          @root_collector.realize!(resources)
+
+          ctx = StepContext.new
+          leaves = @leaves.dup
+
+          @collectors_by_name.each do |k, v|
+            @values_by_name[k] = v.value(ctx)
+            leaves.delete v
+          end
+
+          # Execute code paths
+          leaves.each do |v|
+            v.value(ctx)
+          end
+
+          # Inject descriptors
+          resources + ctx.descriptors.map { |d| d.to_resource(app) }
+        end
+
+        helpers do
+          def collection(label)
+            extensions[:collections].collector_value(label)
+          end
+
+          def pagination
+            current_resource.data.pagination
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'middleman-core/core_extensions/collections/lazy_step'
+
+module Middleman
+  module CoreExtensions
+    module Collections
+      class LazyCollectorRoot < BasicObject
+        def initialize(parent)
+          @data = nil
+          @parent = parent
+        end
+
+        def realize!(data)
+          @data = data
+        end
+
+        def value(_ctx=nil)
+          @data
+        end
+
+        def leaves
+          @parent.leaves
+        end
+
+        def method_missing(name, *args, &block)
+          LazyCollectorStep.new(name, args, block, self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Middleman
+  module CoreExtensions
+    module Collections
+      class LazyCollectorStep < BasicObject
+        DELEGATE = [:hash, :eql?]
+
+        def initialize(name, args, block, parent=nil)
+          @name = name
+          @args = args
+          @block = block
+
+          @parent = parent
+          @result = nil
+
+          leaves << self
+        end
+
+        def leaves
+          @parent.leaves
+        end
+
+        def value(ctx=nil)
+          data = @parent.value(ctx)
+
+          original_block = @block
+
+          b = if ctx
+            ::Proc.new do |*args|
+              ctx.instance_exec(*args, &original_block)
+            end
+          else
+            original_block
+          end if original_block
+
+          data.send(@name, *@args.deep_dup, &b)
+        end
+
+        def method_missing(name, *args, &block)
+          return ::Kernel.send(name, *args, &block) if DELEGATE.include? name
+
+          leaves.delete self
+
+          LazyCollectorStep.new(name, args, block, self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+require 'active_support/core_ext/object/deep_dup'
+require 'middleman-core/util'
+
+module Middleman
+  module Pagination
+    module ArrayHelpers
+      def per_page(per_page)
+        return to_enum(__method__, per_page) unless block_given?
+
+        parts = if per_page.respond_to? :call
+          per_page.call(dup)
+        else
+          each_slice(per_page).reduce([]) do |sum, items|
+            sum << items
+          end
+        end
+
+        num_pages = parts.length
+        collection = self
+
+        current_start_i = 0
+        parts.each_with_index do |items, i|
+          num = i + 1
+
+          meta = ::Middleman::Pagination.page_locals(
+            num,
+            num_pages,
+            collection,
+            items,
+            current_start_i
+          )
+
+          yield items, num, meta, num >= num_pages
+
+          current_start_i += items.length
+        end
+      end
+    end
+
+    def self.page_locals(page_num, num_pages, collection, items, page_start)
+      per_page = items.length
+
+      # Index into collection of the last item of this page
+      page_end = (page_start + per_page) - 1
+
+      ::Middleman::Util.recursively_enhance(page_number: page_num,
+                                            num_pages: num_pages,
+                                            per_page: per_page,
+
+                                            # The range of item numbers on this page
+                                            # (1-based, for showing "Items X to Y of Z")
+                                            page_start: page_start + 1,
+                                            page_end: [page_end + 1, collection.length].min,
+
+                                            # Use "collection" in templates.
+                                            collection: collection)
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Middleman
+  module CoreExtensions
+    module Collections
+      class StepContext
+        def self.add_to_context(name, &func)
+          send(:define_method, :"_internal_#{name}", &func)
+        end
+
+        attr_reader :descriptors
+
+        def initialize
+          @descriptors = []
+        end
+
+        def method_missing(name, *args, &block)
+          internal = :"_internal_#{name}"
+          if respond_to?(internal)
+            @descriptors << send(internal, *args, &block)
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -33,7 +33,7 @@ module Middleman
 
         # Setup data files before anything else so they are available when
         # parsing config.rb
-        app.files.changed(:data, &@data_store.method(:update_files))
+        app.files.on_change(:data, &@data_store.method(:update_files))
       end
 
       def after_configuration

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

@@ -11,7 +11,7 @@ class Padrino::Helpers::OutputHelpers::ErbHandler
     raw = block.call(*args)
     captured = template.instance_variable_get(:@_out_buf)
     self.output_buffer = buf_was
-    engine_matches?(block) ? captured : raw
+    engine_matches?(block) && !captured.empty? ? captured : raw
   end
 end
 
@@ -35,7 +35,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
   # The helpers
   helpers do
-
     # Make all block content html_safe
     def content_tag(name, content=nil, options=nil, &block)
       # safe_content_tag(name, content, options, &block)

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

@@ -27,7 +27,7 @@ module Middleman::CoreExtensions
     end
 
     def before_configuration
-      app.files.changed(:source, &method(:clear_data))
+      app.files.on_change(:source, &method(:clear_data))
     end
 
     # @return Array<Middleman::Sitemap::Resource>
@@ -90,7 +90,14 @@ module Middleman::CoreExtensions
 
       return [data, nil] if ::Middleman::Util.binary?(full_path)
 
-      content = File.read(full_path)
+      # Avoid weird race condition when a file is renamed.
+      content = begin
+        File.read(full_path)
+      rescue ::EOFError
+      rescue ::IOError
+      rescue ::Errno::ENOENT
+        ''
+      end
 
       begin
         if content =~ /\A.*coding:/
@@ -115,7 +122,7 @@ module Middleman::CoreExtensions
     # @return [Array<Hash, String>]
     Contract String, Pathname => Maybe[[Hash, String]]
     def parse_yaml_front_matter(content, full_path)
-      yaml_regex = /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
+      yaml_regex = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
       if content =~ yaml_regex
         content = content.sub(yaml_regex, '')
 

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

@@ -23,7 +23,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # Setup data files before anything else so they are available when
     # parsing config.rb
-    app.files.changed(:locales, &method(:on_file_changed))
+    app.files.on_change(:locales, &method(:on_file_changed))
 
     @maps = {}
     @mount_at_root = options[:mount_at_root].nil? ? langs.first : options[:mount_at_root]
@@ -59,12 +59,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       if lang_suffix
         super(suffixed_partial_name) ||
-        super(File.join(locals_dir, suffixed_partial_name)) ||
-        super(partials_path) ||
-        super
+          super(File.join(locals_dir, suffixed_partial_name)) ||
+          super(partials_path) ||
+          super
       else
         super(partials_path) ||
-        super
+          super
       end
     end
   end
@@ -82,8 +82,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     resources.each do |resource|
       # If it uses file extension localization
-      if parse_locale_extension(resource.path)
-        result = parse_locale_extension(resource.path)
+      if result = parse_locale_extension(resource.path)
         ext_lang, path, page_id = result
         new_resources << build_resource(path, resource.path, page_id, ext_lang)
       # If it's a "localizable template"

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

@@ -12,7 +12,7 @@ module Middleman::CoreExtensions
     end
 
     def after_configuration
-      app.use ::Rack::ShowExceptions if app.config[:show_exceptions]
+      app.use ::Rack::ShowExceptions if !app.build? && app.config[:show_exceptions]
     end
   end
 end

data/lib/middleman-core/extension.rb

@@ -238,7 +238,7 @@ module Middleman
         @options[k] = v
       end
 
-      yield @options if block_given?
+      yield @options, self if block_given?
 
       @options.all_settings.each do |o|
         next unless o.options[:required] && !o.value_set?

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

@@ -16,8 +16,6 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
     # @return [String]
     def image_tag(path, params={})
       if !params.key?(:width) && !params.key?(:height) && !path.include?('://')
-        params[:alt] ||= ''
-
         real_path = path.dup
         real_path = File.join(config[:images_dir], real_path) unless real_path.start_with?('/')
 

data/lib/middleman-core/file_renderer.rb

@@ -75,7 +75,9 @@ module Middleman
       end
 
       # Render using Tilt
-      content = template.render(context, locs, &block)
+      content = ::Middleman::Util.instrument 'render.tilt', path: path do
+        template.render(context, locs, &block)
+      end
 
       # Allow hooks to manipulate the result after render
       @app.class.callbacks_for_hook(:after_render).each do |callback|

data/lib/middleman-core/load_paths.rb

@@ -37,7 +37,8 @@ module Middleman
     end
 
     # Recursive method to find a file in parent directories
-    def findup(filename, cwd=Pathname.new(Dir.pwd))
+    def findup(filename, cwd=Dir.pwd)
+      cwd = Pathname(cwd)
       return cwd.to_s if (cwd + filename).exist?
       return false if cwd.root?
       findup(filename, cwd.parent)

data/lib/middleman-core/logger.rb

@@ -40,7 +40,7 @@ module Middleman
       return if @instrumenting.is_a?(String) && @instrumenting != 'instrument' && !message.include?(@instrumenting)
 
       evt = ActiveSupport::Notifications::Event.new(message, *args)
-      info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms"
+      info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms\n#{args.last}"
     end
   end
 end

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -39,7 +39,7 @@ module Middleman
         build_path = 'Not built' if ignored?
         props['Build Path'] = build_path if @resource.path != build_path
         props['URL'] = content_tag(:a, @resource.url, href: @resource.url) unless ignored?
-        props['Source File'] = @resource.source_file ? @resource.source_file[:full_path].to_s : 'Dynamic'
+        props['Source File'] = @resource.source_file ? @resource.source_file[:full_path].to_s.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '') : 'Dynamic'
 
         data = @resource.data
         props['Data'] = data.inspect unless data.empty?

data/lib/middleman-core/preview_server.rb

@@ -120,7 +120,7 @@ module Middleman
           end
         end
 
-        app.files.changed :reload do
+        app.files.on_change :reload do
           $mm_reload = true
           @webrick.stop
         end