middleman-core 4.5.0 → 4.6.0

data/fixtures/generator-test/config.rb

@@ -1,16 +1,3 @@
-###
-# Compass
-###
-
-# Susy grids in Compass
-# First: gem install compass-susy-plugin
-# require 'susy'
-
-# Change Compass configuration
-# compass_config do |config|
-#   config.output_style = :compact
-# end
-
 ###
 # Page options, layouts, aliases and proxies
 ###
@@ -53,7 +40,7 @@
 
 # Production configuration
 configure :production do
-  # For example, change the Compass output style for deployment
+  # Minify CSS
   # activate :minify_css
 
   # Minify Javascript

data/fixtures/sinatra-app/config.rb

@@ -1,6 +1,8 @@
 require "sinatra"
 
 class MySinatra < Sinatra::Base
+  set :host_authorization, { permitted_hosts: "www.example.com" }
+
   get "/" do
     "Hello World (Sinatra)"
   end

data/lib/middleman-core/application.rb

@@ -300,8 +300,6 @@ module Middleman
         Encoding.default_external = config[:encoding]
       end
 
-      prune_tilt_templates!
-
       # After extensions have worked after_config
       execute_callbacks(:after_configuration)
 
@@ -343,17 +341,6 @@ module Middleman
       config_context.instance_eval File.read(env_config), env_config, 1
     end
 
-    # Clean up missing Tilt exts
-    def prune_tilt_templates!
-      ::Tilt.default_mapping.lazy_map.each_key do |key|
-        begin
-          ::Tilt[".#{key}"]
-        rescue LoadError, NameError
-          ::Tilt.default_mapping.lazy_map.delete(key)
-        end
-      end
-    end
-
     # Whether we're in a specific mode
     # @param [Symbol] key
     # @return [Boolean]

data/lib/middleman-core/builder.rb

@@ -87,7 +87,7 @@ module Middleman
       !@has_error
     end
 
-    # Pre-request CSS to give Compass a chance to build sprites
+    # Pre-request CSS to give Sass a chance to build sprites
     # @return [Array<Resource>] List of css resources that were output.
     Contract ResourceList
     def prerender_css
@@ -99,9 +99,9 @@ module Middleman
       end
 
       ::Middleman::Util.instrument 'builder.prerender.check-files' do
-        # Double-check for compass sprites
+        # Double-check for Sass sprites
         unless @app.files.find_new_files!.empty?
-          logger.debug '== Checking for Compass sprites'
+          logger.debug '== Checking for Sass sprites'
           @app.sitemap.ensure_resource_list_updated!
         end
       end

data/lib/middleman-core/contracts.rb

@@ -27,7 +27,6 @@ else
       base.extend self
     end
 
-    # rubocop:disable MethodName
     def Contract(*); end
 
     class Callable

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

@@ -3,7 +3,7 @@ require 'middleman-core/core_extensions/collections/lazy_step'
 module Middleman
   module CoreExtensions
     module Collections
-      class LazyCollectorRoot < BasicObject
+      class LazyCollectorRoot
         def initialize(parent)
           @data = nil
           @parent = parent

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

@@ -1,7 +1,7 @@
 module Middleman
   module CoreExtensions
     module Collections
-      class LazyCollectorStep < BasicObject
+      class LazyCollectorStep
         DELEGATE = [:hash, :eql?].freeze
 
         def initialize(name, args, block, parent=nil)