middleman-core 4.3.0.rc.3 → 4.3.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c755cc316fdd5d11efdeef58e9440a0897200ff15834a7d49150c78ddf7d937
-  data.tar.gz: 5afadb54e42bbc0da7ee549c955473dd81b66f1b9dc35db6e0a3068d533b5e22
+  metadata.gz: fe804ebc36f4a264dcde64fc13c9a76573d6fd34b50f982136b82e4bc309d6f5
+  data.tar.gz: 759ee3d80a5683d7904a70a196b0eacc4d7f5e8bafc01da763422285e04d9645
 SHA512:
-  metadata.gz: 34a69f552839aa11d2e0dc963c30c748c7e8f176dc35a890f4bc89548e061f13f0002ee0204a852a96d39eebd0609f3b8fd21f097c04e43e31e87e3651767bdf
-  data.tar.gz: 286fd44a9b7f7d1842b4597d8406e0042a7456ede287e7aa8e369bfb6a540f7dc815b9b51c4fed86150da53aa936480ede6214cc5ab169878686b8b376d65469
+  metadata.gz: 6776538352eff82847ea01c13a3bd1e0afb4bdb38629fda06f15c49e1b6e8e7d0829b12169d4802a1a48a22c7d6c32dd2d62fd73ed9dd165f03b86ad7538598d
+  data.tar.gz: f44eccdd46765b7207e328d560394ea98fa78f11a575e630bf1517dbaf4d566ad3dc25470e857028ed22657a1609ea85c33e6df59594d425a7284e2c0974154f

data/features/coffee-script.feature

@@ -1,5 +1,5 @@
 Feature: Support coffee-script
-  In order to offer an alternative when writing Javascript
+  In order to offer an alternative when writing JavaScript
 
   Scenario: Rendering coffee script
     Given the Server is running at "coffeescript-app"

data/features/helpers_external.feature

@@ -9,4 +9,20 @@ Feature: Helpers in external files
     Given the Server is running at "external-helpers"
     Then going to "/automatic.html" should not raise an exception
     And I should see "One:Two:Three:Four"
-    
+
+  Scenario: Automatic Helpers Reload
+    Given the Server is running at "external-helpers"
+    Then going to "/automatic.html" should not raise an exception
+    And I should see "One:Two:Three:Four"
+
+    When the file "helpers/one_helper.rb" has the contents
+      """
+      module OneHelper
+        def one
+          'Won'
+        end
+      end
+      """
+    When the Server is reloaded
+    Then going to "/automatic.html" should not raise an exception
+    And I should see "Won:Two:Three:Four"

data/features/i18n_preview.feature

@@ -254,3 +254,28 @@ Feature: i18n Preview
     When I go to "/es/"
     Then I should see "Como Esta?"
     Then I should see "Mucho"
+
+  Scenario: Proxy to localized pages.
+    Given a fixture app "i18n-default-app"
+    And a file named "config.rb" with:
+      """
+      langs = [:en, :es]
+      activate :i18n, mount_at_root: false, langs: langs
+
+      ["Tom", "Jen"].each do |name|
+        langs.each do |lang|
+          proxy "/#{lang}/people/#{name.downcase}.html", "/name.html", locals: { name: name }, locale: lang, ignore: true
+        end
+      end
+      """
+    Given the Server is running at "i18n-default-app"
+    When I go to "/name.html"
+    Then I should see "File Not Found"
+    When I go to "/en/people/tom.html"
+    Then I should see "Howdy Tom"
+    When I go to "/en/people/jen.html"
+    Then I should see "Howdy Jen"
+    When I go to "/es/people/tom.html"
+    Then I should see "Como Esta? Tom"
+    When I go to "/es/people/jen.html"
+    Then I should see "Como Esta? Jen"

data/features/ignore_already_minified.feature

@@ -1,4 +1,4 @@
-Feature: CSS and Javascripts which are minify shouldn't be re-minified
+Feature: CSS and JavaScripts which are minify shouldn't be re-minified
 
   Scenario: JS files containing ".min" should not be re-compressed
     Given an empty app

