RubyGems - middleman-core - Versions diffs - 3.3.12 → 3.4.0 - Mend

middleman-core 3.3.12 → 3.4.0

Files changed (93) hide show

data/fixtures/relative-assets-app/source/relative_image.html.erb CHANGED Viewed

@@ -1,6 +1,7 @@
 <html>
   <head>
     <%= stylesheet_link_tag :relative_assets %>
+    <%= javascript_include_tag :app %>
   </head>
   <body>
     <%= image_tag "blank.gif" %>

data/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <%= stylesheet_link_tag :relative_assets, relative: false %>
+    <%= javascript_include_tag :app, relative: false  %>
+  </head>
+  <body>
+    <%= image_tag "blank.gif" %>
+  </body>
+</html>

data/lib/middleman-core/application.rb CHANGED Viewed

@@ -8,10 +8,6 @@ require 'i18n'
 # users expect.
 ::I18n.enforce_available_locales = false
-# Use ActiveSupport JSON
-require 'active_support/json'
-require 'active_support/core_ext/integer/inflections'
 # Simple callback library
 require 'hooks'
@@ -57,7 +53,9 @@ module Middleman
     # Root project directory (overwritten in middleman build/server)
     # @return [String]
     def self.root
-      ENV['MM_ROOT'] || Dir.pwd
+      r = ENV['MM_ROOT'] ? ENV['MM_ROOT'].dup : ::Middleman::Util.current_directory
+      r.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
+      r
     end
     delegate :root, to: :"self.class"
@@ -71,6 +69,14 @@ module Middleman
     # @return [Fixnum]
     config.define_setting :port, 4567, 'The preview server port'
+    # Which server name should be used
+    # @return [NilClass, String]
+    config.define_setting :server_name, nil, 'The server name of preview server'
+    # Which bind address the preview server should use
+    # @return [NilClass, String]
+    config.define_setting :bind_address, nil, 'The bind address of the preview server'
     # Whether to serve the preview server over HTTPS.
     # @return [Boolean]
     config.define_setting :https, false, 'Serve the preview server over SSL/TLS'

data/lib/middleman-core/cli/build.rb CHANGED Viewed

@@ -138,7 +138,9 @@ module Middleman::Cli
         base.remove_file f, force: true
       end
-      Dir[@build_dir.join('**', '*')].select { |d| File.directory?(d) }.each do |d|
+      ::Middleman::Util.glob_directory(@build_dir.join('**', '*'))
+        .select { |d| File.directory?(d) }
+        .each do |d|
         base.remove_file d, force: true if directory_empty? d
       end
     end

data/lib/middleman-core/cli/bundler.rb CHANGED Viewed

@@ -34,6 +34,6 @@ module Middleman::Cli
   # Map "u" to "upgrade"
   Base.map(
-             'u' => 'upgrade'
+    'u' => 'upgrade'
   )
 end

data/lib/middleman-core/cli/extension.rb CHANGED Viewed

@@ -35,13 +35,13 @@ module Middleman::Cli
     # Output a .gitignore file
     class_option :git, type: :boolean, default: true
-    no_tasks {
+    no_tasks do
       # Write a .gitignore file for project
       # @return [void]
       def generate_gitignore!
         return unless options[:git]
         copy_file 'gitignore', File.join(name, '.gitignore')
       end
-    }
+    end
   end
 end

data/lib/middleman-core/cli/init.rb CHANGED Viewed

@@ -64,8 +64,8 @@ module Middleman::Cli
   # Map "i", "new" and "n" to "init"
   Base.map(
-             'i'   => 'init',
-             'new' => 'init',
-             'n'   => 'init'
+    'i'   => 'init',
+    'new' => 'init',
+    'n'   => 'init'
   )
 end

data/lib/middleman-core/cli/server.rb CHANGED Viewed

@@ -14,6 +14,12 @@ module Middleman::Cli
     method_option :port,
                   aliases: '-p',
                   desc: 'The port Middleman will listen on'
