middleman-core 3.4.0 → 3.4.1

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

@@ -1,10 +1,17 @@
 require 'padrino-helpers'
+require 'padrino-helpers/asset_tag_helpers'
+require 'padrino-helpers/form_helpers'
+require 'padrino-helpers/format_helpers'
+require 'padrino-helpers/number_helpers'
+require 'padrino-helpers/output_helpers'
+require 'padrino-helpers/render_helpers'
+require 'padrino-helpers/tag_helpers'
 
 # Don't fail on invalid locale, that's not what our current
 # users expect.
 ::I18n.enforce_available_locales = false
 
-class Padrino::Helpers::OutputHelpers::ErbHandler
+class ::Padrino::Helpers::OutputHelpers::ErbHandler
   # Force Erb capture not to use safebuffer
   # rubocop:disable UnderscorePrefixedVariableName
   def capture_from_template(*args, &block)
@@ -216,7 +223,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @return [String] The fully qualified asset url
     def asset_url(path, prefix='', options={})
       # Don't touch assets which already have a full path
-      if path.include?('//') || path.start_with?('data:') || !current_resource
+      if path.include?('//') || path.start_with?('data:')
         path
       else # rewrite paths to use their destination path
         result = if resource = sitemap.find_resource_by_destination_path(url_for(path))
@@ -234,6 +241,10 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
         if options[:relative] != true
           result
         else
+          unless current_resource
+            raise ArgumentError, "#asset_url must be run in a context with current_resource if relative: true"
+          end
+
           current_dir = Pathname('/' + current_resource.destination_path)
           Pathname(result).relative_path_from(current_dir.dirname).to_s
         end

data/lib/middleman-more/extensions/cache_buster.rb

@@ -43,7 +43,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
           else
             # It's a template, possible with partials. We can't really
             # know when it's updated, so generate fresh cache buster every
-            # time during developement
+            # time during development
             http_path << '?' + Time.now.strftime('%s')
           end
         end

data/middleman-core.gemspec

@@ -1,5 +1,7 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/middleman-core/version", __FILE__)
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "middleman-core/version"
 
 Gem::Specification.new do |s|
   s.name        = "middleman-core"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,8 +196,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".rspec"
 - ".simplecov"
 - ".yardopts"
 - Rakefile
@@ -216,6 +214,7 @@ files:
 - features/capture_html.feature
 - features/chained_templates.feature
 - features/clean_build.feature
+- features/cli/preview_server-hook.feature
 - features/cli/preview_server.feature
 - features/cli_extension.feature
 - features/cli_init.feature
@@ -417,6 +416,8 @@ files:
 - fixtures/chained-app/source/test.erb.combobreaker.str.erb
 - fixtures/clean-app/config-complications.rb
 - fixtures/clean-app/config-empty.rb
+- fixtures/clean-app/config-hidden-dir-after.rb
+- fixtures/clean-app/config-hidden-dir-before.rb
 - fixtures/clean-app/config.rb
 - fixtures/clean-app/source/index.html.erb
 - fixtures/clean-app/source/layout.erb
@@ -896,6 +897,8 @@ files:
 - fixtures/preview-server-app/source/should_be_ignored2.html
 - fixtures/preview-server-app/source/should_be_ignored3.html
 - fixtures/preview-server-app/source/static.html
+- fixtures/preview-server-hook-app/config.rb
+- fixtures/preview-server-hook-app/source/index.html.erb
 - fixtures/proxy-pages-app/config.rb
 - fixtures/proxy-pages-app/source/real.html
 - fixtures/proxy-pages-app/source/real/index-ivars.html.erb
@@ -1075,6 +1078,7 @@ files:
 - lib/middleman-core/configuration.rb
 - lib/middleman-core/core_extensions.rb
 - lib/middleman-core/core_extensions/data.rb
+- lib/middleman-core/core_extensions/data/file_loader.rb
 - lib/middleman-core/core_extensions/extensions.rb
 - lib/middleman-core/core_extensions/external_helpers.rb
 - lib/middleman-core/core_extensions/file_watcher.rb
@@ -1112,6 +1116,7 @@ files:
 - lib/middleman-core/preview_server/network_interface_inventory.rb
 - lib/middleman-core/preview_server/server_hostname.rb
 - lib/middleman-core/preview_server/server_information.rb
+- lib/middleman-core/preview_server/server_information_callback_proxy.rb
 - lib/middleman-core/preview_server/server_information_validator.rb
 - lib/middleman-core/preview_server/server_ip_address.rb
 - lib/middleman-core/preview_server/server_url.rb
@@ -1324,7 +1329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1342,6 +1347,7 @@ test_files:
 - features/capture_html.feature
 - features/chained_templates.feature
 - features/clean_build.feature
+- features/cli/preview_server-hook.feature
 - features/cli/preview_server.feature
 - features/cli_extension.feature
 - features/cli_init.feature
@@ -1543,6 +1549,8 @@ test_files:
 - fixtures/chained-app/source/test.erb.combobreaker.str.erb
 - fixtures/clean-app/config-complications.rb
 - fixtures/clean-app/config-empty.rb
+- fixtures/clean-app/config-hidden-dir-after.rb
+- fixtures/clean-app/config-hidden-dir-before.rb
 - fixtures/clean-app/config.rb
 - fixtures/clean-app/source/index.html.erb
 - fixtures/clean-app/source/layout.erb
@@ -2022,6 +2030,8 @@ test_files:
 - fixtures/preview-server-app/source/should_be_ignored2.html
 - fixtures/preview-server-app/source/should_be_ignored3.html
 - fixtures/preview-server-app/source/static.html
+- fixtures/preview-server-hook-app/config.rb
+- fixtures/preview-server-hook-app/source/index.html.erb
 - fixtures/proxy-pages-app/config.rb
 - fixtures/proxy-pages-app/source/real.html
 - fixtures/proxy-pages-app/source/real/index-ivars.html.erb

data/.rspec

@@ -1 +0,0 @@
---color