data/features/minify_javascript.feature

@@ -1,4 +1,4 @@
-Feature: Minify Javascript
+Feature: Minify JavaScript
   In order reduce bytes sent to client and appease YSlow
 
   Scenario: Rendering inline js with the feature disabled

data/features/page-id.feature

@@ -11,7 +11,7 @@ Feature: Page IDs
     And I should see 'URL5: <a href="/implicit.html">Imp</a>'
     And I should see 'URL6: <a href="/folder/foldern.html">Foldern</a>'
     And I should see 'URL7: <a href="/feed.xml">Feed</a>'
-    And I should see "URL8: /fourty-two.html"
+    And I should see "URL8: /forty-two.html"
 
     When I go to "/fm.html"
     Then I should see "I am: frontmatter"
@@ -46,7 +46,7 @@ Feature: Page IDs
     And I should see "URL2: /2.html"
     And I should see 'URL3: <a href="/3.html">Hi</a>'
     And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
-    And I should see "URL8: /fourty-two.html"
+    And I should see "URL8: /forty-two.html"
     And I should see 'URL9: <a href="/implicit.html">Imp</a>'
     And I should see 'URL10: <a href="/folder/foldern.html">Foldern</a>'
     And I should see 'URL11: <a href="/feed.xml">Feed</a>'

data/features/support/env.rb

@@ -6,10 +6,7 @@ require 'sassc'
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'phantomjs/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
-Capybara.server = :webrick
+# Capybara.server = :webrick
 
 require 'simplecov'
 SimpleCov.start

data/fixtures/asset-hash-minified-app/config.rb

@@ -1,5 +1,5 @@
 configure :build do
-  # Minify Javascript on build
+  # Minify JavaScript on build
   activate :minify_javascript
   activate :asset_hash
 end

data/fixtures/env-app/source/stylesheets/site.css.scss

@@ -1,3 +1,3 @@
 body {
-  backgroud: red;
+  background: red;
 }

data/fixtures/generator-test/config.rb

@@ -42,7 +42,7 @@
 configure :production do
   # activate :minify_css
 
-  # Minify Javascript
+  # Minify JavaScript
   # activate :minify_javascript
 
   # Enable cache buster

data/fixtures/i18n-default-app/source/name.html.erb

@@ -0,0 +1 @@
+<%= t(:greetings) %> <%= name %>

data/lib/middleman-core/application.rb

@@ -439,7 +439,7 @@ module Middleman
     #
     # @deprecated Prefer accessing settings through "config".
     #
-    # @param [Symbol] key Name of the attribue
+    # @param [Symbol] key Name of the attribute
     # @param value Attribute value
     # @return [void]
     def set(key, value = nil, &block)

data/lib/middleman-core/core_extensions.rb

@@ -100,10 +100,10 @@ Middleman::Extensions.register :minify_css do
   Middleman::Extensions::MinifyCss
 end
 
-# MinifyJavascript compresses JS
+# MinifyJavaScript compresses JS
 Middleman::Extensions.register :minify_javascript do
   require 'middleman-core/extensions/minify_javascript'
-  Middleman::Extensions::MinifyJavascript
+  Middleman::Extensions::MinifyJavaScript
 end
 
 # GZIP assets and pages during build

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

@@ -19,7 +19,7 @@ module Middleman
           module_name = app.config[:helpers_filename_to_module_name_proc].call(filename)
           next unless module_name
 
-          require filename
+          load filename
           next unless Object.const_defined?(module_name.to_sym)
 
           app.template_context_class.send :include, Object.const_get(module_name.to_sym)

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

@@ -177,7 +177,14 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       result = parse_locale_extension(resource.path)
       ext_locale, path, page_id = result
-      new_resources << build_resource(path, resource.path, page_id, ext_locale)
+
+      new_resource = build_resource(path, resource.path, page_id, ext_locale)
+
+      # extension resources replace original i18n attempt.
+      exists = new_resources.find { |r| r.path == new_resource.path }
+      new_resources.delete(exists) if exists
+
+      new_resources << new_resource
 
       resource.ignore!
     end