+    method_option :server_name,
+                  aliases: '-s',
+                  desc: 'The server name name Middleman will use'
+    method_option :bind_address,
+                  aliases: '-b',
+                  desc: 'The bind address Middleman will listen on'
     method_option :https,
                   type: :boolean,
                   desc: 'Serve the preview server over SSL/TLS'
@@ -59,13 +65,15 @@ module Middleman::Cli
       unless ENV['MM_ROOT']
         puts '== Could not find a Middleman project config.rb'
         puts '== Treating directory as a static site to be served'
-        ENV['MM_ROOT'] = Dir.pwd
+        ENV['MM_ROOT'] = ::Middleman::Util.current_directory
         ENV['MM_SOURCE'] = ''
       end
       params = {
         port: options['port'],
+        bind_address: options['bind_address'],
         https: options['https'],
+        server_name: options['server_name'],
         ssl_certificate: options['ssl_certificate'],
         ssl_private_key: options['ssl_private_key'],
         environment: options['environment'],

data/lib/middleman-core/configuration.rb CHANGED Viewed

@@ -118,7 +118,6 @@ module Middleman
       # Set the value of a setting by key. Creates the setting if it doesn't exist.
       # @param [Symbol] key
       # @param [Object] val
-      # rubocop:disable UselessSetterCall
       def []=(key, val)
         setting_obj = setting(key) || define_setting(key)
         setting_obj.value = val
@@ -228,7 +227,6 @@ module Middleman
       end
       # Whether or not there has been a value set beyond the default
-      # rubocop:disable TrivialAccessors
       def value_set?
         @value_set
       end

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

@@ -9,7 +9,7 @@ module Middleman
         def registered(app)
           # Data formats
           require 'yaml'
-          require 'active_support/json'
+          require 'json'
           app.config.define_setting :data_dir, 'data', 'The directory data files are stored in'
           app.send :include, InstanceMethods
@@ -98,7 +98,7 @@ module Middleman
           if %w(.yaml .yml).include?(extension)
             data = YAML.load_file(full_path)
           elsif extension == '.json'
-            data = ActiveSupport::JSON.decode(full_path.read)
+            data = JSON.parse(full_path.read)
           else
             return
           end

data/lib/middleman-core/core_extensions/external_helpers.rb CHANGED Viewed

@@ -19,7 +19,8 @@ module Middleman
             helpers_path = File.join(root, config[:helpers_dir])
             next unless File.exist?(helpers_path)
-            Dir[File.join(helpers_path, config[:helpers_filename_glob])].each do |filename|
+            glob = File.join(helpers_path, config[:helpers_filename_glob])
+            ::Middleman::Util.glob_directory(glob).each do |filename|
               module_name = config[:helpers_filename_to_module_name_proc].call(filename)
               next unless module_name

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

@@ -95,6 +95,8 @@ module Middleman
         # @param [Pathname] path The file that changed
         # @return [void]
         def did_change(path)
+          path = path.to_s.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
           path = Pathname(path)
           logger.debug "== File Change: #{path}"
           @known_paths << path
@@ -106,6 +108,8 @@ module Middleman
         # @param [Pathname] path The file that was deleted
         # @return [void]
         def did_delete(path)
+          path = path.to_s.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
           path = Pathname(path)
           logger.debug "== File Deletion: #{path}"
           @known_paths.delete(path)
@@ -146,7 +150,10 @@ module Middleman
         end
         def exists?(path)
+          path = path.to_s.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
           p = Pathname(path)
           p = p.relative_path_from(Pathname(@app.root)) unless p.relative?
           @known_paths.include?(p)
         end

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

@@ -5,7 +5,7 @@ require 'pathname'
 require 'yaml'
 # Parsing JSON frontmatter
-require 'active_support/json'
+require 'json'
 # Extensions namespace
 module Middleman::CoreExtensions
@@ -101,7 +101,7 @@ module Middleman::CoreExtensions
         data, content = frontmatter_and_content(p)
         if app.files.exists?("#{path}.frontmatter")
-          external_data, _ = frontmatter_and_content("#{p}.frontmatter")
+          external_data, = frontmatter_and_content("#{p}.frontmatter")
           data = external_data.deep_merge(data)
         end
@@ -154,7 +154,7 @@ module Middleman::CoreExtensions
         begin
           json = ($1 + $2).sub(';;;', '{').sub(';;;', '}')
-          data = ActiveSupport::JSON.decode(json).symbolize_keys
+          data = JSON.parse(json).symbolize_keys
         rescue => e
           app.logger.error "JSON Exception parsing #{full_path}: #{e.message}"
           return false
@@ -185,7 +185,7 @@ module Middleman::CoreExtensions
       # Avoid weird race condition when a file is renamed.
       content = begin
-        File.read(full_path)
+        read_data_file(full_path)
       rescue ::EOFError
       rescue ::IOError
       rescue ::Errno::ENOENT
@@ -208,6 +208,15 @@ module Middleman::CoreExtensions
       [data, content]
     end
+    def read_data_file(path)
+      data = File.open(path, 'rb') { |io| io.read }
+      if data.respond_to?(:force_encoding)
+        # Set it to the default external (without verifying)
+        data.force_encoding(Encoding.default_external) if Encoding.default_external
+      end
+      data
+    end
     def normalize_path(path)
       path.sub(%r{^#{Regexp.escape(app.source_dir)}\/}, '')
     end

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

@@ -217,10 +217,19 @@ module Middleman
             # Render the partial if found, otherwide throw exception
             _render_with_all_renderers(found_partial, locals, self, options, &block)
           else
-            File.read(found_partial)
+            read_template_file(found_partial)
           end
         end
+        def read_template_file(path)
+          data = ::File.open(path, 'rb') { |io| io.read }
+          if data.respond_to?(:force_encoding)
+            # Set it to the default external (without verifying)
+            data.force_encoding(::Encoding.default_external) if ::Encoding.default_external
+          end
+          data
+        end
         # Partial locator.
         #
         # @param [String] partial_name
@@ -277,6 +286,7 @@ module Middleman
           extension = File.extname(path)
           options = opts.dup.merge(options_for_ext(extension))
           options[:outvar] ||= '@_out_buf'
+          options[:default_encoding] ||= 'UTF-8'
           options.delete(:layout)
           # Overwrite with frontmatter options
@@ -300,7 +310,7 @@ module Middleman
           end
           # Render using Tilt
-          content = template.render(context, locs, &block)
+          content = template.render(context || ::Object.new, locs, &block)
           # Allow hooks to manipulate the result after render
           self.class.callbacks_for_hook(:after_render).each do |callback|
@@ -326,7 +336,7 @@ module Middleman
         # @param [String] path
         # @return [String]
         def template_data_for_file(path)
-          File.read(File.expand_path(path, source_dir))
+          read_template_file(File.expand_path(path, source_dir))
         end
         # Get a hash of configuration options for a given file extension, from
@@ -418,11 +428,16 @@ module Middleman
           layout_path = locate_layout(layout_name, current_engine)
+          unless layout_path
+            raise ::Middleman::CoreExtensions::Rendering::TemplateNotFound, "Could not locate layout: #{layout_name}"
+          end
           extension = File.extname(layout_path)
           engine = extension[1..-1].to_sym
           # Store last engine for later (could be inside nested renders)
-          self.current_engine, engine_was = engine, current_engine
+          self.current_engine = engine
+          engine_was = current_engine
           begin
             content = if block_given?
@@ -447,7 +462,6 @@ module Middleman
         end
         # The currently rendering engine
-        # rubocop:disable TrivialAccessors
         # @return [Symbol, nil]
         def current_engine=(v)
           @_current_engine = v
@@ -502,7 +516,7 @@ module Middleman
             found_path = nil
             search_paths.each do |path_with_ext|
-              found_path = Dir[path_with_ext].find do |path|
+              found_path = ::Middleman::Util.glob_directory(path_with_ext).find do |path|
                 ::Tilt[path]
               end

data/lib/middleman-core/core_extensions/request.rb CHANGED Viewed

@@ -173,8 +173,8 @@ module Middleman
         def current_path=(path)
           Thread.current[:current_path] = path
           Thread.current[:legacy_request] = ::Thor::CoreExt::HashWithIndifferentAccess.new(
-                                                                                             path: path,
-                                                                                             params: req ? ::Thor::CoreExt::HashWithIndifferentAccess.new(req.params) : {}
+            path: path,
+            params: req ? ::Thor::CoreExt::HashWithIndifferentAccess.new(req.params) : {}
           )
         end

data/lib/middleman-core/dns_resolver.rb ADDED Viewed

@@ -0,0 +1,73 @@
+require 'resolv'
+require 'middleman-core/dns_resolver/network_resolver'
+require 'middleman-core/dns_resolver/hosts_resolver'
+module Middleman
+  # This resolves IP address to names and vice versa
+  class DnsResolver
+    private
+    attr_reader :resolvers
+    public
+    # Create resolver
+    #
+    # First the local resolver is used. If environment variable HOSTSRC is
+    # given this file is used for local name lookup.
+    #
+    # @param [#getnames, #getaddresses] network_resolver
+    #   The resolver which uses a network name server to resolve ip addresses
+    #   and names.
+    #
+    # @param [#getnames, #getaddresses] local_resolver
+    #   The resolver uses /etc/hosts on POSIX-systems and
+    #   C:\Windows\System32\drivers\etc\hosts on Windows-operating systems to
+    #   resolve ip addresses and names.
+    #
+    # First the local resolver is queried. If this raises an error or returns
+    # nil or [] the network resolver is queried.
+    def initialize(opts={})
+      @resolvers = []
+      @resolvers << opts.fetch(:hosts_resolver, HostsResolver.new)
+      if RUBY_VERSION >= '2.1'
+        require 'middleman-core/dns_resolver/local_link_resolver'
+        @resolvers << opts.fetch(:local_link_resolver, LocalLinkResolver.new)
+      end
+      @resolvers << opts.fetch(:network_resolver, NetworkResolver.new)
+    end
+    # Get names for given ip
+    #
+    # @param [String] ip
+    #   The ip which should be resolved.
+    def names_for(ip)
+      resolvers.each do |r|
+        names = r.getnames(ip)
+        return names unless names.nil? || names.empty?
+      end
+      []
+    end
+    # Get ips for given name
+    #
+    # First the local resolver is used. On POSIX-systems /etc/hosts is used. On
+    # Windows C:\Windows\System32\drivers\etc\hosts is used.
+    #
+    # @param [String] name
+    #   The name which should be resolved.
+    def ips_for(name)
+      resolvers.each do |r|
+        ips = r.getaddresses(name)
+        return ips unless ips.nil? || ips.empty?
+      end
+      []
+    end
+  end
+end

data/lib/middleman-core/dns_resolver/basic_network_resolver.rb ADDED Viewed

@@ -0,0 +1,52 @@
+module Middleman
+  class DnsResolver
+    # Use network name server to resolve ips and names
+    class BasicNetworkResolver
+      private
+      attr_reader :resolver, :timeouts
+      public
+      def initialize(opts={})
+        @timeouts = opts.fetch(:timeouts, 2)
+      end
+      # Get names for ip
+      #
+      # @param [#to_s] ip
+      #   The ip to resolve into names
+      #
+      # @return [Array]
+      #   Array of Names
+      def getnames(ip)
+        resolver.getnames(ip.to_s).map(&:to_s)
+      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL
+        []
+      end
+      # Get ips for name
+      #
+      # @param [#to_s] name
+      #   The name to resolve into ips
+      #
+      # @return [Array]
+      #   Array of ipaddresses
+      def getaddresses(name)
+        resolver.getaddresses(name.to_s).map(&:to_s)
+      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL
+        []
+      end
+      # Set timeout for lookup
+      #
+      # @param [Integer] value
+      #   The timeout value
+      def timeouts=(timeouts)
+        return if RUBY_VERSION < '2'
+        resolver.timeouts = timeouts
+      end
+    end
+  end
+end