data/lib/middleman-core/extension.rb

@@ -204,7 +204,7 @@ module Middleman
       #   expose_to_application global_name: :local_name
       # @example with Array:
       #   expose_to_application :method1, :method2
-      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @param [Array<Symbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
       # @return [void]
       def expose_to_application(*symbols)
         self.exposed_to_application ||= {}
@@ -224,7 +224,7 @@ module Middleman
       #   expose_to_config global_name: :local_name
       # @example with Array:
       #   expose_to_config :method1, :method2
-      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @param [Array<Symbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
       # @return [void]
       def expose_to_config(*symbols)
         self.exposed_to_config ||= {}
@@ -244,7 +244,7 @@ module Middleman
       #   expose_to_template global_name: :local_name
       # @example with Array:
       #   expose_to_template :method1, :method2
-      # @param [Array<Sumbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
+      # @param [Array<Symbol>, Hash<Symbol, Symbol>] symbols An optional list of symbols representing instance methods to exposed.
       # @return [void]
       def expose_to_template(*symbols)
         self.exposed_to_template ||= {}

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

@@ -1,7 +1,7 @@
 # This extension Gzips assets and pages when building.
 # Gzipped assets and pages can be served directly by Apache or
 # Nginx with the proper configuration, and pre-zipping means that we
-# can use a more agressive compression level at no CPU cost per request.
+# can use a more aggressive compression level at no CPU cost per request.
 #
 # Use Nginx's gzip_static directive, or AddEncoding and mod_rewrite in Apache
 # to serve your Gzipped files whenever the normal (non-.gz) filename is requested.

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

@@ -57,7 +57,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     end
 
     # Rack interface
-    # @param [Rack::Environmemt] env
+    # @param [Rack::Environment] env
     # @return [Array]
     def call(env)
       status, headers, response = @app.call(env)

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

@@ -2,8 +2,8 @@ require 'active_support/core_ext/object/try'
 require 'middleman-core/contracts'
 require 'memoist'
 
-# Minify Javascript Extension
-class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
+# Minify JavaScript Extension
+class Middleman::Extensions::MinifyJavaScript < ::Middleman::Extension
   option :inline, false, 'Whether to minify JS inline within HTML files'
   option :ignore, [], 'Patterns to avoid minifying'
   option :compressor, proc {
@@ -49,7 +49,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     end
 
     # Rack interface
-    # @param [Rack::Environmemt] env
+    # @param [Rack::Environment] env
     # @return [Array]
     def call(env)
       status, headers, response = @app.call(env)

data/lib/middleman-core/file_renderer.rb

@@ -32,7 +32,7 @@ module Middleman
     def render(locs, opts, context, &block)
       path = @path.dup
 
-      # Detect the remdering engine from the extension
+      # Detect the rendering engine from the extension
       extension = File.extname(path)
       engine = extension[1..-1].to_sym
 

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

@@ -59,7 +59,7 @@ module Middleman
 
         if path_parts.size == 1
           sitemap_class = SitemapResource
-          # Allow special sitemap resources to use custom metadata view calsses
+          # Allow special sitemap resources to use custom metadata view classes
           sitemap_class = resource.meta_pages_class if resource.respond_to? :meta_pages_class
 
           @children[first_part] = sitemap_class.new(resource)

data/lib/middleman-core/preview_server.rb

@@ -212,7 +212,7 @@ module Middleman
         @cli_options[key] || config[key]
       end
 
-      # Trap some interupt signals and shut down smoothly
+      # Trap some interrupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers
         %w[INT HUP TERM QUIT].each do |sig|

data/lib/middleman-core/preview_server/server_information_callback_proxy.rb

@@ -7,7 +7,7 @@ module Middleman
     # * server name
     # * site_addresses
     #
-    # All information is "dupped" and the callback is not meant to be used to
+    # All information is "duped" and the callback is not meant to be used to
     # modify these information.
     class ServerInformationCallbackProxy
       attr_reader :server_name, :port, :site_addresses, :listeners

data/lib/middleman-core/renderers/sass.rb

@@ -9,11 +9,14 @@ module Middleman
   module Renderers
     # Sass renderer
     class Sass < ::Middleman::Extension
+      DEFAULT_SASS_CACHE_LOCATION = './.sass-cache'.freeze
+
       opts = { output_style: :nested }
       opts[:line_comments] = false if ENV['TEST']
       define_setting :sass, opts, 'Sass engine options'
       define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
       define_setting :sass_source_maps, nil, 'Whether to inline sourcemap into Sass'
+      define_setting :sass_cache_location, ENV['SASS_CACHE_LOCATION'] || DEFAULT_SASS_CACHE_LOCATION, 'Where to store sass cache files'
 
       # Setup extension
       def initialize(app, options = {}, &block)
@@ -21,7 +24,9 @@ module Middleman
 
         logger.info '== Preferring use of LibSass' if defined?(::SassC)
 
-        app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//
+        if app.config[:sass_cache_location] == DEFAULT_SASS_CACHE_LOCATION
+          app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//
+        end
 
         # Tell Tilt to use it as well (for inline sass blocks)
         ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
@@ -81,6 +86,7 @@ module Middleman
             filename: eval_file,
             line: line,
             syntax: syntax,
+            cache_location: ctx.app.config[:sass_cache_location],
             custom: {}.merge!(options[:custom] || {}).merge!(
               middleman_context: ctx.app,
               current_resource: ctx.current_resource

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

@@ -28,8 +28,8 @@ module Middleman
           # Does the current page has the name of an index file?
           is_index = current_page == index_file
           # Is the `current_page` in the traversal root?
-          # Note: `traversal_root` is `/` for non localised pages and `/[lang]/` for
-          # localised pages.
+          # Note: `traversal_root` is `/` for non localized pages and `/[lang]/` for
+          # localized pages.
           at_traversal_root = !(child_path =~ /^#{traversal_root}#{current_page}$/).nil?
 
           # Check that we have any path parts left after the pop because if we
@@ -66,8 +66,8 @@ module Middleman
           # E.g. `parts == ['en', 'blog']`, we try to find: `/en/blog.html`
           file_by_parts.call(parts)
 
-          # Try to find an non-localised parent instead if `traversal_root`
-          # indicates the path is localised and there are still more parts
+          # Try to find an non-localized parent instead if `traversal_root`
+          # indicates the path is localized and there are still more parts
           # remaining, and return it.
           # E.g. `parts == ['en', 'blog']`, we try to find: `/blog.html`
           if traversal_root != '/' && parts.length > 1
@@ -80,7 +80,7 @@ module Middleman
           parts.pop if is_index
           index_by_parts.call(parts)
 
-          # Lastly, check for an non-localised index index file in the path
+          # Lastly, check for an non-localized index index file in the path
           # above `current_page`'s path and return it.
           # E.g. `parts == ['en', 'blog']`, we try to find: `/index.html`
           if traversal_root == "#{parts.first}/"

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

@@ -121,7 +121,7 @@ module Middleman
         rebuild_resource_list!(:"registered_new_manipulator_#{name}")
       end
 
-      # Rebuild the list of resources from scratch, using registed manipulators
+      # Rebuild the list of resources from scratch, using registered manipulators
       # @return [void]
       Contract Symbol => Any
       def rebuild_resource_list!(name)

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

@@ -301,7 +301,7 @@ module Middleman
       [valid_updates, valid_removes]
     end
 
-    # Convert a path to a file resprentation.
+    # Convert a path to a file representation.
     #
     # @param [Pathname] path The path.
     # @return [Middleman::SourceFile]

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

@@ -65,6 +65,10 @@ Given /^the Server is running at "([^\"]*)"$/ do |app_path|
   step %(the Server is running)
 end
 
+When /^the Server is reloaded$/ do
+  step %(the Server is running)
+end
+
 Given /^a template named "([^\"]*)" with:$/ do |name, string|
   step %(a file named "source/#{name}" with:), string
 end

data/lib/middleman-core/util/files.rb

@@ -6,7 +6,7 @@ module Middleman
 
     module_function
 
-    # Get a recusive list of files inside a path.
+    # Get a recursive list of files inside a path.
     # Works with symlinks.
     #
     # @param path Some path string or Pathname

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -37,9 +37,6 @@ Gem::Specification.new do |s|
   # Watcher
   s.add_dependency('listen', ['~> 3.0'])
 
-  # Tests
-  s.add_development_dependency('capybara', ['~> 2.5.0'])
-
   # i18n
   s.add_dependency('i18n', ['~> 0.7'])
 

data/spec/middleman-core/core_extensions/data_spec.rb

@@ -87,7 +87,7 @@ describe Middleman::CoreExtensions::Data::DataStore do
     end
 
     context 'given path matches callback data' do
-      it 'returns value of calback lambda' do
+      it 'returns value of callback lambda' do
         @subject.callbacks :foo, -> { { 'bar' => 'baz' } }
         @subject.callbacks :wu, -> { %i[tang clan] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc.3
+  version: 4.3.0.rc.4
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +388,6 @@ files:
 - features/ignore_already_minified.feature
 - features/image_srcset_paths.feature
 - features/import_files.feature
-- features/javascript-testing.feature
 - features/layouts_dir.feature
 - features/liquid.feature
 - features/markdown.feature
@@ -805,6 +790,7 @@ files:
 - fixtures/i18n-default-app/locales/en.yml
 - fixtures/i18n-default-app/locales/es.yml
 - fixtures/i18n-default-app/source/localizable/index.html.erb
+- fixtures/i18n-default-app/source/name.html.erb
 - fixtures/i18n-force-locale/config.rb
 - fixtures/i18n-force-locale/locales/en.yml
 - fixtures/i18n-force-locale/locales/es.yml
@@ -1279,7 +1265,7 @@ files:
 - fixtures/page-id-app/source/feed.xml.erb
 - fixtures/page-id-app/source/fm.html.erb
 - fixtures/page-id-app/source/folder/foldern.html.erb
-- fixtures/page-id-app/source/fourty-two.html.erb
+- fixtures/page-id-app/source/forty-two.html.erb
 - fixtures/page-id-app/source/implicit.html.erb
 - fixtures/page-id-app/source/index.html.erb
 - fixtures/page-id-app/source/overwrites/from-default.html.erb
@@ -1622,7 +1608,6 @@ test_files:
 - features/ignore_already_minified.feature
 - features/image_srcset_paths.feature
 - features/import_files.feature
-- features/javascript-testing.feature
 - features/layouts_dir.feature
 - features/liquid.feature
 - features/markdown.feature
@@ -2025,6 +2010,7 @@ test_files:
 - fixtures/i18n-default-app/locales/en.yml
 - fixtures/i18n-default-app/locales/es.yml
 - fixtures/i18n-default-app/source/localizable/index.html.erb
+- fixtures/i18n-default-app/source/name.html.erb
 - fixtures/i18n-force-locale/config.rb
 - fixtures/i18n-force-locale/locales/en.yml
 - fixtures/i18n-force-locale/locales/es.yml
@@ -2499,7 +2485,7 @@ test_files:
 - fixtures/page-id-app/source/feed.xml.erb
 - fixtures/page-id-app/source/fm.html.erb
 - fixtures/page-id-app/source/folder/foldern.html.erb
-- fixtures/page-id-app/source/fourty-two.html.erb
+- fixtures/page-id-app/source/forty-two.html.erb
 - fixtures/page-id-app/source/implicit.html.erb
 - fixtures/page-id-app/source/index.html.erb
 - fixtures/page-id-app/source/overwrites/from-default.html.erb

data/features/javascript-testing.feature

@@ -1,18 +0,0 @@
-Feature: Test a site with javascript included
-
-  As a software developer
-  I want to develop a site using javascript
-  I would like to have a server step rendering javascript correctly in order to test it
-
-  @javascript
-  Scenario: Existing app with javascript
-    Given the Server is running at "javascript-app"
-    When I go to "/index.html"
-    Then I should see:
-    """
-    Local Hour
-    """
-    And I should see:
-    """
-    Local Minutes
-    """