From 049dabbf153e56cd56b3c2830ad31f2878e5c882 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sun, 12 Oct 2014 15:44:16 -0700 Subject: [PATCH 001/364] Use configurable content type for detection of minifiable content. Squashed changes: - Prevent side effects of content type testing. - Test for inline minification in PHP files. --- middleman-core/features/content_type.feature | 3 + middleman-core/features/minify_css.feature | 64 +++++++++++++- .../features/minify_javascript.feature | 49 ++++++++++- .../features/support/preserve_mime_types.rb | 7 ++ .../content-type-app/source/index.php | 1 + .../minify-css-app/source/inline-css.php | 8 ++ .../source/stylesheets/site.xcss.sass | 5 ++ .../minify-js-app/source/inline-js.php | 22 +++++ .../source/javascripts/js_test.xjs | 8 ++ .../middleman-core/core_extensions/request.rb | 3 + .../middleman-more/extensions/minify_css.rb | 64 ++++++++++---- .../extensions/minify_javascript.rb | 88 +++++++++++++------ 12 files changed, 276 insertions(+), 46 deletions(-) create mode 100644 middleman-core/features/support/preserve_mime_types.rb create mode 100644 middleman-core/fixtures/content-type-app/source/index.php create mode 100644 middleman-core/fixtures/minify-css-app/source/inline-css.php create mode 100755 middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass create mode 100755 middleman-core/fixtures/minify-js-app/source/inline-js.php create mode 100644 middleman-core/fixtures/minify-js-app/source/javascripts/js_test.xjs diff --git a/middleman-core/features/content_type.feature b/middleman-core/features/content_type.feature index 175361d8..95aeadab 100644 --- a/middleman-core/features/content_type.feature +++ b/middleman-core/features/content_type.feature @@ -12,6 +12,8 @@ Feature: Setting the right content type for files Then the content type should be "text/css" When I go to "/README" Then the content type should be "text/plain" + When I go to "/index.php" + Then the content type should be "text/php" Scenario: Content type can be set explicitly via page or proxy or frontmatter Given a fixture app "content-type-app" @@ -31,6 +33,7 @@ Feature: Setting the right content type for files When I go to "/override.html" Then the content type should be "text/neato" + @preserve_mime_types Scenario: Content types can be overridden with mime_type Given a fixture app "content-type-app" And a file named "config.rb" with: diff --git a/middleman-core/features/minify_css.feature b/middleman-core/features/minify_css.feature index 0c707861..29c3e8c6 100644 --- a/middleman-core/features/minify_css.feature +++ b/middleman-core/features/minify_css.feature @@ -26,6 +26,18 @@ Feature: Minify CSS When I go to "/stylesheets/report.css" Then I should see "p{border:1px solid #ff6600}" + Scenario: Rendering external css in a proxied resource + Given a fixture app "minify-css-app" + And a file named "config.rb" with: + """ + activate :minify_css + proxy '/css-proxy', '/stylesheets/site.css', ignore: true + """ + And the Server is running at "minify-css-app" + When I go to "/css-proxy" + Then I should see "1" lines + And I should see "only screen and (device-width" + Scenario: Rendering external css with passthrough compressor Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -124,4 +136,54 @@ Feature: Minify CSS - """ \ No newline at end of file + """ + + Scenario: Rendering inline css in a PHP document + Given a fixture app "minify-css-app" + And a file named "config.rb" with: + """ + activate :minify_css, :inline => true + """ + And the Server is running at "minify-css-app" + When I go to "/inline-css.php" + Then I should see: + """ + + + + """ + + Scenario: Rendering inline css in a proxied resource + Given a fixture app "minify-css-app" + And a file named "config.rb" with: + """ + activate :minify_css, :inline => true + proxy '/inline-css-proxy', '/inline-css.html', ignore: true + """ + And the Server is running at "minify-css-app" + When I go to "/inline-css-proxy" + Then I should see: + """ + + """ + + @preserve_mime_types + Scenario: Configuring content types of resources to be minified + Given a fixture app "minify-css-app" + And a file named "config.rb" with: + """ + mime_type('.xcss', 'text/x-css') + activate :minify_css, content_types: ['text/x-css'], + inline: true, + inline_content_types: ['text/html'] + """ + And the Server is running at "minify-css-app" + When I go to "/stylesheets/site.xcss" + Then I should see "1" lines + And I should see "only screen and (device-width" + When I go to "/inline-css.php" + Then I should see "8" lines diff --git a/middleman-core/features/minify_javascript.feature b/middleman-core/features/minify_javascript.feature index 1fb0e699..a8235368 100644 --- a/middleman-core/features/minify_javascript.feature +++ b/middleman-core/features/minify_javascript.feature @@ -88,7 +88,7 @@ Feature: Minify Javascript """ - Scenario: Rendering inline css with a passthrough minifier using activate-style compressor + Scenario: Rendering inline JS with a passthrough minifier using activate-style compressor Given a fixture app "passthrough-app" And a file named "config.rb" with: """ @@ -148,6 +148,42 @@ Feature: Minify Javascript """ + Scenario: Rendering inline js in a PHP document + Given a fixture app "minify-js-app" + And a file named "config.rb" with: + """ + activate :minify_javascript, :inline => true + """ + And the Server is running at "minify-js-app" + When I go to "/inline-js.php" + Then I should see: + """ + + + + + + """ + + Scenario: Rendering inline js in a proxied resource + Given a fixture app "minify-js-app" + And a file named "config.rb" with: + """ + activate :minify_javascript, :inline => true + proxy '/inline-js-proxy', '/inline-js.html', ignore: true + """ + And the Server is running at "minify-js-app" + When I go to "/inline-js-proxy" + Then I should see "14" lines + Scenario: Rendering external js with the feature enabled Given a fixture app "minify-js-app" And a file named "config.rb" with: @@ -160,6 +196,17 @@ Feature: Minify Javascript When I go to "/more-js/other.js" Then I should see "1" lines + Scenario: Rendering external js in a proxied resource + Given a fixture app "minify-js-app" + And a file named "config.rb" with: + """ + activate :minify_javascript + proxy '/js-proxy', '/javascripts/js_test.js', ignore: true + """ + And the Server is running at "minify-js-app" + When I go to "/js-proxy" + Then I should see "1" lines + Scenario: Rendering external js with a passthrough minifier And the Server is running at "passthrough-app" When I go to "/javascripts/js_test.js" diff --git a/middleman-core/features/support/preserve_mime_types.rb b/middleman-core/features/support/preserve_mime_types.rb new file mode 100644 index 00000000..a791e49c --- /dev/null +++ b/middleman-core/features/support/preserve_mime_types.rb @@ -0,0 +1,7 @@ +Around('@preserve_mime_types') do |_scenario, block| + mime_types = ::Rack::Mime::MIME_TYPES.clone + + block.call + + ::Rack::Mime::MIME_TYPES.replace mime_types +end diff --git a/middleman-core/fixtures/content-type-app/source/index.php b/middleman-core/fixtures/content-type-app/source/index.php new file mode 100644 index 00000000..eb55fa96 --- /dev/null +++ b/middleman-core/fixtures/content-type-app/source/index.php @@ -0,0 +1 @@ + diff --git a/middleman-core/fixtures/minify-css-app/source/inline-css.php b/middleman-core/fixtures/minify-css-app/source/inline-css.php new file mode 100644 index 00000000..d978aafd --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/inline-css.php @@ -0,0 +1,8 @@ + + + diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass b/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass new file mode 100755 index 00000000..0cf9e7da --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass @@ -0,0 +1,5 @@ +@import "compass/reset" + +@media handheld, only screen and (device-width: 768px) + body + display: block \ No newline at end of file diff --git a/middleman-core/fixtures/minify-js-app/source/inline-js.php b/middleman-core/fixtures/minify-js-app/source/inline-js.php new file mode 100755 index 00000000..4a7fd303 --- /dev/null +++ b/middleman-core/fixtures/minify-js-app/source/inline-js.php @@ -0,0 +1,22 @@ + + + + + diff --git a/middleman-core/fixtures/minify-js-app/source/javascripts/js_test.xjs b/middleman-core/fixtures/minify-js-app/source/javascripts/js_test.xjs new file mode 100644 index 00000000..f6a9406c --- /dev/null +++ b/middleman-core/fixtures/minify-js-app/source/javascripts/js_test.xjs @@ -0,0 +1,8 @@ +var race; +var __slice = Array.prototype.slice; + +race = function() { + var runners, winner; + winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : []; + return print(winner, runners); +}; diff --git a/middleman-core/lib/middleman-core/core_extensions/request.rb b/middleman-core/lib/middleman-core/core_extensions/request.rb index 612001e1..cbef8d83 100644 --- a/middleman-core/lib/middleman-core/core_extensions/request.rb +++ b/middleman-core/lib/middleman-core/core_extensions/request.rb @@ -24,6 +24,9 @@ module Middleman # Sourcemap format ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=utf-8' + # Create a MIME type for PHP files (for detection by extensions) + ::Rack::Mime::MIME_TYPES['.php'] = 'text/php' + app.extend ClassMethods app.extend ServerMethods diff --git a/middleman-core/lib/middleman-more/extensions/minify_css.rb b/middleman-core/lib/middleman-more/extensions/minify_css.rb index 91cbf29a..61954a66 100644 --- a/middleman-core/lib/middleman-more/extensions/minify_css.rb +++ b/middleman-core/lib/middleman-more/extensions/minify_css.rb @@ -3,6 +3,8 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension option :compressor, nil, 'Set the CSS compressor to use.' option :inline, false, 'Whether to minify CSS inline within HTML files' option :ignore, [], 'Patterns to avoid minifying' + option :content_types, %w(text/css), 'Content types of resources that contain CSS' + option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline CSS' def initialize(app, options_hash={}, &block) super @@ -16,7 +18,9 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension # Setup Rack middleware to minify CSS app.use Rack, compressor: chosen_compressor, ignore: Array(options[:ignore]) + [/\.min\./], - inline: options[:inline] + inline: options[:inline], + content_types: options[:content_types], + inline_content_types: options[:inline_content_types] end class SassCompressor @@ -39,6 +43,8 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension @compressor = options[:compressor] @ignore = options[:ignore] @inline = options[:inline] + @content_types = options[:content_types] + @inline_content_types = options[:inline_content_types] end # Rack interface @@ -47,19 +53,18 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension def call(env) status, headers, response = @app.call(env) - if inline_html_content?(env['PATH_INFO']) - minified = ::Middleman::Util.extract_response_text(response) - minified.gsub!(INLINE_CSS_REGEX) do - $1 << @compressor.compress($2) << $3 - end + content_type = headers['Content-Type'].try(:slice, /^[^;]*/) + path = env['PATH_INFO'] + minified = if @inline && minifiable_inline?(content_type) + minify_inline(::Middleman::Util.extract_response_text(response)) + elsif minifiable?(content_type) && !ignore?(path) + minify(::Middleman::Util.extract_response_text(response)) + end + + if minified headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s response = [minified] - elsif standalone_css_content?(env['PATH_INFO']) - minified_css = @compressor.compress(::Middleman::Util.extract_response_text(response)) - - headers['Content-Length'] = ::Rack::Utils.bytesize(minified_css).to_s - response = [minified_css] end [status, headers, response] @@ -67,12 +72,41 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension private - def inline_html_content?(path) - (path.end_with?('.html') || path.end_with?('.php')) && @inline + # Whether the path should be ignored + # @param [String] path + # @return [Boolean] + def ignore?(path) + @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) } end - def standalone_css_content?(path) - path.end_with?('.css') && @ignore.none? { |ignore| Middleman::Util.path_match(ignore, path) } + # Whether this type of content can be minified + # @param [String, nil] content_type + # @return [Boolean] + def minifiable?(content_type) + @content_types.include?(content_type) + end + + # Whether this type of content contains inline content that can be minified + # @param [String, nil] content_type + # @return [Boolean] + def minifiable_inline?(content_type) + @inline_content_types.include?(content_type) + end + + # Minify the content + # @param [String] content + # @return [String] + def minify(content) + @compressor.compress(content) + end + + # Detect and minify inline content + # @param [String] content + # @return [String] + def minify_inline(content) + content.gsub(INLINE_CSS_REGEX) do + $1 + minify($2) + $3 + end end end end diff --git a/middleman-core/lib/middleman-more/extensions/minify_javascript.rb b/middleman-core/lib/middleman-more/extensions/minify_javascript.rb index d51d864f..df020765 100644 --- a/middleman-core/lib/middleman-more/extensions/minify_javascript.rb +++ b/middleman-core/lib/middleman-more/extensions/minify_javascript.rb @@ -3,6 +3,8 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension option :compressor, nil, 'Set the JS compressor to use.' option :inline, false, 'Whether to minify JS inline within HTML files' option :ignore, [], 'Patterns to avoid minifying' + option :content_types, %w(application/javascript), 'Content types of resources that contain JS' + option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline JS' def initialize(app, options_hash={}, &block) super @@ -16,14 +18,18 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension ::Uglifier.new end - # Setup Rack middleware to minify CSS + # Setup Rack middleware to minify JS app.use Rack, compressor: chosen_compressor, ignore: Array(options[:ignore]) + [/\.min\./], - inline: options[:inline] + inline: options[:inline], + content_types: options[:content_types], + inline_content_types: options[:inline_content_types] end # Rack middleware to look for JS and compress it class Rack + INLINE_JS_REGEX = /(]*>\s*(?:\/\/(?:(?:)|(?:\]\]>)))?\s*<\/script>)/m + # Init # @param [Class] app # @param [Hash] options @@ -32,6 +38,8 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension @compressor = options[:compressor] @ignore = options[:ignore] @inline = options[:inline] + @content_types = options[:content_types] + @inline_content_types = options[:inline_content_types] end # Rack interface @@ -40,25 +48,18 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension def call(env) status, headers, response = @app.call(env) + type = headers['Content-Type'].try(:slice, /^[^;]*/) path = env['PATH_INFO'] - begin - if @inline && (path.end_with?('.html') || path.end_with?('.php')) - uncompressed_source = ::Middleman::Util.extract_response_text(response) + minified = if @inline && minifiable_inline?(type) + minify_inline(::Middleman::Util.extract_response_text(response)) + elsif minifiable?(type) && !ignore?(path) + minify(::Middleman::Util.extract_response_text(response)) + end - minified = minify_inline_content(uncompressed_source) - - headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s - response = [minified] - elsif path.end_with?('.js') && @ignore.none? { |ignore| Middleman::Util.path_match(ignore, path) } - uncompressed_source = ::Middleman::Util.extract_response_text(response) - minified = @compressor.compress(uncompressed_source) - - headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s - response = [minified] - end - rescue ExecJS::ProgramError => e - warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}" + if minified + headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s + response = [minified] end [status, headers, response] @@ -66,19 +67,48 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension private - def minify_inline_content(uncompressed_source) - uncompressed_source.gsub(/(]*>\s*(?:\/\/(?:(?:)|(?:\]\]>)))?\s*<\/script>)/m) do |match| - first = $1 - javascript = $2 - last = $3 + # Whether the path should be ignored + # @param [String] path + # @return [Boolean] + def ignore?(path) + @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) } + end - # Only compress script tags that contain JavaScript (as opposed - # to something like jQuery templates, identified with a "text/html" - # type. - if first =~ / + + diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 24f01b94..b605e4ce 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -1,6 +1,7 @@ # encoding: UTF-8 -require 'rack/test' +require 'rspec/expectations' +require 'capybara/cucumber' Given /^a clean server$/ do @initialize_commands = [] @@ -57,8 +58,7 @@ Given /^the Server is running$/ do end end - app_rack = @server_inst.class.to_rack_app - @browser = ::Rack::Test::Session.new(::Rack::MockSession.new(app_rack)) + Capybara.app = @server_inst.class.to_rack_app end Given /^the Server is running at "([^\"]*)"$/ do |app_path| @@ -72,60 +72,61 @@ end When /^I go to "([^\"]*)"$/ do |url| in_current_dir do - @browser.get(URI.encode(url)) + visit(URI.encode(url).to_s) end end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| in_current_dir do - expect{ @browser.get(URI.encode(url)) }.to_not raise_exception + + expect{ visit(URI.encode(url).to_s) }.to_not raise_exception end end Then /^the content type should be "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.content_type).to start_with(expected) + expect(page.response_headers['Content-Type']).to start_with expected end end Then /^I should see "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to include(expected) + expect(page.body).to include expected end end Then /^I should see '([^\']*)'$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to include(expected) + expect(page.body).to include expected end end Then /^I should see:$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to include(expected) + expect(page.body).to include expected end end Then /^I should not see "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to_not include(expected) + expect(page.body).not_to include expected end end Then /^I should not see:$/ do |expected| in_current_dir do - expect(@browser.last_response.body).to_not include(expected.chomp) + expect(page.body).not_to include expected end end Then /^the status code should be "([^\"]*)"$/ do |expected| in_current_dir do - expect(@browser.last_response.status).to eq expected.to_i + expect(page.status_code).to eq expected.to_i end end Then /^I should see "([^\"]*)" lines$/ do |lines| in_current_dir do - expect(@browser.last_response.body.chomp.split($/).length).to eq(lines.to_i) + expect(page.body.chomp.split($/).length).to eq lines.to_i end end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 03e468bd..0e8e9fa7 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency("hooks", ["~> 0.3"]) # Builder - s.add_dependency("rack-test", ["~> 0.6.2"]) + s.add_dependency("capybara", ["~> 2.4.4"]) # CLI s.add_dependency("thor", [">= 0.15.2", "< 2.0"]) From bb44e59e6e3e3c0675f171b14eaa755f9792abea Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 9 Jun 2015 10:15:24 -0700 Subject: [PATCH 052/364] Blindly attempt to imrpove encoding situation --- .../core_extensions/front_matter.rb | 11 ++++++++++- .../middleman-core/core_extensions/rendering.rb | 16 ++++++++++++++-- .../step_definitions/server_steps.rb | 2 -- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 3e1ca08b..8499a339 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -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 diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb index 39cb4006..fb3ec6a5 100644 --- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb +++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb @@ -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 @@ -299,6 +309,8 @@ module Middleman ::Tilt.new(path, 1, options) { body } end + ', :default_encoding => 'Big5' + # Render using Tilt content = template.render(context || ::Object.new, locs, &block) @@ -326,7 +338,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 diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index b605e4ce..5f2f2886 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require 'rspec/expectations' require 'capybara/cucumber' From 3e46e8139fba9c9448ae83be771485a2f1768895 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 9 Jun 2015 10:17:47 -0700 Subject: [PATCH 053/364] Add osx build env --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15a12e33..492342aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,16 @@ bundler_args: --without development rvm: - ruby-head - 2.2 - - 2.1.1 - - 2.1.0 - - 2.0.0 + - 2.1 + - 2.0 - 1.9.3 - - jruby-19mode +os: + - linux + - osx matrix: fast_finish: true allow_failures: - rvm: ruby-head - - rvm: jruby-19mode env: TEST=true before_install: git submodule update --init --recursive script: bundle exec rake test From 6562716aa53999f681cca13496e081c7c5fe32fe Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 9 Jun 2015 10:42:41 -0700 Subject: [PATCH 054/364] bone head move --- middleman-core/lib/middleman-core/core_extensions/rendering.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb index fb3ec6a5..7bbfd7cb 100644 --- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb +++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb @@ -309,8 +309,6 @@ module Middleman ::Tilt.new(path, 1, options) { body } end - ', :default_encoding => 'Big5' - # Render using Tilt content = template.render(context || ::Object.new, locs, &block) From ae2d1487fae8f5b08c5057257e4725c8ece42a2f Mon Sep 17 00:00:00 2001 From: Todd Fisher Date: Thu, 11 Jun 2015 15:24:19 -0400 Subject: [PATCH 055/364] Update util.rb line 128, Float type is also not something that can be dup'ed, similar to Fixnum and friends --- middleman-core/lib/middleman-core/util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index 8a00eb9d..7d8512f0 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -122,7 +122,7 @@ module Middleman Hamster::Set.new(res) when Hamster::Vector, Hamster::Set, Hamster::SortedSet obj.map { |element| recursively_enhance(element) } - when ::TrueClass, ::FalseClass, ::Fixnum, ::Symbol, ::NilClass + when ::TrueClass, ::FalseClass, ::Fixnum, ::Symbol, ::NilClass, ::Float obj else obj.dup.freeze From 70d4671d2c2588690de27950ba28bda49009ff6e Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Sun, 14 Jun 2015 11:55:10 +0100 Subject: [PATCH 056/364] Allow extended globs with ignore This makes it match the default behaviour of Dir#glob --- .../lib/middleman-core/sitemap/extensions/ignores.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb index df803505..c26f8a80 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb @@ -59,7 +59,11 @@ module Middleman elsif path.is_a? String path_clean = ::Middleman::Util.normalize_path(path) if path_clean.include?('*') # It's a glob - @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) } + if defined? File::FNM_EXTGLOB + @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p, File::FNM_EXTGLOB) } + else + @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) } + end else # Add a specific-path ignore unless that path is already covered return if ignored?(path_clean) From e09f7fadb5c092bf667eaf4e16d53891dc643925 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 15 Jun 2015 09:58:29 -0700 Subject: [PATCH 057/364] Add better error messaging for #1541 --- .../lib/middleman-core/core_extensions/rendering.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb index 7bbfd7cb..d1c361ee 100644 --- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb +++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb @@ -428,6 +428,10 @@ module Middleman layout_path = locate_layout(layout_name, current_engine) + if !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 From 7383f67874ca6bdbc31fe5db70279118ea5deac3 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 16 Jun 2015 15:30:37 -0700 Subject: [PATCH 058/364] Implement yaml data postscript --- CHANGELOG.md | 3 + middleman-core/features/data.feature | 7 + .../features/front-matter-neighbor.feature | 11 -- middleman-core/features/front-matter.feature | 22 --- .../source/front-matter-line-2.html.erb | 5 +- .../source/json-front-matter-2.php.erb | 7 - .../json-front-matter-encoding.html.erb | 7 - .../source/json-front-matter-line-2.html.erb | 7 - .../source/json-front-matter.html.erb | 6 - .../frontmatter-neighbor-app/config.rb | 2 +- .../source/json-front-matter-2.php.erb | 2 - .../json-front-matter-2.php.erb.frontmatter | 4 - .../source/json-front-matter.html.erb | 1 - .../json-front-matter.html.erb.frontmatter | 4 - .../config.rb | 2 +- .../data/examples/withcontent.yaml | 11 ++ .../source/extracontent.html.haml.erb | 4 + .../lib/middleman-core/configuration.rb | 1 - .../middleman-core/core_extensions/data.rb | 8 +- .../core_extensions/front_matter.rb | 108 +------------ .../lib/middleman-core/renderers/liquid.rb | 21 ++- .../lib/middleman-core/util/data.rb | 153 ++++++++++++++++++ 22 files changed, 215 insertions(+), 181 deletions(-) delete mode 100644 middleman-core/fixtures/frontmatter-app/source/json-front-matter-2.php.erb delete mode 100644 middleman-core/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb delete mode 100644 middleman-core/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb delete mode 100644 middleman-core/fixtures/frontmatter-app/source/json-front-matter.html.erb delete mode 100644 middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb delete mode 100644 middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter delete mode 100644 middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb delete mode 100644 middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter create mode 100644 middleman-core/fixtures/nested-data-app/data/examples/withcontent.yaml create mode 100644 middleman-core/fixtures/nested-data-app/source/extracontent.html.haml.erb create mode 100644 middleman-core/lib/middleman-core/util/data.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 22202562..9ae9a891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ master === +* Removed ability to use JSON as frontmatter. Still allowed in data/ folder. +* Added YAML data postscript. Like frontmatter, but reversed. Attach content after the key/value data as a `:postscript` key to the data structure (if Hash). + # 4.0.0.beta.2 * Fixed regression causing exceptions to be silently thrown away outside of `--verbose` mode in the dev server. diff --git a/middleman-core/features/data.feature b/middleman-core/features/data.feature index fcce8445..db8bede6 100644 --- a/middleman-core/features/data.feature +++ b/middleman-core/features/data.feature @@ -51,3 +51,10 @@ Feature: Local Data API Then I should see "title1:Hello" Then I should see "title2:More" Then I should see "title3:Stuff" + + Scenario: Using data postscript + Given the Server is running at "nested-data-app" + When I go to "/extracontent.html" + Then I should see "

With Content

" + Then I should see '

Header 2

' + Then I should see "

Paragraph 1

" diff --git a/middleman-core/features/front-matter-neighbor.feature b/middleman-core/features/front-matter-neighbor.feature index 08b4f57c..e2e5cc69 100644 --- a/middleman-core/features/front-matter-neighbor.feature +++ b/middleman-core/features/front-matter-neighbor.feature @@ -30,17 +30,6 @@ Feature: Neighboring YAML Front Matter Then I should not see "---" When I go to "/front-matter-encoding.html.erb.frontmatter" Then I should see "File Not Found" - - Scenario: Rendering html (json) - Given the Server is running at "frontmatter-neighbor-app" - When I go to "/json-front-matter.html.erb.frontmatter" - Then I should see "File Not Found" - When I go to "/json-front-matter-2.php" - Then I should see "

This is the title

" - Then I should see "This is the title" Then I should not see "---" - - Scenario: Rendering html (json) - Given the Server is running at "frontmatter-app" - When I go to "/json-front-matter.html" - Then I should see "

This is the title

" - Then I should not see ";;;" - When I go to "/json-front-matter-2.php" - Then I should see "

This is the title

" - Then I should see "" - Then I should see ";;;" - - Scenario: JSON not on first line, with encoding - Given the Server is running at "frontmatter-app" - When I go to "/json-front-matter-encoding.html" - Then I should see "

This is the title

" - Then I should not see ";;;" Scenario: A template changes frontmatter during preview Given the Server is running at "frontmatter-app" diff --git a/middleman-core/fixtures/frontmatter-app/source/front-matter-line-2.html.erb b/middleman-core/fixtures/frontmatter-app/source/front-matter-line-2.html.erb index 7aeb16b9..d0c0802c 100644 --- a/middleman-core/fixtures/frontmatter-app/source/front-matter-line-2.html.erb +++ b/middleman-core/fixtures/frontmatter-app/source/front-matter-line-2.html.erb @@ -1,7 +1,10 @@

Test

+ +

<%= current_page.data.title %>

+ --- layout: false title: This is the title --- -

<%= current_page.data.title %>

+
Stuff
diff --git a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-2.php.erb b/middleman-core/fixtures/frontmatter-app/source/json-front-matter-2.php.erb deleted file mode 100644 index 7208cf6f..00000000 --- a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-2.php.erb +++ /dev/null @@ -1,7 +0,0 @@ -;;; - "layout": false, - "title": "This is the title" -;;; - -

<%= current_page.data.title %>

- diff --git a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb b/middleman-core/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb deleted file mode 100644 index d05b1f70..00000000 --- a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -# encoding: UTF-8 -;;; -"layout": false, -"title": "This is the title" -;;; - -

<%= current_page.data.title %>

diff --git a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb b/middleman-core/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb deleted file mode 100644 index 56b65add..00000000 --- a/middleman-core/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

Test

-;;; -layout: false, -title: "This is the title" -;;; - -

<%= current_page.data.title %>

diff --git a/middleman-core/fixtures/frontmatter-app/source/json-front-matter.html.erb b/middleman-core/fixtures/frontmatter-app/source/json-front-matter.html.erb deleted file mode 100644 index da001783..00000000 --- a/middleman-core/fixtures/frontmatter-app/source/json-front-matter.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -;;; - "layout": false, - "title": "This is the title" -;;; - -

<%= current_page.data.title %>

diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb index f5edde7f..babfbc2c 100644 --- a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb +++ b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb @@ -15,7 +15,7 @@ class NeighborFrontmatter < ::Middleman::Extension next unless file - fmdata = app.extensions[:front_matter].frontmatter_and_content(file[:full_path]).first + fmdata = ::Middleman::Util::Data.parse(file[:full_path], :yaml).first opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type) opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options) ignored = fmdata.delete(:ignored) diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb b/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb deleted file mode 100644 index c271a92f..00000000 --- a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb +++ /dev/null @@ -1,2 +0,0 @@ -

<%= current_page.data.title %>

- diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter b/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter deleted file mode 100644 index 415cefbc..00000000 --- a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter +++ /dev/null @@ -1,4 +0,0 @@ -;;; - "layout": false, - "title": "This is the title" -;;; \ No newline at end of file diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb b/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb deleted file mode 100644 index 1ae95c52..00000000 --- a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb +++ /dev/null @@ -1 +0,0 @@ -

<%= current_page.data.title %>

diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter b/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter deleted file mode 100644 index 415cefbc..00000000 --- a/middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter +++ /dev/null @@ -1,4 +0,0 @@ -;;; - "layout": false, - "title": "This is the title" -;;; \ No newline at end of file diff --git a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb index 011d5230..1fc88608 100644 --- a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb +++ b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb @@ -26,7 +26,7 @@ class NeighborFrontmatter < ::Middleman::Extension end def apply_neighbor_data(resource, file) - fmdata = app.extensions[:front_matter].frontmatter_and_content(file[:full_path]).first + fmdata = ::Middleman::Util::Data.parse(file[:full_path], :yaml).first opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type) opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options) ignored = fmdata.delete(:ignored) diff --git a/middleman-core/fixtures/nested-data-app/data/examples/withcontent.yaml b/middleman-core/fixtures/nested-data-app/data/examples/withcontent.yaml new file mode 100644 index 00000000..74d583cd --- /dev/null +++ b/middleman-core/fixtures/nested-data-app/data/examples/withcontent.yaml @@ -0,0 +1,11 @@ +--- +name: "With Content" +--- + +## Header 2 + +Paragraph 1 + +Paragraph 2 + +### Header 3 \ No newline at end of file diff --git a/middleman-core/fixtures/nested-data-app/source/extracontent.html.haml.erb b/middleman-core/fixtures/nested-data-app/source/extracontent.html.haml.erb new file mode 100644 index 00000000..90e0e6f8 --- /dev/null +++ b/middleman-core/fixtures/nested-data-app/source/extracontent.html.haml.erb @@ -0,0 +1,4 @@ +%h1= data.examples.withcontent.name + +:markdown + <%= data.examples.withcontent.postscript.gsub("\n", "\n\s\s") %> diff --git a/middleman-core/lib/middleman-core/configuration.rb b/middleman-core/lib/middleman-core/configuration.rb index e8c9b647..81422461 100644 --- a/middleman-core/lib/middleman-core/configuration.rb +++ b/middleman-core/lib/middleman-core/configuration.rb @@ -33,7 +33,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 diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb index 205021d4..9169410a 100644 --- a/middleman-core/lib/middleman-core/core_extensions/data.rb +++ b/middleman-core/lib/middleman-core/core_extensions/data.rb @@ -1,6 +1,5 @@ -require 'yaml' -require 'active_support/json' require 'middleman-core/contracts' +require 'middleman-core/util/data' module Middleman module CoreExtensions @@ -100,9 +99,10 @@ module Middleman basename = File.basename(data_path, extension) if %w(.yaml .yml).include?(extension) - data = ::YAML.load_file(file[:full_path]) + data, postscript = ::Middleman::Util::Data.parse(file[:full_path], :yaml) + data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash) elsif extension == '.json' - data = ::ActiveSupport::JSON.decode(file[:full_path].read) + data, _postscript = ::Middleman::Util::Data.parse(file[:full_path], :json) else return end diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 9f672a7e..0e26259a 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -1,11 +1,12 @@ -require 'active_support/core_ext/hash/keys' +# Core Pathname library used for traversal require 'pathname' -# Parsing YAML frontmatter -require 'yaml' +# DbC +require 'middleman-core/contracts' -# Parsing JSON frontmatter -require 'active_support/json' +require 'active_support/core_ext/hash/keys' + +require 'middleman-core/util/data' # Extensions namespace module Middleman::CoreExtensions @@ -13,13 +14,6 @@ module Middleman::CoreExtensions # Try to run after routing but before directory_indexes self.resource_list_manipulator_priority = 90 - YAML_ERRORS = [StandardError] - - # https://github.com/tenderlove/psych/issues/23 - if defined?(Psych) && defined?(Psych::SyntaxError) - YAML_ERRORS << Psych::SyntaxError - end - def initialize(app, options_hash={}, &block) super @@ -71,7 +65,7 @@ module Middleman::CoreExtensions return [{}, nil] unless file - @cache[file[:full_path]] ||= frontmatter_and_content(file[:full_path]) + @cache[file[:full_path]] ||= ::Middleman::Util::Data.parse(file[:full_path]) end Contract ArrayOf[IsA['Middleman::SourceFile']], ArrayOf[IsA['Middleman::SourceFile']] => Any @@ -80,93 +74,5 @@ module Middleman::CoreExtensions @cache.delete(file[:full_path]) end end - - # Get the frontmatter and plain content from a file - # @param [String] path - # @return [Array] - Contract Pathname => [Hash, Maybe[String]] - def frontmatter_and_content(full_path) - data = {} - - return [data, nil] if ::Middleman::Util.binary?(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:/ - lines = content.split(/\n/) - lines.shift - content = lines.join("\n") - end - - result = parse_yaml_front_matter(content, full_path) || parse_json_front_matter(content, full_path) - return result if result - rescue - # Probably a binary file, move on - end - - [data, content] - end - - private - - # Parse YAML frontmatter out of a string - # @param [String] content - # @return [Array] - Contract String, Pathname => Maybe[[Hash, String]] - def parse_yaml_front_matter(content, full_path) - yaml_regex = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m - if content =~ yaml_regex - content = content.sub(yaml_regex, '') - - begin - data = YAML.load($1) || {} - data = data.symbolize_keys - rescue *YAML_ERRORS => e - app.logger.error "YAML Exception parsing #{full_path}: #{e.message}" - return nil - end - else - return nil - end - - [data, content] - rescue - [{}, content] - end - - # Parse JSON frontmatter out of a string - # @param [String] content - # @return [Array] - Contract String, Pathname => Maybe[[Hash, String]] - def parse_json_front_matter(content, full_path) - json_regex = /\A(;;;\s*\n.*?\n?)^(;;;\s*$\n?)/m - - if content =~ json_regex - content = content.sub(json_regex, '') - - begin - json = ($1 + $2).sub(';;;', '{').sub(';;;', '}') - data = ::ActiveSupport::JSON.decode(json).symbolize_keys - rescue => e - app.logger.error "JSON Exception parsing #{full_path}: #{e.message}" - return nil - end - - else - return nil - end - - [data, content] - rescue - [{}, content] - end end end diff --git a/middleman-core/lib/middleman-core/renderers/liquid.rb b/middleman-core/lib/middleman-core/renderers/liquid.rb index 16817caf..e09306b4 100644 --- a/middleman-core/lib/middleman-core/renderers/liquid.rb +++ b/middleman-core/lib/middleman-core/renderers/liquid.rb @@ -27,7 +27,26 @@ module Middleman next unless resource.source_file[:relative_path].to_s =~ %r{\.liquid$} # Convert data object into a hash for liquid - resource.add_metadata locals: { data: app.extensions[:data].data_store.to_h } + resource.add_metadata locals: { + data: stringify_recursive(app.extensions[:data].data_store.to_h) + } + end + end + + def stringify_recursive(hash) + {}.tap do |h| + hash.each { |key, value| h[key.to_s] = map_value(value) } + end + end + + def map_value(thing) + case thing + when Hash + stringify_recursive(thing) + when Array + thing.map { |v| map_value(v) } + else + thing end end end diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb new file mode 100644 index 00000000..1d107ef9 --- /dev/null +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -0,0 +1,153 @@ +# Core Pathname library used for traversal +require 'pathname' + +# DbC +require 'middleman-core/contracts' + +# Shared util methods +require 'middleman-core/util' + +# Parsing YAML data +require 'yaml' + +# Parsing JSON data +require 'active_support/json' + +module Middleman + module Util + module Data + include Contracts + + module_function + + YAML_ERRORS = [StandardError] + + # https://github.com/tenderlove/psych/issues/23 + if defined?(Psych) && defined?(Psych::SyntaxError) + YAML_ERRORS << Psych::SyntaxError + end + + # Get the frontmatter and plain content from a file + # @param [String] path + # @return [Array] + Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]] + def parse(full_path, known_type=nil) + data = {} + + return [data, nil] if ::Middleman::Util.binary?(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:/ + lines = content.split(/\n/) + lines.shift + content = lines.join("\n") + end + + if known_type + if known_type == :yaml + result = parse_yaml(content, full_path, true) + elsif known_type == :json + result = parse_json(content, full_path) + end + else + result = parse_yaml(content, full_path, false) + end + + return result if result + rescue + # Probably a binary file, move on + end + + [data, content] + end + + # Parse YAML frontmatter out of a string + # @param [String] content + # @return [Array] + Contract String, Pathname, Bool => Maybe[[Hash, String]] + def parse_yaml(content, full_path, require_yaml=false) + total_delims = content.scan(/^(?:---|\.\.\.)\s*(?:\n|$)/).length + has_first_line_delim = !content.match(/\A(---\s*(?:\n|$))/).nil? + # has_closing_delim = (total_delims > 1 && has_first_line_delim) || (!has_first_line_delim && total_delims == 1) + + parts = content.split(/^(?:---|\.\.\.)\s*(?:\n|$)/) + parts.shift if parts[0].empty? + + yaml_string = nil + additional_content = nil + + if require_yaml + yaml_string = parts[0] + additional_content = parts[1] + else + if total_delims > 1 + if has_first_line_delim + yaml_string = parts[0] + additional_content = parts[1] + else + additional_content = content + end + else + additional_content = parts[0] + end + end + + return [{}, additional_content] if yaml_string.nil? + + begin + data = map_value(::YAML.load(yaml_string) || {}) + rescue *YAML_ERRORS => e + $stderr.puts "YAML Exception parsing #{full_path}: #{e.message}" + return nil + end + + [data, additional_content] + rescue + [{}, additional_content] + end + + # Parse JSON frontmatter out of a string + # @param [String] content + # @return [Array] + Contract String, Pathname => Maybe[[Hash, String]] + def parse_json(content, full_path) + begin + data = map_value(::ActiveSupport::JSON.decode(content)) + rescue => e + $stderr.puts "JSON Exception parsing #{full_path}: #{e.message}" + return nil + end + + [data, nil] + rescue + [{}, nil] + end + + def symbolize_recursive(hash) + {}.tap do |h| + hash.each { |key, value| h[key.to_sym] = map_value(value) } + end + end + + def map_value(thing) + case thing + when Hash + symbolize_recursive(thing) + when Array + thing.map { |v| map_value(v) } + else + thing + end + end + end + end +end From 1efe6a27c55f92f5a1ebdf5c7889490c65bbf24a Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 16 Jun 2015 16:47:42 -0700 Subject: [PATCH 059/364] Add tests for Slim inline filters. Refactor similar feature in Haml filters. Closes #1542 --- .../markdown_kramdown_in_slim.feature | 42 ++++++++++++++++++ .../fixtures/markdown-in-slim-app/config.rb | 0 .../source/images/blank.gif | Bin 0 -> 43 bytes .../source/link_target.html.markdown | 4 ++ .../lib/middleman-core/file_renderer.rb | 8 ++-- .../lib/middleman-core/renderers/haml.rb | 28 +++++++++--- .../lib/middleman-core/renderers/kramdown.rb | 13 ++++-- .../lib/middleman-core/renderers/redcarpet.rb | 12 ++--- .../lib/middleman-core/renderers/sass.rb | 6 +-- .../lib/middleman-core/renderers/slim.rb | 28 +++++++----- 10 files changed, 107 insertions(+), 34 deletions(-) create mode 100644 middleman-core/features/markdown_kramdown_in_slim.feature create mode 100644 middleman-core/fixtures/markdown-in-slim-app/config.rb create mode 100755 middleman-core/fixtures/markdown-in-slim-app/source/images/blank.gif create mode 100755 middleman-core/fixtures/markdown-in-slim-app/source/link_target.html.markdown diff --git a/middleman-core/features/markdown_kramdown_in_slim.feature b/middleman-core/features/markdown_kramdown_in_slim.feature new file mode 100644 index 00000000..9e58a461 --- /dev/null +++ b/middleman-core/features/markdown_kramdown_in_slim.feature @@ -0,0 +1,42 @@ +Feature: Markdown support in Slim (Kramdown) + In order to test support of the Slim markdown filter + + Scenario: Markdown filter in Slim works (with Kramdown) + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :kramdown + activate :directory_indexes + """ + And a file named "source/markdown_filter.html.slim" with: + """ + markdown: + # H1 + + paragraph + """ + Given the Server is running at "markdown-in-slim-app" + When I go to "/markdown_filter/" + Then I should see ">H1" + Then I should see "

paragraph

" + + + Scenario: Markdown filter in Slim uses our link_to and image_tag helpers (with Kramdown) + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :kramdown + activate :directory_indexes + """ + And a file named "source/link_and_image.html.slim" with: + """ + markdown: + [A link](/link_target.html) + + ![image](blank.gif){: srcset="image_2x.jpg 2x"} + """ + Given the Server is running at "markdown-in-slim-app" + When I go to "/link_and_image/" + Then I should see "/link_target/" + Then I should see "/images/image_2x.jpg 2x" + Then I should see 'src="/images/blank.gif"' diff --git a/middleman-core/fixtures/markdown-in-slim-app/config.rb b/middleman-core/fixtures/markdown-in-slim-app/config.rb new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/markdown-in-slim-app/source/images/blank.gif b/middleman-core/fixtures/markdown-in-slim-app/source/images/blank.gif new file mode 100755 index 0000000000000000000000000000000000000000..2498f1aac58dab923f0fd99b1c8ee6b8c53c7158 GIT binary patch literal 43 rcmZ?wbhEHbWMp7uXkcKtd-pB_1B2pE76uT|0TCb>1|}vKMh0sDy$1%8 literal 0 HcmV?d00001 diff --git a/middleman-core/fixtures/markdown-in-slim-app/source/link_target.html.markdown b/middleman-core/fixtures/markdown-in-slim-app/source/link_target.html.markdown new file mode 100755 index 00000000..4f970c47 --- /dev/null +++ b/middleman-core/fixtures/markdown-in-slim-app/source/link_target.html.markdown @@ -0,0 +1,4 @@ +--- +layout: false +--- +Hello World \ No newline at end of file diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb index f9087004..796587d2 100644 --- a/middleman-core/lib/middleman-core/file_renderer.rb +++ b/middleman-core/lib/middleman-core/file_renderer.rb @@ -53,6 +53,7 @@ module Middleman extension = File.extname(path) options = opts.merge(options_for_ext(extension)) options[:outvar] ||= '@_out_buf' + options[:context] = context options.delete(:layout) # Overwrite with frontmatter options @@ -66,9 +67,10 @@ module Middleman end # Read compiled template from disk or cache - template = cache.fetch(:compiled_template, extension, options, body) do - ::Tilt.new(path, 1, options) { body } - end + template = ::Tilt.new(path, 1, options) { body } + # template = cache.fetch(:compiled_template, extension, options, body) do + # ::Tilt.new(path, 1, options) { body } + # end # Render using Tilt content = ::Middleman::Util.instrument 'render.tilt', path: path do diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb index 8f98ddc6..7e2b6fbb 100644 --- a/middleman-core/lib/middleman-core/renderers/haml.rb +++ b/middleman-core/lib/middleman-core/renderers/haml.rb @@ -20,29 +20,45 @@ module Middleman # thus making it impossible to pass our Middleman instance # in. So we have to resort to heavy hackery :( class HamlTemplate < ::Tilt::HamlTemplate + def initialize(*args, &block) + super + + @context = @options[:context] if @options.key?(:context) + end + def prepare end def evaluate(scope, locals, &block) - ::Middleman::Renderers::Haml.last_haml_scope = scope - - options = @options.merge(filename: eval_file, line: line) + options = @options.merge(filename: eval_file, line: line, context: @context || scope) @engine = ::Haml::Engine.new(data, options) output = @engine.render(scope, locals, &block) - ::Middleman::Renderers::Haml.last_haml_scope = nil - output end end # Haml Renderer class Haml < ::Middleman::Extension - cattr_accessor :last_haml_scope def initialize(app, options={}, &block) super + ::Haml::Options.defaults[:context] = nil + ::Haml::Options.send :attr_accessor, :context + + [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f| + f.class_exec do + def self.render_with_options(text, compiler_options) + modified_options = options.dup + modified_options[:context] = compiler_options[:context] + + text = template_class.new(nil, 1, modified_options) {text}.render + super(text, compiler_options) + end + end + end + ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml) # Add haml helpers to context diff --git a/middleman-core/lib/middleman-core/renderers/kramdown.rb b/middleman-core/lib/middleman-core/renderers/kramdown.rb index c93d254d..86317560 100644 --- a/middleman-core/lib/middleman-core/renderers/kramdown.rb +++ b/middleman-core/lib/middleman-core/renderers/kramdown.rb @@ -4,10 +4,16 @@ module Middleman module Renderers # Our own Kramdown Tilt template that simply uses our custom renderer. class KramdownTemplate < ::Tilt::KramdownTemplate - def evaluate(scope, *) - @output ||= begin - MiddlemanKramdownHTML.scope = (defined?(::Middleman::Renderers::Haml) && ::Middleman::Renderers::Haml.last_haml_scope) ? ::Middleman::Renderers::Haml.last_haml_scope : scope + def initialize(*args, &block) + super + @context = @options[:context] if @options.key?(:context) + end + + def evaluate(context, *) + MiddlemanKramdownHTML.scope = @context || context + + @output ||= begin output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options) @engine.warnings.concat(warnings) output @@ -38,6 +44,7 @@ module Middleman attr = el.attr.dup link = attr.delete('href') + scope.link_to(content, link, attr) end end diff --git a/middleman-core/lib/middleman-core/renderers/redcarpet.rb b/middleman-core/lib/middleman-core/renderers/redcarpet.rb index 0e141969..545a3c87 100644 --- a/middleman-core/lib/middleman-core/renderers/redcarpet.rb +++ b/middleman-core/lib/middleman-core/renderers/redcarpet.rb @@ -10,6 +10,12 @@ module Middleman escape_html: :filter_html } + def initialize(*args, &block) + super + + @context = @options[:context] if @options.key?(:context) + end + # Overwrite built-in Tilt version. # Don't overload :renderer option with smartypants # Support renderer-level options @@ -40,11 +46,7 @@ module Middleman def evaluate(scope, _) @output ||= begin - if defined?(::Middleman::Renderers::Haml) - MiddlemanRedcarpetHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope - else - MiddlemanRedcarpetHTML.scope = scope - end + MiddlemanRedcarpetHTML.scope = @context || scope @engine.render(data) end diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index f796992d..ff449f4b 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -94,11 +94,7 @@ module Middleman # Change Sass path, for url functions, to the build folder if we're building # @return [Hash] def sass_options - ctx = if defined?(::Middleman::Renderers::Haml) - ::Middleman::Renderers::Haml.last_haml_scope || @context - else - @context - end + ctx = @context more_opts = { load_paths: ctx.config[:sass_assets_paths], diff --git a/middleman-core/lib/middleman-core/renderers/slim.rb b/middleman-core/lib/middleman-core/renderers/slim.rb index 21277fe4..16640f4a 100644 --- a/middleman-core/lib/middleman-core/renderers/slim.rb +++ b/middleman-core/lib/middleman-core/renderers/slim.rb @@ -7,9 +7,24 @@ module SafeTemplate end end -class Slim::Template +class ::Slim::Template include SafeTemplate + def initialize(file, line, opts, &block) + if opts.key?(:context) + context_hack = { + context: opts[:context] + } + + ::Slim::Embedded::SassEngine.disable_option_validator! + %w(sass scss markdown).each do |engine| + ::Slim::Embedded.options[engine.to_sym] = context_hack + end + end + + super + end + def precompiled_preamble(locals) "__in_slim_template = true\n" << super end @@ -32,17 +47,6 @@ module Middleman disable_escape: true ) end - - def after_configuration - context_hack = { - context: app.template_context_class.new(app) - } - - ::Slim::Embedded::SassEngine.disable_option_validator! - %w(sass scss markdown).each do |engine| - ::Slim::Embedded.options[engine.to_sym] = context_hack - end - end end end end From 3fca2c6961215a2e0b9d00faee6d185c4b93a5d7 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 22 Jun 2015 10:37:17 -0700 Subject: [PATCH 060/364] Add relative argument to stylesheet and javascript helpers. Closes #1539 --- CHANGELOG.md | 1 + .../features/relative_assets.feature | 11 ++++ .../absolute_image_relative_css.html.erb | 9 ++++ .../source/javascripts/app.js | 3 ++ .../source/relative_image.html.erb | 1 + .../relative_image_absolute_css.html.erb | 9 ++++ .../core_extensions/default_helpers.rb | 50 +++++++++++++++++-- .../extensions/relative_assets.rb | 12 ++--- 8 files changed, 83 insertions(+), 13 deletions(-) create mode 100644 middleman-core/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb create mode 100644 middleman-core/fixtures/relative-assets-app/source/javascripts/app.js create mode 100644 middleman-core/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb diff --git a/CHANGELOG.md b/CHANGELOG.md index 22573947..c9378726 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ master * Empower link_to in a i18n context. * Add retina files support on automatic_image_sizes * Fix woff/woff2 confusion in asset hashing. +* Support `relative: false` on `stylesheet_link_tag` and `javascript_include_tag` 3.3.12 === diff --git a/middleman-core/features/relative_assets.feature b/middleman-core/features/relative_assets.feature index 1ebafdfa..e0c6b16f 100644 --- a/middleman-core/features/relative_assets.feature +++ b/middleman-core/features/relative_assets.feature @@ -21,6 +21,12 @@ Feature: Relative Assets Given "relative_assets" feature is "disabled" And the Server is running at "relative-assets-app" When I go to "/relative_image.html" + Then I should see '"/stylesheets/relative_assets.css"' + Then I should see '"/javascripts/app.js"' + Then I should see "/images/blank.gif" + When I go to "/absolute_image_relative_css.html" + Then I should see '"stylesheets/relative_assets.css"' + Then I should see '"javascripts/app.js"' Then I should see "/images/blank.gif" Scenario: Rendering css with the feature enabled @@ -54,6 +60,11 @@ Feature: Relative Assets Given "relative_assets" feature is "enabled" And the Server is running at "relative-assets-app" When I go to "/relative_image.html" + Then I should see '"stylesheets/relative_assets.css"' + Then I should see '"javascripts/app.js"' + When I go to "/relative_image_absolute_css.html" + Then I should see '"/stylesheets/relative_assets.css"' + Then I should see '"/javascripts/app.js"' Then I should not see "/images/blank.gif" And I should see "images/blank.gif" diff --git a/middleman-core/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb b/middleman-core/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb new file mode 100644 index 00000000..1a763ecf --- /dev/null +++ b/middleman-core/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb @@ -0,0 +1,9 @@ + + + <%= stylesheet_link_tag :relative_assets, relative: true %> + <%= javascript_include_tag :app, relative: true %> + + + <%= image_tag "blank.gif" %> + + \ No newline at end of file diff --git a/middleman-core/fixtures/relative-assets-app/source/javascripts/app.js b/middleman-core/fixtures/relative-assets-app/source/javascripts/app.js new file mode 100644 index 00000000..a9ec7a89 --- /dev/null +++ b/middleman-core/fixtures/relative-assets-app/source/javascripts/app.js @@ -0,0 +1,3 @@ +function hello() { + console.log('world'); +} \ No newline at end of file diff --git a/middleman-core/fixtures/relative-assets-app/source/relative_image.html.erb b/middleman-core/fixtures/relative-assets-app/source/relative_image.html.erb index 4fb9dc0c..4344f2a2 100644 --- a/middleman-core/fixtures/relative-assets-app/source/relative_image.html.erb +++ b/middleman-core/fixtures/relative-assets-app/source/relative_image.html.erb @@ -1,6 +1,7 @@ <%= stylesheet_link_tag :relative_assets %> + <%= javascript_include_tag :app %> <%= image_tag "blank.gif" %> diff --git a/middleman-core/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb b/middleman-core/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb new file mode 100644 index 00000000..4e910c47 --- /dev/null +++ b/middleman-core/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb @@ -0,0 +1,9 @@ + + + <%= stylesheet_link_tag :relative_assets, relative: false %> + <%= javascript_include_tag :app, relative: false %> + + + <%= image_tag "blank.gif" %> + + \ No newline at end of file diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index 0ac4c147..cbb94768 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -99,6 +99,36 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension end end + # Override helper to add `relative` opt-out. + def stylesheet_link_tag(*sources) + options = { + :rel => 'stylesheet' + }.update(sources.extract_options!.symbolize_keys) + + path_options = {} + path_options[:relative] = options.delete(:relative) if options.key?(:relative) + + sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all,source| + all << tag(:link, { + href: asset_path(:css, source, path_options) + }.update(options)) + end + end + + # Override helper to add `relative` opt-out. + def javascript_include_tag(*sources) + options = sources.extract_options!.symbolize_keys + + path_options = {} + path_options[:relative] = options.delete(:relative) if options.key?(:relative) + + sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all,source| + all << content_tag(:script, nil, { + src: asset_path(:js, source, path_options) + }.update(options)) + end + end + # Output a stylesheet link tag based on the current path # # @param [Symbol] asset_ext The type of asset @@ -153,8 +183,9 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension # # @param [Symbol] kind The type of file # @param [String] source The path to the file + # @param [Hash] options Additional options. # @return [String] - def asset_path(kind, source) + def asset_path(kind, source, options={}) return source if source.to_s.include?('//') || source.to_s.start_with?('data:') asset_folder = case kind when :css @@ -174,29 +205,38 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}") asset_folder = '' if source.start_with?('/') # absolute path - asset_url(source, asset_folder) + asset_url(source, asset_folder, options) end # Get the URL of an asset given a type/prefix # # @param [String] path The path (such as "photo.jpg") # @param [String] prefix The type prefix (such as "images") + # @param [Hash] options Additional options. # @return [String] The fully qualified asset url - def asset_url(path, prefix='') + def asset_url(path, prefix='', options={}) # Don't touch assets which already have a full path - if path.include?('//') || path.start_with?('data:') + if path.include?('//') || path.start_with?('data:') || !current_resource path else # rewrite paths to use their destination path - if resource = sitemap.find_resource_by_destination_path(url_for(path)) + result = if resource = sitemap.find_resource_by_destination_path(url_for(path)) resource.url else path = File.join(prefix, path) + if resource = sitemap.find_resource_by_path(path) resource.url else File.join(config[:http_prefix], path) end end + + if options[:relative] != true + result + else + current_dir = Pathname('/' + current_resource.destination_path) + Pathname(result).relative_path_from(current_dir.dirname).to_s + end end end diff --git a/middleman-core/lib/middleman-more/extensions/relative_assets.rb b/middleman-core/lib/middleman-more/extensions/relative_assets.rb index 130bffb8..95eb291b 100644 --- a/middleman-core/lib/middleman-more/extensions/relative_assets.rb +++ b/middleman-core/lib/middleman-more/extensions/relative_assets.rb @@ -13,16 +13,12 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension # asset_url override for relative assets # @param [String] path # @param [String] prefix + # @param [Hash] options Additional options. # @return [String] - def asset_url(path, prefix='') - path = super(path, prefix) + def asset_url(path, prefix='', options={}) + options[:relative] = true unless options.key?(:relative) - if path.include?('//') || path.start_with?('data:') || !current_resource - path - else - current_dir = Pathname('/' + current_resource.destination_path) - Pathname(path).relative_path_from(current_dir.dirname).to_s - end + path = super(path, prefix, options) end end end From 709a0d1a6c7502da2b3e64167cbd59afec03d255 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 22 Jun 2015 10:48:40 -0700 Subject: [PATCH 061/364] Fix previous commit --- middleman-core/lib/middleman-more/extensions/asset_host.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-more/extensions/asset_host.rb b/middleman-core/lib/middleman-more/extensions/asset_host.rb index 194eaa85..c5c58ec3 100644 --- a/middleman-core/lib/middleman-more/extensions/asset_host.rb +++ b/middleman-core/lib/middleman-more/extensions/asset_host.rb @@ -32,7 +32,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension # @param [String] path # @param [String] prefix # @return [String] - def asset_url(path, prefix='') + def asset_url(path, prefix='', options={}) controller = extensions[:asset_host] original_output = super From 8bbda9ea7b9e3a44ab97db804de4a60e9c671288 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 22 Jun 2015 11:28:09 -0700 Subject: [PATCH 062/364] Whoops again --- middleman-core/lib/middleman-more/extensions/cache_buster.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-more/extensions/cache_buster.rb b/middleman-core/lib/middleman-more/extensions/cache_buster.rb index 20d00f9b..1028cb84 100644 --- a/middleman-core/lib/middleman-more/extensions/cache_buster.rb +++ b/middleman-core/lib/middleman-more/extensions/cache_buster.rb @@ -21,7 +21,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension # asset_url override if we're using cache busting # @param [String] path # @param [String] prefix - def asset_url(path, prefix='') + def asset_url(path, prefix='', options={}) http_path = super if http_path.include?('://') || !%w(.css .png .jpg .jpeg .svg .svgz .webp .js .gif).include?(File.extname(http_path)) From 9abcdaa7f7630abeb3b4de64519391b779c620af Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 23 Jun 2015 15:49:36 -0700 Subject: [PATCH 063/364] Experiment with activersupport bump --- middleman-core/middleman-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 0e8e9fa7..12909e75 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_dependency("thor", [">= 0.15.2", "< 2.0"]) # Helpers - s.add_dependency("activesupport", ["~> 4.1.0"]) + s.add_dependency("activesupport", ["~> 4.2.0"]) s.add_dependency("padrino-helpers", ["~> 0.12.3"]) # Watcher From 724e249b490d869d5b1f5aa1ef64ec316bb3f38c Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 23 Jun 2015 15:53:12 -0700 Subject: [PATCH 064/364] Experiment with activersupport bump --- middleman-core/middleman-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 12909e75..91fa76d3 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_dependency("thor", [">= 0.15.2", "< 2.0"]) # Helpers - s.add_dependency("activesupport", ["~> 4.2.0"]) + s.add_dependency("activesupport", ["~> 4.1"]) s.add_dependency("padrino-helpers", ["~> 0.12.3"]) # Watcher From 232aca91bced48f77efa31b0a0ddf696a17d4cfd Mon Sep 17 00:00:00 2001 From: Max Meyer Date: Thu, 25 Jun 2015 22:26:46 +0200 Subject: [PATCH 065/364] Make testing a little bit easier and require features-directory to make subdirectories in cucumber work --- .rubocop.yml | 1 + Gemfile | 2 +- gem_rake_helper.rb | 2 +- middleman-core/.rspec | 1 + middleman-core/cucumber.yml | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 middleman-core/.rspec create mode 100644 middleman-core/cucumber.yml diff --git a/.rubocop.yml b/.rubocop.yml index 2a518da3..68908de8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -14,6 +14,7 @@ AllCops: - 'middleman-core/fixtures/**/*' - 'middleman-core/features/**/*' - 'middleman-core/spec/**/*' + DisplayCopNames: true LineLength: Enabled: false MethodLength: diff --git a/Gemfile b/Gemfile index f34fbaec..6ed44aac 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'pry', '~> 0.10', group: :development gem 'aruba', '~> 0.6' gem 'rspec', '~> 3.0' gem 'fivemat', '~> 1.3' -gem 'cucumber', '~> 1.3' +gem 'cucumber', '~> 2.0' # Optional middleman dependencies, included for tests gem 'less', '2.3', require: false diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb index 5f95c90e..a90ea7dc 100644 --- a/gem_rake_helper.rb +++ b/gem_rake_helper.rb @@ -21,7 +21,7 @@ Cucumber::Rake::Task.new do |t| exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding) exempt_tags << '--tags ~@nowindows' if Gem.win_platform? exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true' - t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" end Cucumber::Rake::Task.new(:cucumber_wip) do |t| diff --git a/middleman-core/.rspec b/middleman-core/.rspec new file mode 100644 index 00000000..4e1e0d2f --- /dev/null +++ b/middleman-core/.rspec @@ -0,0 +1 @@ +--color diff --git a/middleman-core/cucumber.yml b/middleman-core/cucumber.yml new file mode 100644 index 00000000..a65d694e --- /dev/null +++ b/middleman-core/cucumber.yml @@ -0,0 +1,2 @@ +default: --require features --tags ~@wip +wip: --require features --tags @wip From 6aa7ce741a11db6fc25f3d10a30fb0a79095779e Mon Sep 17 00:00:00 2001 From: Max Meyer Date: Thu, 25 Jun 2015 15:39:56 +0200 Subject: [PATCH 066/364] Refactor preview server to support server_name and bind_address --- Gemfile | 3 + .../features/cli/preview_server.feature | 532 ++++++++++++++++++ .../preview-server-app/bin/dns_server.rb | 33 ++ .../config-complications.rb | 11 + .../preview-server-app/config-empty.rb | 0 .../fixtures/preview-server-app/config.rb | 11 + .../preview-server-app/source/index.html.erb | 1 + .../preview-server-app/source/layout.erb | 9 + .../source/layouts/custom.erb | 8 + .../preview-server-app/source/real.html | 1 + .../source/real/index.html.erb | 5 + .../source/should_be_ignored.html | 1 + .../source/should_be_ignored2.html | 1 + .../source/should_be_ignored3.html | 1 + .../preview-server-app/source/static.html | 1 + .../lib/middleman-core/application.rb | 6 +- .../lib/middleman-core/cli/server.rb | 12 +- .../lib/middleman-core/dns_resolver.rb | 73 +++ .../dns_resolver/basic_network_resolver.rb | 52 ++ .../dns_resolver/hosts_resolver.rb | 63 +++ .../dns_resolver/local_link_resolver.rb | 44 ++ .../dns_resolver/network_resolver.rb | 42 ++ .../lib/middleman-core/preview_server.rb | 94 ++-- .../middleman-core/preview_server/checks.rb | 81 +++ .../preview_server/information.rb | 273 +++++++++ .../network_interface_inventory.rb | 65 +++ .../preview_server/server_hostname.rb | 39 ++ .../preview_server/server_information.rb | 144 +++++ .../server_information_validator.rb | 18 + .../preview_server/server_ip_address.rb | 55 ++ .../preview_server/server_url.rb | 50 ++ .../preview_server/tcp_port_prober.rb | 29 + .../lib/middleman-core/step_definitions.rb | 1 + .../step_definitions/commandline_steps.rb | 88 +++ .../spec/middleman-core/dns_resolver_spec.rb | 118 ++++ .../preview_server/server_hostname_spec.rb | 39 ++ .../preview_server/server_ip_address_spec.rb | 43 ++ middleman-core/spec/spec_helper.rb | 26 + 38 files changed, 2023 insertions(+), 50 deletions(-) create mode 100644 middleman-core/features/cli/preview_server.feature create mode 100755 middleman-core/fixtures/preview-server-app/bin/dns_server.rb create mode 100644 middleman-core/fixtures/preview-server-app/config-complications.rb create mode 100644 middleman-core/fixtures/preview-server-app/config-empty.rb create mode 100644 middleman-core/fixtures/preview-server-app/config.rb create mode 100755 middleman-core/fixtures/preview-server-app/source/index.html.erb create mode 100644 middleman-core/fixtures/preview-server-app/source/layout.erb create mode 100755 middleman-core/fixtures/preview-server-app/source/layouts/custom.erb create mode 100644 middleman-core/fixtures/preview-server-app/source/real.html create mode 100644 middleman-core/fixtures/preview-server-app/source/real/index.html.erb create mode 100644 middleman-core/fixtures/preview-server-app/source/should_be_ignored.html create mode 100644 middleman-core/fixtures/preview-server-app/source/should_be_ignored2.html create mode 100644 middleman-core/fixtures/preview-server-app/source/should_be_ignored3.html create mode 100755 middleman-core/fixtures/preview-server-app/source/static.html create mode 100644 middleman-core/lib/middleman-core/dns_resolver.rb create mode 100644 middleman-core/lib/middleman-core/dns_resolver/basic_network_resolver.rb create mode 100644 middleman-core/lib/middleman-core/dns_resolver/hosts_resolver.rb create mode 100644 middleman-core/lib/middleman-core/dns_resolver/local_link_resolver.rb create mode 100644 middleman-core/lib/middleman-core/dns_resolver/network_resolver.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/checks.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/information.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/network_interface_inventory.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/server_hostname.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/server_information.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/server_information_validator.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/server_ip_address.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/server_url.rb create mode 100644 middleman-core/lib/middleman-core/preview_server/tcp_port_prober.rb create mode 100644 middleman-core/lib/middleman-core/step_definitions/commandline_steps.rb create mode 100644 middleman-core/spec/middleman-core/dns_resolver_spec.rb create mode 100644 middleman-core/spec/middleman-core/preview_server/server_hostname_spec.rb create mode 100644 middleman-core/spec/middleman-core/preview_server/server_ip_address_spec.rb diff --git a/Gemfile b/Gemfile index 6ed44aac..37122c0a 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,9 @@ gem 'sinatra', '>= 1.4', require: false gem 'redcarpet', '>= 3.1', require: false unless RUBY_ENGINE == 'jruby' gem 'asciidoctor', '~> 0.1', require: false +# Dns server to test preview server +gem 'rubydns', '~> 1.0.1', require: false + # To test javascript gem 'poltergeist', '~> 1.6.0', require: false diff --git a/middleman-core/features/cli/preview_server.feature b/middleman-core/features/cli/preview_server.feature new file mode 100644 index 00000000..f82a0a1f --- /dev/null +++ b/middleman-core/features/cli/preview_server.feature @@ -0,0 +1,532 @@ +Feature: Run the preview server + + As a software developer + I want to start the preview server + In order to view my changes immediately in the browser + + Background: + Given a fixture app "preview-server-app" + And the default aruba timeout is 30 seconds + + Scenario: Start the server with defaults + When I run `middleman server` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + And the output should contain: + """ + View your site at "http:// + """ + And the output should contain: + """ + Inspect your site configuration at "http:// + """ + + Scenario: Start the server with defaults in verbose mode + When I run `middleman server --verbose` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to ":::4567", "0.0.0.0:4567" + """ + And the output should contain: + """ + View your site at "http:// + """ + And the output should contain: + """ + Inspect your site configuration at "http:// + """ + + @ruby-2.1 + Scenario: Start the server with defaults in verbose mode, when a local mdns server resolves the local hostname + Given I start a mdns server for the local hostname + When I run `middleman server --verbose` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to ":::4567", "0.0.0.0:4567" + """ + And the output should contain: + """ + View your site at "http:// + """ + And the output should contain: + """ + Inspect your site configuration at "http:// + """ + + Scenario: Start the server with bind address 127.0.0.1 + Given I have a local hosts file with: + """ + # + 127.0.0.1 localhost.localdomain localhost + """ + When I run `middleman server --verbose --bind-address 127.0.0.1` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://127.0.0.1:4567/__middleman" + """ + + Scenario: Start the server with bind address 127.0.0.1 configured via config.rb + Given I have a local hosts file with: + """ + # + 127.0.0.1 localhost.localdomain localhost + """ + And a file named "config.rb" with: + """ + set :bind_address, '127.0.0.1' + """ + When I run `middleman server --verbose` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://127.0.0.1:4567/__middleman" + """ + + Scenario: Start the server with bind address 127.0.0.5 + + This will have no hostname attached because the hosts file, the DNS server + and the MDNS-server do not know anything about 127.0.0.5 + + When I run `middleman server --verbose --bind-address 127.0.0.5` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.5:4567" + """ + And the output should contain: + """ + View your site at "http://127.0.0.5:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://127.0.0.5:4567/__middleman" + """ + + Scenario: Start the server with bind address ::1 + Given a file named ".hosts" with: + """ + # + ::1 localhost.localdomain localhost + """ + When I run `middleman server --verbose --bind-address ::1` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "::1:4567" + """ + And the output should contain: + """ + View your site at "http://[::1]:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://[::1]:4567/__middleman" + """ + + Scenario: Start the server with bind address 0.0.0.0 + When I run `middleman server --verbose --bind-address 0.0.0.0` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "0.0.0.0:4567" + """ + And the output should contain: + """ + View your site at "http:// + """ + And the output should contain: + """ + Inspect your site configuration at "http:// + """ + + Scenario: Start the server with bind address :: + When I run `middleman server --verbose --bind-address ::` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to ":::4567" + """ + And the output should contain: + """ + View your site at "http:// + """ + And the output should contain: + """ + Inspect your site configuration at "http:// + """ + + Scenario: Start the server with server name "localhost" + Given I have a local hosts file with: + """ + # + 127.0.0.1 localhost.localdomain localhost + """ + When I run `middleman server --verbose --server-name localhost` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://localhost:4567", "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://localhost:4567/__middleman", "http://127.0.0.1:4567/__middleman" + """ + + Scenario: Start the server with server name "localhost" configured via config.rb + Given I have a local hosts file with: + """ + # + 127.0.0.1 localhost.localdomain localhost + """ + And a file named "config.rb" with: + """ + set :server_name, 'localhost' + """ + When I run `middleman server --verbose` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://localhost:4567", "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://localhost:4567/__middleman", "http://127.0.0.1:4567/__middleman" + """ + + Scenario: Start the server with server name "localhost" and bind address "127.0.0.1" + Given I have a local hosts file with: + """ + # + 127.0.0.1 localhost.localdomain localhost + """ + When I run `middleman server --verbose --server-name localhost --bind-address 127.0.0.1` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://localhost:4567", "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://localhost:4567/__middleman", "http://127.0.0.1:4567/__middleman" + """ + + Scenario: Start the server with server name "127.0.0.1" + When I run `middleman server --verbose --server-name 127.0.0.1` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://127.0.0.1:4567/__middleman" + """ + + Scenario: Start the server with server name "::1" + When I run `middleman server --verbose --server-name ::1` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "::1:4567" + """ + And the output should contain: + """ + View your site at "http://[::1]:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://[::1]:4567/__middleman" + """ + + Scenario: Start the server with https + When I run `middleman server --verbose --https` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to ":::4567", "0.0.0.0:4567" + """ + And the output should contain: + """ + View your site at "https:// + """ + And the output should contain: + """ + Inspect your site configuration at "https:// + """ + + Scenario: Start the server with port 65432 + When I run `middleman server --verbose --port 65432` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to ":::65432", "0.0.0.0:65432" + """ + + Scenario: Start the server with port 65432 configured via config.rb + Given a file named "config.rb" with: + """ + set :port, 65432 + """ + When I run `middleman server --verbose` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to ":::65432", "0.0.0.0:65432" + """ + + Scenario: Start the server when port is blocked by other middleman instance + Given `middleman server` is running in background + When I run `middleman server --verbose` interactively + And I stop all commands if the output of the last command contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman uses a different port + """ + + Scenario: Start the server with bind address 1.1.1.1 + + This should fail, because "1.1.1.1" is not an interface available on this computer. + + Given a file named ".hosts" with: + """ + 1.1.1.1 www.example.com www + """ + When I run `middleman server --verbose --bind-address 1.1.1.1` interactively + And I stop middleman if the output contains: + """ + Running Middleman failed: + """ + Then the output should contain: + """ + Bind address "1.1.1.1" is not available on your system + """ + + Scenario: Start the server with server name www.example.com and bind address 0.0.0.0 + + This should fail, because the user can just use `--server-name`. It does + not make sense for `middleman` to only listen on `0.0.0.0` (IPv4 all + interfaces), but not on `::` (IPv6 all interfaces). There are other tools + like `iptables` (Linux-only) or better some `kernel`-configurations to make + this possible. + + When I run `middleman server --verbose --server-name www.example.com --bind-address 0.0.0.0` interactively + And I stop middleman if the output contains: + """ + Running Middleman failed: + """ + Then the output should contain: + """ + Undefined combination of options "--server-name" and "--bind-address". + """ + + Scenario: Start the server with server name "www.example.com" and bind address "127.0.0.1" + + This should fail because the server name does not resolve to the ip address. + + Given a file named ".hosts" with: + """ + 1.1.1.1 www.example.com www + """ + When I run `middleman server --verbose --server-name www.example.com --bind-address 127.0.0.1` interactively + And I stop middleman if the output contains: + """ + Running Middleman failed: + """ + Then the output should contain: + """ + Server name "www.example.com" does not resolve to bind address "127.0.0.1". Please fix that and try again. + """ + + Scenario: Start the server with server name "garbage.example.com" + When I run `middleman server --verbose --server-name garbage.example.com` interactively + And I stop middleman if the output contains: + """ + Running Middleman failed: + """ + Then the output should contain: + """ + Server name "garbage.example.com" does not resolve to an ip address. Please fix that and try again. + """ + + Scenario: Start the server with server name "www.example.com" and the network name server is used to resolve the server name + Given I have a local hosts file with: + """ + # empty + """ + And I start a mdns server with: + """ + # empty + """ + And I start a dns server with: + """ + www.example.com: 127.0.0.1 + """ + When I run `middleman server --verbose --server-name www.example.com` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://www.example.com:4567", "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://www.example.com:4567/__middleman", "http://127.0.0.1:4567/__middleman" + """ + + @ruby-2.1 + Scenario: Start the server with server name "host.local" and the link local name server is used to resolve the server name + + To make the mdns resolver resolve a name, it needs to end with ".local". + Otherwise the resolver returns []. + + Given I have a local hosts file with: + """ + # empty + """ + And I start a mdns server with: + """ + host.local: 127.0.0.1 + """ + When I run `middleman server --verbose --server-name host.local` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://host.local:4567", "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://host.local:4567/__middleman", "http://127.0.0.1:4567/__middleman" + """ + + @ruby-2.1 + Scenario: Start the server with server name "host" and the link local name server is used to resolve the server name + + To make the mdns resolver resolve a name, it needs to end with ".local". If + a plain hostname is given `middleman` appends ".local" automatically. + + Given I have a local hosts file with: + """ + # empty + """ + And I start a mdns server with: + """ + host.local: 127.0.0.1 + """ + When I run `middleman server --verbose --server-name host` interactively + And I stop middleman if the output contains: + """ + Inspect your site configuration + """ + Then the output should contain: + """ + The Middleman preview server is bind to "127.0.0.1:4567" + """ + And the output should contain: + """ + View your site at "http://host.local:4567", "http://127.0.0.1:4567" + """ + And the output should contain: + """ + Inspect your site configuration at "http://host.local:4567/__middleman", "http://127.0.0.1:4567/__middleman" + """ diff --git a/middleman-core/fixtures/preview-server-app/bin/dns_server.rb b/middleman-core/fixtures/preview-server-app/bin/dns_server.rb new file mode 100755 index 00000000..78726f59 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/bin/dns_server.rb @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby + +require 'rubydns' +require 'psych' + +db_file = ARGV[0] +port = ARGV[1] || 5300 + +db = if File.file? db_file + $stderr.puts 'Found dns db' + Psych.load_file(db_file) + else + $stderr.puts 'Found no dns db. Use default db.' + + { + /www\.example\.org/ => '1.1.1.1' + } + end + +interfaces = [ + [:udp, "127.0.0.1", port], + [:tcp, "127.0.0.1", port] +] + + +# Start the RubyDNS server +RubyDNS::run_server(:listen => interfaces) do + db.each do |matcher, result| + match(matcher, Resolv::DNS::Resource::IN::A) do |transaction| + transaction.respond!(result) + end + end +end diff --git a/middleman-core/fixtures/preview-server-app/config-complications.rb b/middleman-core/fixtures/preview-server-app/config-complications.rb new file mode 100644 index 00000000..14d6c328 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/config-complications.rb @@ -0,0 +1,11 @@ +page "/fake.html", :proxy => "/real.html", :layout => false + +ignore "/should_be_ignored.html" +page "/should_be_ignored2.html", :ignore => true +page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true + +%w(one two).each do |num| + page "/fake/#{num}.html", :proxy => "/real/index.html" do + @num = num + end +end diff --git a/middleman-core/fixtures/preview-server-app/config-empty.rb b/middleman-core/fixtures/preview-server-app/config-empty.rb new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/preview-server-app/config.rb b/middleman-core/fixtures/preview-server-app/config.rb new file mode 100644 index 00000000..14d6c328 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/config.rb @@ -0,0 +1,11 @@ +page "/fake.html", :proxy => "/real.html", :layout => false + +ignore "/should_be_ignored.html" +page "/should_be_ignored2.html", :ignore => true +page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true + +%w(one two).each do |num| + page "/fake/#{num}.html", :proxy => "/real/index.html" do + @num = num + end +end diff --git a/middleman-core/fixtures/preview-server-app/source/index.html.erb b/middleman-core/fixtures/preview-server-app/source/index.html.erb new file mode 100755 index 00000000..f47aba51 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/index.html.erb @@ -0,0 +1 @@ +

Welcome

\ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/layout.erb b/middleman-core/fixtures/preview-server-app/source/layout.erb new file mode 100644 index 00000000..b72f66e9 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/layout.erb @@ -0,0 +1,9 @@ + + + My Sample Site + + + + <%= yield %> + + \ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/layouts/custom.erb b/middleman-core/fixtures/preview-server-app/source/layouts/custom.erb new file mode 100755 index 00000000..c8a83373 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/layouts/custom.erb @@ -0,0 +1,8 @@ + + + Custom Layout + + + <%= yield %> + + \ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/real.html b/middleman-core/fixtures/preview-server-app/source/real.html new file mode 100644 index 00000000..cb312952 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/real.html @@ -0,0 +1 @@ +I am real \ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/real/index.html.erb b/middleman-core/fixtures/preview-server-app/source/real/index.html.erb new file mode 100644 index 00000000..190d84ec --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/real/index.html.erb @@ -0,0 +1,5 @@ +--- +layout: false +--- + +I am real: <%= @num %> \ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/should_be_ignored.html b/middleman-core/fixtures/preview-server-app/source/should_be_ignored.html new file mode 100644 index 00000000..fb81d5c0 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/should_be_ignored.html @@ -0,0 +1 @@ +

Ignore me!

\ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/should_be_ignored2.html b/middleman-core/fixtures/preview-server-app/source/should_be_ignored2.html new file mode 100644 index 00000000..0940fd7c --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/should_be_ignored2.html @@ -0,0 +1 @@ +

Ignore me! 2

\ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/should_be_ignored3.html b/middleman-core/fixtures/preview-server-app/source/should_be_ignored3.html new file mode 100644 index 00000000..98007c81 --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/should_be_ignored3.html @@ -0,0 +1 @@ +

Ignore me! 3

\ No newline at end of file diff --git a/middleman-core/fixtures/preview-server-app/source/static.html b/middleman-core/fixtures/preview-server-app/source/static.html new file mode 100755 index 00000000..7e50df4e --- /dev/null +++ b/middleman-core/fixtures/preview-server-app/source/static.html @@ -0,0 +1 @@ +Static, no code! \ No newline at end of file diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index f509e943..72c17ee0 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -75,7 +75,11 @@ module Middleman # Which server name should be used # @return [NilClass, String] - config.define_setting :host, nil, 'The preview host name' + 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] diff --git a/middleman-core/lib/middleman-core/cli/server.rb b/middleman-core/lib/middleman-core/cli/server.rb index 47b61b11..8c7d0d06 100644 --- a/middleman-core/lib/middleman-core/cli/server.rb +++ b/middleman-core/lib/middleman-core/cli/server.rb @@ -14,9 +14,12 @@ module Middleman::Cli method_option :port, aliases: '-p', desc: 'The port Middleman will listen on' - method_option :host, - aliases: '-h', - desc: 'The host name Middleman will use' + 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' @@ -68,8 +71,9 @@ module Middleman::Cli params = { port: options['port'], + bind_address: options['bind_address'], https: options['https'], - host: options['host'], + server_name: options['server_name'], ssl_certificate: options['ssl_certificate'], ssl_private_key: options['ssl_private_key'], environment: options['environment'], diff --git a/middleman-core/lib/middleman-core/dns_resolver.rb b/middleman-core/lib/middleman-core/dns_resolver.rb new file mode 100644 index 00000000..ab49b11f --- /dev/null +++ b/middleman-core/lib/middleman-core/dns_resolver.rb @@ -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 diff --git a/middleman-core/lib/middleman-core/dns_resolver/basic_network_resolver.rb b/middleman-core/lib/middleman-core/dns_resolver/basic_network_resolver.rb new file mode 100644 index 00000000..11dc3096 --- /dev/null +++ b/middleman-core/lib/middleman-core/dns_resolver/basic_network_resolver.rb @@ -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 diff --git a/middleman-core/lib/middleman-core/dns_resolver/hosts_resolver.rb b/middleman-core/lib/middleman-core/dns_resolver/hosts_resolver.rb new file mode 100644 index 00000000..ba3ff997 --- /dev/null +++ b/middleman-core/lib/middleman-core/dns_resolver/hosts_resolver.rb @@ -0,0 +1,63 @@ +module Middleman + class DnsResolver + # Use network name server to resolve ips and names + class HostsResolver + private + + attr_reader :resolver + + public + + def initialize(opts={}) + # using the splat operator works around a non-existing HOSTSRC variable + # using nil as input does not work, but `*[]` does and then Resolv::Hosts + # uses its defaults + @resolver = opts.fetch(:resolver, Resolv::Hosts.new(*hosts_file)) + 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 + [] + 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 + [] + end + + private + + # Path to hosts file + # + # This looks for MM_HOSTSRC in your environment + # + # @return [Array] + # This needs to be an array, to make the splat operator work + # + # @example + # # + # 127.0.0.1 localhost.localhost localhost + def hosts_file + return [ENV['MM_HOSTSRC']] if ENV.key?('MM_HOSTSRC') && File.file?(ENV['MM_HOSTSRC']) + + [] + end + end + end +end diff --git a/middleman-core/lib/middleman-core/dns_resolver/local_link_resolver.rb b/middleman-core/lib/middleman-core/dns_resolver/local_link_resolver.rb new file mode 100644 index 00000000..e083d8f3 --- /dev/null +++ b/middleman-core/lib/middleman-core/dns_resolver/local_link_resolver.rb @@ -0,0 +1,44 @@ +require 'middleman-core/dns_resolver/basic_network_resolver' + +module Middleman + class DnsResolver + # Use network name server to resolve ips and names + class LocalLinkResolver < BasicNetworkResolver + def initialize(opts={}) + super + + @timeouts = opts.fetch(:timeouts, 1) + @resolver = opts.fetch(:resolver, Resolv::MDNS.new(nameserver_config)) + + self.timeouts = timeouts + end + + private + + # Hosts + Ports for MDNS resolver + # + # This looks for MM_MDNSRC in your environment. If you are going to use + # IPv6-addresses: Make sure you do not forget to add the port at the end. + # + # MM_MDNSRC=ip:port ip:port + # + # @return [Hash] + # Returns the configuration for the nameserver + # + # @example + # export MM_MDNSRC="224.0.0.251:5353 ff02::fb:5353" + # + def nameserver_config + return unless ENV.key?('MM_MDNSRC') && ENV['MM_MDNSRC'] + + address, port = ENV['MM_MDNSRC'].split(/:/) + + { + nameserver_port: [[address, port.to_i]] + } + rescue StandardError + {} + end + end + end +end diff --git a/middleman-core/lib/middleman-core/dns_resolver/network_resolver.rb b/middleman-core/lib/middleman-core/dns_resolver/network_resolver.rb new file mode 100644 index 00000000..c9db4265 --- /dev/null +++ b/middleman-core/lib/middleman-core/dns_resolver/network_resolver.rb @@ -0,0 +1,42 @@ +require 'middleman-core/dns_resolver/basic_network_resolver' + +module Middleman + class DnsResolver + # Use network name server to resolve ips and names + class NetworkResolver < BasicNetworkResolver + def initialize(opts={}) + super + + @resolver = opts.fetch(:resolver, Resolv::DNS.new(nameserver_config)) + self.timeouts = timeouts + end + + private + + # Hosts + Ports for MDNS resolver + # + # This looks for MM_MDNSRC in your environment. If you are going to use + # IPv6-addresses: Make sure you do not forget to add the port at the end. + # + # MM_MDNSRC=ip:port ip:port + # + # @return [Hash] + # Returns the configuration for the nameserver + # + # @example + # export MM_MDNSRC="224.0.0.251:5353 ff02::fb:5353" + # + def nameserver_config + return unless ENV.key?('MM_DNSRC') && ENV['MM_DNSRC'] + + address, port = ENV['MM_DNSRC'].split(/:/) + + { + nameserver_port: [[address, port.to_i]] + } + rescue StandardError + {} + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 1e81b4e6..9076b2fa 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -1,15 +1,16 @@ require 'webrick' require 'webrick/https' require 'openssl' -require 'socket' require 'middleman-core/meta_pages' require 'middleman-core/logger' +require 'middleman-core/preview_server/server_information' +require 'middleman-core/preview_server/server_url' # rubocop:disable GlobalVars module Middleman - module PreviewServer + class PreviewServer class << self - attr_reader :app, :host, :port, :ssl_certificate, :ssl_private_key, :environment + attr_reader :app, :ssl_certificate, :ssl_private_key, :environment, :server_information delegate :logger, to: :app def https? @@ -19,13 +20,31 @@ module Middleman # Start an instance of Middleman::Application # @return [void] def start(opts={}) + # Do not buffer output, otherwise testing of output does not work + $stdout.sync = true + $stderr.sync = true + @options = opts + @server_information = ServerInformation.new - mount_instance(new_app) + # New app evaluates the middleman configuration. Since this can be + # invalid as well, we need to evaluate the configuration BEFORE + # checking for validity + the_app = new_app + # And now comes the check + unless server_information.valid? + logger.fatal %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.) + exit 1 + end + + mount_instance(the_app) + + logger.debug %(== Server information is provided by #{server_information.handler}) logger.debug %(== The Middleman is running in "#{environment}" environment) - logger.info "== The Middleman is standing watch at #{uri} (#{uri(public_ip)})" - logger.info "== Inspect your site configuration at #{uri + '__middleman'}" + logger.debug format('== The Middleman preview server is bind to %s', ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: https?).to_bind_addresses.join(', ')) + logger.info format('== View your site at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_urls.join(', ')) + logger.info format('== Inspect your site configuration at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_config_urls.join(', ')) @initialized ||= false return if @initialized @@ -116,18 +135,26 @@ module Middleman opts[:instrumenting] || false ) - config[:environment] = opts[:environment].to_sym if opts[:environment] - config[:port] = opts[:port] if opts[:port] - config[:host] = opts[:host].presence || Socket.gethostname.tr(' ', '+') - config[:https] = opts[:https] unless opts[:https].nil? + config[:environment] = opts[:environment].to_sym if opts[:environment] + config[:port] = opts[:port] if opts[:port] + config[:bind_address] = opts[:bind_address] + config[:server_name] = opts[:server_name] + config[:https] = opts[:https] unless opts[:https].nil? config[:ssl_certificate] = opts[:ssl_certificate] if opts[:ssl_certificate] config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key] end - @host = @app.config[:host] - @port = @app.config[:port] - @https = @app.config[:https] - @environment = @app.config[:environment] + # store configured port to make a check later on possible + configured_port = @app.config[:port] + + # Use configuration values to set `bind_address` etc. in + # `server_information` + server_information.use @app.config + + logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless @app.config[:port] == configured_port + + @https = @app.config[:https] + @environment = @app.config[:environment] @ssl_certificate = @app.config[:ssl_certificate] @ssl_private_key = @app.config[:ssl_private_key] @@ -190,9 +217,10 @@ module Middleman # @return [void] def setup_webrick(is_logging) http_opts = { - Port: port, + Port: server_information.port, AccessLog: [], - ServerName: host, + ServerName: server_information.server_name, + BindAddress: server_information.bind_address.to_s, DoNotReverseLookup: true } @@ -205,7 +233,7 @@ module Middleman http_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new File.read ssl_private_key else # use a generated self-signed cert - cert, key = create_self_signed_cert(1024, [['CN', host]], 'Middleman Preview Server') + cert, key = create_self_signed_cert(1024, [['CN', server_information.server_name]], server_information.site_addresses, 'Middleman Preview Server') http_opts[:SSLCertificate] = cert http_opts[:SSLPrivateKey] = key end @@ -217,20 +245,17 @@ module Middleman http_opts[:Logger] = ::WEBrick::Log.new(nil, 0) end - attempts_left = 4 - tried_ports = [] begin ::WEBrick::HTTPServer.new(http_opts) rescue Errno::EADDRINUSE - logger.error "== Port #{port} is unavailable. Either close the instance of Middleman already running on #{port} or start this Middleman on a new port with: --port=#{unused_tcp_port}" - exit(1) + logger.error %(== Port "#{http_opts[:Port]}" is in use. This should not have happened. Please start "middleman server" again.) end end # Copy of https://github.com/nahi/ruby/blob/webrick_trunk/lib/webrick/ssl.rb#L39 # that uses a different serial number each time the cert is generated in order to # avoid errors in Firefox. Also doesn't print out stuff to $stderr unnecessarily. - def create_self_signed_cert(bits, cn, comment) + def create_self_signed_cert(bits, cn, aliases, comment) rsa = OpenSSL::PKey::RSA.new(bits) cert = OpenSSL::X509::Certificate.new cert.version = 2 @@ -254,6 +279,8 @@ module Middleman aki = ef.create_extension('authorityKeyIdentifier', 'keyid:always,issuer:always') cert.add_extension(aki) + cert.add_extension ef.create_extension('subjectAltName', aliases.map { |d| "DNS: #{d}" }.join(',')) + cert.sign(rsa, OpenSSL::Digest::SHA1.new) [cert, rsa] @@ -306,29 +333,6 @@ module Middleman end end end - - # Returns the URI the preview server will run on - # @return [URI] - def uri(host=@host) - scheme = https? ? 'https' : 'http' - URI("#{scheme}://#{host}:#{@port}/") - end - - # An IPv4 address on this machine which should be externally addressable. - # @return [String] - def public_ip - ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? } - ip ? ip.ip_address : '127.0.0.1' - end - - # Returns unused TCP port - # @return [Fixnum] - def unused_tcp_port - server = TCPServer.open(0) - port = server.addr[1] - server.close - port - end end class FilteredWebrickLog < ::WEBrick::Log diff --git a/middleman-core/lib/middleman-core/preview_server/checks.rb b/middleman-core/lib/middleman-core/preview_server/checks.rb new file mode 100644 index 00000000..e4302acf --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/checks.rb @@ -0,0 +1,81 @@ +require 'ipaddr' + +module Middleman + class PreviewServer + # Checks for input of preview server + module Checks + # This one will get all default setup + class BasicCheck; end + + # This checks if the server name resolves to the bind_address + # + # If the users enters: + # + # 1. server_name: www.example.com (10.0.0.1) + # 2. bind_address: 127.0.0.01 + # + # This validation will fail + class ServerNameResolvesToBindAddress < BasicCheck + private + + attr_reader :resolver + + public + + def initialize + @resolver = DnsResolver.new + end + + # Validate + # + # @param [Information] information + # The information to be validated + def validate(information) + return if resolver.ips_for(information.server_name).include? information.bind_address + + information.valid = false + information.reason = format('Server name "%s" does not resolve to bind address "%s"', information.server_name, information.bind_address) + end + end + + # This validation fails if the user chooses to use an ip address which is + # not available on his/her system + class InterfaceIsAvailableOnSystem < BasicCheck + # Validate + # + # @param [Information] information + # The information to be validated + def validate(information) + return if information.bind_address.blank? || information.local_network_interfaces.include?(information.bind_address.to_s) || %w(0.0.0.0 ::).any? { |b| information.bind_address == b } || IPAddr.new('127.0.0.0/8').include?(information.bind_address.to_s) + + information.valid = false + information.reason = format('Bind address "%s" is not available on your system. Please use one of %s', information.bind_address, information.local_network_interfaces.map { |i| %("#{i}") }.join(', ')) + end + end + + # This one requires a bind address if the user entered a server name + # + # If the `bind_address` is blank this check will fail + class RequiresBindAddressIfServerNameIsGiven < BasicCheck + def validate(information) + return unless information.bind_address.blank? + + information.valid = false + information.reason = format('Server name "%s" does not resolve to an ip address', information.server_name) + end + end + + # This validation always fails + class DenyAnyAny < BasicCheck + # Validate + # + # @param [Information] information + # The information to be validated + def validate(information) + information.valid = false + information.reason = 'Undefined combination of options "--server-name" and "--bind-address". If you think this is wrong, please file a bug at "https://github.com/middleman/middleman"' + end + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/information.rb b/middleman-core/lib/middleman-core/preview_server/information.rb new file mode 100644 index 00000000..4518cfb2 --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/information.rb @@ -0,0 +1,273 @@ +require 'ipaddr' +require 'active_support/core_ext/object/blank' +require 'middleman-core/preview_server/checks' +require 'middleman-core/preview_server/server_hostname' +require 'middleman-core/preview_server/server_ip_address' + +module Middleman + class PreviewServer + # Basic information class to wrap common behaviour + class BasicInformation + private + + attr_reader :checks, :network_interfaces_inventory + + public + + attr_accessor :bind_address, :server_name, :port, :reason, :valid + attr_reader :listeners, :site_addresses + + # Create instance + # + # @param [String] bind_address + # The bind address of the server + # + # @param [String] server_name + # The name of the server + # + # @param [Integer] port + # The port to listen on + def initialize(opts={}) + @bind_address = ServerIpAddress.new(opts[:bind_address]) + @server_name = ServerHostname.new(opts[:server_name]) + @port = opts[:port] + @valid = true + + @site_addresses = [] + @listeners = [] + @checks = [] + + # This needs to be check for each use case. Otherwise `Webrick` will + # complain about that. + @checks << Checks::InterfaceIsAvailableOnSystem.new + end + + # Is the given information valid? + def valid? + valid == true + end + + # Pass "self" to validator + # + # @param [#validate] validator + # The validator + def validate_me(validator) + validator.validate self, checks + end + + def resolve_me(*) + fail NoMethodError + end + + # Get network information + # + # @param [#network_interfaces] inventory + # Get list of available network interfaces + def show_me_network_interfaces(inventory) + @network_interfaces_inventory = inventory + end + + # Default is to get all network interfaces + def local_network_interfaces + network_interfaces_inventory.nil? ? [] : network_interfaces_inventory.network_interfaces(:all) + end + end + + # This only is used if no other parser is available + # + # The "default" behaviour is to fail because of "Checks::DenyAnyAny" + class DefaultInformation < BasicInformation + def initialize(*args) + super + + # Make this fail + @checks << Checks::DenyAnyAny.new + end + + def resolve_me(*); end + + # Always true + def self.matches?(*) + true + end + end + + # This one is used if no bind address and no server name is given + class AllInterfaces < BasicInformation + def initialize(*args) + super + + after_init + end + + def self.matches?(opts={}) + opts[:bind_address].blank? && opts[:server_name].blank? + end + + # Resolve ips + def resolve_me(resolver) + hostname = ServerHostname.new(Socket.gethostname) + hostname_ips = resolver.ips_for(hostname) + network_interface = ServerIpAddress.new(Array(local_network_interfaces).first) + resolved_name = ServerHostname.new(resolver.names_for(network_interface).first) + + if includes_array? local_network_interfaces, hostname_ips + @server_name = hostname + @site_addresses << hostname + + network_interface = ServerIpAddress.new((local_network_interfaces & hostname_ips).first) + elsif RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ + @server_name = hostname + @site_addresses << hostname + elsif !resolved_name.blank? + @server_name = resolved_name + @site_addresses << resolved_name + else + @server_name = network_interface + end + + @site_addresses << network_interface + + self + end + + private + + def includes_array?(a, b) + !(a & b).empty? + end + + def after_init + @listeners << ServerIpAddress.new('::') + @listeners << ServerIpAddress.new('0.0.0.0') + end + end + + # This is used if bind address is 0.0.0.0, the server name needs to be + # blank + class AllIpv4Interfaces < AllInterfaces + def self.matches?(opts={}) + opts[:bind_address] == '0.0.0.0' && opts[:server_name].blank? + end + + # Use only ipv4 interfaces + def local_network_interfaces + network_interfaces_inventory.nil? ? [] : network_interfaces_inventory.network_interfaces(:ipv4) + end + + private + + def after_init + @listeners << ServerIpAddress.new('0.0.0.0') + end + end + + # This is used if bind address is ::, the server name needs to be blank + class AllIpv6Interfaces < AllInterfaces + def self.matches?(opts={}) + opts[:bind_address] == '::' && opts[:server_name].blank? + end + + # Use only ipv6 interfaces + def local_network_interfaces + network_interfaces_inventory.nil? ? [] : network_interfaces_inventory.network_interfaces(:ipv6) + end + + private + + def after_init + @listeners << ServerIpAddress.new('::') + end + end + + # Used if a bind address is given and the server name is blank + class BindAddressInformation < BasicInformation + def initialize(*args) + super + + @listeners << bind_address + @site_addresses << bind_address + end + + def self.matches?(opts={}) + !opts[:bind_address].blank? && opts[:server_name].blank? + end + + # Resolv + def resolve_me(resolver) + @server_name = ServerHostname.new(resolver.names_for(bind_address).first) + @site_addresses << @server_name unless @server_name.blank? + + self + end + end + + # Use if server name is given and bind address is blank + class ServerNameInformation < BasicInformation + def initialize(*args) + super + + @checks << Checks::RequiresBindAddressIfServerNameIsGiven.new + @site_addresses << server_name + end + + def resolve_me(resolver) + @bind_address = ServerIpAddress.new(resolver.ips_for(server_name).first) + + unless bind_address.blank? + @listeners << bind_address + @site_addresses << bind_address + end + + self + end + + def self.matches?(opts={}) + opts[:bind_address].blank? && !opts[:server_name].blank? + end + end + + # Only used if bind address and server name are given and bind address is + # not :: or 0.0.0.0 + class BindAddressAndServerNameInformation < BasicInformation + def initialize(*args) + super + + @listeners << bind_address + @site_addresses << server_name + @site_addresses << bind_address + + @checks << Checks::ServerNameResolvesToBindAddress.new + end + + def self.matches?(opts={}) + !opts[:bind_address].blank? && !opts[:server_name].blank? && !%w(:: 0.0.0.0).include?(opts[:bind_address]) + end + + def resolve_me(*); end + end + + # If the server name is either an ipv4 or ipv6 address, e.g. 127.0.0.1 or + # ::1, use this one + class ServerNameIsIpInformation < BasicInformation + def initialize(opts={}) + super + + ip = ServerIpAddress.new(server_name.to_s) + + @listeners << ip + @site_addresses << ip + end + + def resolve_me(*); end + + def self.matches?(opts={}) + ip = IPAddr.new(opts[:server_name]) + + ip.ipv4? || ip.ipv6? + rescue + false + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/network_interface_inventory.rb b/middleman-core/lib/middleman-core/preview_server/network_interface_inventory.rb new file mode 100644 index 00000000..d9ba1229 --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/network_interface_inventory.rb @@ -0,0 +1,65 @@ +require 'middleman-core/preview_server/server_ip_address' + +module Middleman + class PreviewServer + # This holds information about local network interfaces on the user systemd + class NetworkInterfaceInventory + # Return all ip interfaces + class All + def network_interfaces + ipv4_addresses = Socket.ip_address_list.select(&:ipv4?).map { |ai| ServerIpv4Address.new(ai.ip_address) } + ipv6_addresses = Socket.ip_address_list.select(&:ipv6?).map { |ai| ServerIpv6Address.new(ai.ip_address) } + + ipv4_addresses + ipv6_addresses + end + + def self.match?(*) + true + end + end + + # Return all ipv4 interfaces + class Ipv4 + def network_interfaces + Socket.ip_address_list.select { |ai| ai.ipv4? && !ai.ipv4_loopback? }.map { |ai| ServerIpv4Address.new(ai.ip_address) } + end + + def self.match?(type) + :ipv4 == type + end + end + + # Return all ipv6 interfaces + class Ipv6 + def network_interfaces + Socket.ip_address_list.select { |ai| ai.ipv6? && !ai.ipv6_loopback? }.map { |ai| ServerIpv6Address.new(ai.ip_address) } + end + + def self.match?(type) + :ipv6 == type + end + end + + private + + attr_reader :types + + public + + def initialize + @types = [] + @types << Ipv4 + @types << Ipv6 + @types << All + end + + # Return ip interfaces + # + # @param [Symbol] type + # The type of interface which should be returned + def network_interfaces(type=:all) + types.find { |t| t.match? type.to_sym }.new.network_interfaces + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/server_hostname.rb b/middleman-core/lib/middleman-core/preview_server/server_hostname.rb new file mode 100644 index 00000000..9df133cb --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/server_hostname.rb @@ -0,0 +1,39 @@ +module Middleman + class PreviewServer + class ServerHostname + class ServerFullHostname < SimpleDelegator + def to_s + __getobj__ + end + + def self.match?(*) + true + end + + alias_method :to_browser, :to_s + end + + class ServerPlainHostname < SimpleDelegator + def to_s + __getobj__ + '.local' + end + + def self.match?(name) + # rubocop:disable Style/CaseEquality + name != 'localhost' && /^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?\.?$/ === name + # rubocop:enable Style/CaseEquality + end + + alias_method :to_browser, :to_s + end + + def self.new(string) + @names = [] + @names << ServerPlainHostname + @names << ServerFullHostname + + @names.find { |n| n.match? string }.new(string) + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/server_information.rb b/middleman-core/lib/middleman-core/preview_server/server_information.rb new file mode 100644 index 00000000..937efdd5 --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/server_information.rb @@ -0,0 +1,144 @@ +require 'middleman-core/dns_resolver' +require 'middleman-core/preview_server/information' +require 'middleman-core/preview_server/network_interface_inventory' +require 'middleman-core/preview_server/tcp_port_prober' +require 'middleman-core/preview_server/server_information_validator' + +module Middleman + class PreviewServer + # This class holds all information which the preview server needs to setup a listener + # + # * server name + # * bind address + # * port + # + # Furthermore it probes for a free tcp port, if the default one 4567 is not available. + class ServerInformation + private + + attr_reader :resolver, :validator, :network_interface_inventory, :informations, :tcp_port_prober + + public + + def initialize(opts={}) + @resolver = opts.fetch(:resolver, DnsResolver.new) + @validator = opts.fetch(:validator, ServerInformationValidator.new) + @network_interface_inventory = opts.fetch(:network_interface_inventory, NetworkInterfaceInventory.new) + @tcp_port_prober = opts.fetch(:tcp_port_prober, TcpPortProber.new) + + @informations = [] + @informations << AllInterfaces + @informations << AllIpv4Interfaces + @informations << AllIpv6Interfaces + @informations << ServerNameIsIpInformation + @informations << ServerNameInformation + @informations << BindAddressInformation + @informations << BindAddressAndServerNameInformation + @informations << DefaultInformation + end + + # The information + # + # Is cached + def information + return @information if @information + + # The `DefaultInformation`-class always returns `true`, so there's + # always a klass available and find will never return nil + listener_klass = informations.find { |l| l.matches? bind_address: @bind_address, server_name: @server_name } + @information = listener_klass.new(bind_address: @bind_address, server_name: @server_name) + + @information.show_me_network_interfaces(network_interface_inventory) + @information.resolve_me(resolver) + @information.port = tcp_port_prober.port(@port) + @information.validate_me(validator) + + @information + end + + # Use a middleman configuration to get information + # + # @param [#[]] config + # The middleman config + def use(config) + @bind_address = config[:bind_address] + @port = config[:port] + @server_name = config[:server_name] + + config[:bind_address] = bind_address + config[:port] = port + config[:server_name] = server_name + end + + # Make information of internal server class avaible to make debugging + # easier. This can be used to log the class which was used to determine + # the preview server settings + # + # @return [String] + # The name of the class + def handler + information.class.to_s + end + + # Is the server information valid? + # + # This is used to output a helpful error message, which can be stored in + # `#reason`. + # + # @return [TrueClass, FalseClass] + # The result + def valid? + information.valid? + end + + # The reason why the information is NOT valid + # + # @return [String] + # The reason why the information is not valid + def reason + information.reason + end + + # The server name + # + # @return [String] + # The name of the server + def server_name + information.server_name + end + + # The bind address of server + # + # @return [String] + # The bind address of the server + def bind_address + information.bind_address + end + + # The port on which the server should listen + # + # @return [Integer] + # The port number + def port + information.port + end + + # A list of site addresses + # + # @return [Array] + # A list of addresses which can be used to access the middleman preview + # server + def site_addresses + information.site_addresses + end + + # A list of listeners + # + # @return [Array] + # A list of bind address where the + def listeners + information.listeners + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/server_information_validator.rb b/middleman-core/lib/middleman-core/preview_server/server_information_validator.rb new file mode 100644 index 00000000..ff2eeb2e --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/server_information_validator.rb @@ -0,0 +1,18 @@ +module Middleman + class PreviewServer + # Validate user input + class ServerInformationValidator + # Validate the input + # + # @param [ServerInformation] information + # The information instance which holds information about the preview + # server settings + # + # @param [Array] checks + # A list of checks which should be evaluated + def validate(information, checks) + checks.each { |c| c.validate information } + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/server_ip_address.rb b/middleman-core/lib/middleman-core/preview_server/server_ip_address.rb new file mode 100644 index 00000000..55a83db5 --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/server_ip_address.rb @@ -0,0 +1,55 @@ +require 'ipaddr' +require 'forwardable' + +module Middleman + class PreviewServer + class ServerIpAddress + def self.new(ip_address) + @parser = [] + @parser << ServerIpv6Address + @parser << ServerIpv4Address + + @parser.find { |p| p.match? ip_address }.new(ip_address) + end + end + + class BasicServerIpAddress < SimpleDelegator + end + + class ServerIpv4Address < BasicServerIpAddress + def to_browser + __getobj__.to_s + end + + def self.match?(*) + true + end + end + + class ServerIpv6Address < BasicServerIpAddress + def to_s + __getobj__.sub(/%.*$/, '') + end + + def to_browser + format('[%s]', to_s) + end + + if RUBY_VERSION < '2' + def self.match?(str) + str = str.to_s.sub(/%.*$/, '') + IPAddr.new(str).ipv6? + rescue StandardError + false + end + else + def self.match?(str) + str = str.to_s.sub(/%.*$/, '') + IPAddr.new(str).ipv6? + rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError + false + end + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/server_url.rb b/middleman-core/lib/middleman-core/preview_server/server_url.rb new file mode 100644 index 00000000..9b7a5b29 --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/server_url.rb @@ -0,0 +1,50 @@ +require 'ipaddr' + +module Middleman + class PreviewServer + # This builds the server urls for the preview server + class ServerUrl + private + + attr_reader :hosts, :port, :https + + public + + def initialize(opts={}) + @hosts = opts.fetch(:hosts) + @port = opts.fetch(:port) + @https = opts.fetch(:https, false) + end + + # Return bind addresses + # + # @return [Array] + # List of bind addresses of format host:port + def to_bind_addresses + hosts.map { |l| format('"%s:%s"', l.to_s, port) } + end + + # Return server urls + # + # @return [Array] + # List of urls of format http://host:port + def to_urls + hosts.map { |l| format('"%s://%s:%s"', https? ? 'https' : 'http', l.to_browser, port) } + end + + # Return server config urls + # + # @return [Array] + # List of urls of format http://host:port/__middleman + def to_config_urls + hosts.map { |l| format('"%s://%s:%s/__middleman"', https? ? 'https' : 'http', l.to_browser, port) } + end + + private + + def https? + https == true + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/tcp_port_prober.rb b/middleman-core/lib/middleman-core/preview_server/tcp_port_prober.rb new file mode 100644 index 00000000..c480f91b --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/tcp_port_prober.rb @@ -0,0 +1,29 @@ +module Middleman + class PreviewServer + # Probe for tcp ports + # + # This one first tries `try_port` if this is not available use the free + # port returned by TCPServer. + class TcpPortProber + # Check for port + # + # @param [Integer] try_port + # The port to be checked + # + # @return [Integer] + # The port + def port(try_port) + server = TCPServer.open(try_port) + server.close + + try_port + rescue + server = TCPServer.open(0) + port = server.addr[1] + server.close + + port + end + end + end +end diff --git a/middleman-core/lib/middleman-core/step_definitions.rb b/middleman-core/lib/middleman-core/step_definitions.rb index 95245f14..25c4790a 100644 --- a/middleman-core/lib/middleman-core/step_definitions.rb +++ b/middleman-core/lib/middleman-core/step_definitions.rb @@ -3,6 +3,7 @@ require 'aruba/jruby' require 'middleman-core/step_definitions/middleman_steps' require 'middleman-core/step_definitions/builder_steps' require 'middleman-core/step_definitions/server_steps' +require 'middleman-core/step_definitions/commandline_steps' # Monkeypatch for windows support module ArubaMonkeypatch diff --git a/middleman-core/lib/middleman-core/step_definitions/commandline_steps.rb b/middleman-core/lib/middleman-core/step_definitions/commandline_steps.rb new file mode 100644 index 00000000..5a663c32 --- /dev/null +++ b/middleman-core/lib/middleman-core/step_definitions/commandline_steps.rb @@ -0,0 +1,88 @@ +When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |last_command, expected| + begin + Timeout.timeout(exit_timeout) do + loop do + fail "You need to start middleman interactively first." unless @interactive + + if unescape(@interactive.output) =~ Regexp.new(unescape(expected)) + only_processes.each { |p| p.terminate } + break + end + + sleep 0.1 + end + end + rescue ChildProcess::TimeoutError, TimeoutError + @interactive.terminate + ensure + announcer.stdout @interactive.stdout + announcer.stderr @interactive.stderr + end +end + +# Make it just a long running process +Given /`(.*?)` is running in background/ do |cmd| + run(cmd, 120) +end + +Given /I have a local hosts file with:/ do |string| + step 'I set the environment variables to:', table( + %( + | variable | value | + | MM_HOSTSRC | .hosts | + ) + ) + + step 'a file named ".hosts" with:', string +end + +Given /I start a dns server with:/ do |string| + @dns_server.terminate if defined? @dns_server + + port = 5300 + db_file = 'dns.db' + + step 'I set the environment variables to:', table( + %( + | variable | value | + | MM_DNSRC | 127.0.0.1:#{port}| + ) + ) + + set_env 'PATH', File.expand_path(File.join(current_dir, 'bin')) + ':' + ENV['PATH'] + write_file db_file, string + + @dns_server = run("dns_server.rb #{db_file} #{port}", 120) +end + +Given /I start a mdns server with:/ do |string| + @mdns_server.terminate if defined? @mdns_server + + port = 5301 + db_file = 'mdns.db' + + step 'I set the environment variables to:', table( + %( + | variable | value | + | MM_MDNSRC | 127.0.0.1:#{port}| + ) + ) + + set_env 'PATH', File.expand_path(File.join(current_dir, 'bin')) + ':' + ENV['PATH'] + write_file db_file, string + + @mdns_server = run("dns_server.rb #{db_file} #{port}", 120) +end + +Given /I start a mdns server for the local hostname/ do + step %(I start a mdns server with:), "#{Socket.gethostname}: 127.0.0.1" +end + +# Make sure each and every process is really dead +After do + only_processes.each { |p| p.terminate } +end + +Before '@ruby-2.1' do + skip_this_scenario if RUBY_VERSION < '2.1' +end diff --git a/middleman-core/spec/middleman-core/dns_resolver_spec.rb b/middleman-core/spec/middleman-core/dns_resolver_spec.rb new file mode 100644 index 00000000..8e5b2251 --- /dev/null +++ b/middleman-core/spec/middleman-core/dns_resolver_spec.rb @@ -0,0 +1,118 @@ +require 'spec_helper' +require 'middleman-core/dns_resolver' + +RSpec.describe Middleman::DnsResolver do + subject(:resolver) do + described_class.new( + hosts_resolver: hosts_resolver, + local_link_resolver: local_link_resolver, + network_resolver: network_resolver + ) + end + + let(:hosts_resolver) { instance_double('Middleman::DnsResolver::HostsResolver') } + let(:local_link_resolver) { instance_double('Middleman::DnsResolver::LocalLinkResolver') } + let(:network_resolver) { instance_double('Middleman::DnsResolver::NetworkResolver') } + + before :each do + allow(network_resolver).to receive(:timeouts=) + end + + describe '#names_for' do + context 'when hosts resolver can resolve name' do + before :each do + expect(hosts_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names) + if RUBY_VERSION >= '2.1' + expect(local_link_resolver).not_to receive(:getnames) + end + expect(network_resolver).not_to receive(:getnames) + end + + let(:unresolved_ip) { '127.0.0.1' } + let(:resolved_names) { %w(localhost) } + + it { expect(resolver.names_for(unresolved_ip)).to eq resolved_names } + end + + context 'when local link resolver can resolve name' do + before :each do + expect(hosts_resolver).to receive(:getnames).with(unresolved_ip).and_return([]) + if RUBY_VERSION >= '2.1' + expect(local_link_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names) + expect(network_resolver).not_to receive(:getnames) + else + expect(network_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names) + end + end + + let(:unresolved_ip) { '127.0.0.1' } + let(:resolved_names) { %w(localhost) } + + it { expect(resolver.names_for(unresolved_ip)).to eq resolved_names } + end + + context 'when network resolver can resolve name' do + before :each do + expect(hosts_resolver).to receive(:getnames).with(unresolved_ip).and_return([]) + if RUBY_VERSION >= '2.1' + expect(local_link_resolver).to receive(:getnames).with(unresolved_ip).and_return([]) + end + expect(network_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names) + end + + let(:unresolved_ip) { '127.0.0.1' } + let(:resolved_names) { %w(localhost) } + + it { expect(resolver.names_for(unresolved_ip)).to eq resolved_names } + end + end + + describe '#ips_for' do + context 'when hosts resolver can resolve name' do + before :each do + expect(hosts_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name) + if RUBY_VERSION >= '2.1' + expect(local_link_resolver).not_to receive(:getaddresses) + end + expect(network_resolver).not_to receive(:getaddresses) + end + + let(:unresolved_ips) { '127.0.0.1' } + let(:resolved_name) { %w(localhost) } + + it { expect(resolver.ips_for(unresolved_ips)).to eq resolved_name } + end + + context 'when local link resolver can resolve name' do + before :each do + expect(hosts_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([]) + if RUBY_VERSION >= '2.1' + expect(local_link_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name) + expect(network_resolver).not_to receive(:getaddresses) + else + expect(network_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name) + end + end + + let(:unresolved_ips) { '127.0.0.1' } + let(:resolved_name) { %w(localhost) } + + it { expect(resolver.ips_for(unresolved_ips)).to eq resolved_name } + end + + context 'when network resolver can resolve name' do + before :each do + expect(hosts_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([]) + if RUBY_VERSION >= '2.1' + expect(local_link_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([]) + end + expect(network_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name) + end + + let(:unresolved_ips) { '127.0.0.1' } + let(:resolved_name) { %w(localhost) } + + it { expect(resolver.ips_for(unresolved_ips)).to eq resolved_name } + end + end +end diff --git a/middleman-core/spec/middleman-core/preview_server/server_hostname_spec.rb b/middleman-core/spec/middleman-core/preview_server/server_hostname_spec.rb new file mode 100644 index 00000000..b0dc6a07 --- /dev/null +++ b/middleman-core/spec/middleman-core/preview_server/server_hostname_spec.rb @@ -0,0 +1,39 @@ +require 'spec_helper' +require 'middleman-core/preview_server/server_hostname' + +RSpec.describe Middleman::PreviewServer::ServerHostname do + subject(:hostname) { described_class.new(string) } + let(:string) { 'www.example.com' } + + describe '#to_s' do + context 'when hostname' do + it { expect(hostname.to_s).to eq string } + end + + context 'when ipv4' do + let(:string) { '127.0.0.1' } + it { expect(hostname.to_s).to eq string } + end + + context 'when ipv6' do + let(:string) { '2607:f700:8000:12e:b3d9:1cba:b52:aa1b' } + it { expect(hostname.to_s).to eq string } + end + end + + describe '#to_browser' do + context 'when hostname' do + it { expect(hostname.to_browser).to eq string } + end + + context 'when ipv4' do + let(:string) { '127.0.0.1' } + it { expect(hostname.to_browser).to eq string } + end + + context 'when ipv6' do + let(:string) { '::1' } + it { expect(hostname.to_browser).to eq string } + end + end +end diff --git a/middleman-core/spec/middleman-core/preview_server/server_ip_address_spec.rb b/middleman-core/spec/middleman-core/preview_server/server_ip_address_spec.rb new file mode 100644 index 00000000..a82fec63 --- /dev/null +++ b/middleman-core/spec/middleman-core/preview_server/server_ip_address_spec.rb @@ -0,0 +1,43 @@ +require 'spec_helper' +require 'middleman-core/preview_server/server_ip_address' + +RSpec.describe Middleman::PreviewServer::ServerIpAddress do + subject(:ip_address) { described_class.new(string) } + let(:string) { '127.0.0.1' } + + describe '#to_s' do + context 'when ipv4' do + let(:string) { '127.0.0.1' } + it { expect(ip_address.to_s).to eq string } + end + + context 'when ipv6' do + context 'without suffix' do + let(:string) { '2607:f700:8000:12e:b3d9:1cba:b52:aa1b' } + it { expect(ip_address.to_s).to eq string } + end + + context 'with suffix' do + let(:string) { '2607:f700:8000:12e:b3d9:1cba:b52:aa1b%wlp1s0' } + let(:result) { '2607:f700:8000:12e:b3d9:1cba:b52:aa1b' } + it { expect(ip_address.to_s).to eq result } + end + end + end + + describe '#to_browser' do + context 'when ip_address' do + it { expect(ip_address.to_browser).to eq string } + end + + context 'when ipv4' do + let(:string) { '127.0.0.1' } + it { expect(ip_address.to_browser).to eq string } + end + + context 'when ipv6' do + let(:string) { '2607:f700:8000:12e:b3d9:1cba:b52:aa1b' } + it { expect(ip_address.to_browser).to eq "[#{string}]" } + end + end +end diff --git a/middleman-core/spec/spec_helper.rb b/middleman-core/spec/spec_helper.rb index a9d71768..32c25a34 100644 --- a/middleman-core/spec/spec_helper.rb +++ b/middleman-core/spec/spec_helper.rb @@ -3,3 +3,29 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..')) require 'coveralls' Coveralls.wear! + +require 'aruba/api' +RSpec.configure do |config| + config.include Aruba::Api +end + +# encoding: utf-8 +RSpec.configure do |config| + config.filter_run :focus + config.run_all_when_everything_filtered = true + + config.default_formatter = 'doc' if config.files_to_run.one? + + # config.profile_examples = 10 + config.order = :random + Kernel.srand config.seed + + config.expect_with :rspec do |expectations| + expectations.syntax = :expect + end + + config.mock_with :rspec do |mocks| + mocks.syntax = :expect + mocks.verify_partial_doubles = true + end +end From c14fd72d04231755528b64066987033f3ffb9832 Mon Sep 17 00:00:00 2001 From: Mauro Otonelli Date: Tue, 14 Jul 2015 19:26:59 -0300 Subject: [PATCH 067/364] Remove unused integer/inflections extension. --- middleman-core/lib/middleman-core/application.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index f509e943..5fcf8ffc 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -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' From 63d6a00ed9dbcf7150fd0c4dbe296bf1cbc4bc5e Mon Sep 17 00:00:00 2001 From: Mauro Otonelli Date: Tue, 14 Jul 2015 19:30:17 -0300 Subject: [PATCH 068/364] Use native Ruby JSON implementation instead of ActiveSupport's. --- middleman-core/lib/middleman-core/core_extensions/data.rb | 4 ++-- .../lib/middleman-core/core_extensions/front_matter.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb index 4f8a0e50..0f25c223 100644 --- a/middleman-core/lib/middleman-core/core_extensions/data.rb +++ b/middleman-core/lib/middleman-core/core_extensions/data.rb @@ -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 diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 8499a339..982a6d70 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -5,7 +5,7 @@ require 'pathname' require 'yaml' # Parsing JSON frontmatter -require 'active_support/json' +require 'json' # Extensions namespace module Middleman::CoreExtensions @@ -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 From d18e5ed973eb5d4a3de6bb1bc5a27fb3855d2bfd Mon Sep 17 00:00:00 2001 From: Mauro Otonelli Date: Tue, 14 Jul 2015 21:32:52 -0300 Subject: [PATCH 069/364] Locked aruba to ~> 0.7.4, as 0.8 (latest) breaks the build. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f34fbaec..2740f00c 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'yard', '~> 0.8', require: false # Test tools gem 'pry', '~> 0.10', group: :development -gem 'aruba', '~> 0.6' +gem 'aruba', '~> 0.7.4' gem 'rspec', '~> 3.0' gem 'fivemat', '~> 1.3' gem 'cucumber', '~> 1.3' From 55f909d9cfa7f04b77d90dadea09496c2ab936fb Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 15 Jul 2015 14:08:51 -0700 Subject: [PATCH 070/364] Attempt to help #1563 --- middleman-core/lib/middleman-more/extensions/asset_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-more/extensions/asset_hash.rb b/middleman-core/lib/middleman-more/extensions/asset_hash.rb index e44218ee..7a7e5148 100644 --- a/middleman-core/lib/middleman-more/extensions/asset_hash.rb +++ b/middleman-core/lib/middleman-more/extensions/asset_hash.rb @@ -91,7 +91,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension dirpath = Pathname.new(File.dirname(path)) # TODO: This regex will change some paths in plan HTML (not in a tag) - is that OK? - body.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]+(#{@exts_regex_text}))/) do |match| + body.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]{1,255}#{@exts_regex_text})/) do |match| opening_character = $1 asset_path = $2 From 68a6eacc333b283bf90df1519a4b55660fa82de3 Mon Sep 17 00:00:00 2001 From: Mauro Otonelli Date: Wed, 15 Jul 2015 22:03:41 -0300 Subject: [PATCH 071/364] Removed most deprecation warnings from the build. --- .../step_definitions/builder_steps.rb | 14 +++++----- .../step_definitions/server_steps.rb | 27 +++++++++---------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb index 21266e26..e57bb51b 100644 --- a/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb @@ -6,8 +6,8 @@ end Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name| target = File.join(PROJECT_ROOT_PATH, 'fixtures', path) - config_path = File.join(current_dir, "config-#{config_name}.rb") - config_dest = File.join(current_dir, 'config.rb') + config_path = File.join(current_directory, "config-#{config_name}.rb") + config_dest = File.join(current_directory, 'config.rb') FileUtils.cp(config_path, config_dest) end @@ -22,12 +22,12 @@ Given /^a fixture app "([^\"]*)"$/ do |path| # This step can be reentered from several places but we don't want # to keep re-copying and re-cd-ing into ever-deeper directories - next if File.basename(current_dir) == path + next if File.basename(current_directory) == path step %Q{a directory named "#{path}"} target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path) - FileUtils.cp_r(target_path, current_dir) + FileUtils.cp_r(target_path, current_directory) step %Q{I cd to "#{path}"} end @@ -58,12 +58,12 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, end Given /^a modification time for a file named "([^\"]*)"$/ do |file| - target = File.join(current_dir, file) + target = File.join(current_directory, file) @modification_times[target] = File.mtime(target) end Then /^the file "([^\"]*)" should not have been updated$/ do |file| - target = File.join(current_dir, file) + target = File.join(current_directory, file) File.mtime(target).should == @modification_times[target] end @@ -73,5 +73,5 @@ Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content| end And /the file "(.*)" should be gzipped/ do |file| - expect(File.binread(File.join(current_dir, file), 2)).to eq(['1F8B'].pack('H*')) + expect(File.binread(File.join(current_directory, file), 2)).to eq(['1F8B'].pack('H*')) end diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 5f2f2886..52a13d6e 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -31,8 +31,7 @@ Given /^current environment is "([^\"]*)"$/ do |env| end Given /^the Server is running$/ do - root_dir = File.expand_path(current_dir) - + root_dir = File.expand_path(current_directory) if File.exists?(File.join(root_dir, 'source')) ENV['MM_SOURCE'] = 'source' @@ -48,7 +47,7 @@ Given /^the Server is running$/ do set :show_exceptions, false } - in_current_dir do + in_current_directory do @server_inst = Middleman::Application.server.inst do initialize_commands.each do |p| instance_exec(&p) @@ -69,62 +68,62 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string| end When /^I go to "([^\"]*)"$/ do |url| - in_current_dir do + in_current_directory do visit(URI.encode(url).to_s) end end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| - in_current_dir do - + in_current_directory do + expect{ visit(URI.encode(url).to_s) }.to_not raise_exception end end Then /^the content type should be "([^\"]*)"$/ do |expected| - in_current_dir do + in_current_directory do expect(page.response_headers['Content-Type']).to start_with expected end end Then /^I should see "([^\"]*)"$/ do |expected| - in_current_dir do + in_current_directory do expect(page.body).to include expected end end Then /^I should see '([^\']*)'$/ do |expected| - in_current_dir do + in_current_directory do expect(page.body).to include expected end end Then /^I should see:$/ do |expected| - in_current_dir do + in_current_directory do expect(page.body).to include expected end end Then /^I should not see "([^\"]*)"$/ do |expected| - in_current_dir do + in_current_directory do expect(page.body).not_to include expected end end Then /^I should not see:$/ do |expected| - in_current_dir do + in_current_directory do expect(page.body).not_to include expected end end Then /^the status code should be "([^\"]*)"$/ do |expected| - in_current_dir do + in_current_directory do expect(page.status_code).to eq expected.to_i end end Then /^I should see "([^\"]*)" lines$/ do |lines| - in_current_dir do + in_current_directory do expect(page.body.chomp.split($/).length).to eq lines.to_i end end From df13c62a6bf5e82e13b267f4fd419501243a3088 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 16 Jul 2015 11:34:46 -0700 Subject: [PATCH 072/364] Revert "Attempt to help #1563" This reverts commit 55f909d9cfa7f04b77d90dadea09496c2ab936fb. --- middleman-core/lib/middleman-more/extensions/asset_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-more/extensions/asset_hash.rb b/middleman-core/lib/middleman-more/extensions/asset_hash.rb index 7a7e5148..e44218ee 100644 --- a/middleman-core/lib/middleman-more/extensions/asset_hash.rb +++ b/middleman-core/lib/middleman-more/extensions/asset_hash.rb @@ -91,7 +91,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension dirpath = Pathname.new(File.dirname(path)) # TODO: This regex will change some paths in plan HTML (not in a tag) - is that OK? - body.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]{1,255}#{@exts_regex_text})/) do |match| + body.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]+(#{@exts_regex_text}))/) do |match| opening_character = $1 asset_path = $2 From c11a9e6f39948ff653fe9a1c59a9e555bcbb65cf Mon Sep 17 00:00:00 2001 From: Mauro Otonelli Date: Sun, 19 Jul 2015 20:45:10 -0300 Subject: [PATCH 073/364] Removed invalid Rubocop blocks. --- .rubocop.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 68908de8..836f048b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -23,14 +23,10 @@ ClassLength: Enabled: false Documentation: Enabled: false -Encoding: - Enabled: false HashSyntax: EnforcedStyle: ruby19 SpaceAroundEqualsInParameterDefault: EnforcedStyle: no_space -Blocks: - Enabled: false PerlBackrefs: Enabled: false ClassAndModuleChildren: From dcc52d967cfd9577d7899ea0141a2b886c29a693 Mon Sep 17 00:00:00 2001 From: Mauro Otonelli Date: Sun, 19 Jul 2015 20:45:45 -0300 Subject: [PATCH 074/364] Applied Rubocop feedback. --- middleman-core/lib/middleman-core/cli/extension.rb | 4 ++-- middleman-core/lib/middleman-core/configuration.rb | 2 -- .../lib/middleman-core/core_extensions/rendering.rb | 3 +-- middleman-core/lib/middleman-core/extension.rb | 1 - .../lib/middleman-core/sitemap/extensions/proxies.rb | 1 - .../lib/middleman-more/core_extensions/default_helpers.rb | 6 +++--- middleman-core/lib/middleman-more/core_extensions/i18n.rb | 4 ++-- middleman-core/lib/middleman-more/extensions/lorem.rb | 4 ++-- .../lib/middleman-more/extensions/relative_assets.rb | 2 +- 9 files changed, 11 insertions(+), 16 deletions(-) diff --git a/middleman-core/lib/middleman-core/cli/extension.rb b/middleman-core/lib/middleman-core/cli/extension.rb index 1065514f..c6ababd9 100644 --- a/middleman-core/lib/middleman-core/cli/extension.rb +++ b/middleman-core/lib/middleman-core/cli/extension.rb @@ -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 diff --git a/middleman-core/lib/middleman-core/configuration.rb b/middleman-core/lib/middleman-core/configuration.rb index 6c227504..e1cff713 100644 --- a/middleman-core/lib/middleman-core/configuration.rb +++ b/middleman-core/lib/middleman-core/configuration.rb @@ -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 diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb index d1c361ee..11e1cbb0 100644 --- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb +++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb @@ -428,7 +428,7 @@ module Middleman layout_path = locate_layout(layout_name, current_engine) - if !layout_path + unless layout_path raise ::Middleman::CoreExtensions::Rendering::TemplateNotFound, "Could not locate layout: #{layout_name}" end @@ -462,7 +462,6 @@ module Middleman end # The currently rendering engine - # rubocop:disable TrivialAccessors # @return [Symbol, nil] def current_engine=(v) @_current_engine = v diff --git a/middleman-core/lib/middleman-core/extension.rb b/middleman-core/lib/middleman-core/extension.rb index 3a21000c..311375b7 100644 --- a/middleman-core/lib/middleman-core/extension.rb +++ b/middleman-core/lib/middleman-core/extension.rb @@ -130,7 +130,6 @@ module Middleman @klass.after_configuration do ext.after_configuration if ext.respond_to?(:after_configuration) - # rubocop:disable IfUnlessModifier if ext.respond_to?(:manipulate_resource_list) ext.app.sitemap.register_resource_list_manipulator(ext.class.extension_name, ext) end diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 8fb29cc8..54ca3d5e 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -17,7 +17,6 @@ module Middleman module ResourceInstanceMethods # Whether this page is a proxy - # rubocop:disable TrivialAccessors # @return [Boolean] def proxy? @proxied_to diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index cbb94768..3fe8d680 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -102,13 +102,13 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension # Override helper to add `relative` opt-out. def stylesheet_link_tag(*sources) options = { - :rel => 'stylesheet' + rel: 'stylesheet' }.update(sources.extract_options!.symbolize_keys) path_options = {} path_options[:relative] = options.delete(:relative) if options.key?(:relative) - sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all,source| + sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all, source| all << tag(:link, { href: asset_path(:css, source, path_options) }.update(options)) @@ -122,7 +122,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension path_options = {} path_options[:relative] = options.delete(:relative) if options.key?(:relative) - sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all,source| + sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source| all << content_tag(:script, nil, { src: asset_path(:js, source, path_options) }.update(options)) diff --git a/middleman-core/lib/middleman-more/core_extensions/i18n.rb b/middleman-core/lib/middleman-more/core_extensions/i18n.rb index 318b2b47..2c041a83 100644 --- a/middleman-core/lib/middleman-more/core_extensions/i18n.rb +++ b/middleman-core/lib/middleman-more/core_extensions/i18n.rb @@ -245,10 +245,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension ::I18n.locale = lang localized_page_id = ::I18n.t("paths.#{page_id}", default: page_id, fallback: []) - partially_localized_path = "" + partially_localized_path = '' File.dirname(path).split('/').each do |path_sub| - next if path_sub == "" + next if path_sub == '' partially_localized_path = "#{partially_localized_path}/#{(::I18n.t("paths.#{path_sub}", default: path_sub).to_s)}" end diff --git a/middleman-core/lib/middleman-more/extensions/lorem.rb b/middleman-core/lib/middleman-more/extensions/lorem.rb index 32f1c6c1..91a0612d 100644 --- a/middleman-core/lib/middleman-more/extensions/lorem.rb +++ b/middleman-core/lib/middleman-more/extensions/lorem.rb @@ -152,8 +152,8 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension color = options[:color] if options[:random_color] - background_color = hex.shuffle[0...6].join - color = hex.shuffle[0...6].join + background_color = hex.sample(6).join + color = hex.sample(6).join end src << "/#{background_color.sub(/^#/, '')}" if background_color diff --git a/middleman-core/lib/middleman-more/extensions/relative_assets.rb b/middleman-core/lib/middleman-more/extensions/relative_assets.rb index 95eb291b..28024a2e 100644 --- a/middleman-core/lib/middleman-more/extensions/relative_assets.rb +++ b/middleman-core/lib/middleman-more/extensions/relative_assets.rb @@ -18,7 +18,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension def asset_url(path, prefix='', options={}) options[:relative] = true unless options.key?(:relative) - path = super(path, prefix, options) + super(path, prefix, options) end end end From 0a8ceb24b0b0007c007fb83798c9c2ab175ac460 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 20 Jul 2015 12:13:10 -0700 Subject: [PATCH 075/364] Add test for #1568 --- middleman-core/features/chained_templates.feature | 5 ++++- .../chained-app/source/test.html.combobreaker.str.erb | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature index 7f538b65..4647e7eb 100644 --- a/middleman-core/features/chained_templates.feature +++ b/middleman-core/features/chained_templates.feature @@ -13,10 +13,13 @@ Feature: Templates should be chainable When I cd to "build" Then the following files should exist: | index.html | - + | test.html.combobreaker | And the file "index.html" should contain "Title" And the file "index.html" should contain "Subtitle" And the file "index.html" should contain "Sup" + And the file "test.html.combobreaker.html" should contain "Title" + And the file "test.html.combobreaker.html" should contain "Subtitle" + And the file "test.html.combobreaker.html" should contain "Sup" Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb Given a fixture app "partial-chained_templates-app" diff --git a/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb b/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb new file mode 100644 index 00000000..3b7caec2 --- /dev/null +++ b/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb @@ -0,0 +1,8 @@ +--- +layout: false +sup: "Sup" +--- + +

#{"<%= data.article.title %>"}

+

#{"<%= data.article.subtitle %>"}

+

#{"<%= current_page.data.sup %>"}

From c69099c451e7cf7d66265b4c11ab056b6169fe31 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 22 Jul 2015 14:32:14 -0700 Subject: [PATCH 076/364] Really fix #1568 --- .travis.yml | 2 ++ Gemfile | 2 +- middleman-core/features/chained_templates.feature | 8 ++++---- ...combobreaker.str.erb => test.erb.combobreaker.str.erb} | 0 middleman-core/lib/middleman-core/sitemap/store.rb | 2 +- .../lib/middleman-core/step_definitions/server_steps.rb | 1 - 6 files changed, 8 insertions(+), 7 deletions(-) rename middleman-core/fixtures/chained-app/source/{test.html.combobreaker.str.erb => test.erb.combobreaker.str.erb} (100%) diff --git a/.travis.yml b/.travis.yml index 492342aa..71acb01f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ rvm: os: - linux - osx +cache: bundler +sudo: false matrix: fast_finish: true allow_failures: diff --git a/Gemfile b/Gemfile index 21951896..7c355f39 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'pry', '~> 0.10', group: :development gem 'aruba', '~> 0.7.4' gem 'rspec', '~> 3.0' gem 'fivemat', '~> 1.3' -gem 'cucumber', '~> 2.0' +gem 'cucumber', '~> 1.3' # Optional middleman dependencies, included for tests gem 'less', '2.3', require: false diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature index 4647e7eb..aed75b7c 100644 --- a/middleman-core/features/chained_templates.feature +++ b/middleman-core/features/chained_templates.feature @@ -13,13 +13,13 @@ Feature: Templates should be chainable When I cd to "build" Then the following files should exist: | index.html | - | test.html.combobreaker | + | test.erb.combobreaker | And the file "index.html" should contain "Title" And the file "index.html" should contain "Subtitle" And the file "index.html" should contain "Sup" - And the file "test.html.combobreaker.html" should contain "Title" - And the file "test.html.combobreaker.html" should contain "Subtitle" - And the file "test.html.combobreaker.html" should contain "Sup" + And the file "test.erb.combobreaker" should contain "Title" + And the file "test.erb.combobreaker" should contain "Subtitle" + And the file "test.erb.combobreaker" should contain "Sup" Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb Given a fixture app "partial-chained_templates-app" diff --git a/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb b/middleman-core/fixtures/chained-app/source/test.erb.combobreaker.str.erb similarity index 100% rename from middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb rename to middleman-core/fixtures/chained-app/source/test.erb.combobreaker.str.erb diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 589a8ab6..a5541349 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -242,7 +242,7 @@ module Middleman # @return [String] def remove_templating_extensions(path) # Strip templating extensions as long as Tilt knows them - path = path.sub(File.extname(path), '') while ::Tilt[path] + path = path.sub(/#{::Regexp.escape(File.extname(path))}$/, '') while ::Tilt[path] path end diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 52a13d6e..0d2d7a92 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -75,7 +75,6 @@ end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| in_current_directory do - expect{ visit(URI.encode(url).to_s) }.to_not raise_exception end end From 63e9cd9b5f70915b122dfee531e9b1b8262177c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Tue, 21 Jul 2015 10:28:11 +0200 Subject: [PATCH 077/364] Substitue whitespace in name --- .../lib/middleman-core/preview_server/server_hostname.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server/server_hostname.rb b/middleman-core/lib/middleman-core/preview_server/server_hostname.rb index 9df133cb..833daa4d 100644 --- a/middleman-core/lib/middleman-core/preview_server/server_hostname.rb +++ b/middleman-core/lib/middleman-core/preview_server/server_hostname.rb @@ -3,7 +3,7 @@ module Middleman class ServerHostname class ServerFullHostname < SimpleDelegator def to_s - __getobj__ + __getobj__.gsub(/\s/, '+') end def self.match?(*) @@ -15,7 +15,7 @@ module Middleman class ServerPlainHostname < SimpleDelegator def to_s - __getobj__ + '.local' + __getobj__.gsub(/\s/, '+') + '.local' end def self.match?(name) From 7bfacd565ae65574c397cb663a9db81a5cf1f25d Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 22 Jul 2015 11:24:57 -0700 Subject: [PATCH 078/364] Update change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9378726..0a461146 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ master * Add retina files support on automatic_image_sizes * Fix woff/woff2 confusion in asset hashing. * Support `relative: false` on `stylesheet_link_tag` and `javascript_include_tag` +* New host detection in preview server. Provides better externally accessible host/ip information for connecting from mobile devices and virtual machines. 3.3.12 === From a52865903423a85de6715eec8c204b6558f4e7ee Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 24 Jul 2015 14:20:04 -0700 Subject: [PATCH 079/364] Bump listen to 3.0 --- middleman-core/middleman-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 91fa76d3..844e6de9 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |s| s.add_dependency("padrino-helpers", ["~> 0.12.3"]) # Watcher - s.add_dependency("listen", [">= 2.7.9", "< 3.0"]) + s.add_dependency("listen", ["~> 3.0.3"]) # i18n s.add_dependency("i18n", ["~> 0.7.0"]) From 837a679aa737d08131eaf6bc3db506d570bf809d Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 24 Jul 2015 14:51:20 -0700 Subject: [PATCH 080/364] bump thor --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 7c355f39..785849f1 100644 --- a/Gemfile +++ b/Gemfile @@ -32,8 +32,8 @@ gem 'therubyrhino', '>= 2.0', platforms: :jruby # Code Quality gem 'rubocop', '~> 0.24', require: false -gem 'simplecov', '0.9', require: false -gem 'coveralls', '~> 0.7', require: false +gem 'simplecov', '~> 0.10', require: false +gem 'coveralls', '~> 0.8', require: false # Middleman itself gem 'middleman', path: 'middleman' From 0fba2ae2f6d645e8ce9d99d677007672db174cd6 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 5 Aug 2015 13:37:03 -0700 Subject: [PATCH 081/364] Fix config meta page --- .../lib/middleman-core/extension_manager.rb | 3 ++- .../lib/middleman-core/extensions.rb | 2 +- .../lib/middleman-core/meta_pages.rb | 7 +++++- .../meta_pages/templates/config.html.erb | 24 +++++++++---------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/middleman-core/lib/middleman-core/extension_manager.rb b/middleman-core/lib/middleman-core/extension_manager.rb index 916713b0..4e2040eb 100644 --- a/middleman-core/lib/middleman-core/extension_manager.rb +++ b/middleman-core/lib/middleman-core/extension_manager.rb @@ -3,13 +3,14 @@ module Middleman extend Forwardable def_delegator :@app, :logger - def_delegators :@activated, :[] + def_delegators :@activated, :[], :each def initialize(app) @app = app @activated = {} manager = self + { before_sitemap: :before_sitemap, initialized: :before_configuration diff --git a/middleman-core/lib/middleman-core/extensions.rb b/middleman-core/lib/middleman-core/extensions.rb index fa51796d..42fbdb2d 100644 --- a/middleman-core/lib/middleman-core/extensions.rb +++ b/middleman-core/lib/middleman-core/extensions.rb @@ -106,7 +106,7 @@ module Middleman # A flattened list of all extensions which are automatically activated # @return [Array] A list of extension names which are automatically activated. def auto_activated - @auto_activate.values.flat_map(&:name) + @auto_activate.values.map(&:to_a).flatten.map(&:name) end # @api private diff --git a/middleman-core/lib/middleman-core/meta_pages.rb b/middleman-core/lib/middleman-core/meta_pages.rb index cd789ef1..f5478ae5 100644 --- a/middleman-core/lib/middleman-core/meta_pages.rb +++ b/middleman-core/lib/middleman-core/meta_pages.rb @@ -61,9 +61,13 @@ module Middleman def config(_) global_config = @middleman.config.all_settings.map { |c| ConfigSetting.new(c) } extension_config = {} + auto_activated_config = {} @middleman.extensions.each do |ext_name, extension| - next if ::Middleman::Extension.auto_activated.include? ext_name + if ::Middleman::Extensions.auto_activated.include? ext_name + auto_activated_config[ext_name] = extension_options(extension) + next + end if extension.is_a?(Hash) # Multiple instance extension @@ -82,6 +86,7 @@ module Middleman template('config.html.erb', global_config: global_config, extension_config: extension_config, + auto_activated_config: auto_activated_config, registered_extensions: Middleman::Extensions.registered.dup) end diff --git a/middleman-core/lib/middleman-core/meta_pages/templates/config.html.erb b/middleman-core/lib/middleman-core/meta_pages/templates/config.html.erb index 44e55388..d2b29847 100644 --- a/middleman-core/lib/middleman-core/meta_pages/templates/config.html.erb +++ b/middleman-core/lib/middleman-core/meta_pages/templates/config.html.erb @@ -29,22 +29,22 @@

Extensions

    - <% extension_config.each do |ext_name, configs| %> -
  • - <% registered_extensions.delete(ext_name) %> + <% [extension_config, auto_activated_config].each do |extensions| %> + <% extensions.each do |ext_name, configs| %> +
  • + <% registered_extensions.delete(ext_name) %> - :<%= ext_name %> + :<%= ext_name %> - - <% if configs && !configs.empty? %> -
      - <% configs.each do |setting| %> -
    • <%= setting.render %>
      • + <% if configs && !configs.empty? %> +
        + <% configs.each do |setting| %> +
      • <%= setting.render %>
        • + <% end %> +
      <% end %> -
    +
    • <% end %> - - <% end %> <% registered_extensions.keys.each do |ext_name| %> From dc4057d8dc56b7507f393978756080ec5c4ce062 Mon Sep 17 00:00:00 2001 From: Max Meyer Date: Wed, 5 Aug 2015 22:51:25 +0200 Subject: [PATCH 082/364] Bump version of cucumber --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 785849f1..28cc9224 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'pry', '~> 0.10', group: :development gem 'aruba', '~> 0.7.4' gem 'rspec', '~> 3.0' gem 'fivemat', '~> 1.3' -gem 'cucumber', '~> 1.3' +gem 'cucumber', '~> 2.0' # Optional middleman dependencies, included for tests gem 'less', '2.3', require: false From dcbeb7dc76bd29584ed8ef3bed8d74afc9488ecc Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 6 Aug 2015 11:06:34 -0700 Subject: [PATCH 083/364] Remove fivemat --- Gemfile | 1 - gem_rake_helper.rb | 4 ++-- middleman-core/lib/middleman-core/templates/extension/Gemfile | 1 - .../lib/middleman-core/templates/extension/Rakefile | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 28cc9224..24ba43b2 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,6 @@ gem 'yard', '~> 0.8', require: false gem 'pry', '~> 0.10', group: :development gem 'aruba', '~> 0.7.4' gem 'rspec', '~> 3.0' -gem 'fivemat', '~> 1.3' gem 'cucumber', '~> 2.0' # Optional middleman dependencies, included for tests diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb index a90ea7dc..ff7a592d 100644 --- a/gem_rake_helper.rb +++ b/gem_rake_helper.rb @@ -21,7 +21,7 @@ Cucumber::Rake::Task.new do |t| exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding) exempt_tags << '--tags ~@nowindows' if Gem.win_platform? exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true' - t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict"# --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" end Cucumber::Rake::Task.new(:cucumber_wip) do |t| @@ -29,7 +29,7 @@ Cucumber::Rake::Task.new(:cucumber_wip) do |t| exempt_tags << '--tags ~@nojava' if RUBY_PLATFORM == 'java' exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding) exempt_tags << '--tags ~@nowindows' if Gem.win_platform? - t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict"# --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" end require 'rspec/core/rake_task' diff --git a/middleman-core/lib/middleman-core/templates/extension/Gemfile b/middleman-core/lib/middleman-core/templates/extension/Gemfile index 81495fe1..b52f3729 100644 --- a/middleman-core/lib/middleman-core/templates/extension/Gemfile +++ b/middleman-core/lib/middleman-core/templates/extension/Gemfile @@ -13,7 +13,6 @@ end group :test do gem 'cucumber' - gem 'fivemat' gem 'aruba' gem 'rspec' end diff --git a/middleman-core/lib/middleman-core/templates/extension/Rakefile b/middleman-core/lib/middleman-core/templates/extension/Rakefile index 7910cf22..529dfacf 100644 --- a/middleman-core/lib/middleman-core/templates/extension/Rakefile +++ b/middleman-core/lib/middleman-core/templates/extension/Rakefile @@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks require 'cucumber/rake/task' Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t| - t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = "--color --tags ~@wip --strict" end require 'rake/clean' From 8cce9b8a8cf465c5de9b663e99598b0c4e70b900 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 10 Aug 2015 10:00:23 -0700 Subject: [PATCH 084/364] Loudly announce external pipeline errors and exit with failure. --- .../lib/middleman-core/extensions/external_pipeline.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb index 2e4e3669..6fc82aa0 100644 --- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb +++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb @@ -33,5 +33,8 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension logger.info "== External: #{without_newline}" if without_newline.length > 0 end end + rescue ::Errno::ENOENT => e + logger.error "== External: Command failed with message: #{e.message}" + exit(1) end end From 1a3f96b58fdcb21d40ec4239070337164fbc1195 Mon Sep 17 00:00:00 2001 From: Jim Dalton Date: Mon, 10 Aug 2015 15:04:47 -0700 Subject: [PATCH 085/364] Fix misnamed config value which was causing --force-polling flag to be ignored by file_watcher extension --- .../lib/middleman-core/core_extensions/file_watcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb b/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb index 6a800098..617e0ac7 100644 --- a/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb +++ b/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb @@ -30,7 +30,7 @@ module Middleman # Setup source collection. @sources = ::Middleman::Sources.new(app, disable_watcher: app.config[:watcher_disable], - force_polling: app.config[:force_polling], + force_polling: app.config[:watcher_force_polling], latency: app.config[:watcher_latency]) # Add default ignores. From fb6bca234fac2776dc2829230b40645ac37ebaa3 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 10 Aug 2015 16:58:32 -0700 Subject: [PATCH 086/364] Update to newer cucumber and aruba --- Gemfile | 7 ++--- Rakefile | 2 -- gem_rake_helper.rb | 5 ++-- .../middleman-cli/templates/extension/Gemfile | 1 - .../templates/extension/Rakefile | 2 +- .../lib/middleman-core/step_definitions.rb | 1 - .../step_definitions/builder_steps.rb | 16 +++++------ .../step_definitions/middleman_steps.rb | 4 +-- .../step_definitions/server_steps.rb | 28 +++++++++---------- 9 files changed, 30 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 61e9e125..dadde139 100644 --- a/Gemfile +++ b/Gemfile @@ -6,12 +6,9 @@ gem 'yard', '~> 0.8', require: false # Test tools gem 'pry', '~> 0.10', group: :development, require: false -gem 'pry-byebug' -gem 'pry-stack_explorer' -gem 'aruba', '~> 0.6', require: false +gem 'aruba', '~> 0.7.4', require: false gem 'rspec', '~> 3.0', require: false -gem 'fivemat', '~> 1.3', require: false -gem 'cucumber', '~> 1.3', require: false +gem 'cucumber', '~> 2.0', require: false # Optional middleman dependencies, included for tests gem 'haml', '>= 4.0.5', require: false diff --git a/Rakefile b/Rakefile index 8affa54c..09806b6b 100644 --- a/Rakefile +++ b/Rakefile @@ -48,8 +48,6 @@ task :test do GEM_PATHS.each do |g| Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake test" } end - - Rake::Task['rubocop'].invoke end desc 'Run specs for all middleman gems' diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb index 5f95c90e..5cc8bb64 100644 --- a/gem_rake_helper.rb +++ b/gem_rake_helper.rb @@ -21,7 +21,7 @@ Cucumber::Rake::Task.new do |t| exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding) exempt_tags << '--tags ~@nowindows' if Gem.win_platform? exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true' - t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict" end Cucumber::Rake::Task.new(:cucumber_wip) do |t| @@ -29,7 +29,8 @@ Cucumber::Rake::Task.new(:cucumber_wip) do |t| exempt_tags << '--tags ~@nojava' if RUBY_PLATFORM == 'java' exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding) exempt_tags << '--tags ~@nowindows' if Gem.win_platform? - t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true' + t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict" end require 'rspec/core/rake_task' diff --git a/middleman-cli/lib/middleman-cli/templates/extension/Gemfile b/middleman-cli/lib/middleman-cli/templates/extension/Gemfile index 81495fe1..b52f3729 100644 --- a/middleman-cli/lib/middleman-cli/templates/extension/Gemfile +++ b/middleman-cli/lib/middleman-cli/templates/extension/Gemfile @@ -13,7 +13,6 @@ end group :test do gem 'cucumber' - gem 'fivemat' gem 'aruba' gem 'rspec' end diff --git a/middleman-cli/lib/middleman-cli/templates/extension/Rakefile b/middleman-cli/lib/middleman-cli/templates/extension/Rakefile index 7910cf22..529dfacf 100644 --- a/middleman-cli/lib/middleman-cli/templates/extension/Rakefile +++ b/middleman-cli/lib/middleman-cli/templates/extension/Rakefile @@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks require 'cucumber/rake/task' Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t| - t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = "--color --tags ~@wip --strict" end require 'rake/clean' diff --git a/middleman-core/lib/middleman-core/step_definitions.rb b/middleman-core/lib/middleman-core/step_definitions.rb index 083bca0a..1c648164 100644 --- a/middleman-core/lib/middleman-core/step_definitions.rb +++ b/middleman-core/lib/middleman-core/step_definitions.rb @@ -1,5 +1,4 @@ require 'aruba/cucumber' -require 'aruba/jruby' require 'middleman-core/step_definitions/middleman_steps' require 'middleman-core/step_definitions/builder_steps' require 'middleman-core/step_definitions/server_steps' diff --git a/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb index 47292862..3293c082 100644 --- a/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb @@ -6,8 +6,8 @@ end Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name| target = File.join(PROJECT_ROOT_PATH, 'fixtures', path) - config_path = File.join(current_dir, "config-#{config_name}.rb") - config_dest = File.join(current_dir, 'config.rb') + config_path = File.join(expand_path("."), "config-#{config_name}.rb") + config_dest = File.join(expand_path("."), 'config.rb') FileUtils.cp(config_path, config_dest) end @@ -22,12 +22,12 @@ Given /^a fixture app "([^\"]*)"$/ do |path| # This step can be reentered from several places but we don't want # to keep re-copying and re-cd-ing into ever-deeper directories - next if File.basename(current_dir) == path + next if File.basename(expand_path(".")) == path step %Q{a directory named "#{path}"} target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path) - FileUtils.cp_r(target_path, current_dir) + FileUtils.cp_r(target_path, expand_path(".")) step %Q{I cd to "#{path}"} end @@ -58,20 +58,20 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, end Given /^a modification time for a file named "([^\"]*)"$/ do |file| - target = File.join(current_dir, file) + target = File.join(expand_path("."), file) @modification_times[target] = File.mtime(target) end Then /^the file "([^\"]*)" should not have been updated$/ do |file| - target = File.join(current_dir, file) + target = File.join(expand_path("."), file) expect(File.mtime(target)).to eq(@modification_times[target]) end # Provide this Aruba overload in case we're matching something with quotes in it Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content| - check_file_content(file, Regexp.new(Regexp.escape(partial_content)), true) + expect(file).to have_file_content(Regexp.new(Regexp.escape(partial_content)), true) end And /the file "(.*)" should be gzipped/ do |file| - expect(File.binread(File.join(current_dir, file), 2)).to eq(['1F8B'].pack('H*')) + expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*')) end diff --git a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb index f4bed280..395ff3de 100644 --- a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb @@ -1,7 +1,7 @@ Then /^the file "([^\"]*)" has the contents$/ do |path, contents| write_file(path, contents) - in_current_dir do + cd(".") do @server_inst.files.find_new_files! end end @@ -9,7 +9,7 @@ end Then /^the file "([^\"]*)" is removed$/ do |path| step %Q{I remove the file "#{path}"} - in_current_dir do + cd(".") do @server_inst.files.find_new_files! end end diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 2fbbd3a5..68c3c7d2 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -31,7 +31,7 @@ Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value| end Given /^the Server is running$/ do - root_dir = File.expand_path(current_dir) + root_dir = File.expand_path(expand_path(".")) if File.exists?(File.join(root_dir, 'source')) ENV['MM_SOURCE'] = 'source' @@ -43,7 +43,7 @@ Given /^the Server is running$/ do initialize_commands = @initialize_commands || [] - in_current_dir do + cd(".") do @server_inst = ::Middleman::Application.new do config[:watcher_disable] = true config[:show_exceptions] = false @@ -68,13 +68,13 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string| end When /^I go to "([^\"]*)"$/ do |url| - in_current_dir do + cd(".") do @last_response = @browser.get(URI.encode(url)) end end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| - in_current_dir do + cd(".") do last_response = nil expect { last_response = @browser.get(URI.encode(url)) @@ -84,61 +84,61 @@ Then /^going to "([^\"]*)" should not raise an exception$/ do |url| end Then /^the content type should be "([^\"]*)"$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.content_type).to start_with(expected) end end Then /^I should see "([^\"]*)"$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.body).to include(expected) end end Then /^I should see '([^\']*)'$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.body).to include(expected) end end Then /^I should see:$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.body).to include(expected) end end Then /^I should not see "([^\"]*)"$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.body).to_not include(expected) end end Then /^I should see content matching %r{(.*)}$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.body).to match(expected) end end Then /^I should not see content matching %r{(.*)}$/ do |expected| - in_current_dir do + cd(".") do expect(@last_response.body).to_not match(expected) end end Then /^I should not see:$/ do |expected| - in_current_dir do + cd(".") do expect(@browser.last_response.body).to_not include(expected.chomp) end end Then /^the status code should be "([^\"]*)"$/ do |expected| - in_current_dir do + cd(".") do expect(@browser.last_response.status).to eq expected.to_i end end Then /^I should see "([^\"]*)" lines$/ do |lines| - in_current_dir do + cd(".") do expect(@last_response.body.chomp.split($/).length).to eq(lines.to_i) end end From 23cf612dd9d2e323b8bb37724e3412a75d7c63c1 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 12 Aug 2015 10:51:06 -0700 Subject: [PATCH 087/364] bump sprockets branch --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 24ba43b2..08de2a54 100644 --- a/Gemfile +++ b/Gemfile @@ -37,4 +37,4 @@ gem 'coveralls', '~> 0.8', require: false # Middleman itself gem 'middleman', path: 'middleman' gem 'middleman-core', path: 'middleman-core' -gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', branch: 'v3-stable' +gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', branch: 'v3-stable-real' From bb6b8c7f133d2468e5605e7c9624e3221ce32da4 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 12 Aug 2015 15:24:35 -0700 Subject: [PATCH 088/364] Replace Hamster hash for user-accessible data with Hashie Indifferent access --- .../lib/middleman-core/contracts.rb | 10 ---- .../lib/middleman-core/sitemap/resource.rb | 4 +- middleman-core/lib/middleman-core/util.rb | 59 +++++-------------- .../lib/middleman-core/util/data.rb | 2 +- middleman-core/lib/middleman-core/version.rb | 2 +- middleman-core/middleman-core.gemspec | 3 +- .../spec/middleman-core/util_spec.rb | 26 +------- 7 files changed, 23 insertions(+), 83 deletions(-) diff --git a/middleman-core/lib/middleman-core/contracts.rb b/middleman-core/lib/middleman-core/contracts.rb index 16fff201..3afedbfe 100644 --- a/middleman-core/lib/middleman-core/contracts.rb +++ b/middleman-core/lib/middleman-core/contracts.rb @@ -18,16 +18,6 @@ if ENV['TEST'] || ENV['CONTRACTS'] == 'true' end end - class Frozen < CallableClass - def initialize(contract) - @contract = contract - end - - def valid?(val) - (val.frozen? || val.nil? || [::TrueClass, ::FalseClass, ::Fixnum].include?(val.class)) && Contract.valid?(val, @contract) - end - end - VectorOf = Contracts::CollectionOf::Factory.new(::Hamster::Vector) ResourceList = Contracts::ArrayOf[IsA['Middleman::Sitemap::Resource']] end diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 11a085eb..56768900 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -87,8 +87,8 @@ module Middleman end # Data about this resource, populated from frontmatter or extensions. - # @return [IndifferentHash] - Contract IsA['Middleman::Util::IndifferentHash'] + # @return [Hash] + Contract RespondTo[:indifferent_access?] def data ::Middleman::Util.recursively_enhance(metadata[:page]) end diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index 7d8512f0..bf1f1755 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -11,8 +11,8 @@ require 'rack/mime' # DbC require 'middleman-core/contracts' -# Immutable Data -require 'hamster' +# Indifferent Access +require 'hashie' # For URI templating require 'addressable/uri' @@ -76,56 +76,25 @@ module Middleman end end - class IndifferentHash < ::Hamster::Hash - def [](key) - if key?(key.to_sym) - super(key.to_sym) - elsif key?(key.to_s) - super(key.to_s) - else - super - end - end - - def method_missing(key, *_args) - if key?(key.to_sym) - self[key.to_sym] - elsif key?(key.to_s) - self[key.to_s] - end - end + class EnhancedHash < ::Hash + include ::Hashie::Extensions::MergeInitializer + include ::Hashie::Extensions::MethodReader + include ::Hashie::Extensions::IndifferentAccess end - # Recursively convert a normal Hash into a IndifferentHash + # Recursively convert a normal Hash into a EnhancedHash # # @private # @param [Hash] data Normal hash - # @return [Middleman::Util::IndifferentHash] - FrozenDataStructure = Frozen[Or[IndifferentHash, Array, String, TrueClass, FalseClass, Fixnum, NilClass]] - Contract Maybe[Or[String, Array, Hash, IndifferentHash]] => Maybe[FrozenDataStructure] + # @return [Hash] + Contract Maybe[Hash] => Maybe[Or[Array, EnhancedHash]] def recursively_enhance(obj) - case obj - when ::Hash - res = obj.map { |key, value| [recursively_enhance(key), recursively_enhance(value)] } - IndifferentHash.new(res) - when IndifferentHash - obj.map { |key, value| [recursively_enhance(key), recursively_enhance(value)] } - when ::Array - res = obj.map { |element| recursively_enhance(element) } - Hamster::Vector.new(res) - when ::SortedSet - # This clause must go before ::Set clause, since ::SortedSet is a ::Set. - res = obj.map { |element| recursively_enhance(element) } - Hamster::SortedSet.new(res) - when ::Set - res = obj.map { |element| recursively_enhance(element) } - Hamster::Set.new(res) - when Hamster::Vector, Hamster::Set, Hamster::SortedSet - obj.map { |element| recursively_enhance(element) } - when ::TrueClass, ::FalseClass, ::Fixnum, ::Symbol, ::NilClass, ::Float - obj + if obj.is_a? ::Array + obj.map { |e| recursively_enhance(e) }.freeze + elsif obj.is_a? ::Hash + EnhancedHash.new(obj).freeze else - obj.dup.freeze + obj end end diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index 1d107ef9..a02d64e2 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -29,7 +29,7 @@ module Middleman # Get the frontmatter and plain content from a file # @param [String] path - # @return [Array] + # @return [Array] Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]] def parse(full_path, known_type=nil) data = {} diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index 269aebb3..a141218d 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -1,5 +1,5 @@ module Middleman # Current Version # @return [String] - VERSION = '4.0.0.beta.2' unless const_defined?(:VERSION) + VERSION = '4.0.0.beta.3' unless const_defined?(:VERSION) end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 752108eb..2078b063 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -52,6 +52,7 @@ Gem::Specification.new do |s| # Testing s.add_dependency('contracts', ['~> 0.9.0']) - # Immutability + # Hash stuff + s.add_dependency('hashie', ['~> 3.4']) s.add_dependency('hamster', ['~> 1.0']) end diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb index f339a31c..447d1abd 100644 --- a/middleman-core/spec/middleman-core/util_spec.rb +++ b/middleman-core/spec/middleman-core/util_spec.rb @@ -54,43 +54,23 @@ describe Middleman::Util do end describe "::recursively_enhance" do - it "returns IndifferentHash if given one" do - input = Middleman::Util::IndifferentHash.new({test: "subject"}) - subject = Middleman::Util.recursively_enhance input - - expect( subject ).to be_a Middleman::Util::IndifferentHash - expect( subject.test ).to eq "subject" - end - - it "returns IndifferentHash if given a hash" do + it "returns Hashie extended Hash if given a hash" do input = {test: "subject"} subject = Middleman::Util.recursively_enhance input - - expect( subject ).to be_a Middleman::Util::IndifferentHash + expect( subject.test ).to eq "subject" end it "returns Array with strings, or IndifferentHash, true, false" do - indifferent_hash = Middleman::Util::IndifferentHash.new({test: "subject"}) + indifferent_hash = {test: "subject"} regular_hash = {regular: "hash"} input = [ indifferent_hash, regular_hash, true, false ] subject = Middleman::Util.recursively_enhance input - expect( subject[0] ).to be_a Middleman::Util::IndifferentHash - expect( subject[1] ).to be_a Middleman::Util::IndifferentHash expect( subject[1].regular ).to eq "hash" expect( subject[2] ).to eq true expect( subject[3] ).to eq false end - - it "returns duplicated & frozen original object if not special cased" do - input = "foo" - subject = Middleman::Util.recursively_enhance input - - expect( subject ).to eq input - expect( subject.object_id ).not_to eq input.object_id - expect( subject ).to be_frozen - end end end \ No newline at end of file From 50bf848ee8f77d5ea5f7aa419108b2ba3dba2dc4 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 17 Aug 2015 10:48:56 -0700 Subject: [PATCH 089/364] Add config CLI command --- middleman-cli/lib/middleman-cli.rb | 1 + middleman-cli/lib/middleman-cli/config.rb | 33 +++++++++++++++++++ .../middleman-core/extensions/asset_hash.rb | 1 + 3 files changed, 35 insertions(+) create mode 100644 middleman-cli/lib/middleman-cli/config.rb diff --git a/middleman-cli/lib/middleman-cli.rb b/middleman-cli/lib/middleman-cli.rb index 67565f3e..83b95d30 100644 --- a/middleman-cli/lib/middleman-cli.rb +++ b/middleman-cli/lib/middleman-cli.rb @@ -31,3 +31,4 @@ require 'middleman-cli/extension' require 'middleman-cli/server' require 'middleman-cli/build' require 'middleman-cli/console' +require 'middleman-cli/config' diff --git a/middleman-cli/lib/middleman-cli/config.rb b/middleman-cli/lib/middleman-cli/config.rb new file mode 100644 index 00000000..b5b64064 --- /dev/null +++ b/middleman-cli/lib/middleman-cli/config.rb @@ -0,0 +1,33 @@ +# CLI Module +module Middleman::Cli + # The CLI Config class + class Config < Thor::Group + include Thor::Actions + + check_unknown_options! + + class_option :environment, + aliases: '-e', + default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', + desc: 'The environment Middleman will run under' + def console + require 'json' + require 'middleman-core' + + opts = { + environment: options['environment'] + } + + app = ::Middleman::Application.new do + config[:environment] = opts[:environment].to_sym if opts[:environment] + end + + puts JSON.pretty_generate(app.config.to_h) + + app.shutdown! + end + + # Add to CLI + Base.register(self, 'config', 'config [options]', 'Output a Middleman configuration in JSON format') + end +end diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb index 07d58234..bb1389e9 100644 --- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb +++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb @@ -1,5 +1,6 @@ require 'addressable/uri' require 'middleman-core/util' +require 'middleman-core/rack' class Middleman::Extensions::AssetHash < ::Middleman::Extension option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg), 'List of extensions that get asset hashes appended to them.' From 226099d64e8ec8a4dbf23f13c48034147b580653 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 17 Aug 2015 10:55:34 -0700 Subject: [PATCH 090/364] Bump listen for test --- middleman-core/middleman-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 2078b063..02952f07 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |s| s.add_dependency("addressable", ["~> 2.3.5"]) # Watcher - s.add_dependency('listen', ['>= 2.7.9', '< 3.0']) + s.add_dependency('listen', ['~> 3.0']) # i18n s.add_dependency('i18n', ['~> 0.7.0']) From 9886e04a95ef0eb4afac33f188e67526cbe312ee Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 17 Aug 2015 14:28:15 -0700 Subject: [PATCH 091/364] Patch around seemingly invalid logic in Listen v3 --- .../lib/middleman-core/preview_server.rb | 5 +++- .../middleman-core/sources/source_watcher.rb | 27 ++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 073864a2..9aa0af86 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -124,9 +124,12 @@ module Middleman ] # config.rb - files.watch :reload, + watcher = files.watch :reload, path: root, only: match_against + + # Hack around node_modules in root. + watcher.listener.ignore(/^node_modules/) end end diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index 80b3702f..82dc8f74 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -4,6 +4,26 @@ require 'middleman-core/contracts' require 'middleman-core/contracts' require 'backports/2.0.0/enumerable/lazy' +# Monkey patch Listen silencer so `only` works on directories too +module Listen + class Silencer + # TODO: switch type and path places - and verify + def silenced?(relative_path, type) + path = relative_path.to_s + + # if only_patterns && type == :file + # return true unless only_patterns.any? { |pattern| path =~ pattern } + # end + + if only_patterns + return !only_patterns.any? { |pattern| path =~ pattern } + end + + ignore_patterns.any? { |pattern| path =~ pattern } + end + end +end + module Middleman # The default source watcher implementation. Watches a directory on disk # and responds to events on changes. @@ -29,6 +49,9 @@ module Middleman Contract Hash attr_reader :options + # Reference to lower level listener + attr_reader :listener + # Construct a new SourceWatcher # # @param [Middleman::Sources] parent The parent collection. @@ -138,9 +161,11 @@ module Middleman config[:latency] = @latency if @latency @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change)) - @listener.start + @listener.ignore(/^\.sass-cache/) @listener.only(@only) unless @only.empty? + + @listener.start end # Stop the listener. From 241fe69f7de8cd230311c4ba70dfbcab485f1cd9 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 17 Aug 2015 14:33:19 -0700 Subject: [PATCH 092/364] Adding ignore --- middleman-core/lib/middleman-core/preview_server.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 9aa0af86..175ad4d2 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -130,6 +130,9 @@ module Middleman # Hack around node_modules in root. watcher.listener.ignore(/^node_modules/) + + # Hack around sass cache in root. + watcher.listener.ignore(/^\.sass-cache/) end end From 0861fad2e1a464494d73336a327b8b71acc6a7e7 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 17 Aug 2015 15:59:48 -0700 Subject: [PATCH 093/364] Adding ignore --- middleman-core/lib/middleman-core/preview_server.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 175ad4d2..4d727bd1 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -133,6 +133,9 @@ module Middleman # Hack around sass cache in root. watcher.listener.ignore(/^\.sass-cache/) + + # Hack around bundler cache in root. + watcher.listener.ignore(/^vendor\/bundle/) end end From 3485f49f74bddd65470836e9aa3e5f59e26351a6 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 18 Aug 2015 16:22:32 -0700 Subject: [PATCH 094/364] Use Hashie Mash for recursive indifferent --- middleman-core/lib/middleman-core/util.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index bf1f1755..a444617e 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -76,10 +76,10 @@ module Middleman end end - class EnhancedHash < ::Hash - include ::Hashie::Extensions::MergeInitializer - include ::Hashie::Extensions::MethodReader - include ::Hashie::Extensions::IndifferentAccess + class EnhancedHash < ::Hashie::Mash + # include ::Hashie::Extensions::MergeInitializer + # include ::Hashie::Extensions::MethodReader + # include ::Hashie::Extensions::IndifferentAccess end # Recursively convert a normal Hash into a EnhancedHash @@ -90,9 +90,9 @@ module Middleman Contract Maybe[Hash] => Maybe[Or[Array, EnhancedHash]] def recursively_enhance(obj) if obj.is_a? ::Array - obj.map { |e| recursively_enhance(e) }.freeze + obj.map { |e| recursively_enhance(e) } elsif obj.is_a? ::Hash - EnhancedHash.new(obj).freeze + ::Hashie::Mash.new(obj) else obj end From 9ed0796b4a346af3228d6cf880081f04ca6dc159 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 20 Aug 2015 17:45:18 -0700 Subject: [PATCH 095/364] Move some extension setup to ready event --- middleman-cli/lib/middleman-cli/config.rb | 5 +++++ middleman-core/lib/middleman-core/application.rb | 6 +++++- .../lib/middleman-core/core_extensions/show_exceptions.rb | 2 +- middleman-core/lib/middleman-core/extensions/asset_hash.rb | 2 +- middleman-core/lib/middleman-core/extensions/asset_host.rb | 2 +- .../lib/middleman-core/extensions/external_pipeline.rb | 2 +- middleman-core/lib/middleman-core/extensions/minify_css.rb | 2 +- .../lib/middleman-core/extensions/minify_javascript.rb | 2 +- .../lib/middleman-core/extensions/relative_assets.rb | 2 +- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/middleman-cli/lib/middleman-cli/config.rb b/middleman-cli/lib/middleman-cli/config.rb index b5b64064..902ea216 100644 --- a/middleman-cli/lib/middleman-cli/config.rb +++ b/middleman-cli/lib/middleman-cli/config.rb @@ -13,12 +13,17 @@ module Middleman::Cli def console require 'json' require 'middleman-core' + require 'middleman-core/logger' opts = { environment: options['environment'] } + # Don't output info messages + ::Middleman::Logger.singleton(2, false) + app = ::Middleman::Application.new do + config[:exit_before_ready] = true config[:environment] = opts[:environment].to_sym if opts[:environment] end diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index 9d8a239d..ecd863f2 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -92,6 +92,10 @@ module Middleman # @return [String] define_setting :source, 'source', 'Name of the source directory' + # If we should exit before ready event. + # @return [Boolean] + define_setting :exit_before_ready, false, 'If we should exit before ready event.' + # Middleman mode. Defaults to :server, set to :build by the build process # @return [String] define_setting :mode, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :server), 'Middleman mode. Defaults to :server' @@ -274,7 +278,7 @@ module Middleman execute_callbacks(:after_configuration) # Everything is stable - execute_callbacks(:ready) + execute_callbacks(:ready) unless config[:exit_before_ready] end # Eval config diff --git a/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb b/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb index 6f01448a..b6407100 100644 --- a/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb +++ b/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb @@ -11,7 +11,7 @@ module Middleman::CoreExtensions app.config.define_setting :show_exceptions, ENV['TEST'] ? false : true, 'Whether to catch and display exceptions' end - def after_configuration + def ready app.use ::Rack::ShowExceptions if !app.build? && app.config[:show_exceptions] end end diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb index bb1389e9..e3248bd5 100644 --- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb +++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb @@ -17,7 +17,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension def after_configuration # Allow specifying regexes to ignore, plus always ignore apple touch icons @ignore = Array(options.ignore) + [/^apple-touch-icon/] - + app.use ::Middleman::Middleware::InlineURLRewriter, id: :asset_hash, url_extensions: options.exts, diff --git a/middleman-core/lib/middleman-core/extensions/asset_host.rb b/middleman-core/lib/middleman-core/extensions/asset_host.rb index 79e1813d..d0487591 100644 --- a/middleman-core/lib/middleman-core/extensions/asset_host.rb +++ b/middleman-core/lib/middleman-core/extensions/asset_host.rb @@ -7,7 +7,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for bustable assets.' option :ignore, [], 'Regexes of filenames to skip adding query strings to' - def after_configuration + def ready app.use ::Middleman::Middleware::InlineURLRewriter, id: :asset_host, url_extensions: options.exts, diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb index 6fc82aa0..9c649f5e 100644 --- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb +++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb @@ -16,7 +16,7 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension latency: options[:latency] end - def after_configuration + def ready if app.build? logger.info "== Executing: `#{options[:command]}`" watch_command! diff --git a/middleman-core/lib/middleman-core/extensions/minify_css.rb b/middleman-core/lib/middleman-core/extensions/minify_css.rb index 75b2ca4b..df7d7567 100644 --- a/middleman-core/lib/middleman-core/extensions/minify_css.rb +++ b/middleman-core/lib/middleman-core/extensions/minify_css.rb @@ -9,7 +9,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension SassCompressor }, 'Set the CSS compressor to use.' - def after_configuration + def ready # Setup Rack middleware to minify CSS app.use Rack, compressor: options[:compressor], ignore: Array(options[:ignore]) + [/\.min\./], diff --git a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb index 5c90bd13..466fb133 100644 --- a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb +++ b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb @@ -9,7 +9,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension ::Uglifier.new }, 'Set the JS compressor to use.' - def after_configuration + def ready # Setup Rack middleware to minify CSS app.use Rack, compressor: options[:compressor], ignore: Array(options[:ignore]) + [/\.min\./], diff --git a/middleman-core/lib/middleman-core/extensions/relative_assets.rb b/middleman-core/lib/middleman-core/extensions/relative_assets.rb index 58ba20c3..74d7d180 100644 --- a/middleman-core/lib/middleman-core/extensions/relative_assets.rb +++ b/middleman-core/lib/middleman-core/extensions/relative_assets.rb @@ -12,7 +12,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension require 'middleman-core/middleware/inline_url_rewriter' end - def after_configuration + def ready app.use ::Middleman::Middleware::InlineURLRewriter, id: :asset_hash, url_extensions: options.exts, From f76561d1012d6fdfb2120479b9238249a52bff22 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 28 Aug 2015 09:58:10 -0700 Subject: [PATCH 096/364] Add logger require in rack. Addresses #1550 --- middleman-core/lib/middleman-core/rack.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb index 8f6b1609..583056de 100644 --- a/middleman-core/lib/middleman-core/rack.rb +++ b/middleman-core/lib/middleman-core/rack.rb @@ -4,6 +4,7 @@ require 'rack/lint' require 'rack/head' require 'middleman-core/util' +require 'middleman-core/logger' require 'middleman-core/template_renderer' # CSSPIE HTC File From 8bdeab50eeb5d3fce4ac76b6d84f2f112a068eb6 Mon Sep 17 00:00:00 2001 From: Brad Gessler Date: Fri, 28 Aug 2015 13:08:56 -0700 Subject: [PATCH 097/364] Fix typo in server CLI. --- middleman-core/lib/middleman-core/cli/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/cli/server.rb b/middleman-core/lib/middleman-core/cli/server.rb index 8c7d0d06..cda9373c 100644 --- a/middleman-core/lib/middleman-core/cli/server.rb +++ b/middleman-core/lib/middleman-core/cli/server.rb @@ -16,7 +16,7 @@ module Middleman::Cli desc: 'The port Middleman will listen on' method_option :server_name, aliases: '-s', - desc: 'The server name name Middleman will use' + desc: 'The server name Middleman will use' method_option :bind_address, aliases: '-b', desc: 'The bind address Middleman will listen on' From 5cab7c46a9dc411d46142915866a293f7ba9f431 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 31 Aug 2015 11:18:45 -0700 Subject: [PATCH 098/364] Store intermediate resources in reducer so the array is not empty the first run. Addresses #1590 --- middleman-core/lib/middleman-core/sitemap/store.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index a5541349..aa46497b 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -211,20 +211,21 @@ module Middleman @app.logger.debug '== Rebuilding resource list' - @resources = @resource_list_manipulators.reduce([]) do |result, (_, inst)| - newres = inst.manipulate_resource_list(result) + @resources = [] + + @resource_list_manipulators.each do |(_, inst)| + @resources = inst.manipulate_resource_list(@resources) # Reset lookup cache reset_lookup_cache! - newres.each do |resource| + + @resources.each do |resource| @_lookup_by_path[resource.path] = resource @_lookup_by_destination_path[resource.destination_path] = resource end - newres + invalidate_resources_not_ignored_cache! end - - invalidate_resources_not_ignored_cache! end end From 7a28fd0a508d34dfa4a37cc181e0d1c7656b5b72 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 31 Aug 2015 11:25:22 -0700 Subject: [PATCH 099/364] disable osx builds for now --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 71acb01f..7bc8a3be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ rvm: - 1.9.3 os: - linux - - osx + # - osx cache: bundler sudo: false matrix: From d849930e511b7eb102d8b370d7fdf792ef3e50b6 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 1 Sep 2015 09:58:13 -0700 Subject: [PATCH 100/364] Don't set mode AND environment with the same ENV --- middleman-core/lib/middleman-core/application.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index ecd863f2..9ee3f4b9 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -98,11 +98,11 @@ module Middleman # Middleman mode. Defaults to :server, set to :build by the build process # @return [String] - define_setting :mode, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :server), 'Middleman mode. Defaults to :server' + define_setting :mode, :server, 'Middleman mode. Defaults to :server' # Middleman environment. Defaults to :development # @return [String] - define_setting :environment, :development, 'Middleman environment. Defaults to :development' + define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development' # Which file should be used for directory indexes # @return [String] From 0d4d82a01a0067b39c9215f955fdaa38227eac82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Komorowski?= Date: Thu, 3 Sep 2015 18:25:43 +0200 Subject: [PATCH 101/364] Update middleman-livereload version to more current As discussed https://github.com/middleman/middleman-livereload/issues/69 but I forgot to apply the fix to source code inside MM. @tdreyno, should it be `~> 3.3.0` or `~> 3.4.0`? I looked into 3.4 changes and they seem to be MM v4 related? --- middleman-core/lib/middleman-core/templates/shared/Gemfile.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt b/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt index 50d76543..e4c03d0d 100644 --- a/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt +++ b/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt @@ -5,10 +5,10 @@ source 'https://rubygems.org' gem "middleman", "~><%= Middleman::VERSION %>" # Live-reloading plugin -gem "middleman-livereload", "~> 3.1.0" +gem "middleman-livereload", "~> 3.3.0" # For faster file watcher updates on Windows: gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw] # Windows does not come with time zone data -gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby] \ No newline at end of file +gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby] From 441dc2faa68822ed06f09cdc9105a7256a3da7d4 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 9 Sep 2015 11:55:56 -0700 Subject: [PATCH 102/364] Revert breaking resource source_file api. For #1595 --- middleman-core/features/collections.feature | 2 +- .../frontmatter-neighbor-app/config.rb | 4 +- .../config.rb | 6 +-- .../more-traversal-app/source/layout.erb | 2 +- .../fixtures/traversal-app/source/layout.erb | 2 +- middleman-core/lib/middleman-core/builder.rb | 2 +- .../core_extensions/front_matter.rb | 4 +- .../meta_pages/sitemap_resource.rb | 2 +- middleman-core/lib/middleman-core/rack.rb | 2 +- .../lib/middleman-core/renderers/liquid.rb | 4 +- .../sitemap/extensions/proxies.rb | 6 +-- .../lib/middleman-core/sitemap/resource.rb | 37 +++++++++++-------- .../lib/middleman-core/template_context.rb | 4 +- 13 files changed, 42 insertions(+), 35 deletions(-) diff --git a/middleman-core/features/collections.feature b/middleman-core/features/collections.feature index 30f32691..a745a5a1 100644 --- a/middleman-core/features/collections.feature +++ b/middleman-core/features/collections.feature @@ -98,7 +98,7 @@ Feature: Collections And a file named "source/index.html.erb" with: """ <% collection(:articles).each do |article| %> - Article: <%= article.data.title || article.source_file[:relative_path] %> + Article: <%= article.data.title || article.file_descriptor[:relative_path] %> <% end %> """ Given the Server is running at "collections-app" diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb index babfbc2c..b9f82b36 100644 --- a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb +++ b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb @@ -7,9 +7,9 @@ class NeighborFrontmatter < ::Middleman::Extension def manipulate_resource_list(resources) resources.each do |resource| - next unless resource.source_file + next unless resource.file_descriptor - neighbor = "#{resource.source_file[:relative_path]}.frontmatter" + neighbor = "#{resource.file_descriptor[:relative_path]}.frontmatter" file = app.files.find(:source, neighbor) diff --git a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb index 1fc88608..93cd8f1f 100644 --- a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb +++ b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb @@ -12,12 +12,12 @@ class NeighborFrontmatter < ::Middleman::Extension def manipulate_resource_list(resources) resources.each do |resource| - next unless resource.source_file - next if resource.source_file[:relative_path].extname == '.frontmatter' + next unless resource.file_descriptor + next if resource.file_descriptor[:relative_path].extname == '.frontmatter' [ "#{resource.url.sub(/^\//, '')}.frontmatter", - "#{resource.source_file[:relative_path]}.frontmatter" + "#{resource.file_descriptor[:relative_path]}.frontmatter" ].each do |n| file = app.files.find(:source, n) apply_neighbor_data(resource, file) if file diff --git a/middleman-core/fixtures/more-traversal-app/source/layout.erb b/middleman-core/fixtures/more-traversal-app/source/layout.erb index 25411d39..f0aea54a 100644 --- a/middleman-core/fixtures/more-traversal-app/source/layout.erb +++ b/middleman-core/fixtures/more-traversal-app/source/layout.erb @@ -1,6 +1,6 @@ Path: <%= current_page.path %> -Source: <%= current_page.source_file[:full_path].sub(root + "/", "") %> +Source: <%= current_page.file_descriptor[:full_path].sub(root + "/", "") %> <% if current_page.parent %> Parent: <%= current_page.parent.path %> diff --git a/middleman-core/fixtures/traversal-app/source/layout.erb b/middleman-core/fixtures/traversal-app/source/layout.erb index 25411d39..f0aea54a 100644 --- a/middleman-core/fixtures/traversal-app/source/layout.erb +++ b/middleman-core/fixtures/traversal-app/source/layout.erb @@ -1,6 +1,6 @@ Path: <%= current_page.path %> -Source: <%= current_page.source_file[:full_path].sub(root + "/", "") %> +Source: <%= current_page.file_descriptor[:full_path].sub(root + "/", "") %> <% if current_page.parent %> Parent: <%= current_page.parent.path %> diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb index 0d0966c4..e386c2d0 100644 --- a/middleman-core/lib/middleman-core/builder.rb +++ b/middleman-core/lib/middleman-core/builder.rb @@ -169,7 +169,7 @@ module Middleman begin if resource.binary? - export_file!(output_file, resource.source_file[:full_path]) + export_file!(output_file, resource.file_descriptor[:full_path]) else response = @rack.get(URI.escape(resource.request_path)) diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 0e26259a..03d2f431 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -28,9 +28,9 @@ module Middleman::CoreExtensions Contract ResourceList => ResourceList def manipulate_resource_list(resources) resources.each do |resource| - next if resource.source_file.nil? + next if resource.file_descriptor.nil? - fmdata = data(resource.source_file[:full_path].to_s).first.dup + fmdata = data(resource.file_descriptor[:full_path].to_s).first.dup # Copy over special options # TODO: Should we make people put these under "options" instead of having diff --git a/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb b/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb index a42f9157..d746be95 100644 --- a/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb +++ b/middleman-core/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.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '') : 'Dynamic' + props['Source File'] = @resource.file_descriptor ? @resource.file_descriptor[:full_path].to_s.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '') : 'Dynamic' data = @resource.data props['Data'] = data.inspect unless data.empty? diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb index 583056de..a6743c59 100644 --- a/middleman-core/lib/middleman-core/rack.rb +++ b/middleman-core/lib/middleman-core/rack.rb @@ -126,7 +126,7 @@ module Middleman # Immediately send static file def send_file(resource, env) file = ::Rack::File.new nil - file.path = resource.source_file[:full_path] + file.path = resource.file_descriptor[:full_path] response = file.serving(env) status = response[0] response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext) diff --git a/middleman-core/lib/middleman-core/renderers/liquid.rb b/middleman-core/lib/middleman-core/renderers/liquid.rb index e09306b4..daa7d220 100644 --- a/middleman-core/lib/middleman-core/renderers/liquid.rb +++ b/middleman-core/lib/middleman-core/renderers/liquid.rb @@ -23,8 +23,8 @@ module Middleman return resources unless app.extensions[:data] resources.each do |resource| - next if resource.source_file.nil? - next unless resource.source_file[:relative_path].to_s =~ %r{\.liquid$} + next if resource.file_descriptor.nil? + next unless resource.file_descriptor[:relative_path].to_s =~ %r{\.liquid$} # Convert data object into a hash for liquid resource.add_metadata locals: { diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 0ad0a512..78d6e17a 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -87,7 +87,7 @@ module Middleman # Initialize resource with parent store and URL # @param [Middleman::Sitemap::Store] store # @param [String] path - # @param [String] source_file + # @param [String] target def initialize(store, path, target) super(store, path) @@ -115,8 +115,8 @@ module Middleman end Contract IsA['Middleman::SourceFile'] - def source_file - target_resource.source_file + def file_descriptor + target_resource.file_descriptor end Contract Maybe[String] diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 56768900..14b43fd7 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -24,7 +24,7 @@ module Middleman # The on-disk source file for this resource, if there is one # @return [String] Contract Maybe[IsA['Middleman::SourceFile']] - attr_reader :source_file + attr_reader :file_descriptor # The path to use when requesting this resource. Normally it's # the same as {#destination_path} but it can be overridden in subclasses. @@ -41,21 +41,21 @@ module Middleman # Initialize resource with parent store and URL # @param [Middleman::Sitemap::Store] store # @param [String] path - # @param [String] source_file + # @param [String] source Contract IsA['Middleman::Sitemap::Store'], String, Maybe[Or[IsA['Middleman::SourceFile'], String]] => Any - def initialize(store, path, source_file=nil) + def initialize(store, path, source=nil) @store = store @app = @store.app @path = path - if source_file && source_file.is_a?(String) - source_file = Pathname(source_file) + if source && source.is_a?(String) + source = Pathname(source) end - if source_file && source_file.is_a?(Pathname) - @source_file = ::Middleman::SourceFile.new(source_file.relative_path_from(@app.source_dir), source_file, @app.source_dir, Set.new([:source])) + if source && source.is_a?(Pathname) + @file_descriptor = ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source])) else - @source_file = source_file + @file_descriptor = source end @destination_path = @path @@ -71,8 +71,15 @@ module Middleman # @return [Boolean] Contract Bool def template? - return false if source_file.nil? - !::Tilt[source_file[:full_path].to_s].nil? + return false if file_descriptor.nil? + !::Tilt[file_descriptor[:full_path].to_s].nil? + end + + # Backwards compatible method for turning descriptor into a string. + # @return [String] + Contract String + def source_file + file_descriptor && file_descriptor[:full_path].to_s end # Merge in new metadata specific to this resource. @@ -119,9 +126,9 @@ module Middleman # @return [String] Contract Hash, Hash => String def render(opts={}, locs={}) - return ::Middleman::FileRenderer.new(@app, source_file[:full_path].to_s).template_data_for_file unless template? + return ::Middleman::FileRenderer.new(@app, file_descriptor[:full_path].to_s).template_data_for_file unless template? - ::Middleman::Util.instrument 'render.resource', path: source_file[:full_path].to_s, destination_path: destination_path do + ::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do md = metadata opts = md[:options].deep_merge(opts) locs = md[:locals].deep_merge(locs) @@ -132,7 +139,7 @@ module Middleman opts[:layout] = false if %w(.js .json .css .txt).include?(ext) end - renderer = ::Middleman::TemplateRenderer.new(@app, source_file[:full_path].to_s) + renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s) renderer.render(locs, opts) end end @@ -155,7 +162,7 @@ module Middleman # @return [Boolean] Contract Bool def binary? - !source_file.nil? && ::Middleman::Util.binary?(source_file[:full_path].to_s) + !file_descriptor.nil? && ::Middleman::Util.binary?(file_descriptor[:full_path].to_s) end # Ignore a resource directly, without going through the whole @@ -174,7 +181,7 @@ module Middleman # Ignore based on the source path (without template extensions) return true if @app.sitemap.ignored?(path) # This allows files to be ignored by their source file name (with template extensions) - if !self.is_a?(ProxyResource) && source_file && @app.sitemap.ignored?(source_file[:relative_path].to_s) + if !self.is_a?(ProxyResource) && file_descriptor && @app.sitemap.ignored?(file_descriptor[:relative_path].to_s) true else false diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb index 368742b4..48498d85 100644 --- a/middleman-core/lib/middleman-core/template_context.rb +++ b/middleman-core/lib/middleman-core/template_context.rb @@ -128,7 +128,7 @@ module Middleman return unless resource = sitemap.find_resource_by_destination_path(current_path) # Look for partials relative to the current path - current_dir = resource.source_file[:relative_path].dirname + current_dir = resource.file_descriptor[:relative_path].dirname non_root = partial_path.to_s.sub(/^\//, '') relative_dir = current_dir + Pathname(non_root) @@ -138,7 +138,7 @@ module Middleman partial_file = nil [ - [relative_dir.to_s, { preferred_engine: resource.source_file[:relative_path].extname[1..-1].to_sym }], + [relative_dir.to_s, { preferred_engine: resource.file_descriptor[:relative_path].extname[1..-1].to_sym }], [non_root], [non_root, { try_static: try_static }], [relative_dir_no_underscore.to_s, { try_static: try_static }], From 40f023f01cb02e2972ac6732b70d518db68a1ae5 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 12 Sep 2015 16:15:32 -0700 Subject: [PATCH 103/364] Let's do this --- middleman-core/lib/middleman-core/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index a141218d..ebccc3f9 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -1,5 +1,5 @@ module Middleman # Current Version # @return [String] - VERSION = '4.0.0.beta.3' unless const_defined?(:VERSION) + VERSION = '4.0.0.rc.1' unless const_defined?(:VERSION) end From d99b922e671b50cad4b4b8078dd78a58b7602eba Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 12 Sep 2015 16:16:26 -0700 Subject: [PATCH 104/364] Let's do this --- middleman/middleman.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index f1bffe12..c1fa5372 100644 --- a/middleman/middleman.gemspec +++ b/middleman/middleman.gemspec @@ -20,8 +20,8 @@ Gem::Specification.new do |s| s.add_dependency('middleman-core', Middleman::VERSION) s.add_dependency('middleman-cli', Middleman::VERSION) - s.add_dependency('middleman-sprockets', '>= 4.0.0.beta.1') - s.add_dependency('middleman-compass', '>= 4.0.0.beta.1.1') + s.add_dependency('middleman-sprockets', '>= 4.0.0.rc.1') + s.add_dependency('middleman-compass', '>= 4.0.0.rc.1') s.add_dependency('sass', ['>= 3.4.0', '< 4.0']) s.add_dependency('compass-import-once', ['1.0.5']) s.add_dependency('haml', ['>= 4.0.5']) From 8c02eb2a26801a9a5737d07c23158992dae7cb8c Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 14 Sep 2015 17:37:35 -0700 Subject: [PATCH 105/364] Some tweaks to get blog working --- .../core_extensions/front_matter.rb | 2 +- .../middleman-core/sitemap/extensions/ignores.rb | 2 ++ .../middleman-core/sitemap/extensions/on_disk.rb | 2 ++ .../middleman-core/sitemap/extensions/proxies.rb | 15 +++++++++++++++ .../sitemap/extensions/redirects.rb | 2 ++ .../sitemap/extensions/request_endpoints.rb | 2 ++ .../lib/middleman-core/sitemap/store.rb | 1 + 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 03d2f431..d685e994 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -12,7 +12,7 @@ require 'middleman-core/util/data' module Middleman::CoreExtensions class FrontMatter < ::Middleman::Extension # Try to run after routing but before directory_indexes - self.resource_list_manipulator_priority = 90 + self.resource_list_manipulator_priority = 10 def initialize(app, options_hash={}, &block) super diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb index 9ba53899..0e54b2c2 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb @@ -3,6 +3,8 @@ module Middleman module Extensions # Class to handle managing ignores class Ignores < Extension + self.resource_list_manipulator_priority = 0 + # Expose `create_ignore` as `app.ignore` expose_to_application ignore: :create_ignore diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb b/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb index ba8f656e..a0d03400 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb @@ -5,6 +5,8 @@ module Middleman module Sitemap module Extensions class OnDisk < Extension + self.resource_list_manipulator_priority = 0 + def initialize(app, config={}, &block) super diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 78d6e17a..0285726f 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -7,6 +7,8 @@ module Middleman # Manages the list of proxy configurations and manipulates the sitemap # to include new resources based on those configurations class Proxies < Extension + self.resource_list_manipulator_priority = 0 + # Expose `create_proxy` as `app.proxy` expose_to_application proxy: :create_proxy @@ -83,7 +85,16 @@ module Middleman end end + class Resource + def proxy_to(path) + throw "Resource#proxy_to has been removed. Use ProxyResource class instead." + end + end + class ProxyResource < ::Middleman::Sitemap::Resource + Contract String + attr_reader :target + # Initialize resource with parent store and URL # @param [Middleman::Sitemap::Store] store # @param [String] path @@ -119,6 +130,10 @@ module Middleman target_resource.file_descriptor end + def metadata + target_resource.metadata.deep_merge super + end + Contract Maybe[String] def content_type mime_type = super diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb b/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb index e42d34dc..dc0c74f9 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb @@ -7,6 +7,8 @@ module Middleman # Manages the list of proxy configurations and manipulates the sitemap # to include new resources based on those configurations class Redirects < Extension + self.resource_list_manipulator_priority = 0 + # Expose `create_redirect` to config as `redirect` expose_to_config redirect: :create_redirect diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/request_endpoints.rb b/middleman-core/lib/middleman-core/sitemap/extensions/request_endpoints.rb index fc66cd71..245df873 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/request_endpoints.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/request_endpoints.rb @@ -4,6 +4,8 @@ module Middleman module Sitemap module Extensions class RequestEndpoints < Extension + self.resource_list_manipulator_priority = 0 + # Expose `create_endpoint` to config as `endpoint` expose_to_config endpoint: :create_endpoint diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 129fa9b5..f7af3bd2 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -188,6 +188,7 @@ module Middleman @app.logger.debug '== Rebuilding resource list' @resources = @resource_list_manipulators.reduce([]) do |result, m| + @app.logger.debug "== Running manipulator: #{m[:name]}" newres = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, result) # Reset lookup cache From ed405b266f52cef8a7da0bc3697bc8e244aed003 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 14 Sep 2015 17:46:12 -0700 Subject: [PATCH 106/364] bump target ruby version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36463c2b..7c93ae0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: - ruby-head - jruby-head - jruby-19mode - - 2.2 + - 2.2.2 - 2.1 - 2.0 os: From 260c6be66c1f039847a391d5011d96621ae9ec98 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 16 Sep 2015 10:53:31 -0700 Subject: [PATCH 107/364] Move compass and sprockets to template config --- middleman/middleman.gemspec | 2 -- 1 file changed, 2 deletions(-) diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index c1fa5372..33167d3d 100644 --- a/middleman/middleman.gemspec +++ b/middleman/middleman.gemspec @@ -20,8 +20,6 @@ Gem::Specification.new do |s| s.add_dependency('middleman-core', Middleman::VERSION) s.add_dependency('middleman-cli', Middleman::VERSION) - s.add_dependency('middleman-sprockets', '>= 4.0.0.rc.1') - s.add_dependency('middleman-compass', '>= 4.0.0.rc.1') s.add_dependency('sass', ['>= 3.4.0', '< 4.0']) s.add_dependency('compass-import-once', ['1.0.5']) s.add_dependency('haml', ['>= 4.0.5']) From 2b2ee10d81be2e51d2e0c0f04f5d89b4fd7a2612 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 16 Sep 2015 14:01:39 -0700 Subject: [PATCH 108/364] dont autoload stuff when bundler will load --- middleman/lib/middleman.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/middleman/lib/middleman.rb b/middleman/lib/middleman.rb index 01b9aa97..878b9c59 100644 --- a/middleman/lib/middleman.rb +++ b/middleman/lib/middleman.rb @@ -2,6 +2,3 @@ require 'middleman-core' # Make the VERSION string available require 'middleman-core/version' - -require 'middleman-sprockets' -require 'middleman-compass' From a251c82562efccb4819295b364e6445b1ab799da Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 20 Jul 2015 12:13:10 -0700 Subject: [PATCH 109/364] Add test for #1568 --- middleman-core/features/chained_templates.feature | 5 ++++- .../chained-app/source/test.html.combobreaker.str.erb | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature index 7f538b65..4647e7eb 100644 --- a/middleman-core/features/chained_templates.feature +++ b/middleman-core/features/chained_templates.feature @@ -13,10 +13,13 @@ Feature: Templates should be chainable When I cd to "build" Then the following files should exist: | index.html | - + | test.html.combobreaker | And the file "index.html" should contain "Title" And the file "index.html" should contain "Subtitle" And the file "index.html" should contain "Sup" + And the file "test.html.combobreaker.html" should contain "Title" + And the file "test.html.combobreaker.html" should contain "Subtitle" + And the file "test.html.combobreaker.html" should contain "Sup" Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb Given a fixture app "partial-chained_templates-app" diff --git a/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb b/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb new file mode 100644 index 00000000..3b7caec2 --- /dev/null +++ b/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb @@ -0,0 +1,8 @@ +--- +layout: false +sup: "Sup" +--- + +

    #{"<%= data.article.title %>"}

    +

    #{"<%= data.article.subtitle %>"}

    +

    #{"<%= current_page.data.sup %>"}

    From 409a892da707aab0eef848ae79fc7ad97700199d Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 17 Sep 2015 09:41:17 -0700 Subject: [PATCH 110/364] Forward port some stable changes --- .editorconfig | 13 +++++++++++++ .rubocop.yml | 2 -- .../middleman-cli/templates/extension/Rakefile | 2 +- middleman-core/.rspec | 1 + middleman-core/cucumber.yml | 2 ++ .../features/chained_templates.feature | 16 ++++++++-------- ...ker.str.erb => test.erb.combobreaker.str.erb} | 0 middleman-core/lib/middleman-core/application.rb | 2 -- .../core_extensions/default_helpers.rb | 3 ++- .../lib/middleman-core/extensions/asset_hash.rb | 2 +- .../lib/middleman-core/preview_server.rb | 4 ++-- middleman-core/lib/middleman-core/rack.rb | 2 +- .../lib/middleman-core/renderers/haml.rb | 3 +-- .../middleman-core/sitemap/extensions/proxies.rb | 4 ++-- .../lib/middleman-core/sitemap/resource.rb | 4 +--- .../lib/middleman-core/sitemap/store.rb | 13 +++++++------ .../lib/middleman-core/sources/source_watcher.rb | 6 ++---- .../lib/middleman-core/template_context.rb | 3 ++- middleman-core/lib/middleman-core/util/data.rb | 6 +++--- 19 files changed, 49 insertions(+), 39 deletions(-) create mode 100644 .editorconfig create mode 100644 middleman-core/.rspec create mode 100644 middleman-core/cucumber.yml rename middleman-core/fixtures/chained-app/source/{test.html.combobreaker.str.erb => test.erb.combobreaker.str.erb} (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..5d126348 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.rubocop.yml b/.rubocop.yml index 652f08fb..337be055 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -25,8 +25,6 @@ ClassLength: Enabled: false Documentation: Enabled: false -Encoding: - Enabled: false HashSyntax: EnforcedStyle: ruby19 SpaceAroundEqualsInParameterDefault: diff --git a/middleman-cli/lib/middleman-cli/templates/extension/Rakefile b/middleman-cli/lib/middleman-cli/templates/extension/Rakefile index 529dfacf..4c62996f 100644 --- a/middleman-cli/lib/middleman-cli/templates/extension/Rakefile +++ b/middleman-cli/lib/middleman-cli/templates/extension/Rakefile @@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks require 'cucumber/rake/task' Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t| - t.cucumber_opts = "--color --tags ~@wip --strict" + t.cucumber_opts = '--color --tags ~@wip --strict' end require 'rake/clean' diff --git a/middleman-core/.rspec b/middleman-core/.rspec new file mode 100644 index 00000000..5052887a --- /dev/null +++ b/middleman-core/.rspec @@ -0,0 +1 @@ +--color \ No newline at end of file diff --git a/middleman-core/cucumber.yml b/middleman-core/cucumber.yml new file mode 100644 index 00000000..922a378c --- /dev/null +++ b/middleman-core/cucumber.yml @@ -0,0 +1,2 @@ +default: --require features --tags ~@wip +wip: --require features --tags @wip \ No newline at end of file diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature index 4647e7eb..27135bf6 100644 --- a/middleman-core/features/chained_templates.feature +++ b/middleman-core/features/chained_templates.feature @@ -7,19 +7,19 @@ Feature: Templates should be chainable Then I should see "Title" And I should see "Subtitle" And I should see "Sup" - + Scenario: Build chained template Given a successfully built app at "chained-app" When I cd to "build" Then the following files should exist: | index.html | - | test.html.combobreaker | + | test.erb.combobreaker | And the file "index.html" should contain "Title" And the file "index.html" should contain "Subtitle" And the file "index.html" should contain "Sup" - And the file "test.html.combobreaker.html" should contain "Title" - And the file "test.html.combobreaker.html" should contain "Subtitle" - And the file "test.html.combobreaker.html" should contain "Sup" + And the file "test.erb.combobreaker" should contain "Title" + And the file "test.erb.combobreaker" should contain "Subtitle" + And the file "test.erb.combobreaker" should contain "Sup" Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb Given a fixture app "partial-chained_templates-app" @@ -32,7 +32,7 @@ Feature: Templates should be chainable And a template named "my_partial.html.md.erb" with: """ ## My Partial - + <%= 'hello world' %> """ And the Server is running @@ -61,7 +61,7 @@ Feature: Templates should be chainable And a template named "my_partial.html.md.erb" with: """ ## My Partial - + <%= 'hello world' %> """ And the Server is running @@ -90,7 +90,7 @@ Feature: Templates should be chainable And a template named "my_partial.html.erb" with: """

    My Partial

    - + <%= 'hello world' %> """ And the Server is running diff --git a/middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb b/middleman-core/fixtures/chained-app/source/test.erb.combobreaker.str.erb similarity index 100% rename from middleman-core/fixtures/chained-app/source/test.html.combobreaker.str.erb rename to middleman-core/fixtures/chained-app/source/test.erb.combobreaker.str.erb diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index 9ee3f4b9..6c39af54 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -1,5 +1,3 @@ -# Use ActiveSupport JSON -require 'active_support/json' require 'active_support/core_ext/integer/inflections' require 'middleman-core/contracts' diff --git a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb index 71666bab..ba508c4d 100644 --- a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb @@ -7,7 +7,8 @@ require 'padrino-helpers' class Padrino::Helpers::OutputHelpers::ErbHandler # Force Erb capture not to use safebuffer def capture_from_template(*args, &block) - self.output_buffer, buf_was = '', output_buffer + self.output_buffer = '' + buf_was = output_buffer raw = block.call(*args) captured = template.instance_variable_get(:@_out_buf) self.output_buffer = buf_was diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb index e3248bd5..bb1389e9 100644 --- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb +++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb @@ -17,7 +17,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension def after_configuration # Allow specifying regexes to ignore, plus always ignore apple touch icons @ignore = Array(options.ignore) + [/^apple-touch-icon/] - + app.use ::Middleman::Middleware::InlineURLRewriter, id: :asset_hash, url_extensions: options.exts, diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 4d727bd1..d9f5c172 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -125,8 +125,8 @@ module Middleman # config.rb watcher = files.watch :reload, - path: root, - only: match_against + path: root, + only: match_against # Hack around node_modules in root. watcher.listener.ignore(/^node_modules/) diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb index a6743c59..3e2a6f25 100644 --- a/middleman-core/lib/middleman-core/rack.rb +++ b/middleman-core/lib/middleman-core/rack.rb @@ -102,7 +102,7 @@ module Middleman begin # Write out the contents of the page - res.write resource.render({}, { rack: { request: req } }) + res.write resource.render({}, rack: { request: req }) # Valid content is a 200 status res.status = 200 diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb index 7e2b6fbb..24cdced4 100644 --- a/middleman-core/lib/middleman-core/renderers/haml.rb +++ b/middleman-core/lib/middleman-core/renderers/haml.rb @@ -40,7 +40,6 @@ module Middleman # Haml Renderer class Haml < ::Middleman::Extension - def initialize(app, options={}, &block) super @@ -53,7 +52,7 @@ module Middleman modified_options = options.dup modified_options[:context] = compiler_options[:context] - text = template_class.new(nil, 1, modified_options) {text}.render + text = template_class.new(nil, 1, modified_options) { text }.render super(text, compiler_options) end end diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 0285726f..110d9890 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -86,8 +86,8 @@ module Middleman end class Resource - def proxy_to(path) - throw "Resource#proxy_to has been removed. Use ProxyResource class instead." + def proxy_to(_path) + throw 'Resource#proxy_to has been removed. Use ProxyResource class instead.' end end diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 14b43fd7..4a247cb8 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -48,9 +48,7 @@ module Middleman @app = @store.app @path = path - if source && source.is_a?(String) - source = Pathname(source) - end + source = Pathname(source) if source && source.is_a?(String) if source && source.is_a?(Pathname) @file_descriptor = ::Middleman::SourceFile.new(source.relative_path_from(@app.source_dir), source, @app.source_dir, Set.new([:source])) diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index f7af3bd2..54e6b1ce 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -187,23 +187,24 @@ module Middleman @app.logger.debug '== Rebuilding resource list' - @resources = @resource_list_manipulators.reduce([]) do |result, m| + @resources = [] + + @resource_list_manipulators.each do |m| @app.logger.debug "== Running manipulator: #{m[:name]}" - newres = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, result) + @resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources) # Reset lookup cache reset_lookup_cache! # Rebuild cache - newres.each do |resource| + @resources.each do |resource| @_lookup_by_path[resource.path] = resource @_lookup_by_destination_path[resource.destination_path] = resource end - newres + invalidate_resources_not_ignored_cache! end - invalidate_resources_not_ignored_cache! @update_count += 1 end end @@ -223,7 +224,7 @@ module Middleman Contract String => String def remove_templating_extensions(path) # Strip templating extensions as long as Tilt knows them - path = path.sub(File.extname(path), '') while ::Tilt[path] + path = path.sub(/#{::Regexp.escape(File.extname(path))}$/, '') while ::Tilt[path] path end diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index 82dc8f74..38ac639a 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -8,16 +8,14 @@ require 'backports/2.0.0/enumerable/lazy' module Listen class Silencer # TODO: switch type and path places - and verify - def silenced?(relative_path, type) + def silenced?(relative_path, _type) path = relative_path.to_s # if only_patterns && type == :file # return true unless only_patterns.any? { |pattern| path =~ pattern } # end - if only_patterns - return !only_patterns.any? { |pattern| path =~ pattern } - end + return !only_patterns.any? { |pattern| path =~ pattern } if only_patterns ignore_patterns.any? { |pattern| path =~ pattern } end diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb index 48498d85..6771ddbe 100644 --- a/middleman-core/lib/middleman-core/template_context.rb +++ b/middleman-core/lib/middleman-core/template_context.rb @@ -71,7 +71,8 @@ module Middleman 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 # By default, no content is captured content = '' diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index a02d64e2..781ed5c0 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -11,11 +11,11 @@ require 'middleman-core/util' require 'yaml' # Parsing JSON data -require 'active_support/json' +require 'json' module Middleman module Util - module Data + module Data include Contracts module_function @@ -121,7 +121,7 @@ module Middleman Contract String, Pathname => Maybe[[Hash, String]] def parse_json(content, full_path) begin - data = map_value(::ActiveSupport::JSON.decode(content)) + data = map_value(::JSON.parse(content)) rescue => e $stderr.puts "JSON Exception parsing #{full_path}: #{e.message}" return nil From 2907761556ae7e84e28c26bdcb73b1037225db8e Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 17 Sep 2015 14:46:27 -0700 Subject: [PATCH 111/364] tweak logger ref --- .../lib/middleman-core/preview_server.rb | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index a32262fd..40275df5 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -14,7 +14,6 @@ module Middleman extend Forwardable attr_reader :app, :ssl_certificate, :ssl_private_key, :environment, :server_information - def_delegator :app, :logger def https? @https == true @@ -43,11 +42,11 @@ module Middleman mount_instance(the_app) - logger.debug %(== Server information is provided by #{server_information.handler}) - logger.debug %(== The Middleman is running in "#{environment}" environment) - logger.debug format('== The Middleman preview server is bound to %s', ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: https?).to_bind_addresses.join(', ')) - logger.info format('== View your site at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_urls.join(', ')) - logger.info format('== Inspect your site configuration at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_config_urls.join(', ')) + app.logger.debug %(== Server information is provided by #{server_information.handler}) + app.logger.debug %(== The Middleman is running in "#{environment}" environment) + app.logger.debug format('== The Middleman preview server is bound to %s', ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: https?).to_bind_addresses.join(', ')) + app.logger.info format('== View your site at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_urls.join(', ')) + app.logger.info format('== Inspect your site configuration at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_config_urls.join(', ')) @initialized ||= false return if @initialized @@ -77,7 +76,7 @@ module Middleman # @return [void] def stop begin - logger.info '== The Middleman is shutting down' + app.logger.info '== The Middleman is shutting down' rescue # if the user closed their terminal STDOUT/STDERR won't exist end @@ -88,13 +87,13 @@ module Middleman # Simply stop, then start the server # @return [void] def reload - logger.info '== The Middleman is reloading' + app.logger.info '== The Middleman is reloading' begin app = initialize_new_app rescue => e - logger.error "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}" - logger.info '== The Middleman is still running the application from before the error' + $stderr.puts "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}" + app.logger.info '== The Middleman is still running the application from before the error' return end @@ -105,7 +104,7 @@ module Middleman mount_instance(app) - logger.info '== The Middleman has reloaded' + app.logger.info '== The Middleman has reloaded' end # Stop the current instance, exit Webrick @@ -143,7 +142,7 @@ module Middleman %r{^config\.rb$}, %r{^environments/[^\.](.*)\.rb$}, %r{^lib/[^\.](.*)\.rb$}, - %r{^#{@app.config[:helpers_dir]}/[^\.](.*)\.rb$} + %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$} ] # config.rb @@ -169,7 +168,7 @@ module Middleman # `server_information` server_information.use app.config - logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless app.config[:port] == configured_port + app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless app.config[:port] == configured_port @https = app.config[:https] @environment = app.config[:environment] @@ -245,7 +244,7 @@ module Middleman begin ::WEBrick::HTTPServer.new(http_opts) rescue Errno::EADDRINUSE - logger.error %(== Port "#{http_opts[:Port]}" is in use. This should not have happened. Please start "middleman server" again.) + $stderr.puts %(== Port "#{http_opts[:Port]}" is in use. This should not have happened. Please start "middleman server" again.) end end From 3ae28874bf3fe82368a41386ce768b553fe24f59 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 19 Sep 2015 14:07:42 -0700 Subject: [PATCH 112/364] Fix test breakage --- .../lib/middleman-core/application.rb | 3 +- .../core_extensions/front_matter.rb | 2 +- .../middleman-core/core_extensions/routing.rb | 2 +- .../extensions/automatic_image_sizes.rb | 3 +- .../extensions/minify_javascript.rb | 2 +- middleman-core/lib/middleman-core/rack.rb | 6 ++ .../step_definitions/middleman_steps.rb | 8 +-- .../step_definitions/server_steps.rb | 56 +++++++++---------- 8 files changed, 45 insertions(+), 37 deletions(-) diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index f8cb7563..0712eed1 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -334,8 +334,9 @@ module Middleman end # Whether we're in a specific environment + # @param [Symbol] key # @return [Boolean] - Contract Bool + Contract Symbol => Bool def environment?(key) config[:environment] == key end diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index d685e994..a133d0ef 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -12,7 +12,7 @@ require 'middleman-core/util/data' module Middleman::CoreExtensions class FrontMatter < ::Middleman::Extension # Try to run after routing but before directory_indexes - self.resource_list_manipulator_priority = 10 + self.resource_list_manipulator_priority = 20 def initialize(app, options_hash={}, &block) super diff --git a/middleman-core/lib/middleman-core/core_extensions/routing.rb b/middleman-core/lib/middleman-core/core_extensions/routing.rb index 0601d2d0..3e66f3dc 100644 --- a/middleman-core/lib/middleman-core/core_extensions/routing.rb +++ b/middleman-core/lib/middleman-core/core_extensions/routing.rb @@ -4,7 +4,7 @@ module Middleman class Routing < Extension # This should always run late, but not as late as :directory_indexes, # so it can add metadata to any pages generated by other extensions - self.resource_list_manipulator_priority = 80 + self.resource_list_manipulator_priority = 10 # Expose the `page` method to config. expose_to_config :page diff --git a/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb b/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb index aa184df9..b88721de 100644 --- a/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb +++ b/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb @@ -23,7 +23,8 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension if file && file[:full_path].exist? begin - width, height = ::FastImage.size(file[:full_path].to_s, raise_on_failure: true) + full_path = file[:full_path].to_s + width, height = ::FastImage.size(full_path, raise_on_failure: true) # Check for @2x and @3x image retina = full_path.match(/@(\d)x\.[a-zA-Z]{3,4}$/) if retina diff --git a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb index 4ab0979a..73a75cd0 100644 --- a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb +++ b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb @@ -13,7 +13,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension def ready # Setup Rack middleware to minify JS - app.use Rack, compressor: chosen_compressor, + app.use Rack, compressor: options[:compressor], ignore: Array(options[:ignore]) + [/\.min\./], inline: options[:inline], content_types: options[:content_types], diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb index 3e2a6f25..4578005b 100644 --- a/middleman-core/lib/middleman-core/rack.rb +++ b/middleman-core/lib/middleman-core/rack.rb @@ -14,6 +14,12 @@ require 'middleman-core/template_renderer' ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=utf-8' ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=utf-8' +# Sourcemap format +::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=utf-8' + +# Create a MIME type for PHP files (for detection by extensions) +::Rack::Mime::MIME_TYPES['.php'] = 'text/php' + module Middleman class Rack extend Forwardable diff --git a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb index 395ff3de..ff256a94 100644 --- a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb @@ -1,15 +1,15 @@ Then /^the file "([^\"]*)" has the contents$/ do |path, contents| write_file(path, contents) - cd(".") do + # cd(".") do @server_inst.files.find_new_files! - end + # end end Then /^the file "([^\"]*)" is removed$/ do |path| step %Q{I remove the file "#{path}"} - cd(".") do + # cd(".") do @server_inst.files.find_new_files! - end + # end end diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 448af3cf..1a80a118 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -1,3 +1,4 @@ +require 'middleman-core/rack' require 'rspec/expectations' require 'capybara/cucumber' @@ -41,7 +42,7 @@ Given /^the Server is running$/ do initialize_commands = @initialize_commands || [] - cd(".") do + # cd(".") do @server_inst = ::Middleman::Application.new do config[:watcher_disable] = true config[:show_exceptions] = false @@ -51,9 +52,8 @@ Given /^the Server is running$/ do end end - rack = ::Middleman::Rack.new(@server_inst) - Capybara.app = rack.to_app - end + Capybara.app = ::Middleman::Rack.new(@server_inst).to_app + # end end Given /^the Server is running at "([^\"]*)"$/ do |app_path| @@ -66,73 +66,73 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string| end When /^I go to "([^\"]*)"$/ do |url| - cd(".") do + # cd(".") do visit(URI.encode(url).to_s) - end + # end end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| - cd(".") do + # cd(".") do expect{ visit(URI.encode(url).to_s) }.to_not raise_exception - end + # end end Then /^the content type should be "([^\"]*)"$/ do |expected| - cd(".") do + # cd(".") do expect(page.response_headers['Content-Type']).to start_with expected - end + # end end Then /^I should see "([^\"]*)"$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).to include expected - end + # end end Then /^I should see '([^\']*)'$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).to include expected - end + # end end Then /^I should see:$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).to include expected - end + # end end Then /^I should not see "([^\"]*)"$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).not_to include expected - end + # end end Then /^I should see content matching %r{(.*)}$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).to match(expected) - end + # end end Then /^I should not see content matching %r{(.*)}$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).to_not match(expected) - end + # end end Then /^I should not see:$/ do |expected| - cd(".") do + # cd(".") do expect(page.body).not_to include expected - end + # end end Then /^the status code should be "([^\"]*)"$/ do |expected| - cd(".") do + # cd(".") do expect(page.status_code).to eq expected.to_i - end + # end end Then /^I should see "([^\"]*)" lines$/ do |lines| - cd(".") do + # cd(".") do expect(page.body.chomp.split($/).length).to eq lines.to_i - end + # end end From 3e1fc0aa1f83ba29b1eb89fb9463dc8d1c7a6987 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 19 Sep 2015 14:26:30 -0700 Subject: [PATCH 113/364] Change test to respect global relative assets change --- CHANGELOG.md | 4 ++++ middleman-core/features/relative_assets.feature | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ae9a891..7c1b6569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ master === +* `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers. + +# 4.0.0.rc.1 + * Removed ability to use JSON as frontmatter. Still allowed in data/ folder. * Added YAML data postscript. Like frontmatter, but reversed. Attach content after the key/value data as a `:postscript` key to the data structure (if Hash). diff --git a/middleman-core/features/relative_assets.feature b/middleman-core/features/relative_assets.feature index ac4d1776..e78f7665 100644 --- a/middleman-core/features/relative_assets.feature +++ b/middleman-core/features/relative_assets.feature @@ -59,15 +59,15 @@ Feature: Relative Assets When I cd to "build" Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css" - Scenario: Rendering html with the feature enabled + Scenario: Rendering html with the feature enabled (overrides relative option on helpers) Given "relative_assets" feature is "enabled" And the Server is running at "relative-assets-app" When I go to "/relative_image.html" Then I should see '"stylesheets/relative_assets.css"' Then I should see '"javascripts/app.js"' When I go to "/relative_image_absolute_css.html" - Then I should see '"/stylesheets/relative_assets.css"' - Then I should see '"/javascripts/app.js"' + Then I should see '"stylesheets/relative_assets.css"' + Then I should see '"javascripts/app.js"' Then I should not see "/images/blank.gif" And I should see "images/blank.gif" @@ -121,4 +121,4 @@ Feature: Relative Assets """ And the Server is running at "relative-assets-app" When I go to "/sub/image_tag.html" - Then I should see '' \ No newline at end of file + Then I should see '' From 765de5ab11f682a919e9cdf0542571826d4946a9 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 19 Sep 2015 14:39:55 -0700 Subject: [PATCH 114/364] Remove ancient twitter bootstrap test. Use npm or bower, y'all --- Gemfile | 1 - .../twitter-bootstrap-compile.feature | 6 - .../fixtures/twitter-bootstrap-app/config.rb | 0 .../twitter-bootstrap-ebc6935/.gitignore | 36 - .../twitter-bootstrap-ebc6935/.travis.yml | 3 - .../source/twitter-bootstrap-ebc6935/LICENSE | 176 - .../twitter-bootstrap-ebc6935/README.md | 137 - .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../img/glyphicons-halflings.png | Bin 13826 -> 0 bytes .../twitter-bootstrap-ebc6935/js/.jshintrc | 10 - .../twitter-bootstrap-ebc6935/js/README.md | 112 - .../js/bootstrap-alert.js | 90 - .../js/bootstrap-button.js | 96 - .../js/bootstrap-carousel.js | 169 - .../js/bootstrap-collapse.js | 157 - .../js/bootstrap-dropdown.js | 100 - .../js/bootstrap-modal.js | 218 - .../js/bootstrap-popover.js | 98 - .../js/bootstrap-scrollspy.js | 151 - .../js/bootstrap-tab.js | 135 - .../js/bootstrap-tooltip.js | 275 - .../js/bootstrap-transition.js | 61 - .../js/bootstrap-typeahead.js | 285 - .../js/tests/index.html | 54 - .../js/tests/phantom.js | 63 - .../js/tests/server.js | 14 - .../js/tests/unit/bootstrap-alert.js | 56 - .../js/tests/unit/bootstrap-button.js | 77 - .../js/tests/unit/bootstrap-carousel.js | 28 - .../js/tests/unit/bootstrap-collapse.js | 54 - .../js/tests/unit/bootstrap-dropdown.js | 87 - .../js/tests/unit/bootstrap-modal.js | 114 - .../js/tests/unit/bootstrap-phantom.js | 21 - .../js/tests/unit/bootstrap-popover.js | 93 - .../js/tests/unit/bootstrap-scrollspy.js | 31 - .../js/tests/unit/bootstrap-tab.js | 61 - .../js/tests/unit/bootstrap-tooltip.js | 155 - .../js/tests/unit/bootstrap-transition.js | 13 - .../js/tests/unit/bootstrap-typeahead.js | 148 - .../js/tests/vendor/jquery.js | 9252 ----------------- .../js/tests/vendor/qunit.css | 232 - .../js/tests/vendor/qunit.js | 1510 --- .../less/_accordion.less | 33 - .../less/_alerts.less | 58 - .../less/_breadcrumbs.less | 24 - .../less/_button-groups.less | 191 - .../less/_buttons.less | 191 - .../less/_carousel.less | 121 - .../less/_close.less | 29 - .../twitter-bootstrap-ebc6935/less/_code.less | 57 - .../less/_component-animations.less | 20 - .../less/_dropdowns.less | 143 - .../less/_forms.less | 583 -- .../twitter-bootstrap-ebc6935/less/_grid.less | 5 - .../less/_hero-unit.less | 22 - .../less/_labels-badges.less | 55 - .../less/_layouts.less | 17 - .../less/_mixins.less | 646 -- .../less/_modals.less | 90 - .../less/_navbar.less | 358 - .../twitter-bootstrap-ebc6935/less/_navs.less | 363 - .../less/_pager.less | 36 - .../less/_pagination.less | 56 - .../less/_popovers.less | 49 - .../less/_progress-bars.less | 117 - .../less/_reset.less | 131 - .../less/_responsive-1200px-min.less | 26 - .../less/_responsive-767px-max.less | 149 - .../less/_responsive-768px-979px.less | 17 - .../less/_responsive-navbar.less | 153 - .../less/_responsive-utilities.less | 41 - .../less/_scaffolding.less | 29 - .../less/_sprites.less | 191 - .../less/_tables.less | 176 - .../less/_thumbnails.less | 47 - .../less/_tooltip.less | 35 - .../twitter-bootstrap-ebc6935/less/_type.less | 232 - .../less/_utilities.less | 23 - .../less/_variables.less | 206 - .../less/_wells.less | 27 - .../less/bootstrap.less | 62 - .../less/responsive.less | 48 - .../less/tests/css-tests.css | 52 - .../less/tests/css-tests.html | 917 -- .../less/tests/forms.html | 179 - .../less/tests/navbar.html | 108 - .../twitter-bootstrap-ebc6935/package.json | 25 - 87 files changed, 20517 deletions(-) delete mode 100644 middleman-core/features/twitter-bootstrap-compile.feature delete mode 100644 middleman-core/fixtures/twitter-bootstrap-app/config.rb delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings.png delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.css delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.js delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_accordion.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_alerts.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_breadcrumbs.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_button-groups.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_buttons.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_carousel.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_close.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_code.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_component-animations.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_dropdowns.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_forms.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_grid.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_hero-unit.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_labels-badges.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_layouts.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_mixins.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_modals.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navbar.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navs.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pager.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pagination.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_popovers.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_progress-bars.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_reset.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-1200px-min.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-767px-max.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-768px-979px.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-navbar.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-utilities.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_scaffolding.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_sprites.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tables.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_thumbnails.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tooltip.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_type.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_utilities.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_variables.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_wells.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/bootstrap.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/responsive.less delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.css delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.html delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html delete mode 100755 middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json diff --git a/Gemfile b/Gemfile index 311f5476..3da827cc 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ gem 'cucumber', '~> 2.0', require: false gem 'haml', '>= 4.0.5', require: false gem 'coffee-script', '~> 2.2', require: false gem 'kramdown', '~> 1.2', require: false -gem 'less', '2.3', require: false gem 'slim', '>= 2.0', require: false gem 'liquid', '>= 2.6', require: false gem 'stylus', '>= 1.0', require: false diff --git a/middleman-core/features/twitter-bootstrap-compile.feature b/middleman-core/features/twitter-bootstrap-compile.feature deleted file mode 100644 index 2d7d0cdd..00000000 --- a/middleman-core/features/twitter-bootstrap-compile.feature +++ /dev/null @@ -1,6 +0,0 @@ -@nowindows -Feature: Compile a complicated Twitter bootstrap app - - Scenario: User drops Twitter Bootstrap source into an app - - Given a successfully built app at "twitter-bootstrap-app" diff --git a/middleman-core/fixtures/twitter-bootstrap-app/config.rb b/middleman-core/fixtures/twitter-bootstrap-app/config.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore deleted file mode 100755 index 2b1ffbfe..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ -# Numerous always-ignore extensions -*.diff -*.err -*.orig -*.log -*.rej -*.swo -*.swp -*.zip -*.vi -*~ -*.sass-cache - -# OS or Editor folders -.DS_Store -._* -Thumbs.db -.cache -.project -.settings -.tmproj -*.esproj -nbproject -*.sublime-project -*.sublime-workspace - -# Komodo -*.komodoproject -.komodotools - -# Folders to ignore -.hg -.svn -.CVS -.idea -node_modules diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml deleted file mode 100755 index b8e1f172..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: node_js -node_js: - - 0.6 \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE deleted file mode 100755 index 2bb9ad24..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE +++ /dev/null @@ -1,176 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md deleted file mode 100755 index f69925ea..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md +++ /dev/null @@ -1,137 +0,0 @@ -[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) -================= - -Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter. - -To get started, checkout http://twitter.github.com/bootstrap! - - - -Quick start ------------ - -Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master). - - - -Versioning ----------- - -For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. - -Releases will be numbered with the follow format: - -`..` - -And constructed with the following guidelines: - -* Breaking backward compatibility bumps the major (and resets the minor and patch) -* New additions without breaking backward compatibility bumps the minor (and resets the patch) -* Bug fixes and misc changes bumps the patch - -For more information on SemVer, please visit http://semver.org/. - - - -Bug tracker ------------ - -Have a bug? Please create an issue here on GitHub! Also, when filing please make sure you're familiar with [necolas's guidelines](https://github.com/necolas/issue-guidelines). thanks! <3 - -https://github.com/twitter/bootstrap/issues - - - -Twitter account ---------------- - -Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap). - - - -Blog ----- - -Read more detailed announcements, discussions, and more on [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com). - - - -Mailing list ------------- - -Have a question? Ask on our mailing list! - -twitter-bootstrap@googlegroups.com - -http://groups.google.com/group/twitter-bootstrap - - - -IRC ---- - -Server: irc.freenode.net - -Channel: ##twitter-bootstrap (the double ## is not a typo) - - - -Developers ----------- - -We have included a makefile with convenience methods for working with the Bootstrap library. - -+ **dependencies** -Our makefile depends on you having recess, uglify.js, and jshint installed. To install, just run the following command in npm: - -``` -$ npm install recess uglify-js jshint -g -``` - -+ **build** - `make` -Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. Read more in our docs » - -+ **test** - `make test` -Runs jshint and qunit tests headlessly in phantom js (used for ci). Depends on having phatomjs installed. - -+ **watch** - `make watch` -This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem. - - -Contributing ------------- - -Please make all pull requests against wip-* branches. Also, if your unit test contains javascript patches or features - you must include relevant unit tests. Thanks! - - -Authors -------- - -**Mark Otto** - -+ http://twitter.com/mdo -+ http://github.com/markdotto - -**Jacob Thornton** - -+ http://twitter.com/fat -+ http://github.com/fat - - - -Copyright and license ---------------------- - -Copyright 2012 Twitter, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this work except in compliance with the License. -You may obtain a copy of the License in the LICENSE file, or at: - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png deleted file mode 100755 index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8777 zcmeAS@N?(olHy`uVBq!ia0y~yV7$t}z%ZYKnSp^}#^ue`3=B*+1AIbU|NsBb00uvQ z{)Djq|NsB@@88_qTm}Y)|1bbn0^)x7@ZsOTf8V}+V_;zT^XCs-{Qv*|w{G2HU|=|O z=+KuhUm*IveEIVI`*(=33=9mLH*fy?_b&qj!=p!!Hf-1cQS7`3sLjy*RO{UA5NMy=^q#zJa}-%j2R^*B@Z7yyl~+H z0|Ue7&!2bi-o0?)!iI*1zkmN;xpE~bDe3?J|5vYG{qf_+ojZ4a{rdI$_wSc4U;h66 z`!5(=ym;}`r%!+W{Q2?Y$LrUx|NQy0ZQHhE$BsRH`t;qqcVEAL{rmTCYHDhFdisYC zAGU4V_Ta&T@87@w`t|GO%a>1|KK=FU*N-1RPM<#g|NsA%mX?nnKUP#!eE4v(m)^X2^Xu2Id-v`=di3bovuB?_f1W*i_KFoNmM&d-=gysX@813Y|NrC1 zk0(!_{P5ueBuwtzyLar^u|0eCyng-q+O=yJE?ju@=+V!gKfiqW^61f{H*em2{rYvw zmMxH&`u+R&pFe+o{rdIn*)s+Ph9^&+{Q2|e`}gk~Hf)$VbLQW_f8V@$^XJc>g9i`3 zeEAX*O&`GE>({RzKYsl8@86FfKmPsu*Votg=+UF!zkmPy`SZ@5JOBUx|Mcn8uV26B z&!7MH?c49)zkmDo?Zt~1pFe;8_3PJHFj%&1+3C}#A%SrD^5xgBU;p~`>-Fo`t5&W0 z{Q2|Sw{I6MT6F&W`CGScUAuN|(V|7KU%!TUBs4Vi?Af#b|Np;s?b_qVj~_mK`0CZG zKY#xG|NsBnw{O3H|Ni{>^OrAQ&YU>|36P&Ze}4V?72+gF61sWw=AS=*Abx-O^5y>h z`+xub{p!`LmoHyJ($bG2e^79IDhcunW{_gIa-NC*qq4yJ`SDz=`YS&i6MZDXyk98wpXmj%r(Jg_rStV`rx?qDc)Fw=DrzNLh zcy_R?2ypgQG}F*Z_g0GxT;}c)pu_jHF=0|QV_3ivUCCD!2Q@S9nzyGK#(wFzFCD&r zv&!^#Ly6|3BUQn7rY4K~-#i=Jf1pcrTBw+HRHlue@^v0fP7AYwum_)}SY`Ao|1^kd zkqErP=jGS7&sD@Fq~~7U*Y-FD202|%7srr_xHog#>y?ksT(&<+or%|k$x%SXF@u3^ zvJ9^#-{FEb<5@ORz7yOmBP}BiZqm73bS`u5wQslf-Mw8iyLiv-63gdviqHMLxBo%J zU4`sj`?AVDJFLx#-#^Lo|2(a_j4#c63+zN*?pCk7qtx)|!Uchey?1Z4b$WA~nOuvU zqor5&!eP@6`FDMc$$GWc?eFK8_^C3jaPef6ST*C+1x^k{fhgH+7y3-ecv^uF77M3NgG{tM0GSLoa$#dAjs>)+Ou6^nO&~r&Q*sW|H_m3@y)CtcYe?} zf3EUe0f!BD&xGAowm+%v+^MWh8jp`0 zqDn=2RSWlY_Z_VJ`{s{E(ucr1p=z)8%1+muX8QG2g!0to3qFawoaySj>e-zjo3mO4 z(Gm^Os(LH^Po7ykV<}U%`DAH^9MAj>f0oYsIbJ2U4ZXVIgV$FuIQI*}5} zvGKS4xy33TTi@-FTp7M`U%g7`Z}nFBV@EyixXKu7U0u7YVe8gV_L$mNYyZ}_XHN<4q6*Zk9D{5}NO3q#;^SpPnlECA6Pd2(dpYm6Bb#r{UcK5m| zr}P3pT{^0H)j??W-^s`JHh6F>Ixzce($->@9anPZG4_RQS-IWi|ChBv3@k^OjUsXv zD<`t@-hH*pI4AP(xvDc+JNxEdc|2*Bvb5qo2~LxLEM8lVSX|U#==qeqRi3eIX6HV> zlGwE(iQ8v{%oIM(_}~ZUrSJU=F08!gS|99r7-%1-+kKTko;^;*iZSN@n|ooL3shE5 z^{aVft5MbwrC!)?wlnI(^|towf1FIi-kf=-SlPB^kMWcH-gEvx-nc*M0Sg0LnMuz_ zxrz_3Uo94V6cj6+m^1yYyyBIAp11Sc13Dd!mMnb|##}jN*E_)nKJWkET*aT8v-Q?~ z&lRCbHPKodwz1`8r>bl13r~5+Ds|v)%7e`xB;LDhzdW}#CVX~teE9vjTYhd^Qgp%Z zmi^2hx6AIWmOXfTQ-tdBK7-QsZ~3K}S}lLP!X&mg99!0&q}o>d<*|52rm5%B$Q-}< zuDa6Y;up?0{Z5MyH_rXX>iP6R>yf{cTc_*xQ{$2bC|z+ zE1A2*M(N0xJ3Z}5-61t^j;SxZsSNulKHR8 zC3>cMg)6_DFy2&T@W*zhMaYCh?DhLsWv=yF8T0ytS*aV>luh+PJB*FuzDvFRD5!pP zRoCYOZ}~P>bUgB0&H4V4TZ@H%wW`J1dD&jGF8c;Ip4cLs^2o_G<=Mp-3*Lv%ZE}u0 z{N3M5-@nICf4XP4z^i!My$uy^u2U{5N-3PRUHUB3D*s@e^rVH`6)OMPZ=0pQ9fYFK zPDVm&r@h#%w=-1UZllWgfN95;btS8|#V)wb8k4+oi`B~-&c8aT>x1V+=}gR@wLhZh z?UQq-BX%ji4th34?D#P;{!b1Mqkfb%DX_O2TzPKCV1H2S`8wV!HXr_7m1mHv5%|$4 zvU-o7**}9{JFTl_*RzQv&f`zn{K`mz^~%dKZI>sX<4PVp_;oS5kU^1!Qx=b^q zHb?$FtE;%pEOGL@E+?ye)sJFcOKvlJZrn0GR6ej~ap*Dc75*#>5*Dqqjp6>gMQH6O zD~{I&`!*b?;1+A$7?Ak6^Gs=n9FxPG-HOk5d$&De<`W1wpK`S#qukK$x=Pl$-p!NC z#3y`U#nvR&c3mN{?r6ot1}1>Y`GTfO|dzB`*>T{2Z!a^3Qqmtl$q^Qy5N<@ zyLn80JEiQ~<}Wa?Z#>*)6}$J`nkQ{nM9!D2aZ;TeS~K(4&rJ*cie)77i~RoYOxyO0 zljVob?f?N!Mn$2uVk~7!T#;+c_GI|Hk6+8+Ai&_zn)GsevEce-=51>h7p64)*$En{0pzIsPG5(e6{TDd-o~n)W%sCvy}VhFRq){eDKnFX8Zh2-)rS2PHg^A zYhLUakZa``w$nCm>i6|rieLU+t=>4h`t03|J?C5>ELyeLf^kVP!wZ2@hK95GKIRCn2~*%@rNHfKJxrwzb*J+PZPhfo(tP*rw)++tJ!R-Icd9%)M|6KUD@@Lj>c8jpN zomZb}y}ri$HbV99W|r9w#j9iPWfl2tWmkDn^Uapulyfo9j zeuq~Z$H~g(ul~96*Phr{shhk`y*jug^McciIVNT%!fg$4B~0(@d)rHIZu%E`t;fpU zM16n%CnKZCR|V%@cbq9*=B_TGA5eMI#D3ww7kaW+p9MR$1jO^(O%%HLT2gwJCl9A# ziSfC~-<_VET>A`;!ahGipyJif*bc|O+pKuq%$!|g)$w%h^-Gp^cU3lTaA=#tBWq$8 zcq^nuITjiFeihVaSPA7wCd|K2<+ zN2=3#ZS7jk%a3fhIuviYF8K1{xa;14=TV~JQ8V}UglP-@b2!u{a6X9Fl&#t!zf@xS z$qDss>?WIuP`D zr;EMk4k+AOEjuIo?*7mR5iRSPb9SXNZfAOP^BZiZ&o|3wi!tuZ$CGM;4L?_kG z=DD@}uXyJC*ijw%b)oo7)uQ8Cm$FP9vrU(k3as9&bVg^pRo%-=J03>vyTeh(l`-@C zZ{{Pxj&tkwuQd~ud&9G5LR#s;oU83=Tf3@HYz-`N4Dq-S)sZcGU{%+#wfYS48+Kd` zp8sx7-oxKJxi*%HsmCV$jIGH{SnbsM@kryr^9L5ndFlA8ygisw8oND8pm-hc0XLuf zRx6ME{Pk;g;@2PD2fB~Xyvldzj8urp`TPfUNtF`zkW;Dil4D9 zhuQ>|{c2s6cJ=MHI+nz|Ys>ZLt=zFc?nKJfTbsTmi^|`)^^0M~)pi}lBVrc}SN_P9 zQJW@Rkr^N6?T}fp`fRf$^ZE<-!ZKA8t+}sCtoLEG?=Tju`Gf!NqnQmq9!`7gE_lcC-tMl7e2t3#F zlAkP9s5&)z?XjtfePi0z8?iQ7MYd9$il-)@)Y zW8X97Pp;i{Ue5jEmASn4x2)4=xUFidUf6Ybspg5BpPpOw^aq}{*&ne`Z}n64FN@ow zr#k!$5Sst$0^^ag!}=%pux?n`@o9&hzKG=q-y7TS&IrA3S9x+%#Bqn(&Ad~1UcYu* zw55dcPI_F^ZK*Quw%2=Oj+bJPsXT7V#_awC855DPkJBz6}A3r=gy~QeA3shvmPiZ?|Hp^{-I?8 zNl#jG?;AeKsQFTJl3gsewr;0^)QknJQbmHcP56KKZoQUi(*`25Z)5zq)NFdT7?_@R{9m4}WkT``tZr{mYt# zPW$f7eW<4t;u?|CufW^LbH!rH5yj+kwyj#O8q#d%yfjZeJ*jw3I67QuZI)EL=#|3{ zFDy!ph`)Y;HNwey$#?1X`5W5&4eIRISOx5Le$1_*x9RP+jndKE1^XsW{G=FOxLEbR z>=mt?)WZiNHC<=g#C3Q-joKM9)y&|UEVJH+uZ_y9xBhU9`MczxDWi2z?y>rk?36>& z`W904%h@$e>zej2SQBS(OF{XmbGB6av}J7Dq*BkGsnqP#CwgV~X# zt85xH?2lb%S3CLjYia#E$Cig-^Cx}HHHga)nyWXxMD9#Qkk*&$iCOTwO9*TXs0eyPEuE{`CV&tj91uyZ{&jYV>6yRgup3LWGI?B<;(ZmwDKV|@%oKjhE@_>}$*k!CtFLXa^5dBk zZ5k|k_}lN!p!T_ni-owUPmqsfJ(J2yQpyO>a8 zohG+NW8D_F_ck>YYekdZ}DoFDK0-Jxad9a zJ^3`v$zLrs@2-00iKjuT{cJPs-70s46$jU;lyhDW)@XOHKRFo&p(k2{dxON^>c@? zr|tR;UWRYnv>6)&*6cTb($E?0AHLc@`q@uji61*Bc2@RoJ{}smx|dmg)zpr!iuO)l zPPoXb&SiILoEe_A$4*z&G1IJKah2xotLH))xH*IN{#>C3Lzn>b@R-AuBQ)Eu!d6WB9X)-<0tHZS$r*5>{xnniYoc{s6U+kW6)yPl1UFh@p zqPw_7f7zoQk6xWv+%h9)OV)&yTaBXLiU}SoxpQCpsc28w(kqT@%+hUI^!uI(1o8?r zd2p)cQqQlY)ZX|R*w1=0x7W^ms~k)@_C)qxzB;Yf z^qlib-4F%Ny|g4G?wOS{(iL1*@ZWu{hCLr{yx2r zR?nwb3HvQQVOfx#&#UIgGS_+8_2!;??R(_xwuN8*adkudq>mn13qEQtiAXhbYhhSm zUN9+lpYDqU^=rv(yYGnVUFBcheaJD&R-||HzqpgB7T*uKUAMNGd;0egFT-lt&yTyb zEz}!Mu2OHg)*j=yRcpW8r62v#o4C6_2C0NT?vKb!&n1?3J+pF>*r_07rM^5$o3VaV znfS}v69;P+8pz9Bd@WPhw)!xiVPC+ibIlL68kUqYPwfp^eb!vzvzu|>M$5gIUOU#R zG~Ruhwp;sMe(#At?9Zc*zS!%z(NyHy_fs4G-P>CssG)XNev0tjkC_Zxcc0qBA9;_t z|D#p%{(u54w!Ym=Npt2L+QIJCv1ww~)G%{~oHbb`#ePiL%jT3#KmERoeRuS(v`XUx zJ?XL1ufBh8`ucre>6|%-L?67|w2^=3iD&80y?*q#wi!rkhGiaY+PdiQ&KC!vKHdP^2Z%AYrNjvA-ol_`6F zbN=0%ubO^#BYXV(PCrS3XS`g?W=}DFr5Ao(>djYUP`&&A4)urk|~;=?{)u84M1h z?mmC~|E8YY%6x6?^3}1C?Kc;?XTjC&pfcLFI zR0;PV{kr{abN5Vn8PcwN%-G@O?q;TXT+2LeCiik zvmvTGMD9rG@_pYJ0`lXIH=BQceEU!N2k}m)bwN&#!yDss7o=nzWA2(N(R$-=`<6dW zg7XWZe{@qn_J5OWU z`Kt5ciow^-^SQ3SXKA?ZnYym;-OO@^ug0-go+sUz{zv%9af_X%HODfy&pp53*{h)2 z47a?pPi>5v800Ue{YuVaaj4o>tJtYgotddYos-tE$t|++oVliM1G8w&#gwV*=j$|Q zHGX})Y<^>PyTCE)!{+Z>Lm6J&?KvN@qu!~bb9utti$5mzN53dFt&_iHTlJ^#)z+;? zH+0|InaXhb`JSX{$)>-~oXo%W<#si{^~HDJUNzib`NP3_**m5ud0HWj+()(=tz=QT zv!bud;GX*CNL_obsacbwpGGZyowfDAug1%3ca{Br_B^v)_eCGOR*_5ft6U#l9iN4^ zZ;n)o9+;oIQ0lR4g?#t6U&(S-8-FbiPyKr8)yuL=8&CbtKin^Jw55mZz%Hc}x05%n z{j-RE9#VUGtDE$B-JhPP?}dHn%n6GQI5>Utp3RyrVcgDZiyGICzcC)xKEMMXC+RwRD<{=q%|%C&QLof>~Wd!6>}x;Nc?`evEcm!cd* zdN!HfO^kc8E5?0B)y(z9tMq?Q}o#Bl`#YS&Q`w)3}aanj!wV_wWBaO}(qVOFqrH`GFz- zF%PeZ;L-ze?7oe;d=FDLM>U`NocUU%c=f9MY5DhFX;tqwdGqFCs!!4qpPQSNn0i^1 z#BwXF79?2Zp3I)d6fJ#2B0V*vYVAG zuk_Hftb5tsP@fx$8H;A#d^LOjyN@f^-z|QgJ?XQIV{(yS)0clw_RhN4($Lr%=4$fI z;8*30h&z`g>YhrORGr!p_IUFK)$Jd3UhcgATQg1c$KeC4g(ZgzW|S_gd(11qeeXx_ z%D#(Qeu3JY*TwQCmj1t#`~SuCb;o|LuBh57B6{ic^sxEIR^Rg6T9zmKCH()b z`2W&{K69gP9RKuENicqT#JZ~X!&2XmaWhyPk991V-r3x7*1m0<^I7q3hQ5jOOi!3} zY&ZVcCtX#pai`imb(7YKO$oO*tWk8l5;)oFqj#uC-q)!d`w#u+s1kV{`^&JhEv)6o zZ1=}DSxAT)`}T~m_m*K2%jLQLy}N&T&Ah6^6Bj5LMt=vn zA!^R)tM6I_E?BNgT~su?@Uz#B%{%;D?(6?tvon4Bzlde8wJh_ee|YO>w%XK1eLLSUV(RkvN}+o{UDytsvr+b&boCwI z`yi+9S8Cb3znuSnRDW*o=lV?9&aTR~pZmX_=2Z+6i4$D(@$~-GOF?YzuPcyW26?3eg|uj`%X^6)O|uG#yD zW47hQiPyEJ&N?UGE^|X9{Mg4Gj;ok7uZM2)N`ED3Ve>btVau$FIQy3W`;0b~Zd)7q z_wDAdFSO$9f8V~v{*K+7$?|;ihoE5T= z(*HPX&pEU6`rNnnNLoKvcU$k{7biK_LcU%$_O?`GYGTUkC?0M@^>ud`Hb_pGC;vUJ zjpf##nNq*^wEJw9lbcxVl=4Sah~u)h@1pGqcOM6Pf9tilzGTz))o*rbHLqgQOwXAh zpxkGybVOiM`o*pp!Q7I^AB%MNtt>1_uBd39RpVhdZOySCwjU&VtTrEIc`p3-T<)o? zt54V5|NrJ{=>1OzKbI{od{f!mU%c|pqcAUoUeKM{ifV^*=KY1_v+J!R7_L|wYNld?{Z*HHL c=%yz+Wku{p?}hJ}FfdWj%4dKI|^3?N`*Ur~^l zoSj;tkd&I9nP;o?e)oPQh0GLNrEpVU1K$GY)Qn7zs-o23D!-8As_bOT6eW8*1)B=1 zirj+S)RIJnirk#MVyg;UC9t_xdBs*BVSOb9u#%E&TP292B76fBob!uP6-@OEbdwFt z3>C~w^bAc5EKMwR6pRcE4fG9-^bO2)4GpYJ&8-X!6`(-LPQj)qCCw_x#SLm#QA(Pv zQbtKhft9{~d3m{Bxv^e;QM$gNrKP35fswwEk#12+nr?ArUP)qwZeFo6%mkOz;^d;t zf|AVqJOz-6iAnjTCALaRP-81{3w(Xy2Imz+11dQ`SHB{$K;KZ$KtDGZx;Uh=AXPsowK%`DC^VEZPKJhtu7(zdmX1zlE@qBy zPL38PhHfyuo_WP3iFwJXAWK1dGZA`?@ana4E=o--$uA1Y&(DD+m4J-=lKkR~`~n5% zU{eL(#N^C85FZqe;7GD^NiE7OOHFYr%Fk5*M}$=-Hv65;-3$%QO$^M949qMH4J|C3 z&74du9i5yk3@uHa9hIPZQ;-4-NaI$N5XnkwnrDcGbW zTa{#%f%jiFxU^N)@^(scDI&IVDPV={c1J8JWrXdByR?xrsSB z@hOQ#**5y1#F&$5rvPC=jL}Cj9IOB-^}!bao1e+?<-1Vyjf7WN&9G zk$s7Q!Em9ci(^Q|t+%!LIWex=mWOZJ5_hty&qbvsUZ!0ApL6+}f9}?Dk4?56d~)9A zvEk`sC)wtd&N#BU$IQ9u1cOrJ0fl3ip1Ja!+GD__WGnfx;k(Ym?Oej|e;;6(#F}QD ze~HszK|-$($AiCL-t73g@6GgE#d)P)_uk#N{Z+_vYeVn3tB>UVE`NP(ZFODf@^hts zSFJiV!!X(V+#0Lwb4lL}pZ_tK{5$aBL`5-+6yF3+u9)?vsj-dS{*imVS2-@zYHgop znY{h6UiY@JTmdmV6=o%P_~q;2x%hJoh0R7H6ngh$qH`zf4-Hb! zHGMDr(mt@yvtGgKhsVBmg3GGTtkFL?ulktf5C4?BgZyESYo_g<*en{qvf`9z*L;t| zM-8%fy!g+urbMEKU9h8f(}pR2yZ$ZiZqE~ab-`Gf z!ipYyu3xwK;}UbL4;423#dfL@4+@#)?(^I9jkStj>gTTXwyx#Ym6zUGzOOuC`NRK; zs(9VB$Kv%%AC|5>b#gk3)-T(Qt5zL(?kRn-U}Eya%G!0`N6FlCBj0^q zHB z-yvVM`Y2!5nuTiLI{ngJprg`wx6}?tMS&ZN!zCWhs+y76pE7yb@b~y#S{?7Xc@^vA#`#b*6mc2H!di&)M@9O3ntrA-{HD&RtJhmN|imxsU z=Cqy>dvb+Ksaw2Z`c&4IL-je21pl~SzhCulNvg>h21O_xmDQ8P`hjzyG?f4BN>zsJYQYuBy1|Le6s=NgORzbile?BBNk>i07)A4I)$#FgiDCb;d0 zOScI%RNwZ%=khP(jjW~S0b;Ax&FkMiC%Iyi{pOcx9l0ye!KyI#p>n(uiks%dqDor4~6G@O6Ht&zj|oPrSi9XwSw{rX1QItWBl$x#DeVhS2th% z?6;G9y`g-M{pE>oXWcE~`&Y5ZxlaC9$kXu3wC4|Xw}`zuv(2gVoPGF}RiF8Eug9B) zOwC#I?Mm9OWYy_W%(WT3TiM>NKD>C9uKc~<`M!T{Zz-|SWv(f{x7ulT%c;LEr=Qx3 z*z_DWxYfwM^>q9pOZ`%@|Lbk?B}+Y;XNhd9TlFeT^1`ZJr)F%N{lxy*{T@lvT`R%&$C4of}$HBK|pAe8`sF8#Z-i zznt7OPO;MwyrE0%iVKcSS?fDdZ90F2$mJ!r@vC-ZytDlHI3cx7aK%qai)H(=nY(tg zWa53Ps*st*cS7ZZlVR)@Iq89E)G9S@+Ly+CA%w){XJu|7ToM zDT%ec`|HJ{#ryT*rYgnv#AVe6ge~FySe)plEB{eDV#>vN`njpSq1Rs>+PX@#aOU10 za@LP#e6Vxf?T*LwZUTp=UcbGx>9j`=beMIYBF~UTu45>BE`eD1_S#v_Y6)5GdAFiEbY;=kl?CeGqe44% zZqJFHqVPS_FVxO<4_`d<)Q%?8C2Q&mtZIDi%%3P)%70vQaq6UV_j=t!CtoYqDE4o> z|1Ii8xxS6U>#n)e1Y5R>Tw=5f`8vrxaN^a2fkAwI=T@zl=ap_+(mVa1!>h(QF6l33 zE&6FREm+z0#^ZJT>nHB9li|1StI0e+d;gYKB0v7mOtJs9^tZbGFV&8O+7;{kMVJpY zull93U$A19<gR=`X!Q-=vD0Z>?E!#nW;}Y1rh-sM953 zYiCTbX-wD<*5X;z`PfNOuQIs%SHw00QT1(W>}2>K2TqS&t{1aJ=kQ}bE9KdD?ImyO z+}?TYuHA3mQTyi zA9|*AcGaifdKE9PecQi&vctsJcV6|bS{iV5)$8*zH|nciH~x)rdw-)WbJFTtZ*P^g zEu0l5uic=m)wkv!V?pBD>oU>xVePB3`*N+)j~XydVLfwa`rXP0PkIAFQ+}QD4UL@} zdS?Eod19{*PpwJ}`4weX9&zx;GB@ohiaS^Eua@;}j>%ZN3hKC@xh==u?v@PSIx*PJ zW36uR^!In?@xKq>chmdwt^a8~s{|Gwxmn~Ps2hIzh3M%XOTIVeT@MW>J!3R@()&8n z_D{U?LFTXP-rrXI{?DoA$?J{tx9;KF7v)_UseEhO5{4ZXiotcOUcFos<*fAQ?N4F( z;!lbn1lF3_NV=}%=P7sG`ffFMe*T&ThpgX=&;8OIQhQf(|ExvMtJg=Lo;oYOqM>j7 zmldmwi{(7414~^#PHSTIe{;lU&k5<(>y$n$H#=SWzWZY^zsP)rcy7 z6k5D$-np#XvlpG&{jcNx=f8F-^=<(%(-%0sjgS8x%K!fDu1!**+w3BgYrd~)UjHX% zYTk-{duFWq5qz|A>kh%i$4YZ-LO)+RxLImJx$VE#;?=%a55KOA%BnR`ygEPd@xxU2toJ{b6_?Dt zeY8I8MSOkwdF$sB-fvsr9{T;t;vb(c8CdSUyFOjV`q|>Q`49edDyCT%CGWK^Q_I}< z?dAKuo>wDFH5af|&R=!O>1y!Bt84r1;=-?gXM1(Ib=6yzySFCv=3l?K^Xdgvzsd!{ zpFV9p`Cyk_>H6!c&QF}~K1(f_Fm=Y<7t28XIeb+YO0Bl$KurCVxz~YLZsi%H2imXCo&Hr-#==V8 z5u1N)Tpx8T^QlOy;0xcrCd2i+cATj< zxpq)YzfswZrPjPoY-Zjj0znI}MzycHckj)4@qOv8AKR2HS1JAc64KE9v1n7+ zv{fD^B40}SXCa>o<-@MPxk(N zBmCiKzg=7#%;VgyoeH{oZSLP?3K2irgaY2m&X<`ZbH{q#nbZ2G-}KdLlz#OVkjPa& z)A}>w?uiX2LlxHwA9;MG$!W)_pwRHcPUa3@x%~2T8O}WacQmSH%C9G$b_*}t#Z*Us ztC^U5c)e0!q40zQdqUG6M|$+HsjH~p6gF?w$EJVAeidJAjoGcjHcfrw&>kQV*0TS) z+1})@$F3{y`sv!W`|&@m85&u?W^9uT`m%prfrjKkFv^Y7lCbn4fG>wDkUhCN-m z>b`e*?7bUZ@#fpgV%1n~?k#-L7m%Pki{JOk5{Aw-Z4XasaPM(Yy7W=ycEOix!CRMv zr_M@$!Lnj1Z^Oib!;^KM@HJ$9f91v8x_~9Vs+!}`?LQOS9+iGbGPv+1!KAz`JA8i9 zr^bS5CGt}Gd#1*H-}XInY2eoMXJ5ijb%aZWE}o!nxA*IpYaiBWEVSnMYkQ*b+sC;l z-Wcwg?$yPv_)zqBhtrZ9={vs1K3$R3d+XqJjn)ghe#YE2E@8TIiv7Thz;gBjTdH*> zSZ9B|CH(Vo|Mn!_@My(HyC2tAUc2vWCmOi-!#@|@-c{TD>UwWHaFWdtTfXgT|GrLE zJyt!_iQo8nH^-jmR=-`s_wB;Z>Yymigx+m2{+o8!`!5tKljQ#z*0;)c=k9C#4cZeK zQI2v##LZkH^x*!849{qEPkLft*k7&izbg5``!_pxK3P9)jjhevEkYd=71XBvusr{7s}TEa zXKPQMTOKDr=7~>U>gdH~F$1(#wZ-PCn1CM*U>IvUDn=ScvXYyQM3nrZ=uCd#1T0Sm${2v78li z6hj}11!@GWUE`kX`19-2oLzH-3bpo!ZVY<4ZGm3wlwQ#X{USvfUbBC*C*P}>_oYC7 zhKFYQft^=A{Ic8rLnf-$E6`L=m3hC*)P}3|YzaQAZD(J#Hze4h0F}ybu1Tz!#;wy? z9_HO((Q+32aec`Z3zw7c)M9F<`yTk;a6UlAXO5Bu?4dvSebr<9tO_U^5z8`pl>_-gZ)4+Z=8 zdLL8%e9!6g?4uR?RQk%qSYKzIH}UN`o>^M;oHzCKJMpjw@69cy?v{*SLH%=-j2l#}h3D zk9a@HoDi`)a@B$EH!@$u-fcRkK2!JDXVt8Yq+a6vbwe$A;JC)7E?hXNz)h zxW-+(sp(ox0(bdi;avAk>wY@8z1BE>%_{rjBCew7y=yH~JS17n>sdc7czGviVPE5I zDLu0oo9$xLriN;N(7eWwXvvYVbwTts&C~5m>vo9rO)mJWS?RoZLa5(-C6|eg&%3N* zzIpL`TYK~OU(Yyfy6ebX#yMMOFI}Z{YQv$_$vsYC`ZlS1wPauCo!6MShDkqMx46f9 z>CY+eM6Q)qet-L^HA6$y@C(=fo>d%zYRkVq)IHkov2NM!U*7CHtK#m7SUlRe;J4f^ zJ^nk(jx9cvCHy#9e#cW!)w)A`wYiHl_s3ehc5dvw7*}BPt3>jnNfB85%rRxtacxqST@u+_aA&&oGrTeh6~5n zh~inGd@b1qI39Zf@bx95Gis zVW->t-Gz%zbtrzwR`<_uHL$!l^R6}D!>p|`|IhrLJ3%B{I4Wq;huXiI`a5|m59qL{ ztPJVhb;qSP?6Ie9jp5WoUWzkM1#kT@?{Bg~zD;cVgeF~;RaU>1ZppjcH#H60mEQd> zeEN#e(BEYRu3N9oS#|4U_1}%Q^Ux-HCl@G)cEzfVg% z>z+>&SbcE)aAzo7vgbqH&)1T&iypDL9-i!H?0jkI zF?s7>I%mw!i`g%_n4bEu^!I%J^~Fi5VGphhF!aV zS-h1`v(nE#bo9G)#hm@~77B~Lz1vdpWWrruFWK$;(vR^?OMbV{TP<|kznm#+f92k1 zZJhT0Ns}W}npR>^==oKF(`B4_P3`8hFu6KO$*EkJb@gfSrblscJ9lP9$$q=>IN#Lu z>kbKTYj1IVmhgwAVeGEQ)?NyEy3bSEZ_kG-5v_e!gI%tuuVxQSO#892!gjH;{jpX3 zIfo0^SAVPVYCW3eR?vRca{2p75B>9AoN4>qbaZayMEh@?$L1g5UF33q+o5|pS@$Pz z=Zl{qvOra+$kEL4YlY#ovT1U1>o>lX@!^%4cIdR!!*yGBoagpmC@&k`wP=BJ*xc!+ ztlzU)3);57%@19lZllM?nE3t8#<#CN2gsGYuc%+9eA{;SOBt0yt0&Jl%nF|U@jUO2 z)y;>mcwIcr|K|DS{Dpg}6YQhwUVq5j6l7fYQz3d~)tlC(b5sMqW!I_R3)9b=?wh@5 z&h?*OhcC;-?pPh_-u+u<%4bhsd)b`KW6`nCQ++S~eYfxKxn{E|N-sDW6Q|E{duJe# zc2)Dh_TZ4J#N=fGeo@v-$|SbQoGR6RueX0|#qymiCGC$#UR`xOE}|>U$o=ECW%l`P%1W5c|_#OXR+qY%q5MdCgT;*u=qis$uf6Jh$z^v6fr#4`+dDAIOl`)SD%x zRr~WRe#>ln^W@T+`lGcP45nQ#w=6rF=d||HuJBDs*Ny}&&GcJtelEjm?|t(<7Tu>i zF5Wht`S!%CE6am^%ua3eR!FSuj1qs(oE=kRdGFs> zQokWpur*_2SdZ88?It$ySK9uEFZ+`ccV*3;r^SWOM9s>M&WYN7|DtW$N@45Y##4Sx z>AG+2cR6&Me5Kp%RFf5nzAjUDxtn`k)!>?!^>%i{k;U&J6AuKc*6OT^`@ z-M>Kn< z-%5L~e)DtgTV=cbc(XO8i2E*XeX?s^-q)z=fc-_Hi`$nsRj8No`2~MS6mW2`;o5xP zYSp^jF8v4p#3Jmj+3(x1?c_h!S6{5Ahra$|Rq~ z?EC~p#m1#(=4M8$-p@cE=}uHQOsKSGn`)t~CpHzBByNrg3U! z+yCVD?JHg>m+1Yt#uc)sz$Hg<=ekX%8@XZv?r&UiWdqad=W~}|E1GL0_IihvM)EmU z$0%F<$9^(zqw7^W+~XhdFRHWFSiM2pJv6L&Qg!E?E$d?I_XU`4Q*e`zo+h37r?g6T zkHwWAE!sL+HZv8b^nZ%}E2;7$!agXvwY{*lbzN!xrdNx4g6a#|vtpA(GCd#lOpv`* zoYBw9H+jOjpdIfFSIf>hW}BUG)xM^!?Y~=J`|CFwnRaY-dhDrW=N?iq;j57i+djqc z=SwENElOT-g(Jpm$F5unLA|M$uNFR@=n^P$y<+NDXkg zxrvS2xfXHM?|G~cusAi#RAFKDnfH_Lm%E3B$sdWXj=JF`c9zpq=mTG1_R}B7RtM_d z)YD(nB^8r*`6_FfM%sbab$a(-tuo)U!p_$C__oWNcC4A{6f#lu9Iu_C>D*G63tzS@ z*|R?3|Dxyqi%zoqe`>Xt@7~@0CqB-Nbl>^)PLzyl=u`GLK1uUdc-hDatlGFCDE-F4 z-LsF%pZ{eiy&?Tj?KIm>i(XCkxzhYvF4|BgurTH5dCtsQ0ejJ72j;GRDez%&-l9_< zk8iW?+Oae!)R%W|VNuZqU76c6=gLfB+xR}=SW<;hveZIvp0y#-eL8uXk&jLVPyIUg z#>*`M-*r?3c5Ywj_detk!fLgfz}mbq8vDDX1i@ocV1 z@e1z`T+0y7q~wB`rN0}C%xgrOZHb^#Fj^TCINmZI3C9u_t~^QS>-GZH4*O`G#>;|YexVT!AMDcF^$?^5VF$YOJi)!bS%K5*IF6XPb3> z-mN!5dLmYP=Z4I^_g*q?&e5wcH9Zzq-&q-o{83C`2qf*mDxY#RIKL1-&xVA*{_LEARJ^O$A{VIF&OoMOr z{ENKys%9luQjQxu=kwTK+$7ubSeAqA7nXR=cqq zw1zbOuP*)Y_W$>HtGC#DZFf_?U{#Xot$pCA*;SLRTp^~DR9~KMx^-mA_u%Gt(<^0) z|D}GFIe7T@?)Qtf+IH@e4LUz3c)Qoj3dfL`^|j3@SFaxJ-4J{J@hf)`g(FkzcF*fy zA!~H4U~A{c*Ev?#zx!vcTE}?vOez1(^X_cZ>j@Y76t|KsrQ!w!X4SG1qK_$@8;>fQa*%Vi`qwu|mals?@p zBm9Bi{#Hpyn|N{!)0Ohy#tV*pH`;02arf06a-BAH@=(+qzj}zxkyuM$a_;D}a-bJ_n{quL&Z~Jz2%Z?-5xs`E= z*-!Qh@7nQ^^^e}Z1(%MNe(8Q!`C?wXOsw+Fr8^g7q?f(Xc>T)eipo^k$7W(Dzd8!P zzSryZ{1ESZ*TgwukM6~Ab3AJLzT(IAu-z3#p$|_rLsl^!u(Ea2X8+UF6Vds(LHpz~IR~a&NwVK>Wx29z z{SVuYn$y)o z_gBAG?wF-AQS_-t#Tz!g3RRt{XA%|H1#yIAl&6cNm{xr_dGz})7pLuiQ@i^5|1oXS z^D$?3SgQ4Y9+#+NaY|`P33ETYT=?rpVWEi+y4iz5Yo_&ka#l#VZ)3gRt`f5D&*9g9 zKI+b2Gxvz}>zRVe@pFE9x_$RM(DN-mqO?BkYX0||hXOZvx}4or@44w7r+v-!)V}@y zpQ_xhk*R;xFV4C2-ObGEIrIBU&bwW??RR9y9qICWqQ#pEC1eXf+FxaU`|gR0?ESsD zy|wK5)AbWBFJ9#wvN4l$?wXG_fq#RlV=5z$zdZh{`@M+U!C9XIMZH$%|2_44PVV}< z7NNyfH(lHR*2u=*nf51)`4fYvW>k&G-K^mBvg@B4e|qdISu)w)F6;YtkAt;8<&5^- z%a6M{|DfQFd~u&_&0{MY_kS16=VrGSO5Fb(6&`h9V@m)0 z?qv5jx$5tJZWhf*b<(m$TC?)X_AW@AAD4k9mx4$Df}6vYBx@x3`t|y~=jQkGE&sUdymsV`j3Y@zX=^ zLsF)0-SfNd^JlYgwHalib81fBKleK5D%X~ub3WcEd#SDN${u`Unce-DuO7V$-1;!- z`qRtNj&u1wO`EYggxg{MorWW97tf^XuK)bY;&w)beaSVx*@1iK|8Rc9|M$K8t>76= zAC5ThdSvJED&Ka?M$r$Gq)cmjIJZyzna8t#-4^ARW&O3M^N-&P)!6p9f{SV5+ow{Y ztXDtHwpqs2q%uEyg}eUu9S4txUN2c1_fbjd$@jUhELXgKvaa*?2 zFWNXKB-iRyZ~MdCnObX>mKkhPyL{>B)x}xYQwt`|niD@$ZZ~Ul+1nGj_hb zvo%-fmLf~v;s2*Su19PW+|@WgmqAE(^4F7r&%SFc?wW2E`z=mcy{zo)s+hp~b-QjX zSr@(BImFIWVxEY!A&>v5<=RuXEt;;RSX$0-e#`lrFZ;h<+%wbbs_FH;A9v3SZ{KR} z5pr?zrP9>TXUn8zPHp$9@|*PDCaWm?)q>Y|vf>uc)MQ<`u=wRSph}wRW2J zx2enYwM*}2&00}@Q1a|f$#^ci(D2&lK3f*-QZ4<@vZz4qjn$PsoKqWDh~{p2|Df57 zsFBJuGdBLO=M86#6kaCVb8?PKfR43e=)B9jyynK1&24+#)X>xS`PQ!^#rLl+7hvL? zIbr>+ql>Clv!6cwu;R0g`{l~GML#rOoLYC_|KcdS@?&|6n^V80=<2Td6DcV@bK%r| zKeE1=Pkfm4@Z>V~tsVQ=Pp)%lY~h@yE3SXiynrEg`@^KeM+G*ocer?PHFvDM^{fP` ze#6PxZOu}156ax!`s|Ag%e96p5A3yOtvdYVg^hZL)p>8h`@cf(+w<<<_5S4Vy4A<5 zuYHhPH>EAL&(ZVcEvu7Db=P;?%C23+vhn7jPe-^E<4&v>*ZuIz^y1Bh`7tLC#lPJb z`_$l|zVOaGg$mEmcem6c@o#GQB$bJ|dz-S>z4qU@ z@A*8*c{!@RsS7#_o}R0(d-YN+DE-2bc~!s8)wcyMnC=&P;p)$8aSHw`&YsAhW zSEucgcU+U!ILxW_d&XY#XY1lqJo16Xb+W(L%viPYJV)Q`xQ!Qnr9S#!@;7_V#;mE! zV(;ud7kp8D)2w+jS8(%pmrYIX70piV-_!GvG1VrjK15?v-VLKqlXw3Ys)>*McV*Sj zTK`Sowwb4PiS+UMZQpzH)_2>TS@&is^&H@74P3SAo9)N>m&)rHWUoqw=0?r5aJv4q zuI=4)K}%eCLNo~>B3<9e&M-wF4V52h~& zz0mNnao6>xfB!pHykFf|Em!sA=#Bk9^HWl%f2)yZo;maBwH3MwXZtz#-+G+**zM*g zf3s}|Z+^PzbNVau@4)5jR=wK#;5_@k+sXF-TWhv6tv28EpkqDHoNw22orJBkqgUSDwO3z< zPKbYS?MRDL{vFkvWs9;Ny=;|1PgM zwW?lD@`pbEzvOPAd~5H$6;qaPciZ>P$$ej$ro`3cpMP>9f9F)|ez8`WxOd6!Z=c@! zmz;<${yN>?_U#&`G{v8P=DfD)mK0rmT-Qe-FKWWW>NJO)EAP!zU-@C1KDtrCWnUj5I^@0;S$`x&molN(A*!0PJ{m(1Cai3S( zil0nfGO0?5C;fk&_xlt6lU%Z*>r;87>K$vBF5JH7f^+`b1MGjr9sW+Wh<6PY^QlSZ z42VXkpD*O}v9{#4_eCXW3 z(5drMPPeIV{PWOrs>6iGM=MyRLg!wX-hOb=^xr4CSJhSTUihV5FLZ5lH&c{no=AB^ zw9JIx??r+=R3(b9-QAjgc7Lzz)Q8t)U(Yy^PE?b?m3~$iDk?t!~cQ zd2f^ZU(daNjIVuC$f~f=y+4A#Zwn2JG7E09`F?(liQ4uBw>#GV39Q(?Cud)Kx5tm@ z#f?8#gglr07#N}_C#ugi$?MOfz@XOr(`U^Jy%djs-`~GKf6p!Jk1zBWx#Y&TuP_K* zJ2ljEeVm#5 znR(&=y5qlBEAE**_3aBA=EUVKa+~*`Gd`~VLG{#>;$>X%KB1;^Dd&^J);!(C_5VYi z-QBEKW4B9d-fwQ)`?zRluzBEB<6A+`R@rcDQy25HR9ZMCw&q0qn+{Oas2+cHL;v1? ziXrTZVphm6BUSkei%yi3W+XqE zs$sp!_vVGI{d;PTe^nRa3_7;sxktKKs&4b@;N7=w8b0Nok-Yb<&Q|Rmv-&4wty-k8 zQn>B!b77-K)9QUPn^snpp55BJKDk0&cjvv#(`HTQHaF)NmrrA{@pX@S@NsMGhajiL ze^{g|m^3fh=^lP9xOL0URgWc2rc67xA)W2Uyf_i{$%efO-lsq8-S#6!EJa4z;juuP zta9f6d+Y`a+J4+Tu+X;so5Lkl*88R>suthf-u%0?<9o>s#W(w6A9dYeXWO{lx8~pV z4~i_&4uLK{%MZ!kwEiY&9?Bzk|Kh#|<11IYd~J@rUiR-yRB?@ikme&}b!1`E?gd=g=2*Uwu1LcA#R;zLg!hBo!Le2ryc z?s^rRL2`nt?|qBnPV`f9dswqTME&98)=Rgl_Ug0tzO+rc``PNe#Kje*Q>UxdUEcZb z=DB?5{kOmFk?DW9vF~2q$Li2mF`?`B##A-T{qpCq)9=XXQmbD}$9OIdxia6?_SUMd znYOp?23fvxU2OjI{FOF!>2*owZhCWH+a$XL|Cc?w-I>Sn!pdjDEV}D;F81eGZdB+}H-*Wi-@qhBJvuhZ)_I~^W+Lh($>gTe~DWM4f%##(k diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc deleted file mode 100755 index bbac349e..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "validthis": true, - "laxcomma" : true, - "laxbreak" : true, - "browser" : true, - "debug" : true, - "boss" : true, - "expr" : true, - "asi" : true -} \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md deleted file mode 100755 index b7927ba6..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md +++ /dev/null @@ -1,112 +0,0 @@ -## 2.0 BOOTSTRAP JS PHILOSOPHY -These are the high-level design rules which guide the development of Bootstrap's plugin apis. - ---- - -### DATA-ATTRIBUTE API - -We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API. - -We acknowledge that this isn't always the most performant and it may sometimes be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this: - - $('body').off('.data-api') - -To target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this: - - $('body').off('.alert.data-api') - ---- - -### PROGRAMATIC API - -We also believe you should be able to use all plugins provided by Bootstrap purely through the JavaScript API. - -All public APIs should be single, chainable methods, and return the collection acted upon. - - $(".btn.danger").button("toggle").addClass("fat") - -All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior: - - $("#myModal").modal() // initialized with defaults - $("#myModal").modal({ keyboard: false }) // initialized with no keyboard - $("#myModal").modal('show') // initializes and invokes show immediately - ---- - -### OPTIONS - -Options should be sparse and add universal value. We should pick the right defaults. - -All plugins should have a default object which can be modified to affect all instances' default options. The defaults object should be available via `$.fn.plugin.defaults`. - - $.fn.modal.defaults = { … } - -An options definition should take the following form: - - *noun*: *adjective* - describes or modifies a quality of an instance - -Examples: - - backdrop: true - keyboard: false - placement: 'top' - ---- - -### EVENTS - -All events should have an infinitive and past participle form. The infinitive is fired just before an action takes place, the past participle on completion of the action. - - show | shown - hide | hidden - -All infinitive events should provide preventDefault functionality. This provides the abililty to stop the execution of an action. - - $('#myModal').on('show', function (e) { - if (!data) return e.preventDefault() // stops modal from being shown - }) - ---- - -### CONSTRUCTORS - -Each plugin should expose its raw constructor on a `Constructor` property -- accessed in the following way: - - - $.fn.popover.Constructor - ---- - -### DATA ACCESSOR - -Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this: - - $('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor - ---- - -### DATA ATTRIBUTES - -Data attributes should take the following form: - -- data-{{verb}}={{plugin}} - defines main interaction -- data-target || href^=# - defined on "control" element (if element controls an element other than self) -- data-{{noun}} - defines class instance options - -Examples: - - // control other targets - data-toggle="modal" data-target="#foo" - data-toggle="collapse" data-target="#foo" data-parent="#bar" - - // defined on element they control - data-spy="scroll" - - data-dismiss="modal" - data-dismiss="alert" - - data-toggle="dropdown" - - data-toggle="button" - data-toggle="buttons-checkbox" - data-toggle="buttons-radio" \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js deleted file mode 100755 index 57890a9a..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js +++ /dev/null @@ -1,90 +0,0 @@ -/* ========================================================== - * bootstrap-alert.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js deleted file mode 100755 index 7f187be6..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js +++ /dev/null @@ -1,96 +0,0 @@ -/* ============================================================ - * bootstrap-button.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js deleted file mode 100755 index 551de589..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js +++ /dev/null @@ -1,169 +0,0 @@ -/* ========================================================== - * bootstrap-carousel.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = options - this.options.slide && this.slide(this.options.slide) - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e = $.Event('slide') - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if ($next.hasClass('active')) return - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else if (options.interval) data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js deleted file mode 100755 index fbc915b9..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js +++ /dev/null @@ -1,157 +0,0 @@ -/* ============================================================= - * bootstrap-collapse.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js deleted file mode 100755 index 454a9684..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js +++ /dev/null @@ -1,100 +0,0 @@ -/* ============================================================ - * bootstrap-dropdown.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , selector - , isActive - - if ($this.is('.disabled, :disabled')) return - - selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js deleted file mode 100755 index 38fd0c84..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js +++ /dev/null @@ -1,218 +0,0 @@ -/* ========================================================= - * bootstrap-modal.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (content, options) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - $('body').addClass('modal-open') - - this.isShown = true - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element.removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal(that) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop(callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
    ') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js deleted file mode 100755 index 39fbe358..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js +++ /dev/null @@ -1,98 +0,0 @@ -/* =========================================================== - * bootstrap-popover.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title) - $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

    ' - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js deleted file mode 100755 index dce37181..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js +++ /dev/null @@ -1,151 +0,0 @@ -/* ============================================================= - * bootstrap-scrollspy.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && href.length - && [[ $href.position().top, href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu')) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js deleted file mode 100755 index d87f3509..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js +++ /dev/null @@ -1,135 +0,0 @@ -/* ======================================================== - * bootstrap-tab.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js deleted file mode 100755 index b476f1c4..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js +++ /dev/null @@ -1,275 +0,0 @@ -/* =========================================================== - * bootstrap-tooltip.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , isHTML: function(text) { - // html string detection logic adapted from jQuery - return typeof text != 'string' - || ( text.charAt(0) === "<" - && text.charAt( text.length - 1 ) === ">" - && text.length >= 3 - ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text) - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
    ' - , trigger: 'hover' - , title: '' - , delay: 0 - } - -}(window.jQuery); diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js deleted file mode 100755 index 53418262..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js +++ /dev/null @@ -1,61 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - $(function () { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MSTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js deleted file mode 100755 index ad44b908..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js +++ /dev/null @@ -1,285 +0,0 @@ -/* ============================================================= - * bootstrap-typeahead.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , keypress: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - if (e.type != 'keydown') break - e.preventDefault() - this.prev() - break - - case 40: // down arrow - if (e.type != 'keydown') break - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
      ' - , item: '
      • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html deleted file mode 100755 index 2f8f71b1..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - Bootstrap Plugin Test Suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -

      Bootstrap Plugin Test Suite

      -

      -

      -
        -
        -
        - - \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js deleted file mode 100755 index 4105bf52..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js +++ /dev/null @@ -1,63 +0,0 @@ -// Simple phantom.js integration script -// Adapted from Modernizr - -function waitFor(testFx, onReady, timeOutMillis) { - var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 5001 //< Default Max Timout is 5s - , start = new Date().getTime() - , condition = false - , interval = setInterval(function () { - if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { - // If not time-out yet and condition not yet fulfilled - condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code - } else { - if (!condition) { - // If condition still not fulfilled (timeout but condition is 'false') - console.log("'waitFor()' timeout") - phantom.exit(1) - } else { - // Condition fulfilled (timeout and/or condition is 'true') - typeof(onReady) === "string" ? eval(onReady) : onReady() //< Do what it's supposed to do once the condition is fulfilled - clearInterval(interval) //< Stop this interval - } - } - }, 100) //< repeat check every 100ms -} - - -if (phantom.args.length === 0 || phantom.args.length > 2) { - console.log('Usage: phantom.js URL') - phantom.exit() -} - -var page = new WebPage() - -// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this") -page.onConsoleMessage = function(msg) { - console.log(msg) -}; - -page.open(phantom.args[0], function(status){ - if (status !== "success") { - console.log("Unable to access network") - phantom.exit() - } else { - waitFor(function(){ - return page.evaluate(function(){ - var el = document.getElementById('qunit-testresult') - if (el && el.innerText.match('completed')) { - return true - } - return false - }) - }, function(){ - var failedNum = page.evaluate(function(){ - var el = document.getElementById('qunit-testresult') - try { - return el.getElementsByClassName('failed')[0].innerHTML - } catch (e) { } - return 10000 - }); - phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0) - }) - } -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js deleted file mode 100755 index 7c8445fe..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Simple connect server for phantom.js - * Adapted from Modernizr - */ - -var connect = require('connect') - , http = require('http') - , fs = require('fs') - , app = connect() - .use(connect.static(__dirname + '/../../')); - -http.createServer(app).listen(3000); - -fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js deleted file mode 100755 index 7f24e0e6..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js +++ /dev/null @@ -1,56 +0,0 @@ -$(function () { - - module("bootstrap-alerts") - - test("should be defined on jquery object", function () { - ok($(document.body).alert, 'alert method is defined') - }) - - test("should return element", function () { - ok($(document.body).alert()[0] == document.body, 'document.body returned') - }) - - test("should fade element out on clicking .close", function () { - var alertHTML = '
        ' - + '×' - + '

        Holy guacamole! Best check yo self, you\'re not looking too good.

        ' - + '
        ' - , alert = $(alertHTML).alert() - - alert.find('.close').click() - - ok(!alert.hasClass('in'), 'remove .in class on .close click') - }) - - test("should remove element when clicking .close", function () { - $.support.transition = false - - var alertHTML = '
        ' - + '×' - + '

        Holy guacamole! Best check yo self, you\'re not looking too good.

        ' - + '
        ' - , alert = $(alertHTML).appendTo('#qunit-fixture').alert() - - ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom') - - alert.find('.close').click() - - ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') - }) - - test("should not fire closed when close is prevented", function () { - $.support.transition = false - stop(); - $('
        ') - .bind('close', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .bind('closed', function () { - ok(false); - }) - .alert('close') - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js deleted file mode 100755 index 03c4a8e9..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js +++ /dev/null @@ -1,77 +0,0 @@ -$(function () { - - module("bootstrap-buttons") - - test("should be defined on jquery object", function () { - ok($(document.body).button, 'button method is defined') - }) - - test("should return element", function () { - ok($(document.body).button()[0] == document.body, 'document.body returned') - }) - - test("should return set state to loading", function () { - var btn = $('') - equals(btn.html(), 'mdo', 'btn text equals mdo') - btn.button('loading') - equals(btn.html(), 'fat', 'btn text equals fat') - stop() - setTimeout(function () { - ok(btn.attr('disabled'), 'btn is disabled') - ok(btn.hasClass('disabled'), 'btn has disabled class') - start() - }, 0) - }) - - test("should return reset state", function () { - var btn = $('') - equals(btn.html(), 'mdo', 'btn text equals mdo') - btn.button('loading') - equals(btn.html(), 'fat', 'btn text equals fat') - stop() - setTimeout(function () { - ok(btn.attr('disabled'), 'btn is disabled') - ok(btn.hasClass('disabled'), 'btn has disabled class') - start() - stop() - }, 0) - btn.button('reset') - equals(btn.html(), 'mdo', 'btn text equals mdo') - setTimeout(function () { - ok(!btn.attr('disabled'), 'btn is not disabled') - ok(!btn.hasClass('disabled'), 'btn does not have disabled class') - start() - }, 0) - }) - - test("should toggle active", function () { - var btn = $('') - ok(!btn.hasClass('active'), 'btn does not have active class') - btn.button('toggle') - ok(btn.hasClass('active'), 'btn has class active') - }) - - test("should toggle active when btn children are clicked", function () { - var btn = $('') - , inner = $('') - btn - .append(inner) - .appendTo($('#qunit-fixture')) - ok(!btn.hasClass('active'), 'btn does not have active class') - inner.click() - ok(btn.hasClass('active'), 'btn has class active') - }) - - test("should toggle active when btn children are clicked within btn-group", function () { - var btngroup = $('
        ') - , btn = $('') - , inner = $('') - btngroup - .append(btn.append(inner)) - .appendTo($('#qunit-fixture')) - ok(!btn.hasClass('active'), 'btn does not have active class') - inner.click() - ok(btn.hasClass('active'), 'btn has class active') - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js deleted file mode 100755 index 92c23e22..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js +++ /dev/null @@ -1,28 +0,0 @@ -$(function () { - - module("bootstrap-carousel") - - test("should be defined on jquery object", function () { - ok($(document.body).carousel, 'carousel method is defined') - }) - - test("should return element", function () { - ok($(document.body).carousel()[0] == document.body, 'document.body returned') - }) - - test("should not fire sliden when slide is prevented", function () { - $.support.transition = false - stop(); - $('
        ') - .bind('slide', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .bind('slid', function () { - ok(false); - }) - .carousel('next') - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js deleted file mode 100755 index fb66135d..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js +++ /dev/null @@ -1,54 +0,0 @@ -$(function () { - - module("bootstrap-collapse") - - test("should be defined on jquery object", function () { - ok($(document.body).collapse, 'collapse method is defined') - }) - - test("should return element", function () { - ok($(document.body).collapse()[0] == document.body, 'document.body returned') - }) - - test("should show a collapsed element", function () { - var el = $('
        ').collapse('show') - ok(el.hasClass('in'), 'has class in') - ok(/height/.test(el.attr('style')), 'has height set') - }) - - test("should hide a collapsed element", function () { - var el = $('
        ').collapse('hide') - ok(!el.hasClass('in'), 'does not have class in') - ok(/height/.test(el.attr('style')), 'has height set') - }) - - test("should not fire shown when show is prevented", function () { - $.support.transition = false - stop(); - $('
        ') - .bind('show', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .bind('shown', function () { - ok(false); - }) - .collapse('show') - }) - - test("should reset style to auto after finishing opening collapse", function () { - $.support.transition = false - stop(); - $('
        ') - .bind('show', function () { - ok(this.style.height == '0px') - }) - .bind('shown', function () { - ok(this.style.height == 'auto') - start() - }) - .collapse('show') - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js deleted file mode 100755 index 4e52c848..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js +++ /dev/null @@ -1,87 +0,0 @@ -$(function () { - - module("bootstrap-dropdowns") - - test("should be defined on jquery object", function () { - ok($(document.body).dropdown, 'dropdown method is defined') - }) - - test("should return element", function () { - ok($(document.body).dropdown()[0] == document.body, 'document.body returned') - }) - - test("should not open dropdown if target is disabled", function () { - var dropdownHTML = '' - , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') - }) - - test("should not open dropdown if target is disabled", function () { - var dropdownHTML = '' - , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') - }) - - test("should add class open to menu if clicked", function () { - var dropdownHTML = '' - , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') - }) - - test("should remove open class if body clicked", function () { - var dropdownHTML = '' - , dropdown = $(dropdownHTML) - .appendTo('#qunit-fixture') - .find('[data-toggle="dropdown"]') - .dropdown() - .click() - ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') - $('body').click() - ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed') - dropdown.remove() - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js deleted file mode 100755 index 0851f64a..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js +++ /dev/null @@ -1,114 +0,0 @@ -$(function () { - - module("bootstrap-modal") - - test("should be defined on jquery object", function () { - var div = $("") - ok(div.modal, 'modal method is defined') - }) - - test("should return element", function () { - var div = $("") - ok(div.modal() == div, 'document.body returned') - $('#modal-test').remove() - }) - - test("should expose defaults var for settings", function () { - ok($.fn.modal.defaults, 'default object exposed') - }) - - test("should insert into dom when show method is called", function () { - stop() - $.support.transition = false - $("") - .bind("shown", function () { - ok($('#modal-test').length, 'modal insterted into dom') - $(this).remove() - start() - }) - .modal("show") - }) - - test("should fire show event", function () { - stop() - $.support.transition = false - $("") - .bind("show", function () { - ok(true, "show was called") - }) - .bind("shown", function () { - $(this).remove() - start() - }) - .modal("show") - }) - - test("should not fire shown when default prevented", function () { - stop() - $.support.transition = false - $("") - .bind("show", function (e) { - e.preventDefault() - ok(true, "show was called") - start() - }) - .bind("shown", function () { - ok(false, "shown was called") - }) - .modal("show") - }) - - test("should hide modal when hide is called", function () { - stop() - $.support.transition = false - - $("") - .bind("shown", function () { - ok($('#modal-test').is(":visible"), 'modal visible') - ok($('#modal-test').length, 'modal insterted into dom') - $(this).modal("hide") - }) - .bind("hidden", function() { - ok(!$('#modal-test').is(":visible"), 'modal hidden') - $('#modal-test').remove() - start() - }) - .modal("show") - }) - - test("should toggle when toggle is called", function () { - stop() - $.support.transition = false - var div = $("") - div - .bind("shown", function () { - ok($('#modal-test').is(":visible"), 'modal visible') - ok($('#modal-test').length, 'modal insterted into dom') - div.modal("toggle") - }) - .bind("hidden", function() { - ok(!$('#modal-test').is(":visible"), 'modal hidden') - div.remove() - start() - }) - .modal("toggle") - }) - - test("should remove from dom when click [data-dismiss=modal]", function () { - stop() - $.support.transition = false - var div = $("") - div - .bind("shown", function () { - ok($('#modal-test').is(":visible"), 'modal visible') - ok($('#modal-test').length, 'modal insterted into dom') - div.find('.close').click() - }) - .bind("hidden", function() { - ok(!$('#modal-test').is(":visible"), 'modal hidden') - div.remove() - start() - }) - .modal("toggle") - }) -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js deleted file mode 100755 index a04aeaa8..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js +++ /dev/null @@ -1,21 +0,0 @@ -// Logging setup for phantom integration -// adapted from Modernizr - -QUnit.begin = function () { - console.log("Starting test suite") - console.log("================================================\n") -} - -QUnit.moduleDone = function (opts) { - if (opts.failed === 0) { - console.log("\u2714 All tests passed in '" + opts.name + "' module") - } else { - console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module") - } -} - -QUnit.done = function (opts) { - console.log("\n================================================") - console.log("Tests completed in " + opts.runtime + " milliseconds") - console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.") -} \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js deleted file mode 100755 index afd6b170..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js +++ /dev/null @@ -1,93 +0,0 @@ -$(function () { - - module("bootstrap-popover") - - test("should be defined on jquery object", function () { - var div = $('
        ') - ok(div.popover, 'popover method is defined') - }) - - test("should return element", function () { - var div = $('
        ') - ok(div.popover() == div, 'document.body returned') - }) - - test("should render popover element", function () { - $.support.transition = false - var popover = $('@mdo') - .appendTo('#qunit-fixture') - .popover('show') - - ok($('.popover').length, 'popover was inserted') - popover.popover('hide') - ok(!$(".popover").length, 'popover removed') - }) - - test("should store popover instance in popover data object", function () { - $.support.transition = false - var popover = $('@mdo') - .popover() - - ok(!!popover.data('popover'), 'popover instance exists') - }) - - test("should get title and content from options", function () { - $.support.transition = false - var popover = $('@fat') - .appendTo('#qunit-fixture') - .popover({ - title: function () { - return '@fat' - } - , content: function () { - return 'loves writing tests （╯°□°）╯︵ â”»â”â”»' - } - }) - - popover.popover('show') - - ok($('.popover').length, 'popover was inserted') - equals($('.popover .popover-title').text(), '@fat', 'title correctly inserted') - equals($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ â”»â”â”»', 'content correctly inserted') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) - - test("should get title and content from attributes", function () { - $.support.transition = false - var popover = $('@mdo') - .appendTo('#qunit-fixture') - .popover() - .popover('show') - - ok($('.popover').length, 'popover was inserted') - equals($('.popover .popover-title').text(), '@mdo', 'title correctly inserted') - equals($('.popover .popover-content').text(), "loves data attributes (ã¥ï½¡â—•â€¿â€¿â—•ï½¡)㥠︵ â”»â”â”»", 'content correctly inserted') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) - - test("should respect custom classes", function() { - $.support.transition = false - var popover = $('@fat') - .appendTo('#qunit-fixture') - .popover({ - title: 'Test' - , content: 'Test' - , template: '

        ' - }) - - popover.popover('show') - - ok($('.popover').length, 'popover was inserted') - ok($('.popover').hasClass('foobar'), 'custom class is present') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js deleted file mode 100755 index bee46a92..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js +++ /dev/null @@ -1,31 +0,0 @@ -$(function () { - - module("bootstrap-scrollspy") - - test("should be defined on jquery object", function () { - ok($(document.body).scrollspy, 'scrollspy method is defined') - }) - - test("should return element", function () { - ok($(document.body).scrollspy()[0] == document.body, 'document.body returned') - }) - - test("should switch active class on scroll", function () { - var sectionHTML = '
        ' - , $section = $(sectionHTML).append('#qunit-fixture') - , topbarHTML ='
        ' - + '
        ' - + '
        ' - + '

        Bootstrap

        ' - + '' - + '
        ' - + '
        ' - + '
        ' - , $topbar = $(topbarHTML).scrollspy() - - ok($topbar.find('.active', true)) - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js deleted file mode 100755 index 98780478..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js +++ /dev/null @@ -1,61 +0,0 @@ -$(function () { - - module("bootstrap-tabs") - - test("should be defined on jquery object", function () { - ok($(document.body).tab, 'tabs method is defined') - }) - - test("should return element", function () { - ok($(document.body).tab()[0] == document.body, 'document.body returned') - }) - - test("should activate element by tab id", function () { - var tabsHTML = - '' - - $('
        ').appendTo("#qunit-fixture") - - $(tabsHTML).find('li:last a').tab('show') - equals($("#qunit-fixture").find('.active').attr('id'), "profile") - - $(tabsHTML).find('li:first a').tab('show') - equals($("#qunit-fixture").find('.active').attr('id'), "home") - }) - - test("should activate element by tab id", function () { - var pillsHTML = - '' - - $('
        ').appendTo("#qunit-fixture") - - $(pillsHTML).find('li:last a').tab('show') - equals($("#qunit-fixture").find('.active').attr('id'), "profile") - - $(pillsHTML).find('li:first a').tab('show') - equals($("#qunit-fixture").find('.active').attr('id'), "home") - }) - - - test("should not fire closed when close is prevented", function () { - $.support.transition = false - stop(); - $('
        ') - .bind('show', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .bind('shown', function () { - ok(false); - }) - .tab('show') - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js deleted file mode 100755 index 7b0c10de..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js +++ /dev/null @@ -1,155 +0,0 @@ -$(function () { - - module("bootstrap-tooltip") - - test("should be defined on jquery object", function () { - var div = $("
        ") - ok(div.tooltip, 'popover method is defined') - }) - - test("should return element", function () { - var div = $("
        ") - ok(div.tooltip() == div, 'document.body returned') - }) - - test("should expose default settings", function () { - ok(!!$.fn.tooltip.defaults, 'defaults is defined') - }) - - test("should remove title attribute", function () { - var tooltip = $('').tooltip() - ok(!tooltip.attr('title'), 'title tag was removed') - }) - - test("should add data attribute for referencing original title", function () { - var tooltip = $('').tooltip() - equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute') - }) - - test("should place tooltips relative to placement option", function () { - $.support.transition = false - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({placement: 'bottom'}) - .tooltip('show') - - ok($(".tooltip").is('.fade.bottom.in'), 'has correct classes applied') - tooltip.tooltip('hide') - }) - - test("should always allow html entities", function () { - $.support.transition = false - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip('show') - - ok($('.tooltip b').length, 'b tag was inserted') - tooltip.tooltip('hide') - ok(!$(".tooltip").length, 'tooltip removed') - }) - - test("should respect custom classes", function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ template: '
        '}) - .tooltip('show') - - ok($('.tooltip').hasClass('some-class'), 'custom class is present') - tooltip.tooltip('hide') - ok(!$(".tooltip").length, 'tooltip removed') - }) - - test("should not show tooltip if leave event occurs before delay expires", function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: 200 }) - - stop() - - tooltip.trigger('mouseenter') - - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - start() - }, 200) - }, 100) - }) - - test("should not show tooltip if leave event occurs before delay expires, even if hide delay is 0", function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: { show: 200, hide: 0} }) - - stop() - - tooltip.trigger('mouseenter') - - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - start() - }, 200) - }, 100) - }) - - test("should not show tooltip if leave event occurs before delay expires", function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: 100 }) - stop() - tooltip.trigger('mouseenter') - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - start() - }, 100) - }, 50) - }) - - test("should show tooltip if leave event hasn't occured before delay expires", function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: 150 }) - stop() - tooltip.trigger('mouseenter') - setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') - }, 100) - setTimeout(function () { - ok($(".tooltip").is('.fade.in'), 'tooltip has faded in') - start() - }, 200) - }) - - test("should detect if title string is html or text: foo", function () { - ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html') - }) - - test("should detect if title string is html or text: &lt;foo&gt;", function () { - ok(!$.fn.tooltip.Constructor.prototype.isHTML('<foo>'), 'correctly detected html') - }) - - test("should detect if title string is html or text: <div>foo</div>", function () { - ok($.fn.tooltip.Constructor.prototype.isHTML('
        foo
        '), 'correctly detected html') - }) - - test("should detect if title string is html or text: asdfa<div>foo</div>asdfasdf", function () { - ok($.fn.tooltip.Constructor.prototype.isHTML('asdfa
        foo
        asdfasdf'), 'correctly detected html') - }) - - test("should detect if title string is html or text: document.createElement('div')", function () { - ok($.fn.tooltip.Constructor.prototype.isHTML(document.createElement('div')), 'correctly detected html') - }) - - test("should detect if title string is html or text: $('<div />)", function () { - ok($.fn.tooltip.Constructor.prototype.isHTML($('
        ')), 'correctly detected html') - }) - -}) diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js deleted file mode 100755 index 086773fa..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js +++ /dev/null @@ -1,13 +0,0 @@ -$(function () { - - module("bootstrap-transition") - - test("should be defined on jquery support object", function () { - ok($.support.transition !== undefined, 'transition object is defined') - }) - - test("should provide an end object", function () { - ok($.support.transition ? $.support.transition.end : true, 'end string is defined') - }) - -}) \ No newline at end of file diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js deleted file mode 100755 index 4e2428d6..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js +++ /dev/null @@ -1,148 +0,0 @@ -$(function () { - - module("bootstrap-typeahead") - - test("should be defined on jquery object", function () { - ok($(document.body).typeahead, 'alert method is defined') - }) - - test("should return element", function () { - ok($(document.body).typeahead()[0] == document.body, 'document.body returned') - }) - - test("should listen to an input", function () { - var $input = $('') - $input.typeahead() - ok($input.data('events').blur, 'has a blur event') - ok($input.data('events').keypress, 'has a keypress event') - ok($input.data('events').keyup, 'has a keyup event') - if ($.browser.webkit || $.browser.msie) { - ok($input.data('events').keydown, 'has a keydown event') - } else { - ok($input.data('events').keydown, 'does not have a keydown event') - } - }) - - test("should create a menu", function () { - var $input = $('') - ok($input.typeahead().data('typeahead').$menu, 'has a menu') - }) - - test("should listen to the menu", function () { - var $input = $('') - , $menu = $input.typeahead().data('typeahead').$menu - - ok($menu.data('events').mouseover, 'has a mouseover(pseudo: mouseenter)') - ok($menu.data('events').click, 'has a click') - }) - - test("should show menu when query entered", function () { - var $input = $('').typeahead({ - source: ['aa', 'ab', 'ac'] - }) - , typeahead = $input.data('typeahead') - - $input.val('a') - typeahead.lookup() - - ok(typeahead.$menu.is(":visible"), 'typeahead is visible') - equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu') - equals(typeahead.$menu.find('.active').length, 1, 'one item is active') - - typeahead.$menu.remove() - }) - - test("should not explode when regex chars are entered", function () { - var $input = $('').typeahead({ - source: ['aa', 'ab', 'ac', 'mdo*', 'fat+'] - }) - , typeahead = $input.data('typeahead') - - $input.val('+') - typeahead.lookup() - - ok(typeahead.$menu.is(":visible"), 'typeahead is visible') - equals(typeahead.$menu.find('li').length, 1, 'has 1 item in menu') - equals(typeahead.$menu.find('.active').length, 1, 'one item is active') - - typeahead.$menu.remove() - }) - - test("should hide menu when query entered", function () { - stop() - var $input = $('').typeahead({ - source: ['aa', 'ab', 'ac'] - }) - , typeahead = $input.data('typeahead') - - $input.val('a') - typeahead.lookup() - - ok(typeahead.$menu.is(":visible"), 'typeahead is visible') - equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu') - equals(typeahead.$menu.find('.active').length, 1, 'one item is active') - - $input.blur() - - setTimeout(function () { - ok(!typeahead.$menu.is(":visible"), "typeahead is no longer visible") - start() - }, 200) - - typeahead.$menu.remove() - }) - - test("should set next item when down arrow is pressed", function () { - var $input = $('').typeahead({ - source: ['aa', 'ab', 'ac'] - }) - , typeahead = $input.data('typeahead') - - $input.val('a') - typeahead.lookup() - - ok(typeahead.$menu.is(":visible"), 'typeahead is visible') - equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu') - equals(typeahead.$menu.find('.active').length, 1, 'one item is active') - ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") - - $input.trigger({ - type: 'keydown' - , keyCode: 40 - }) - - ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active") - - - $input.trigger({ - type: 'keydown' - , keyCode: 38 - }) - - ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") - - typeahead.$menu.remove() - }) - - - test("should set input value to selected item", function () { - var $input = $('').typeahead({ - source: ['aa', 'ab', 'ac'] - }) - , typeahead = $input.data('typeahead') - , changed = false - - $input.val('a') - typeahead.lookup() - - $input.change(function() { changed = true }); - - $(typeahead.$menu.find('li')[2]).mouseover().click() - - equals($input.val(), 'ac', 'input value was correctly set') - ok(!typeahead.$menu.is(':visible'), 'the menu was hidden') - ok(changed, 'a change event was fired') - - typeahead.$menu.remove() - }) -}) diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js deleted file mode 100755 index 00c4e23a..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js +++ /dev/null @@ -1,9252 +0,0 @@ -/*! jQuery v1.7.1 jquery.com | jquery.org/license */ -(function( window, undefined ) { - -// Use the correct document accordingly with window argument (sandbox) -var document = window.document, - navigator = window.navigator, - location = window.location; -var jQuery = (function() { - -// Define a local copy of jQuery -var jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context, rootjQuery ); - }, - - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - - // Map over the $ in case of overwrite - _$ = window.$, - - // A central reference to the root jQuery(document) - rootjQuery, - - // A simple way to check for HTML strings or ID strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, - - // Check if a string has a non-whitespace character in it - rnotwhite = /\S/, - - // Used for trimming whitespace - trimLeft = /^\s+/, - trimRight = /\s+$/, - - // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, - - // JSON RegExp - rvalidchars = /^[\],:{}\s]*$/, - rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, - rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, - rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, - - // Useragent RegExp - rwebkit = /(webkit)[ \/]([\w.]+)/, - ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, - rmsie = /(msie) ([\w.]+)/, - rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, - - // Matches dashed string for camelizing - rdashAlpha = /-([a-z]|[0-9])/ig, - rmsPrefix = /^-ms-/, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function( all, letter ) { - return ( letter + "" ).toUpperCase(); - }, - - // Keep a UserAgent string for use with jQuery.browser - userAgent = navigator.userAgent, - - // For matching the engine and version of the browser - browserMatch, - - // The deferred used on DOM ready - readyList, - - // The ready event handler - DOMContentLoaded, - - // Save a reference to some core methods - toString = Object.prototype.toString, - hasOwn = Object.prototype.hasOwnProperty, - push = Array.prototype.push, - slice = Array.prototype.slice, - trim = String.prototype.trim, - indexOf = Array.prototype.indexOf, - - // [[Class]] -> type pairs - class2type = {}; - -jQuery.fn = jQuery.prototype = { - constructor: jQuery, - init: function( selector, context, rootjQuery ) { - var match, elem, ret, doc; - - // Handle $(""), $(null), or $(undefined) - if ( !selector ) { - return this; - } - - // Handle $(DOMElement) - if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - } - - // The body element only exists once, optimize finding it - if ( selector === "body" && !context && document.body ) { - this.context = document; - this[0] = document.body; - this.selector = selector; - this.length = 1; - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - // Are we dealing with HTML string or an ID? - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = quickExpr.exec( selector ); - } - - // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - doc = ( context ? context.ownerDocument || context : document ); - - // If a single string is passed in and it's a single tag - // just do a createElement and skip the rest - ret = rsingleTag.exec( selector ); - - if ( ret ) { - if ( jQuery.isPlainObject( context ) ) { - selector = [ document.createElement( ret[1] ) ]; - jQuery.fn.attr.call( selector, context, true ); - - } else { - selector = [ doc.createElement( ret[1] ) ]; - } - - } else { - ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); - selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes; - } - - return jQuery.merge( this, selector ); - - // HANDLE: $("#id") - } else { - elem = document.getElementById( match[2] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return rootjQuery.ready( selector ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }, - - // Start with an empty selector - selector: "", - - // The current version of jQuery being used - jquery: "1.7.1", - - // The default length of a jQuery object is 0 - length: 0, - - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - - toArray: function() { - return slice.call( this, 0 ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == null ? - - // Return a 'clean' array - this.toArray() : - - // Return just the object - ( num < 0 ? this[ this.length + num ] : this[ num ] ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems, name, selector ) { - // Build a new jQuery matched element set - var ret = this.constructor(); - - if ( jQuery.isArray( elems ) ) { - push.apply( ret, elems ); - - } else { - jQuery.merge( ret, elems ); - } - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - ret.context = this.context; - - if ( name === "find" ) { - ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; - } else if ( name ) { - ret.selector = this.selector + "." + name + "(" + selector + ")"; - } - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - ready: function( fn ) { - // Attach the listeners - jQuery.bindReady(); - - // Add the callback - readyList.add( fn ); - - return this; - }, - - eq: function( i ) { - i = +i; - return i === -1 ? - this.slice( i ) : - this.slice( i, i + 1 ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ), - "slice", slice.call(arguments).join(",") ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); - })); - }, - - end: function() { - return this.prevObject || this.constructor(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: [].sort, - splice: [].splice -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.fn.init.prototype = jQuery.fn; - -jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[0] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( length === i ) { - target = this; - --i; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; - - } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - noConflict: function( deep ) { - if ( window.$ === jQuery ) { - window.$ = _$; - } - - if ( deep && window.jQuery === jQuery ) { - window.jQuery = _jQuery; - } - - return jQuery; - }, - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - // Either a released hold or an DOMready/load event and not yet ready - if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready, 1 ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.fireWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.trigger ) { - jQuery( document ).trigger( "ready" ).off( "ready" ); - } - } - }, - - bindReady: function() { - if ( readyList ) { - return; - } - - readyList = jQuery.Callbacks( "once memory" ); - - // Catch cases where $(document).ready() is called after the - // browser event has already occurred. - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - return setTimeout( jQuery.ready, 1 ); - } - - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); - - // If IE event model is used - } else if ( document.attachEvent ) { - // ensure firing before onload, - // maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", DOMContentLoaded ); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); - - // If IE and not a frame - // continually check to see if the document is ready - var toplevel = false; - - try { - toplevel = window.frameElement == null; - } catch(e) {} - - if ( document.documentElement.doScroll && toplevel ) { - doScrollCheck(); - } - } - }, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return jQuery.type(obj) === "function"; - }, - - isArray: Array.isArray || function( obj ) { - return jQuery.type(obj) === "array"; - }, - - // A crude way of determining if an object is a window - isWindow: function( obj ) { - return obj && typeof obj === "object" && "setInterval" in obj; - }, - - isNumeric: function( obj ) { - return !isNaN( parseFloat(obj) ) && isFinite( obj ); - }, - - type: function( obj ) { - return obj == null ? - String( obj ) : - class2type[ toString.call(obj) ] || "object"; - }, - - isPlainObject: function( obj ) { - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - try { - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { - return false; - } - } catch ( e ) { - // IE8,9 Will throw exceptions on certain host objects #9897 - return false; - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - - var key; - for ( key in obj ) {} - - return key === undefined || hasOwn.call( obj, key ); - }, - - isEmptyObject: function( obj ) { - for ( var name in obj ) { - return false; - } - return true; - }, - - error: function( msg ) { - throw new Error( msg ); - }, - - parseJSON: function( data ) { - if ( typeof data !== "string" || !data ) { - return null; - } - - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); - - // Attempt to parse using the native JSON parser first - if ( window.JSON && window.JSON.parse ) { - return window.JSON.parse( data ); - } - - // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js - if ( rvalidchars.test( data.replace( rvalidescape, "@" ) - .replace( rvalidtokens, "]" ) - .replace( rvalidbraces, "")) ) { - - return ( new Function( "return " + data ) )(); - - } - jQuery.error( "Invalid JSON: " + data ); - }, - - // Cross-browser xml parsing - parseXML: function( data ) { - var xml, tmp; - try { - if ( window.DOMParser ) { // Standard - tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); - } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); - xml.async = "false"; - xml.loadXML( data ); - } - } catch( e ) { - xml = undefined; - } - if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { - jQuery.error( "Invalid XML: " + data ); - } - return xml; - }, - - noop: function() {}, - - // Evaluates a script in a global context - // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context - globalEval: function( data ) { - if ( data && rnotwhite.test( data ) ) { - // We use execScript on Internet Explorer - // We use an anonymous function so that context is window - // rather than jQuery in Firefox - ( window.execScript || function( data ) { - window[ "eval" ].call( window, data ); - } )( data ); - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); - }, - - // args is for internal usage only - each: function( object, callback, args ) { - var name, i = 0, - length = object.length, - isObj = length === undefined || jQuery.isFunction( object ); - - if ( args ) { - if ( isObj ) { - for ( name in object ) { - if ( callback.apply( object[ name ], args ) === false ) { - break; - } - } - } else { - for ( ; i < length; ) { - if ( callback.apply( object[ i++ ], args ) === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isObj ) { - for ( name in object ) { - if ( callback.call( object[ name ], name, object[ name ] ) === false ) { - break; - } - } - } else { - for ( ; i < length; ) { - if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) { - break; - } - } - } - } - - return object; - }, - - // Use native String.trim function wherever possible - trim: trim ? - function( text ) { - return text == null ? - "" : - trim.call( text ); - } : - - // Otherwise use our own trimming functionality - function( text ) { - return text == null ? - "" : - text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); - }, - - // results is for internal usage only - makeArray: function( array, results ) { - var ret = results || []; - - if ( array != null ) { - // The window, strings (and functions) also have 'length' - // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 - var type = jQuery.type( array ); - - if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { - push.call( ret, array ); - } else { - jQuery.merge( ret, array ); - } - } - - return ret; - }, - - inArray: function( elem, array, i ) { - var len; - - if ( array ) { - if ( indexOf ) { - return indexOf.call( array, elem, i ); - } - - len = array.length; - i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; - - for ( ; i < len; i++ ) { - // Skip accessing in sparse arrays - if ( i in array && array[ i ] === elem ) { - return i; - } - } - } - - return -1; - }, - - merge: function( first, second ) { - var i = first.length, - j = 0; - - if ( typeof second.length === "number" ) { - for ( var l = second.length; j < l; j++ ) { - first[ i++ ] = second[ j ]; - } - - } else { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, inv ) { - var ret = [], retVal; - inv = !!inv; - - // Go through the array, only saving the items - // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) { - retVal = !!callback( elems[ i ], i ); - if ( inv !== retVal ) { - ret.push( elems[ i ] ); - } - } - - return ret; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var value, key, ret = [], - i = 0, - length = elems.length, - // jquery objects are treated as arrays - isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; - - // Go through the array, translating each of the items to their - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - - // Go through every key on the object - } else { - for ( key in elems ) { - value = callback( elems[ key ], key, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - } - - // Flatten any nested arrays - return ret.concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - if ( typeof context === "string" ) { - var tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - var args = slice.call( arguments, 2 ), - proxy = function() { - return fn.apply( context, args.concat( slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; - - return proxy; - }, - - // Mutifunctional method to get and set values to a collection - // The value/s can optionally be executed if it's a function - access: function( elems, key, value, exec, fn, pass ) { - var length = elems.length; - - // Setting many attributes - if ( typeof key === "object" ) { - for ( var k in key ) { - jQuery.access( elems, k, key[k], exec, fn, value ); - } - return elems; - } - - // Setting one attribute - if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = !pass && exec && jQuery.isFunction(value); - - for ( var i = 0; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); - } - - return elems; - } - - // Getting an attribute - return length ? fn( elems[0], key ) : undefined; - }, - - now: function() { - return ( new Date() ).getTime(); - }, - - // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser - uaMatch: function( ua ) { - ua = ua.toLowerCase(); - - var match = rwebkit.exec( ua ) || - ropera.exec( ua ) || - rmsie.exec( ua ) || - ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || - []; - - return { browser: match[1] || "", version: match[2] || "0" }; - }, - - sub: function() { - function jQuerySub( selector, context ) { - return new jQuerySub.fn.init( selector, context ); - } - jQuery.extend( true, jQuerySub, this ); - jQuerySub.superclass = this; - jQuerySub.fn = jQuerySub.prototype = this(); - jQuerySub.fn.constructor = jQuerySub; - jQuerySub.sub = this.sub; - jQuerySub.fn.init = function init( selector, context ) { - if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { - context = jQuerySub( context ); - } - - return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); - }; - jQuerySub.fn.init.prototype = jQuerySub.fn; - var rootjQuerySub = jQuerySub(document); - return jQuerySub; - }, - - browser: {} -}); - -// Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); - -browserMatch = jQuery.uaMatch( userAgent ); -if ( browserMatch.browser ) { - jQuery.browser[ browserMatch.browser ] = true; - jQuery.browser.version = browserMatch.version; -} - -// Deprecated, use jQuery.browser.webkit instead -if ( jQuery.browser.webkit ) { - jQuery.browser.safari = true; -} - -// IE doesn't match non-breaking spaces with \s -if ( rnotwhite.test( "\xA0" ) ) { - trimLeft = /^[\s\xA0]+/; - trimRight = /[\s\xA0]+$/; -} - -// All jQuery objects should point back to these -rootjQuery = jQuery(document); - -// Cleanup functions for the document ready method -if ( document.addEventListener ) { - DOMContentLoaded = function() { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - jQuery.ready(); - }; - -} else if ( document.attachEvent ) { - DOMContentLoaded = function() { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( document.readyState === "complete" ) { - document.detachEvent( "onreadystatechange", DOMContentLoaded ); - jQuery.ready(); - } - }; -} - -// The DOM ready check for Internet Explorer -function doScrollCheck() { - if ( jQuery.isReady ) { - return; - } - - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - document.documentElement.doScroll("left"); - } catch(e) { - setTimeout( doScrollCheck, 1 ); - return; - } - - // and execute any waiting functions - jQuery.ready(); -} - -return jQuery; - -})(); - - -// String to Object flags format cache -var flagsCache = {}; - -// Convert String-formatted flags into Object-formatted ones and store in cache -function createFlags( flags ) { - var object = flagsCache[ flags ] = {}, - i, length; - flags = flags.split( /\s+/ ); - for ( i = 0, length = flags.length; i < length; i++ ) { - object[ flags[i] ] = true; - } - return object; -} - -/* - * Create a callback list using the following parameters: - * - * flags: an optional list of space-separated flags that will change how - * the callback list behaves - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible flags: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( flags ) { - - // Convert flags from String-formatted to Object-formatted - // (we check in cache first) - flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {}; - - var // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = [], - // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // Add one or several callbacks to the list - add = function( args ) { - var i, - length, - elem, - type, - actual; - for ( i = 0, length = args.length; i < length; i++ ) { - elem = args[ i ]; - type = jQuery.type( elem ); - if ( type === "array" ) { - // Inspect recursively - add( elem ); - } else if ( type === "function" ) { - // Add if not in unique mode and callback is not in - if ( !flags.unique || !self.has( elem ) ) { - list.push( elem ); - } - } - } - }, - // Fire callbacks - fire = function( context, args ) { - args = args || []; - memory = !flags.memory || [ context, args ]; - firing = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) { - memory = true; // Mark as halted - break; - } - } - firing = false; - if ( list ) { - if ( !flags.once ) { - if ( stack && stack.length ) { - memory = stack.shift(); - self.fireWith( memory[ 0 ], memory[ 1 ] ); - } - } else if ( memory === true ) { - self.disable(); - } else { - list = []; - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - var length = list.length; - add( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away, unless previous - // firing was halted (stopOnFalse) - } else if ( memory && memory !== true ) { - firingStart = length; - fire( memory[ 0 ], memory[ 1 ] ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - var args = arguments, - argIndex = 0, - argLength = args.length; - for ( ; argIndex < argLength ; argIndex++ ) { - for ( var i = 0; i < list.length; i++ ) { - if ( args[ argIndex ] === list[ i ] ) { - // Handle firingIndex and firingLength - if ( firing ) { - if ( i <= firingLength ) { - firingLength--; - if ( i <= firingIndex ) { - firingIndex--; - } - } - } - // Remove the element - list.splice( i--, 1 ); - // If we have some unicity property then - // we only need to do this once - if ( flags.unique ) { - break; - } - } - } - } - } - return this; - }, - // Control if a given callback is in the list - has: function( fn ) { - if ( list ) { - var i = 0, - length = list.length; - for ( ; i < length; i++ ) { - if ( fn === list[ i ] ) { - return true; - } - } - } - return false; - }, - // Remove all callbacks from the list - empty: function() { - list = []; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory || memory === true ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( stack ) { - if ( firing ) { - if ( !flags.once ) { - stack.push( [ context, args ] ); - } - } else if ( !( flags.once && memory ) ) { - fire( context, args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!memory; - } - }; - - return self; -}; - - - - -var // Static reference to slice - sliceDeferred = [].slice; - -jQuery.extend({ - - Deferred: function( func ) { - var doneList = jQuery.Callbacks( "once memory" ), - failList = jQuery.Callbacks( "once memory" ), - progressList = jQuery.Callbacks( "memory" ), - state = "pending", - lists = { - resolve: doneList, - reject: failList, - notify: progressList - }, - promise = { - done: doneList.add, - fail: failList.add, - progress: progressList.add, - - state: function() { - return state; - }, - - // Deprecated - isResolved: doneList.fired, - isRejected: failList.fired, - - then: function( doneCallbacks, failCallbacks, progressCallbacks ) { - deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks ); - return this; - }, - always: function() { - deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments ); - return this; - }, - pipe: function( fnDone, fnFail, fnProgress ) { - return jQuery.Deferred(function( newDefer ) { - jQuery.each( { - done: [ fnDone, "resolve" ], - fail: [ fnFail, "reject" ], - progress: [ fnProgress, "notify" ] - }, function( handler, data ) { - var fn = data[ 0 ], - action = data[ 1 ], - returned; - if ( jQuery.isFunction( fn ) ) { - deferred[ handler ](function() { - returned = fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify ); - } else { - newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); - } - }); - } else { - deferred[ handler ]( newDefer[ action ] ); - } - }); - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - if ( obj == null ) { - obj = promise; - } else { - for ( var key in promise ) { - obj[ key ] = promise[ key ]; - } - } - return obj; - } - }, - deferred = promise.promise({}), - key; - - for ( key in lists ) { - deferred[ key ] = lists[ key ].fire; - deferred[ key + "With" ] = lists[ key ].fireWith; - } - - // Handle state - deferred.done( function() { - state = "resolved"; - }, failList.disable, progressList.lock ).fail( function() { - state = "rejected"; - }, doneList.disable, progressList.lock ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( firstParam ) { - var args = sliceDeferred.call( arguments, 0 ), - i = 0, - length = args.length, - pValues = new Array( length ), - count = length, - pCount = length, - deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? - firstParam : - jQuery.Deferred(), - promise = deferred.promise(); - function resolveFunc( i ) { - return function( value ) { - args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - if ( !( --count ) ) { - deferred.resolveWith( deferred, args ); - } - }; - } - function progressFunc( i ) { - return function( value ) { - pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - deferred.notifyWith( promise, pValues ); - }; - } - if ( length > 1 ) { - for ( ; i < length; i++ ) { - if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) { - args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) ); - } else { - --count; - } - } - if ( !count ) { - deferred.resolveWith( deferred, args ); - } - } else if ( deferred !== firstParam ) { - deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); - } - return promise; - } -}); - - - - -jQuery.support = (function() { - - var support, - all, - a, - select, - opt, - input, - marginDiv, - fragment, - tds, - events, - eventName, - i, - isSupported, - div = document.createElement( "div" ), - documentElement = document.documentElement; - - // Preliminary tests - div.setAttribute("className", "t"); - div.innerHTML = "
        a"; - - all = div.getElementsByTagName( "*" ); - a = div.getElementsByTagName( "a" )[ 0 ]; - - // Can't get basic test support - if ( !all || !all.length || !a ) { - return {}; - } - - // First batch of supports tests - select = document.createElement( "select" ); - opt = select.appendChild( document.createElement("option") ); - input = div.getElementsByTagName( "input" )[ 0 ]; - - support = { - // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: ( div.firstChild.nodeType === 3 ), - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - tbody: !div.getElementsByTagName("tbody").length, - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName("link").length, - - // Get the style information from getAttribute - // (IE uses .cssText instead) - style: /top/.test( a.getAttribute("style") ), - - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: ( a.getAttribute("href") === "/a" ), - - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55/.test( a.style.opacity ), - - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - cssFloat: !!a.style.cssFloat, - - // Make sure that if no value is specified for a checkbox - // that it defaults to "on". - // (WebKit defaults to "" instead) - checkOn: ( input.value === "on" ), - - // Make sure that a selected-by-default option has a working selected property. - // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - optSelected: opt.selected, - - // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) - getSetAttribute: div.className !== "t", - - // Tests for enctype support on a form(#6743) - enctype: !!document.createElement("form").enctype, - - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", - - // Will be defined later - submitBubbles: true, - changeBubbles: true, - focusinBubbles: false, - deleteExpando: true, - noCloneEvent: true, - inlineBlockNeedsLayout: false, - shrinkWrapBlocks: false, - reliableMarginRight: true - }; - - // Make sure checked status is properly cloned - input.checked = true; - support.noCloneChecked = input.cloneNode( true ).checked; - - // Make sure that the options inside disabled selects aren't marked as disabled - // (WebKit marks them as disabled) - select.disabled = true; - support.optDisabled = !opt.disabled; - - // Test to see if it's possible to delete an expando from an element - // Fails in Internet Explorer - try { - delete div.test; - } catch( e ) { - support.deleteExpando = false; - } - - if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { - div.attachEvent( "onclick", function() { - // Cloning a node shouldn't copy over any - // bound event handlers (IE does this) - support.noCloneEvent = false; - }); - div.cloneNode( true ).fireEvent( "onclick" ); - } - - // Check if a radio maintains its value - // after being appended to the DOM - input = document.createElement("input"); - input.value = "t"; - input.setAttribute("type", "radio"); - support.radioValue = input.value === "t"; - - input.setAttribute("checked", "checked"); - div.appendChild( input ); - fragment = document.createDocumentFragment(); - fragment.appendChild( div.lastChild ); - - // WebKit doesn't clone checked state correctly in fragments - support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Check if a disconnected checkbox will retain its checked - // value of true after appended to the DOM (IE6/7) - support.appendChecked = input.checked; - - fragment.removeChild( input ); - fragment.appendChild( div ); - - div.innerHTML = ""; - - // Check if div with explicit width and no margin-right incorrectly - // gets computed margin-right based on width of container. For more - // info see bug #3333 - // Fails in WebKit before Feb 2011 nightlies - // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - if ( window.getComputedStyle ) { - marginDiv = document.createElement( "div" ); - marginDiv.style.width = "0"; - marginDiv.style.marginRight = "0"; - div.style.width = "2px"; - div.appendChild( marginDiv ); - support.reliableMarginRight = - ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; - } - - // Technique from Juriy Zaytsev - // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ - // We only care about the case where non-standard event systems - // are used, namely in IE. Short-circuiting here helps us to - // avoid an eval call (in setAttribute) which can cause CSP - // to go haywire. See: https://developer.mozilla.org/en/Security/CSP - if ( div.attachEvent ) { - for( i in { - submit: 1, - change: 1, - focusin: 1 - }) { - eventName = "on" + i; - isSupported = ( eventName in div ); - if ( !isSupported ) { - div.setAttribute( eventName, "return;" ); - isSupported = ( typeof div[ eventName ] === "function" ); - } - support[ i + "Bubbles" ] = isSupported; - } - } - - fragment.removeChild( div ); - - // Null elements to avoid leaks in IE - fragment = select = opt = marginDiv = div = input = null; - - // Run tests that need a body at doc ready - jQuery(function() { - var container, outer, inner, table, td, offsetSupport, - conMarginTop, ptlm, vb, style, html, - body = document.getElementsByTagName("body")[0]; - - if ( !body ) { - // Return for frameset docs that don't have a body - return; - } - - conMarginTop = 1; - ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;"; - vb = "visibility:hidden;border:0;"; - style = "style='" + ptlm + "border:5px solid #000;padding:0;'"; - html = "
        " + - "" + - "
        "; - - container = document.createElement("div"); - container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px"; - body.insertBefore( container, body.firstChild ); - - // Construct the test element - div = document.createElement("div"); - container.appendChild( div ); - - // Check if table cells still have offsetWidth/Height when they are set - // to display:none and there are still other visible table cells in a - // table row; if so, offsetWidth/Height are not reliable for use when - // determining if an element has been hidden directly using - // display:none (it is still safe to use offsets if a parent element is - // hidden; don safety goggles and see bug #4512 for more information). - // (only IE 8 fails this test) - div.innerHTML = "
        t
        "; - tds = div.getElementsByTagName( "td" ); - isSupported = ( tds[ 0 ].offsetHeight === 0 ); - - tds[ 0 ].style.display = ""; - tds[ 1 ].style.display = "none"; - - // Check if empty table cells still have offsetWidth/Height - // (IE <= 8 fail this test) - support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); - - // Figure out if the W3C box model works as expected - div.innerHTML = ""; - div.style.width = div.style.paddingLeft = "1px"; - jQuery.boxModel = support.boxModel = div.offsetWidth === 2; - - if ( typeof div.style.zoom !== "undefined" ) { - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - // (IE < 8 does this) - div.style.display = "inline"; - div.style.zoom = 1; - support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 ); - - // Check if elements with layout shrink-wrap their children - // (IE 6 does this) - div.style.display = ""; - div.innerHTML = "
        "; - support.shrinkWrapBlocks = ( div.offsetWidth !== 2 ); - } - - div.style.cssText = ptlm + vb; - div.innerHTML = html; - - outer = div.firstChild; - inner = outer.firstChild; - td = outer.nextSibling.firstChild.firstChild; - - offsetSupport = { - doesNotAddBorder: ( inner.offsetTop !== 5 ), - doesAddBorderForTableAndCells: ( td.offsetTop === 5 ) - }; - - inner.style.position = "fixed"; - inner.style.top = "20px"; - - // safari subtracts parent border width here which is 5px - offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 ); - inner.style.position = inner.style.top = ""; - - outer.style.overflow = "hidden"; - outer.style.position = "relative"; - - offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 ); - offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop ); - - body.removeChild( container ); - div = container = null; - - jQuery.extend( support, offsetSupport ); - }); - - return support; -})(); - - - - -var rbrace = /^(?:\{.*\}|\[.*\])$/, - rmultiDash = /([A-Z])/g; - -jQuery.extend({ - cache: {}, - - // Please use with caution - uuid: 0, - - // Unique for each copy of jQuery on the page - // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), - - // The following elements throw uncatchable exceptions if you - // attempt to add expando properties to them. - noData: { - "embed": true, - // Ban all objects except for Flash (which handle expandos) - "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", - "applet": true - }, - - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); - }, - - data: function( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var privateCache, thisCache, ret, - internalKey = jQuery.expando, - getByName = typeof name === "string", - - // We have to handle DOM nodes and JS objects differently because IE6-7 - // can't GC object references properly across the DOM-JS boundary - isNode = elem.nodeType, - - // Only DOM nodes need the global jQuery cache; JS object data is - // attached directly to the object so GC can occur automatically - cache = isNode ? jQuery.cache : elem, - - // Only defining an ID for JS objects if its cache already exists allows - // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey, - isEvents = name === "events"; - - // Avoid doing any more work than we need to when trying to get data on an - // object that has no data at all - if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) { - return; - } - - if ( !id ) { - // Only DOM nodes need a new unique ID for each element since their data - // ends up in the global cache - if ( isNode ) { - elem[ internalKey ] = id = ++jQuery.uuid; - } else { - id = internalKey; - } - } - - if ( !cache[ id ] ) { - cache[ id ] = {}; - - // Avoids exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - if ( !isNode ) { - cache[ id ].toJSON = jQuery.noop; - } - } - - // An object can be passed to jQuery.data instead of a key/value pair; this gets - // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ] = jQuery.extend( cache[ id ], name ); - } else { - cache[ id ].data = jQuery.extend( cache[ id ].data, name ); - } - } - - privateCache = thisCache = cache[ id ]; - - // jQuery data() is stored in a separate object inside the object's internal data - // cache in order to avoid key collisions between internal data and user-defined - // data. - if ( !pvt ) { - if ( !thisCache.data ) { - thisCache.data = {}; - } - - thisCache = thisCache.data; - } - - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; - } - - // Users should not attempt to inspect the internal events object using jQuery.data, - // it is undocumented and subject to change. But does anyone listen? No. - if ( isEvents && !thisCache[ name ] ) { - return privateCache.events; - } - - // Check for both converted-to-camel and non-converted data property names - // If a data property was specified - if ( getByName ) { - - // First Try to find as-is property data - ret = thisCache[ name ]; - - // Test for null|undefined property data - if ( ret == null ) { - - // Try to find the camelCased property - ret = thisCache[ jQuery.camelCase( name ) ]; - } - } else { - ret = thisCache; - } - - return ret; - }, - - removeData: function( elem, name, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var thisCache, i, l, - - // Reference to internal data cache key - internalKey = jQuery.expando, - - isNode = elem.nodeType, - - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, - - // See jQuery.data for more information - id = isNode ? elem[ internalKey ] : internalKey; - - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } - - if ( name ) { - - thisCache = pvt ? cache[ id ] : cache[ id ].data; - - if ( thisCache ) { - - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { - - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { - - // split the camel cased version by spaces unless a key with the spaces exists - name = jQuery.camelCase( name ); - if ( name in thisCache ) { - name = [ name ]; - } else { - name = name.split( " " ); - } - } - } - - for ( i = 0, l = name.length; i < l; i++ ) { - delete thisCache[ name[i] ]; - } - - // If there is no data left in the cache, we want to continue - // and let the cache object itself get destroyed - if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { - return; - } - } - } - - // See jQuery.data for more information - if ( !pvt ) { - delete cache[ id ].data; - - // Don't destroy the parent cache unless the internal data object - // had been the only thing left in it - if ( !isEmptyDataObject(cache[ id ]) ) { - return; - } - } - - // Browsers that fail expando deletion also refuse to delete expandos on - // the window, but it will allow it on all other JS objects; other browsers - // don't care - // Ensure that `cache` is not a window object #10080 - if ( jQuery.support.deleteExpando || !cache.setInterval ) { - delete cache[ id ]; - } else { - cache[ id ] = null; - } - - // We destroyed the cache and need to eliminate the expando on the node to avoid - // false lookups in the cache for entries that no longer exist - if ( isNode ) { - // IE does not allow us to delete expando properties from nodes, - // nor does it have a removeAttribute function on Document nodes; - // we must handle all of these cases - if ( jQuery.support.deleteExpando ) { - delete elem[ internalKey ]; - } else if ( elem.removeAttribute ) { - elem.removeAttribute( internalKey ); - } else { - elem[ internalKey ] = null; - } - } - }, - - // For internal use only. - _data: function( elem, name, data ) { - return jQuery.data( elem, name, data, true ); - }, - - // A method for determining if a DOM node can handle the data expando - acceptData: function( elem ) { - if ( elem.nodeName ) { - var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; - - if ( match ) { - return !(match === true || elem.getAttribute("classid") !== match); - } - } - - return true; - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - var parts, attr, name, - data = null; - - if ( typeof key === "undefined" ) { - if ( this.length ) { - data = jQuery.data( this[0] ); - - if ( this[0].nodeType === 1 && !jQuery._data( this[0], "parsedAttrs" ) ) { - attr = this[0].attributes; - for ( var i = 0, l = attr.length; i < l; i++ ) { - name = attr[i].name; - - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.substring(5) ); - - dataAttr( this[0], name, data[ name ] ); - } - } - jQuery._data( this[0], "parsedAttrs", true ); - } - } - - return data; - - } else if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } - - parts = key.split("."); - parts[1] = parts[1] ? "." + parts[1] : ""; - - if ( value === undefined ) { - data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - - // Try to fetch any internally stored data first - if ( data === undefined && this.length ) { - data = jQuery.data( this[0], key ); - data = dataAttr( this[0], key, data ); - } - - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; - - } else { - return this.each(function() { - var self = jQuery( this ), - args = [ parts[0], value ]; - - self.triggerHandler( "setData" + parts[1] + "!", args ); - jQuery.data( this, key, value ); - self.triggerHandler( "changeData" + parts[1] + "!", args ); - }); - } - }, - - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); - -function dataAttr( elem, key, data ) { - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - - var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - jQuery.isNumeric( data ) ? parseFloat( data ) : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} - - // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); - - } else { - data = undefined; - } - } - - return data; -} - -// checks a cache object for emptiness -function isEmptyDataObject( obj ) { - for ( var name in obj ) { - - // if the public data object is empty, the private is still empty - if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { - continue; - } - if ( name !== "toJSON" ) { - return false; - } - } - - return true; -} - - - - -function handleQueueMarkDefer( elem, type, src ) { - var deferDataKey = type + "defer", - queueDataKey = type + "queue", - markDataKey = type + "mark", - defer = jQuery._data( elem, deferDataKey ); - if ( defer && - ( src === "queue" || !jQuery._data(elem, queueDataKey) ) && - ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) { - // Give room for hard-coded callbacks to fire first - // and eventually mark/queue something else on the element - setTimeout( function() { - if ( !jQuery._data( elem, queueDataKey ) && - !jQuery._data( elem, markDataKey ) ) { - jQuery.removeData( elem, deferDataKey, true ); - defer.fire(); - } - }, 0 ); - } -} - -jQuery.extend({ - - _mark: function( elem, type ) { - if ( elem ) { - type = ( type || "fx" ) + "mark"; - jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 ); - } - }, - - _unmark: function( force, elem, type ) { - if ( force !== true ) { - type = elem; - elem = force; - force = false; - } - if ( elem ) { - type = type || "fx"; - var key = type + "mark", - count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 ); - if ( count ) { - jQuery._data( elem, key, count ); - } else { - jQuery.removeData( elem, key, true ); - handleQueueMarkDefer( elem, type, "mark" ); - } - } - }, - - queue: function( elem, type, data ) { - var q; - if ( elem ) { - type = ( type || "fx" ) + "queue"; - q = jQuery._data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !q || jQuery.isArray(data) ) { - q = jQuery._data( elem, type, jQuery.makeArray(data) ); - } else { - q.push( data ); - } - } - return q || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - fn = queue.shift(), - hooks = {}; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - } - - if ( fn ) { - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - jQuery._data( elem, type + ".run", hooks ); - fn.call( elem, function() { - jQuery.dequeue( elem, type ); - }, hooks ); - } - - if ( !queue.length ) { - jQuery.removeData( elem, type + "queue " + type + ".run", true ); - handleQueueMarkDefer( elem, type, "queue" ); - } - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - } - - if ( data === undefined ) { - return jQuery.queue( this[0], type ); - } - return this.each(function() { - var queue = jQuery.queue( this, type, data ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; - type = type || "fx"; - - return this.queue( type, function( next, hooks ) { - var timeout = setTimeout( next, time ); - hooks.stop = function() { - clearTimeout( timeout ); - }; - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, object ) { - if ( typeof type !== "string" ) { - object = type; - type = undefined; - } - type = type || "fx"; - var defer = jQuery.Deferred(), - elements = this, - i = elements.length, - count = 1, - deferDataKey = type + "defer", - queueDataKey = type + "queue", - markDataKey = type + "mark", - tmp; - function resolve() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - } - while( i-- ) { - if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || - ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || - jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && - jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { - count++; - tmp.add( resolve ); - } - } - resolve(); - return defer.promise(); - } -}); - - - - -var rclass = /[\n\t\r]/g, - rspace = /\s+/, - rreturn = /\r/g, - rtype = /^(?:button|input)$/i, - rfocusable = /^(?:button|input|object|select|textarea)$/i, - rclickable = /^a(?:rea)?$/i, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - getSetAttribute = jQuery.support.getSetAttribute, - nodeHook, boolHook, fixSpecified; - -jQuery.fn.extend({ - attr: function( name, value ) { - return jQuery.access( this, name, value, true, jQuery.attr ); - }, - - removeAttr: function( name ) { - return this.each(function() { - jQuery.removeAttr( this, name ); - }); - }, - - prop: function( name, value ) { - return jQuery.access( this, name, value, true, jQuery.prop ); - }, - - removeProp: function( name ) { - name = jQuery.propFix[ name ] || name; - return this.each(function() { - // try/catch handles cases where IE balks (such as removing a property on window) - try { - this[ name ] = undefined; - delete this[ name ]; - } catch( e ) {} - }); - }, - - addClass: function( value ) { - var classNames, i, l, elem, - setClass, c, cl; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).addClass( value.call(this, j, this.className) ); - }); - } - - if ( value && typeof value === "string" ) { - classNames = value.split( rspace ); - - for ( i = 0, l = this.length; i < l; i++ ) { - elem = this[ i ]; - - if ( elem.nodeType === 1 ) { - if ( !elem.className && classNames.length === 1 ) { - elem.className = value; - - } else { - setClass = " " + elem.className + " "; - - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) { - setClass += classNames[ c ] + " "; - } - } - elem.className = jQuery.trim( setClass ); - } - } - } - } - - return this; - }, - - removeClass: function( value ) { - var classNames, i, l, elem, className, c, cl; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).removeClass( value.call(this, j, this.className) ); - }); - } - - if ( (value && typeof value === "string") || value === undefined ) { - classNames = ( value || "" ).split( rspace ); - - for ( i = 0, l = this.length; i < l; i++ ) { - elem = this[ i ]; - - if ( elem.nodeType === 1 && elem.className ) { - if ( value ) { - className = (" " + elem.className + " ").replace( rclass, " " ); - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - className = className.replace(" " + classNames[ c ] + " ", " "); - } - elem.className = jQuery.trim( className ); - - } else { - elem.className = ""; - } - } - } - } - - return this; - }, - - toggleClass: function( value, stateVal ) { - var type = typeof value, - isBool = typeof stateVal === "boolean"; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( i ) { - jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); - }); - } - - return this.each(function() { - if ( type === "string" ) { - // toggle individual class names - var className, - i = 0, - self = jQuery( this ), - state = stateVal, - classNames = value.split( rspace ); - - while ( (className = classNames[ i++ ]) ) { - // check each className given, space seperated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); - } - - } else if ( type === "undefined" || type === "boolean" ) { - if ( this.className ) { - // store className if set - jQuery._data( this, "__className__", this.className ); - } - - // toggle whole className - this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; - } - }); - }, - - hasClass: function( selector ) { - var className = " " + selector + " ", - i = 0, - l = this.length; - for ( ; i < l; i++ ) { - if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { - return true; - } - } - - return false; - }, - - val: function( value ) { - var hooks, ret, isFunction, - elem = this[0]; - - if ( !arguments.length ) { - if ( elem ) { - hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ]; - - if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { - return ret; - } - - ret = elem.value; - - return typeof ret === "string" ? - // handle most common string cases - ret.replace(rreturn, "") : - // handle cases where value is null/undef or number - ret == null ? "" : ret; - } - - return; - } - - isFunction = jQuery.isFunction( value ); - - return this.each(function( i ) { - var self = jQuery(this), val; - - if ( this.nodeType !== 1 ) { - return; - } - - if ( isFunction ) { - val = value.call( this, i, self.val() ); - } else { - val = value; - } - - // Treat null/undefined as ""; convert numbers to string - if ( val == null ) { - val = ""; - } else if ( typeof val === "number" ) { - val += ""; - } else if ( jQuery.isArray( val ) ) { - val = jQuery.map(val, function ( value ) { - return value == null ? "" : value + ""; - }); - } - - hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ]; - - // If set returns undefined, fall back to normal setting - if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { - this.value = val; - } - }); - } -}); - -jQuery.extend({ - valHooks: { - option: { - get: function( elem ) { - // attributes.value is undefined in Blackberry 4.7 but - // uses .value. See #6932 - var val = elem.attributes.value; - return !val || val.specified ? elem.value : elem.text; - } - }, - select: { - get: function( elem ) { - var value, i, max, option, - index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type === "select-one"; - - // Nothing was selected - if ( index < 0 ) { - return null; - } - - // Loop through all the selected options - i = one ? index : 0; - max = one ? index + 1 : options.length; - for ( ; i < max; i++ ) { - option = options[ i ]; - - // Don't return options that are disabled or in a disabled optgroup - if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && - (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { - - // Get the specific value for the option - value = jQuery( option ).val(); - - // We don't need an array for one selects - if ( one ) { - return value; - } - - // Multi-Selects return an array - values.push( value ); - } - } - - // Fixes Bug #2551 -- select.val() broken in IE after form.reset() - if ( one && !values.length && options.length ) { - return jQuery( options[ index ] ).val(); - } - - return values; - }, - - set: function( elem, value ) { - var values = jQuery.makeArray( value ); - - jQuery(elem).find("option").each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; - }); - - if ( !values.length ) { - elem.selectedIndex = -1; - } - return values; - } - } - }, - - attrFn: { - val: true, - css: true, - html: true, - text: true, - data: true, - width: true, - height: true, - offset: true - }, - - attr: function( elem, name, value, pass ) { - var ret, hooks, notxml, - nType = elem.nodeType; - - // don't get/set attributes on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - if ( pass && name in jQuery.attrFn ) { - return jQuery( elem )[ name ]( value ); - } - - // Fallback to prop when attributes are not supported - if ( typeof elem.getAttribute === "undefined" ) { - return jQuery.prop( elem, name, value ); - } - - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - - // All attributes are lowercase - // Grab necessary hook if one is defined - if ( notxml ) { - name = name.toLowerCase(); - hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); - } - - if ( value !== undefined ) { - - if ( value === null ) { - jQuery.removeAttr( elem, name ); - return; - - } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - elem.setAttribute( name, "" + value ); - return value; - } - - } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - - ret = elem.getAttribute( name ); - - // Non-existent attributes return null, we normalize to undefined - return ret === null ? - undefined : - ret; - } - }, - - removeAttr: function( elem, value ) { - var propName, attrNames, name, l, - i = 0; - - if ( value && elem.nodeType === 1 ) { - attrNames = value.toLowerCase().split( rspace ); - l = attrNames.length; - - for ( ; i < l; i++ ) { - name = attrNames[ i ]; - - if ( name ) { - propName = jQuery.propFix[ name ] || name; - - // See #9699 for explanation of this approach (setting first, then removal) - jQuery.attr( elem, name, "" ); - elem.removeAttribute( getSetAttribute ? name : propName ); - - // Set corresponding property to false for boolean attributes - if ( rboolean.test( name ) && propName in elem ) { - elem[ propName ] = false; - } - } - } - } - }, - - attrHooks: { - type: { - set: function( elem, value ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { - // Setting the type on a radio button after the value resets the value in IE6-9 - // Reset value to it's default in case type is set after value - // This is for element creation - var val = elem.value; - elem.setAttribute( "type", value ); - if ( val ) { - elem.value = val; - } - return value; - } - } - }, - // Use the value property for back compat - // Use the nodeHook for button elements in IE6/7 (#1954) - value: { - get: function( elem, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.get( elem, name ); - } - return name in elem ? - elem.value : - null; - }, - set: function( elem, value, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.set( elem, value, name ); - } - // Does not return so that setAttribute is also used - elem.value = value; - } - } - }, - - propFix: { - tabindex: "tabIndex", - readonly: "readOnly", - "for": "htmlFor", - "class": "className", - maxlength: "maxLength", - cellspacing: "cellSpacing", - cellpadding: "cellPadding", - rowspan: "rowSpan", - colspan: "colSpan", - usemap: "useMap", - frameborder: "frameBorder", - contenteditable: "contentEditable" - }, - - prop: function( elem, name, value ) { - var ret, hooks, notxml, - nType = elem.nodeType; - - // don't get/set properties on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - - if ( notxml ) { - // Fix name and attach hooks - name = jQuery.propFix[ name ] || name; - hooks = jQuery.propHooks[ name ]; - } - - if ( value !== undefined ) { - if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - return ( elem[ name ] = value ); - } - - } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - return elem[ name ]; - } - } - }, - - propHooks: { - tabIndex: { - get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - var attributeNode = elem.getAttributeNode("tabindex"); - - return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - } - } -}); - -// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional) -jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex; - -// Hook for boolean attributes -boolHook = { - get: function( elem, name ) { - // Align boolean attributes with corresponding properties - // Fall back to attribute presence where some booleans are not supported - var attrNode, - property = jQuery.prop( elem, name ); - return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? - name.toLowerCase() : - undefined; - }, - set: function( elem, value, name ) { - var propName; - if ( value === false ) { - // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); - } else { - // value is true since we know at this point it's type boolean and not false - // Set boolean attributes to the same name and set the DOM property - propName = jQuery.propFix[ name ] || name; - if ( propName in elem ) { - // Only set the IDL specifically if it already exists on the element - elem[ propName ] = true; - } - - elem.setAttribute( name, name.toLowerCase() ); - } - return name; - } -}; - -// IE6/7 do not support getting/setting some attributes with get/setAttribute -if ( !getSetAttribute ) { - - fixSpecified = { - name: true, - id: true - }; - - // Use this for any attribute in IE6/7 - // This fixes almost every IE6/7 issue - nodeHook = jQuery.valHooks.button = { - get: function( elem, name ) { - var ret; - ret = elem.getAttributeNode( name ); - return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ? - ret.nodeValue : - undefined; - }, - set: function( elem, value, name ) { - // Set the existing or create a new attribute node - var ret = elem.getAttributeNode( name ); - if ( !ret ) { - ret = document.createAttribute( name ); - elem.setAttributeNode( ret ); - } - return ( ret.nodeValue = value + "" ); - } - }; - - // Apply the nodeHook to tabindex - jQuery.attrHooks.tabindex.set = nodeHook.set; - - // Set width and height to auto instead of 0 on empty string( Bug #8150 ) - // This is for removals - jQuery.each([ "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - set: function( elem, value ) { - if ( value === "" ) { - elem.setAttribute( name, "auto" ); - return value; - } - } - }); - }); - - // Set contenteditable to false on removals(#10429) - // Setting to empty string throws an error as an invalid value - jQuery.attrHooks.contenteditable = { - get: nodeHook.get, - set: function( elem, value, name ) { - if ( value === "" ) { - value = "false"; - } - nodeHook.set( elem, value, name ); - } - }; -} - - -// Some attributes require a special call on IE -if ( !jQuery.support.hrefNormalized ) { - jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - get: function( elem ) { - var ret = elem.getAttribute( name, 2 ); - return ret === null ? undefined : ret; - } - }); - }); -} - -if ( !jQuery.support.style ) { - jQuery.attrHooks.style = { - get: function( elem ) { - // Return undefined in the case of empty string - // Normalize to lowercase since IE uppercases css property names - return elem.style.cssText.toLowerCase() || undefined; - }, - set: function( elem, value ) { - return ( elem.style.cssText = "" + value ); - } - }; -} - -// Safari mis-reports the default selected property of an option -// Accessing the parent's selectedIndex property fixes it -if ( !jQuery.support.optSelected ) { - jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, { - get: function( elem ) { - var parent = elem.parentNode; - - if ( parent ) { - parent.selectedIndex; - - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - return null; - } - }); -} - -// IE6/7 call enctype encoding -if ( !jQuery.support.enctype ) { - jQuery.propFix.enctype = "encoding"; -} - -// Radios and checkboxes getter/setter -if ( !jQuery.support.checkOn ) { - jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - get: function( elem ) { - // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified - return elem.getAttribute("value") === null ? "on" : elem.value; - } - }; - }); -} -jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { - set: function( elem, value ) { - if ( jQuery.isArray( value ) ) { - return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); - } - } - }); -}); - - - - -var rformElems = /^(?:textarea|input|select)$/i, - rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, - rhoverHack = /\bhover(\.\S+)?\b/, - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/, - quickParse = function( selector ) { - var quick = rquickIs.exec( selector ); - if ( quick ) { - // 0 1 2 3 - // [ _, tag, id, class ] - quick[1] = ( quick[1] || "" ).toLowerCase(); - quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" ); - } - return quick; - }, - quickIs = function( elem, m ) { - var attrs = elem.attributes || {}; - return ( - (!m[1] || elem.nodeName.toLowerCase() === m[1]) && - (!m[2] || (attrs.id || {}).value === m[2]) && - (!m[3] || m[3].test( (attrs[ "class" ] || {}).value )) - ); - }, - hoverHack = function( events ) { - return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); - }; - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - add: function( elem, types, handler, data, selector ) { - - var elemData, eventHandle, events, - t, tns, type, namespaces, handleObj, - handleObjIn, quick, handlers, special; - - // Don't attach events to noData or text/comment nodes (allow plain objects tho) - if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - events = elemData.events; - if ( !events ) { - elemData.events = events = {}; - } - eventHandle = elemData.handle; - if ( !eventHandle ) { - elemData.handle = eventHandle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : - undefined; - }; - // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events - eventHandle.elem = elem; - } - - // Handle multiple events separated by a space - // jQuery(...).bind("mouseover mouseout", fn); - types = jQuery.trim( hoverHack(types) ).split( " " ); - for ( t = 0; t < types.length; t++ ) { - - tns = rtypenamespace.exec( types[t] ) || []; - type = tns[1]; - namespaces = ( tns[2] || "" ).split( "." ).sort(); - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: tns[1], - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - quick: quickParse( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); - - // Init the event handler queue if we're the first - handlers = events[ type ]; - if ( !handlers ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - global: {}, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var elemData = jQuery.hasData( elem ) && jQuery._data( elem ), - t, tns, type, origType, namespaces, origCount, - j, events, special, handle, eventType, handleObj; - - if ( !elemData || !(events = elemData.events) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = jQuery.trim( hoverHack( types || "" ) ).split(" "); - for ( t = 0; t < types.length; t++ ) { - tns = rtypenamespace.exec( types[t] ) || []; - type = origType = tns[1]; - namespaces = tns[2]; - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector? special.delegateType : special.bindType ) || type; - eventType = events[ type ] || []; - origCount = eventType.length; - namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null; - - // Remove matching events - for ( j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !namespaces || namespaces.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - eventType.splice( j--, 1 ); - - if ( handleObj.selector ) { - eventType.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( eventType.length === 0 && origCount !== eventType.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - handle = elemData.handle; - if ( handle ) { - handle.elem = null; - } - - // removeData also checks for emptiness and clears the expando if empty - // so use it instead of delete - jQuery.removeData( elem, [ "events", "handle" ], true ); - } - }, - - // Events that are safe to short-circuit if no handlers are attached. - // Native DOM events should not be added, they may have inline handlers. - customEvent: { - "getData": true, - "setData": true, - "changeData": true - }, - - trigger: function( event, data, elem, onlyHandlers ) { - // Don't do events on text and comment nodes - if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { - return; - } - - // Event object or event type - var type = event.type || event, - namespaces = [], - cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType; - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf( "!" ) >= 0 ) { - // Exclusive events trigger only for the exact event (no namespaces) - type = type.slice(0, -1); - exclusive = true; - } - - if ( type.indexOf( "." ) >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - - if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { - // No jQuery handlers for this event type, and it can't have inline handlers - return; - } - - // Caller can pass in an Event, Object, or just an event type string - event = typeof event === "object" ? - // jQuery.Event object - event[ jQuery.expando ] ? event : - // Object literal - new jQuery.Event( type, event ) : - // Just the event type (string) - new jQuery.Event( type ); - - event.type = type; - event.isTrigger = true; - event.exclusive = exclusive; - event.namespace = namespaces.join( "." ); - event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; - ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; - - // Handle a global trigger - if ( !elem ) { - - // TODO: Stop taunting the data cache; remove global events and always attach to document - cache = jQuery.cache; - for ( i in cache ) { - if ( cache[ i ].events && cache[ i ].events[ type ] ) { - jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); - } - } - return; - } - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data != null ? jQuery.makeArray( data ) : []; - data.unshift( event ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - eventPath = [[ elem, special.bindType || type ]]; - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; - old = null; - for ( ; cur; cur = cur.parentNode ) { - eventPath.push([ cur, bubbleType ]); - old = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( old && old === elem.ownerDocument ) { - eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); - } - } - - // Fire handlers on the event path - for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { - - cur = eventPath[i][0]; - event.type = eventPath[i][1]; - - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - // Note that this is a bare JS function and not a jQuery handler - handle = ontype && cur[ ontype ]; - if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) { - event.preventDefault(); - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && - !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction() check here because IE6/7 fails that test. - // Don't do default actions on window, that's where global variables be (#6170) - // IE<9 dies on focus/blur to hidden element (#1486) - if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - old = elem[ ontype ]; - - if ( old ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - elem[ type ](); - jQuery.event.triggered = undefined; - - if ( old ) { - elem[ ontype ] = old; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event || window.event ); - - var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), - delegateCount = handlers.delegateCount, - args = [].slice.call( arguments, 0 ), - run_all = !event.exclusive && !event.namespace, - handlerQueue = [], - i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Determine handlers that should run if there are delegated events - // Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861) - if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) { - - // Pregenerate a single jQuery object for reuse with .is() - jqcur = jQuery(this); - jqcur.context = this.ownerDocument || this; - - for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { - selMatch = {}; - matches = []; - jqcur[0] = cur; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - sel = handleObj.selector; - - if ( selMatch[ sel ] === undefined ) { - selMatch[ sel ] = ( - handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel ) - ); - } - if ( selMatch[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, matches: matches }); - } - } - } - - // Add the remaining (directly-bound) handlers - if ( handlers.length > delegateCount ) { - handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); - } - - // Run delegates first; they may want to stop propagation beneath us - for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { - matched = handlerQueue[ i ]; - event.currentTarget = matched.elem; - - for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { - handleObj = matched.matches[ j ]; - - // Triggered event must either 1) be non-exclusive and have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { - - event.data = handleObj.data; - event.handleObj = handleObj; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - return event.result; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** - props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button, - fromElement = original.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, - originalEvent = event, - fixHook = jQuery.event.fixHooks[ event.type ] || {}, - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = jQuery.Event( originalEvent ); - - for ( i = copy.length; i; ) { - prop = copy[ --i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Target should not be a text node (#504, Safari) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8) - if ( event.metaKey === undefined ) { - event.metaKey = event.ctrlKey; - } - - return fixHook.filter? fixHook.filter( event, originalEvent ) : event; - }, - - special: { - ready: { - // Make sure the ready event is setup - setup: jQuery.bindReady - }, - - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - - focus: { - delegateType: "focusin" - }, - blur: { - delegateType: "focusout" - }, - - beforeunload: { - setup: function( data, namespaces, eventHandle ) { - // We only want to do this special case on windows - if ( jQuery.isWindow( this ) ) { - this.onbeforeunload = eventHandle; - } - }, - - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { - this.onbeforeunload = null; - } - } - } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -// Some plugins are using, but it's undocumented/deprecated and will be removed. -// The 1.7 special event interface should provide all the hooks needed now. -jQuery.event.handle = jQuery.event.dispatch; - -jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } - } : - function( elem, type, handle ) { - if ( elem.detachEvent ) { - elem.detachEvent( "on" + type, handle ); - } - }; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || - src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -function returnFalse() { - return false; -} -function returnTrue() { - return true; -} - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - preventDefault: function() { - this.isDefaultPrevented = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - - // if preventDefault exists run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - - // otherwise set the returnValue property of the original event to false (IE) - } else { - e.returnValue = false; - } - }, - stopPropagation: function() { - this.isPropagationStopped = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - // if stopPropagation exists run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - // otherwise set the cancelBubble property of the original event to true (IE) - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - }, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var target = this, - related = event.relatedTarget, - handleObj = event.handleObj, - selector = handleObj.selector, - ret; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -}); - -// IE submit delegation -if ( !jQuery.support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Lazy-add a submit handler when a descendant form may potentially be submitted - jQuery.event.add( this, "click._submit keypress._submit", function( e ) { - // Node name check avoids a VML-related crash in IE (#9807) - var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; - if ( form && !form._submit_attached ) { - jQuery.event.add( form, "submit._submit", function( event ) { - // If form was submitted by the user, bubble the event up the tree - if ( this.parentNode && !event.isTrigger ) { - jQuery.event.simulate( "submit", this.parentNode, event, true ); - } - }); - form._submit_attached = true; - } - }); - // return undefined since we don't need an event listener - }, - - teardown: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Remove delegated handlers; cleanData eventually reaps submit handlers attached above - jQuery.event.remove( this, "._submit" ); - } - }; -} - -// IE change delegation and checkbox/radio fix -if ( !jQuery.support.changeBubbles ) { - - jQuery.event.special.change = { - - setup: function() { - - if ( rformElems.test( this.nodeName ) ) { - // IE doesn't fire change on a check/radio until blur; trigger it on click - // after a propertychange. Eat the blur-change in special.change.handle. - // This still fires onchange a second time for check/radio after blur. - if ( this.type === "checkbox" || this.type === "radio" ) { - jQuery.event.add( this, "propertychange._change", function( event ) { - if ( event.originalEvent.propertyName === "checked" ) { - this._just_changed = true; - } - }); - jQuery.event.add( this, "click._change", function( event ) { - if ( this._just_changed && !event.isTrigger ) { - this._just_changed = false; - jQuery.event.simulate( "change", this, event, true ); - } - }); - } - return false; - } - // Delegated event; lazy-add a change handler on descendant inputs - jQuery.event.add( this, "beforeactivate._change", function( e ) { - var elem = e.target; - - if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) { - jQuery.event.add( elem, "change._change", function( event ) { - if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { - jQuery.event.simulate( "change", this.parentNode, event, true ); - } - }); - elem._change_attached = true; - } - }); - }, - - handle: function( event ) { - var elem = event.target; - - // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { - return event.handleObj.handler.apply( this, arguments ); - } - }, - - teardown: function() { - jQuery.event.remove( this, "._change" ); - - return rformElems.test( this.nodeName ); - } - }; -} - -// Create "bubbling" focus and blur events -if ( !jQuery.support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler while someone wants focusin/focusout - var attaches = 0, - handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - if ( attaches++ === 0 ) { - document.addEventListener( orig, handler, true ); - } - }, - teardown: function() { - if ( --attaches === 0 ) { - document.removeEventListener( orig, handler, true ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - // ( types-Object, data ) - data = selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); - }, - one: function( types, selector, data, fn ) { - return this.on.call( this, types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - var handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace? handleObj.type + "." + handleObj.namespace : handleObj.type, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( var type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, - - bind: function( types, data, fn ) { - return this.on( types, null, data, fn ); - }, - unbind: function( types, fn ) { - return this.off( types, null, fn ); - }, - - live: function( types, data, fn ) { - jQuery( this.context ).on( types, this.selector, data, fn ); - return this; - }, - die: function( types, fn ) { - jQuery( this.context ).off( types, this.selector || "**", fn ); - return this; - }, - - delegate: function( selector, types, data, fn ) { - return this.on( types, selector, data, fn ); - }, - undelegate: function( selector, types, fn ) { - // ( namespace ) or ( selector, types [, fn] ) - return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn ); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - if ( this[0] ) { - return jQuery.event.trigger( type, data, this[0], true ); - } - }, - - toggle: function( fn ) { - // Save reference to arguments for access in closure - var args = arguments, - guid = fn.guid || jQuery.guid++, - i = 0, - toggler = function( event ) { - // Figure out which function to execute - var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; - }; - - // link all the functions, so any of them can unbind this click handler - toggler.guid = guid; - while ( i < args.length ) { - args[ i++ ].guid = guid; - } - - return this.click( toggler ); - }, - - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); - } -}); - -jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { - - // Handle event binding - jQuery.fn[ name ] = function( data, fn ) { - if ( fn == null ) { - fn = data; - data = null; - } - - return arguments.length > 0 ? - this.on( name, null, data, fn ) : - this.trigger( name ); - }; - - if ( jQuery.attrFn ) { - jQuery.attrFn[ name ] = true; - } - - if ( rkeyEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; - } - - if ( rmouseEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; - } -}); - - - -/*! - * Sizzle CSS Selector Engine - * Copyright 2012, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){ - -var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, - expando = "sizcache" + (Math.random() + '').replace('.', ''), - done = 0, - toString = Object.prototype.toString, - hasDuplicate = false, - baseHasDuplicate = true, - rBackslash = /\\/g, - rReturn = /\r\n/g, - rNonWord = /\W/; - -// Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision -// function. If that is the case, discard the hasDuplicate value. -// Thus far that includes Google Chrome. -[0, 0].sort(function() { - baseHasDuplicate = false; - return 0; -}); - -var Sizzle = function( selector, context, results, seed ) { - results = results || []; - context = context || document; - - var origContext = context; - - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { - return []; - } - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - var m, set, checkSet, extra, ret, cur, pop, i, - prune = true, - contextXML = Sizzle.isXML( context ), - parts = [], - soFar = selector; - - // Reset the position of the chunker regexp (start from head) - do { - chunker.exec( "" ); - m = chunker.exec( soFar ); - - if ( m ) { - soFar = m[3]; - - parts.push( m[1] ); - - if ( m[2] ) { - extra = m[3]; - break; - } - } - } while ( m ); - - if ( parts.length > 1 && origPOS.exec( selector ) ) { - - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context, seed ); - - } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); - - while ( parts.length ) { - selector = parts.shift(); - - if ( Expr.relative[ selector ] ) { - selector += parts.shift(); - } - - set = posProcess( selector, set, seed ); - } - } - - } else { - // Take a shortcut and set the context if the root selector is an ID - // (but not if it'll be faster if the inner selector is an ID) - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { - - ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? - Sizzle.filter( ret.expr, ret.set )[0] : - ret.set[0]; - } - - if ( context ) { - ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); - - set = ret.expr ? - Sizzle.filter( ret.expr, ret.set ) : - ret.set; - - if ( parts.length > 0 ) { - checkSet = makeArray( set ); - - } else { - prune = false; - } - - while ( parts.length ) { - cur = parts.pop(); - pop = cur; - - if ( !Expr.relative[ cur ] ) { - cur = ""; - } else { - pop = parts.pop(); - } - - if ( pop == null ) { - pop = context; - } - - Expr.relative[ cur ]( checkSet, pop, contextXML ); - } - - } else { - checkSet = parts = []; - } - } - - if ( !checkSet ) { - checkSet = set; - } - - if ( !checkSet ) { - Sizzle.error( cur || selector ); - } - - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); - - } else if ( context && context.nodeType === 1 ) { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { - results.push( set[i] ); - } - } - - } else { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); - } - } - } - - } else { - makeArray( checkSet, results ); - } - - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); - } - - return results; -}; - -Sizzle.uniqueSort = function( results ) { - if ( sortOrder ) { - hasDuplicate = baseHasDuplicate; - results.sort( sortOrder ); - - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[ i - 1 ] ) { - results.splice( i--, 1 ); - } - } - } - } - - return results; -}; - -Sizzle.matches = function( expr, set ) { - return Sizzle( expr, null, null, set ); -}; - -Sizzle.matchesSelector = function( node, expr ) { - return Sizzle( expr, null, null, [node] ).length > 0; -}; - -Sizzle.find = function( expr, context, isXML ) { - var set, i, len, match, type, left; - - if ( !expr ) { - return []; - } - - for ( i = 0, len = Expr.order.length; i < len; i++ ) { - type = Expr.order[i]; - - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - left = match[1]; - match.splice( 1, 1 ); - - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace( rBackslash, "" ); - set = Expr.find[ type ]( match, context, isXML ); - - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); - break; - } - } - } - } - - if ( !set ) { - set = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName( "*" ) : - []; - } - - return { set: set, expr: expr }; -}; - -Sizzle.filter = function( expr, set, inplace, not ) { - var match, anyFound, - type, found, item, filter, left, - i, pass, - old = expr, - result = [], - curLoop = set, - isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); - - while ( expr && set.length ) { - for ( type in Expr.filter ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - filter = Expr.filter[ type ]; - left = match[1]; - - anyFound = false; - - match.splice(1,1); - - if ( left.substr( left.length - 1 ) === "\\" ) { - continue; - } - - if ( curLoop === result ) { - result = []; - } - - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); - - if ( !match ) { - anyFound = found = true; - - } else if ( match === true ) { - continue; - } - } - - if ( match ) { - for ( i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); - pass = not ^ found; - - if ( inplace && found != null ) { - if ( pass ) { - anyFound = true; - - } else { - curLoop[i] = false; - } - - } else if ( pass ) { - result.push( item ); - anyFound = true; - } - } - } - } - - if ( found !== undefined ) { - if ( !inplace ) { - curLoop = result; - } - - expr = expr.replace( Expr.match[ type ], "" ); - - if ( !anyFound ) { - return []; - } - - break; - } - } - } - - // Improper expression - if ( expr === old ) { - if ( anyFound == null ) { - Sizzle.error( expr ); - - } else { - break; - } - } - - old = expr; - } - - return curLoop; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Utility function for retreiving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -var getText = Sizzle.getText = function( elem ) { - var i, node, - nodeType = elem.nodeType, - ret = ""; - - if ( nodeType ) { - if ( nodeType === 1 || nodeType === 9 ) { - // Use textContent || innerText for elements - if ( typeof elem.textContent === 'string' ) { - return elem.textContent; - } else if ( typeof elem.innerText === 'string' ) { - // Replace IE's carriage returns - return elem.innerText.replace( rReturn, '' ); - } else { - // Traverse it's children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - } else { - - // If no nodeType, this is expected to be an array - for ( i = 0; (node = elem[i]); i++ ) { - // Do not traverse comment nodes - if ( node.nodeType !== 8 ) { - ret += getText( node ); - } - } - } - return ret; -}; - -var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], - - match: { - ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ - }, - - leftMatch: {}, - - attrMap: { - "class": "className", - "for": "htmlFor" - }, - - attrHandle: { - href: function( elem ) { - return elem.getAttribute( "href" ); - }, - type: function( elem ) { - return elem.getAttribute( "type" ); - } - }, - - relative: { - "+": function(checkSet, part){ - var isPartStr = typeof part === "string", - isTag = isPartStr && !rNonWord.test( part ), - isPartStrNotTag = isPartStr && !isTag; - - if ( isTag ) { - part = part.toLowerCase(); - } - - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} - - checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? - elem || false : - elem === part; - } - } - - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); - } - }, - - ">": function( checkSet, part ) { - var elem, - isPartStr = typeof part === "string", - i = 0, - l = checkSet.length; - - if ( isPartStr && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - - for ( ; i < l; i++ ) { - elem = checkSet[i]; - - if ( elem ) { - var parent = elem.parentNode; - checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; - } - } - - } else { - for ( ; i < l; i++ ) { - elem = checkSet[i]; - - if ( elem ) { - checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; - } - } - - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); - } - } - }, - - "": function(checkSet, part, isXML){ - var nodeCheck, - doneName = done++, - checkFn = dirCheck; - - if ( typeof part === "string" && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - nodeCheck = part; - checkFn = dirNodeCheck; - } - - checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); - }, - - "~": function( checkSet, part, isXML ) { - var nodeCheck, - doneName = done++, - checkFn = dirCheck; - - if ( typeof part === "string" && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - nodeCheck = part; - checkFn = dirNodeCheck; - } - - checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); - } - }, - - find: { - ID: function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [m] : []; - } - }, - - NAME: function( match, context ) { - if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], - results = context.getElementsByName( match[1] ); - - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); - } - } - - return ret.length === 0 ? null : ret; - } - }, - - TAG: function( match, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( match[1] ); - } - } - }, - preFilter: { - CLASS: function( match, curLoop, inplace, result, not, isXML ) { - match = " " + match[1].replace( rBackslash, "" ) + " "; - - if ( isXML ) { - return match; - } - - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { - if ( !inplace ) { - result.push( elem ); - } - - } else if ( inplace ) { - curLoop[i] = false; - } - } - } - - return false; - }, - - ID: function( match ) { - return match[1].replace( rBackslash, "" ); - }, - - TAG: function( match, curLoop ) { - return match[1].replace( rBackslash, "" ).toLowerCase(); - }, - - CHILD: function( match ) { - if ( match[1] === "nth" ) { - if ( !match[2] ) { - Sizzle.error( match[0] ); - } - - match[2] = match[2].replace(/^\+|\s*/g, ''); - - // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' - var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( - match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); - - // calculate the numbers (first)n+(last) including if they are negative - match[2] = (test[1] + (test[2] || 1)) - 0; - match[3] = test[3] - 0; - } - else if ( match[2] ) { - Sizzle.error( match[0] ); - } - - // TODO: Move to normal caching system - match[0] = done++; - - return match; - }, - - ATTR: function( match, curLoop, inplace, result, not, isXML ) { - var name = match[1] = match[1].replace( rBackslash, "" ); - - if ( !isXML && Expr.attrMap[name] ) { - match[1] = Expr.attrMap[name]; - } - - // Handle if an un-quoted value was used - match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" ); - - if ( match[2] === "~=" ) { - match[4] = " " + match[4] + " "; - } - - return match; - }, - - PSEUDO: function( match, curLoop, inplace, result, not ) { - if ( match[1] === "not" ) { - // If we're dealing with a complex expression, or a simple one - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { - match[3] = Sizzle(match[3], null, null, curLoop); - - } else { - var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); - - if ( !inplace ) { - result.push.apply( result, ret ); - } - - return false; - } - - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { - return true; - } - - return match; - }, - - POS: function( match ) { - match.unshift( true ); - - return match; - } - }, - - filters: { - enabled: function( elem ) { - return elem.disabled === false && elem.type !== "hidden"; - }, - - disabled: function( elem ) { - return elem.disabled === true; - }, - - checked: function( elem ) { - return elem.checked === true; - }, - - selected: function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - parent: function( elem ) { - return !!elem.firstChild; - }, - - empty: function( elem ) { - return !elem.firstChild; - }, - - has: function( elem, i, match ) { - return !!Sizzle( match[3], elem ).length; - }, - - header: function( elem ) { - return (/h\d/i).test( elem.nodeName ); - }, - - text: function( elem ) { - var attr = elem.getAttribute( "type" ), type = elem.type; - // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) - // use getAttribute instead to test this case - return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); - }, - - radio: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type; - }, - - checkbox: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type; - }, - - file: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "file" === elem.type; - }, - - password: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "password" === elem.type; - }, - - submit: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && "submit" === elem.type; - }, - - image: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "image" === elem.type; - }, - - reset: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && "reset" === elem.type; - }, - - button: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && "button" === elem.type || name === "button"; - }, - - input: function( elem ) { - return (/input|select|textarea|button/i).test( elem.nodeName ); - }, - - focus: function( elem ) { - return elem === elem.ownerDocument.activeElement; - } - }, - setFilters: { - first: function( elem, i ) { - return i === 0; - }, - - last: function( elem, i, match, array ) { - return i === array.length - 1; - }, - - even: function( elem, i ) { - return i % 2 === 0; - }, - - odd: function( elem, i ) { - return i % 2 === 1; - }, - - lt: function( elem, i, match ) { - return i < match[3] - 0; - }, - - gt: function( elem, i, match ) { - return i > match[3] - 0; - }, - - nth: function( elem, i, match ) { - return match[3] - 0 === i; - }, - - eq: function( elem, i, match ) { - return match[3] - 0 === i; - } - }, - filter: { - PSEUDO: function( elem, match, i, array ) { - var name = match[1], - filter = Expr.filters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; - - } else if ( name === "not" ) { - var not = match[3]; - - for ( var j = 0, l = not.length; j < l; j++ ) { - if ( not[j] === elem ) { - return false; - } - } - - return true; - - } else { - Sizzle.error( name ); - } - }, - - CHILD: function( elem, match ) { - var first, last, - doneName, parent, cache, - count, diff, - type = match[1], - node = elem; - - switch ( type ) { - case "only": - case "first": - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - - if ( type === "first" ) { - return true; - } - - node = elem; - - case "last": - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - - return true; - - case "nth": - first = match[2]; - last = match[3]; - - if ( first === 1 && last === 0 ) { - return true; - } - - doneName = match[0]; - parent = elem.parentNode; - - if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) { - count = 0; - - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - node.nodeIndex = ++count; - } - } - - parent[ expando ] = doneName; - } - - diff = elem.nodeIndex - last; - - if ( first === 0 ) { - return diff === 0; - - } else { - return ( diff % first === 0 && diff / first >= 0 ); - } - } - }, - - ID: function( elem, match ) { - return elem.nodeType === 1 && elem.getAttribute("id") === match; - }, - - TAG: function( elem, match ) { - return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match; - }, - - CLASS: function( elem, match ) { - return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; - }, - - ATTR: function( elem, match ) { - var name = match[1], - result = Sizzle.attr ? - Sizzle.attr( elem, name ) : - Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), - value = result + "", - type = match[2], - check = match[4]; - - return result == null ? - type === "!=" : - !type && Sizzle.attr ? - result != null : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value !== check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; - }, - - POS: function( elem, match, i, array ) { - var name = match[2], - filter = Expr.setFilters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } - } - } -}; - -var origPOS = Expr.match.POS, - fescape = function(all, num){ - return "\\" + (num - 0 + 1); - }; - -for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); -} - -var makeArray = function( array, results ) { - array = Array.prototype.slice.call( array, 0 ); - - if ( results ) { - results.push.apply( results, array ); - return results; - } - - return array; -}; - -// Perform a simple check to determine if the browser is capable of -// converting a NodeList to an array using builtin methods. -// Also verifies that the returned array holds DOM nodes -// (which is not the case in the Blackberry browser) -try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; - -// Provide a fallback method if it does not work -} catch( e ) { - makeArray = function( array, results ) { - var i = 0, - ret = results || []; - - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); - - } else { - if ( typeof array.length === "number" ) { - for ( var l = array.length; i < l; i++ ) { - ret.push( array[i] ); - } - - } else { - for ( ; array[i]; i++ ) { - ret.push( array[i] ); - } - } - } - - return ret; - }; -} - -var sortOrder, siblingCheck; - -if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - return a.compareDocumentPosition ? -1 : 1; - } - - return a.compareDocumentPosition(b) & 4 ? -1 : 1; - }; - -} else { - sortOrder = function( a, b ) { - // The nodes are identical, we can exit early - if ( a === b ) { - hasDuplicate = true; - return 0; - - // Fallback to using sourceIndex (in IE) if it's available on both nodes - } else if ( a.sourceIndex && b.sourceIndex ) { - return a.sourceIndex - b.sourceIndex; - } - - var al, bl, - ap = [], - bp = [], - aup = a.parentNode, - bup = b.parentNode, - cur = aup; - - // If the nodes are siblings (or identical) we can do a quick check - if ( aup === bup ) { - return siblingCheck( a, b ); - - // If no parents were found then the nodes are disconnected - } else if ( !aup ) { - return -1; - - } else if ( !bup ) { - return 1; - } - - // Otherwise they're somewhere else in the tree so we need - // to build up a full list of the parentNodes for comparison - while ( cur ) { - ap.unshift( cur ); - cur = cur.parentNode; - } - - cur = bup; - - while ( cur ) { - bp.unshift( cur ); - cur = cur.parentNode; - } - - al = ap.length; - bl = bp.length; - - // Start walking down the tree looking for a discrepancy - for ( var i = 0; i < al && i < bl; i++ ) { - if ( ap[i] !== bp[i] ) { - return siblingCheck( ap[i], bp[i] ); - } - } - - // We ended someplace up the tree so do a sibling check - return i === al ? - siblingCheck( a, bp[i], -1 ) : - siblingCheck( ap[i], b, 1 ); - }; - - siblingCheck = function( a, b, ret ) { - if ( a === b ) { - return ret; - - var cur = a.nextSibling; - } - - while ( cur ) { - if ( cur === b ) { - return -1; - } - - cur = cur.nextSibling; - } - - return 1; - }; -} - -// Check to see if the browser returns elements by name when -// querying by getElementById (and provide a workaround) -(function(){ - // We're going to inject a fake input element with a specified name - var form = document.createElement("div"), - id = "script" + (new Date()).getTime(), - root = document.documentElement; - - form.innerHTML = ""; - - // Inject it into the root element, check its status, and remove it quickly - root.insertBefore( form, root.firstChild ); - - // The workaround has to do additional checks after a getElementById - // Which slows things down for other browsers (hence the branching) - if ( document.getElementById( id ) ) { - Expr.find.ID = function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - - return m ? - m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? - [m] : - undefined : - []; - } - }; - - Expr.filter.ID = function( elem, match ) { - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - - return elem.nodeType === 1 && node && node.nodeValue === match; - }; - } - - root.removeChild( form ); - - // release memory in IE - root = form = null; -})(); - -(function(){ - // Check to see if the browser returns only elements - // when doing getElementsByTagName("*") - - // Create a fake element - var div = document.createElement("div"); - div.appendChild( document.createComment("") ); - - // Make sure no comments are found - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function( match, context ) { - var results = context.getElementsByTagName( match[1] ); - - // Filter out possible comments - if ( match[1] === "*" ) { - var tmp = []; - - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); - } - } - - results = tmp; - } - - return results; - }; - } - - // Check to see if an attribute returns normalized href attributes - div.innerHTML = ""; - - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { - - Expr.attrHandle.href = function( elem ) { - return elem.getAttribute( "href", 2 ); - }; - } - - // release memory in IE - div = null; -})(); - -if ( document.querySelectorAll ) { - (function(){ - var oldSizzle = Sizzle, - div = document.createElement("div"), - id = "__sizzle__"; - - div.innerHTML = "

        "; - - // Safari can't handle uppercase or unicode characters when - // in quirks mode. - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { - return; - } - - Sizzle = function( query, context, extra, seed ) { - context = context || document; - - // Only use querySelectorAll on non-XML documents - // (ID selectors don't work in non-HTML documents) - if ( !seed && !Sizzle.isXML(context) ) { - // See if we find a selector to speed up - var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); - - if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { - // Speed-up: Sizzle("TAG") - if ( match[1] ) { - return makeArray( context.getElementsByTagName( query ), extra ); - - // Speed-up: Sizzle(".CLASS") - } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { - return makeArray( context.getElementsByClassName( match[2] ), extra ); - } - } - - if ( context.nodeType === 9 ) { - // Speed-up: Sizzle("body") - // The body element only exists once, optimize finding it - if ( query === "body" && context.body ) { - return makeArray( [ context.body ], extra ); - - // Speed-up: Sizzle("#ID") - } else if ( match && match[3] ) { - var elem = context.getElementById( match[3] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id === match[3] ) { - return makeArray( [ elem ], extra ); - } - - } else { - return makeArray( [], extra ); - } - } - - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(qsaError) {} - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - var oldContext = context, - old = context.getAttribute( "id" ), - nid = old || id, - hasParent = context.parentNode, - relativeHierarchySelector = /^\s*[+~]/.test( query ); - - if ( !old ) { - context.setAttribute( "id", nid ); - } else { - nid = nid.replace( /'/g, "\\$&" ); - } - if ( relativeHierarchySelector && hasParent ) { - context = context.parentNode; - } - - try { - if ( !relativeHierarchySelector || hasParent ) { - return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); - } - - } catch(pseudoError) { - } finally { - if ( !old ) { - oldContext.removeAttribute( "id" ); - } - } - } - } - - return oldSizzle(query, context, extra, seed); - }; - - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; - } - - // release memory in IE - div = null; - })(); -} - -(function(){ - var html = document.documentElement, - matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector; - - if ( matches ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9 fails this) - var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ), - pseudoWorks = false; - - try { - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( document.documentElement, "[test!='']:sizzle" ); - - } catch( pseudoError ) { - pseudoWorks = true; - } - - Sizzle.matchesSelector = function( node, expr ) { - // Make sure that attribute selectors are quoted - expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); - - if ( !Sizzle.isXML( node ) ) { - try { - if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { - var ret = matches.call( node, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || !disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9, so check for that - node.document && node.document.nodeType !== 11 ) { - return ret; - } - } - } catch(e) {} - } - - return Sizzle(expr, null, null, [node]).length > 0; - }; - } -})(); - -(function(){ - var div = document.createElement("div"); - - div.innerHTML = "
        "; - - // Opera can't find a second classname (in 9.6) - // Also, make sure that getElementsByClassName actually exists - if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { - return; - } - - // Safari caches class attributes, doesn't catch changes (in 3.2) - div.lastChild.className = "e"; - - if ( div.getElementsByClassName("e").length === 1 ) { - return; - } - - Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function( match, context, isXML ) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { - return context.getElementsByClassName(match[1]); - } - }; - - // release memory in IE - div = null; -})(); - -function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - - if ( elem ) { - var match = false; - - elem = elem[dir]; - - while ( elem ) { - if ( elem[ expando ] === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 && !isXML ){ - elem[ expando ] = doneName; - elem.sizset = i; - } - - if ( elem.nodeName.toLowerCase() === cur ) { - match = elem; - break; - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - - if ( elem ) { - var match = false; - - elem = elem[dir]; - - while ( elem ) { - if ( elem[ expando ] === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 ) { - if ( !isXML ) { - elem[ expando ] = doneName; - elem.sizset = i; - } - - if ( typeof cur !== "string" ) { - if ( elem === cur ) { - match = true; - break; - } - - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { - match = elem; - break; - } - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -if ( document.documentElement.contains ) { - Sizzle.contains = function( a, b ) { - return a !== b && (a.contains ? a.contains(b) : true); - }; - -} else if ( document.documentElement.compareDocumentPosition ) { - Sizzle.contains = function( a, b ) { - return !!(a.compareDocumentPosition(b) & 16); - }; - -} else { - Sizzle.contains = function() { - return false; - }; -} - -Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; - - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -var posProcess = function( selector, context, seed ) { - var match, - tmpSet = [], - later = "", - root = context.nodeType ? [context] : context; - - // Position selectors must be done after the filter - // And so must :not(positional) so we move all PSEUDOs to the end - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { - later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); - } - - selector = Expr.relative[selector] ? selector + "*" : selector; - - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet, seed ); - } - - return Sizzle.filter( later, tmpSet ); -}; - -// EXPOSE -// Override sizzle attribute retrieval -Sizzle.attr = jQuery.attr; -Sizzle.selectors.attrMap = {}; -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.filters; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - -})(); - - -var runtil = /Until$/, - rparentsprev = /^(?:parents|prevUntil|prevAll)/, - // Note: This RegExp should be improved, or likely pulled from Sizzle - rmultiselector = /,/, - isSimple = /^.[^:#\[\.,]*$/, - slice = Array.prototype.slice, - POS = jQuery.expr.match.POS, - // methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.fn.extend({ - find: function( selector ) { - var self = this, - i, l; - - if ( typeof selector !== "string" ) { - return jQuery( selector ).filter(function() { - for ( i = 0, l = self.length; i < l; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - }); - } - - var ret = this.pushStack( "", "find", selector ), - length, n, r; - - for ( i = 0, l = this.length; i < l; i++ ) { - length = ret.length; - jQuery.find( selector, this[i], ret ); - - if ( i > 0 ) { - // Make sure that the results are unique - for ( n = length; n < ret.length; n++ ) { - for ( r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { - ret.splice(n--, 1); - break; - } - } - } - } - } - - return ret; - }, - - has: function( target ) { - var targets = jQuery( target ); - return this.filter(function() { - for ( var i = 0, l = targets.length; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); - }, - - filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); - }, - - is: function( selector ) { - return !!selector && ( - typeof selector === "string" ? - // If this is a positional selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - POS.test( selector ) ? - jQuery( selector, this.context ).index( this[0] ) >= 0 : - jQuery.filter( selector, this ).length > 0 : - this.filter( selector ).length > 0 ); - }, - - closest: function( selectors, context ) { - var ret = [], i, l, cur = this[0]; - - // Array (deprecated as of jQuery 1.7) - if ( jQuery.isArray( selectors ) ) { - var level = 1; - - while ( cur && cur.ownerDocument && cur !== context ) { - for ( i = 0; i < selectors.length; i++ ) { - - if ( jQuery( cur ).is( selectors[ i ] ) ) { - ret.push({ selector: selectors[ i ], elem: cur, level: level }); - } - } - - cur = cur.parentNode; - level++; - } - - return ret; - } - - // String - var pos = POS.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( i = 0, l = this.length; i < l; i++ ) { - cur = this[i]; - - while ( cur ) { - if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { - ret.push( cur ); - break; - - } else { - cur = cur.parentNode; - if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) { - break; - } - } - } - } - - ret = ret.length > 1 ? jQuery.unique( ret ) : ret; - - return this.pushStack( ret, "closest", selectors ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; - } - - // index in selector - if ( typeof elem === "string" ) { - return jQuery.inArray( this[0], jQuery( elem ) ); - } - - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); - }, - - add: function( selector, context ) { - var set = typeof selector === "string" ? - jQuery( selector, context ) : - jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), - all = jQuery.merge( this.get(), set ); - - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); - }, - - andSelf: function() { - return this.add( this.prevObject ); - } -}); - -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). -function isDisconnected( node ) { - return !node || !node.parentNode || node.parentNode.nodeType === 11; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return jQuery.nth( elem, 2, "nextSibling" ); - }, - prev: function( elem ) { - return jQuery.nth( elem, 2, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( elem.parentNode.firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray( elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( !runtil.test( name ) ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; - - if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - - return this.pushStack( ret, name, slice.call( arguments ).join(",") ); - }; -}); - -jQuery.extend({ - filter: function( expr, elems, not ) { - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 ? - jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : - jQuery.find.matches(expr, elems); - }, - - dir: function( elem, dir, until ) { - var matched = [], - cur = elem[ dir ]; - - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); - } - cur = cur[dir]; - } - return matched; - }, - - nth: function( cur, result, dir, elem ) { - result = result || 1; - var num = 0; - - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType === 1 && ++num === result ) { - break; - } - } - - return cur; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); - } - } - - return r; - } -}); - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, keep ) { - - // Can't pass null or undefined to indexOf in Firefox 4 - // Set to 0 to skip string check - qualifier = qualifier || 0; - - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - var retVal = !!qualifier.call( elem, i, elem ); - return retVal === keep; - }); - - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return ( elem === qualifier ) === keep; - }); - - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; - }); - - if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); - } - } - - return jQuery.grep(elements, function( elem, i ) { - return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; - }); -} - - - - -function createSafeFragment( document ) { - var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); - - if ( safeFrag.createElement ) { - while ( list.length ) { - safeFrag.createElement( - list.pop() - ); - } - } - return safeFrag; -} - -var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" + - "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", - rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, - rleadingWhitespace = /^\s+/, - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, - rtagName = /<([\w:]+)/, - rtbody = /", "" ], - legend: [ 1, "
        ", "
        " ], - thead: [ 1, "", "
        " ], - tr: [ 2, "", "
        " ], - td: [ 3, "", "
        " ], - col: [ 2, "", "
        " ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] - }, - safeFragment = createSafeFragment( document ); - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// IE can't serialize and - - - - - - - - - - - - - - - - - - - diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html deleted file mode 100755 index a63d728a..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Bootstrap, from Twitter - - - - - - - - - - - - - - - - - - - - - - -
        - -
        -

        Form controls

        -
        - -
        -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        - - - - -
        -
        - -
        - - - diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html deleted file mode 100755 index 17754bf6..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - Bootstrap, from Twitter - - - - - - - - - - - - - - - - - - - - - - - -
        -
        -
        - - - - - - Project name -
        - -
        -
        -
        -
        - -
        - - -
        -
        -
        - - - - - - Project name -
        - -
        -
        -
        -
        - - -
        -

        Navbar example

        -

        This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

        -

        - View navbar docs » -

        -
        - -
        - - - - - - - - - - - - - - - - - - - diff --git a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json deleted file mode 100755 index 2e69156a..00000000 --- a/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "bootstrap" - , "description": "HTML, CSS, and JS toolkit from Twitter." - , "version": "2.0.4" - , "keywords": ["bootstrap", "css"] - , "homepage": "http://twitter.github.com/bootstrap/" - , "author": "Twitter Inc." - , "scripts": { "test": "make test" } - , "repository": { - "type": "git" - , "url": "https://github.com/twitter/bootstrap.git" - } - , "licenses": [ - { - "type": "Apache-2.0" - , "url": "http://www.apache.org/licenses/LICENSE-2.0" - } - ] - , "devDependencies": { - "uglify-js": "1.2.6" - , "jshint": "0.6.1" - , "recess": "1.0.3" - , "connect": "2.1.3" - } -} \ No newline at end of file From d3d32731e17d1d64094ab9e5729008a56c997689 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 19 Sep 2015 16:00:38 -0700 Subject: [PATCH 115/364] more test fixes --- middleman-core/features/collections.feature | 7 +- .../features/working_directory.feature | 33 ---------- .../fixtures/collections-app/config.rb | 16 ----- .../collections-app/source/index.html.erb | 26 -------- .../step_definitions/middleman_steps.rb | 12 ++-- .../step_definitions/server_steps.rb | 64 ++++++------------- middleman-core/middleman-core.gemspec | 2 +- 7 files changed, 29 insertions(+), 131 deletions(-) delete mode 100644 middleman-core/features/working_directory.feature delete mode 100644 middleman-core/fixtures/collections-app/config.rb delete mode 100644 middleman-core/fixtures/collections-app/source/index.html.erb diff --git a/middleman-core/features/collections.feature b/middleman-core/features/collections.feature index a745a5a1..053986fd 100644 --- a/middleman-core/features/collections.feature +++ b/middleman-core/features/collections.feature @@ -197,13 +197,16 @@ Feature: Collections Given a fixture app "collections-app" And a file named "config.rb" with: """ + Dir.chdir(ENV['MM_ROOT']) + ignore "/description_template.html" + live { Dir["descriptions/*.txt"] }.each do |description_name| base = File.basename(description_name, '.txt') proxy "#{base}.html", "/description_template.html", locals: { contents: File.read(description_name) - }, ignore: true + } end """ And a file named "source/description_template.html.erb" with: @@ -233,4 +236,4 @@ Feature: Collections When I go to "test1.html" Then I should see 'Not Found' When I go to "test2.html" - Then I should see 'Test2' \ No newline at end of file + Then I should see 'Test2' diff --git a/middleman-core/features/working_directory.feature b/middleman-core/features/working_directory.feature deleted file mode 100644 index 0ab9cf90..00000000 --- a/middleman-core/features/working_directory.feature +++ /dev/null @@ -1,33 +0,0 @@ -Feature: Honour working directory - Honour the working directory during testing - In order to support helpers which work with the current directories - - Scenario: Set working directory for helpers in tests - Given a fixture app "empty-app" - And a file named "source/index.html.erb" with: - """ - <%= Dir.getwd %> - """ - And the Server is running - When I go to "/index.html" - Then I should see: - """ - aruba - """ - - Scenario: Set working directory for config.rb in tests - Given a fixture app "empty-app" - And a file named "config.rb" with: - """ - set :my_working_directory, Dir.getwd - """ - And a file named "source/index.html.erb" with: - """ - <%= config[:my_working_directory] %> - """ - And the Server is running - When I go to "/index.html" - Then I should see: - """ - aruba - """ diff --git a/middleman-core/fixtures/collections-app/config.rb b/middleman-core/fixtures/collections-app/config.rb deleted file mode 100644 index ae9cb817..00000000 --- a/middleman-core/fixtures/collections-app/config.rb +++ /dev/null @@ -1,16 +0,0 @@ -collection :articles, - where: proc { |resource| - uri_match resource.url, 'blog/{year}-{month}-{day}-{title}.html' - } - -collection :tags, - where: proc { |resource| - resource.data.tags - }, - group_by: proc { |resource| - if resource.data.tags.is_a? String - resource.data.tags.split(',').map(&:strip) - else - resource.data.tags - end - } \ No newline at end of file diff --git a/middleman-core/fixtures/collections-app/source/index.html.erb b/middleman-core/fixtures/collections-app/source/index.html.erb deleted file mode 100644 index 0d6f2ad5..00000000 --- a/middleman-core/fixtures/collections-app/source/index.html.erb +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -<% collected.articles.each do |article| %> -
      1. - Article: <%= article.data.title %> - -
        2. -<% end %> - - -<% collected[:tags].each do |k, items| %> -
      2. - <%= k %> - <% items.each do |article| %> - <%= article.data.title %> - <% end %> -
        3. -<% end %> - - - diff --git a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb index ff256a94..8b2690cb 100644 --- a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb @@ -1,15 +1,11 @@ Then /^the file "([^\"]*)" has the contents$/ do |path, contents| - write_file(path, contents) + File.write(File.expand_path(path), contents) - # cd(".") do - @server_inst.files.find_new_files! - # end + @server_inst.files.find_new_files! end Then /^the file "([^\"]*)" is removed$/ do |path| - step %Q{I remove the file "#{path}"} + File.delete(File.expand_path(path)) - # cd(".") do - @server_inst.files.find_new_files! - # end + @server_inst.files.find_new_files! end diff --git a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb index 1a80a118..9ff79474 100644 --- a/middleman-core/lib/middleman-core/step_definitions/server_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb @@ -42,18 +42,16 @@ Given /^the Server is running$/ do initialize_commands = @initialize_commands || [] - # cd(".") do - @server_inst = ::Middleman::Application.new do - config[:watcher_disable] = true - config[:show_exceptions] = false + @server_inst = ::Middleman::Application.new do + config[:watcher_disable] = true + config[:show_exceptions] = false - initialize_commands.each do |p| - instance_exec(&p) - end + initialize_commands.each do |p| + instance_exec(&p) end + end - Capybara.app = ::Middleman::Rack.new(@server_inst).to_app - # end + Capybara.app = ::Middleman::Rack.new(@server_inst).to_app end Given /^the Server is running at "([^\"]*)"$/ do |app_path| @@ -66,73 +64,49 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string| end When /^I go to "([^\"]*)"$/ do |url| - # cd(".") do - visit(URI.encode(url).to_s) - # end + visit(URI.encode(url).to_s) end Then /^going to "([^\"]*)" should not raise an exception$/ do |url| - # cd(".") do - expect{ visit(URI.encode(url).to_s) }.to_not raise_exception - # end + expect{ visit(URI.encode(url).to_s) }.to_not raise_exception end Then /^the content type should be "([^\"]*)"$/ do |expected| - # cd(".") do - expect(page.response_headers['Content-Type']).to start_with expected - # end + expect(page.response_headers['Content-Type']).to start_with expected end Then /^I should see "([^\"]*)"$/ do |expected| - # cd(".") do - expect(page.body).to include expected - # end + expect(page.body).to include expected end Then /^I should see '([^\']*)'$/ do |expected| - # cd(".") do - expect(page.body).to include expected - # end + expect(page.body).to include expected end Then /^I should see:$/ do |expected| - # cd(".") do - expect(page.body).to include expected - # end + expect(page.body).to include expected end Then /^I should not see "([^\"]*)"$/ do |expected| - # cd(".") do - expect(page.body).not_to include expected - # end + expect(page.body).not_to include expected end Then /^I should see content matching %r{(.*)}$/ do |expected| - # cd(".") do - expect(page.body).to match(expected) - # end + expect(page.body).to match(expected) end Then /^I should not see content matching %r{(.*)}$/ do |expected| - # cd(".") do - expect(page.body).to_not match(expected) - # end + expect(page.body).to_not match(expected) end Then /^I should not see:$/ do |expected| - # cd(".") do - expect(page.body).not_to include expected - # end + expect(page.body).not_to include expected end Then /^the status code should be "([^\"]*)"$/ do |expected| - # cd(".") do - expect(page.status_code).to eq expected.to_i - # end + expect(page.status_code).to eq expected.to_i end Then /^I should see "([^\"]*)" lines$/ do |lines| - # cd(".") do - expect(page.body.chomp.split($/).length).to eq lines.to_i - # end + expect(page.body.chomp.split($/).length).to eq lines.to_i end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index b43475e4..eb747036 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -52,7 +52,7 @@ Gem::Specification.new do |s| s.add_dependency('execjs', ['~> 2.0']) # Testing - s.add_dependency('contracts', ['~> 0.9.0']) + s.add_dependency('contracts', ['~> 0.11.0']) # Hash stuff s.add_dependency('hashie', ['~> 3.4']) From 62f431b5ae5377084305cb781c55f9521f4ddba7 Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Sat, 19 Sep 2015 14:53:12 +0000 Subject: [PATCH 116/364] Refactor frontmatter parsing Closes #1603 --- .../lib/middleman-core/util/data.rb | 130 ++++++------------ 1 file changed, 40 insertions(+), 90 deletions(-) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index 781ed5c0..c37c7bf4 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -20,116 +20,66 @@ module Middleman module_function - YAML_ERRORS = [StandardError] - - # https://github.com/tenderlove/psych/issues/23 - if defined?(Psych) && defined?(Psych::SyntaxError) - YAML_ERRORS << Psych::SyntaxError - end - # Get the frontmatter and plain content from a file # @param [String] path # @return [Array] Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]] def parse(full_path, known_type=nil) - data = {} - - return [data, nil] if ::Middleman::Util.binary?(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 + return [{}, nil] if Middleman::Util.binary?(full_path) + # Avoid weird race condition when a file is renamed begin - if content =~ /\A.*coding:/ - lines = content.split(/\n/) - lines.shift - content = lines.join("\n") - end - - if known_type - if known_type == :yaml - result = parse_yaml(content, full_path, true) - elsif known_type == :json - result = parse_json(content, full_path) - end - else - result = parse_yaml(content, full_path, false) - end - - return result if result - rescue - # Probably a binary file, move on + content = File.read(full_path) + rescue EOFError, IOError, Errno::ENOENT + return [{}, nil] end - [data, content] + case known_type + when :yaml + return [parse_yaml(content, full_path), nil] + when :json + return [parse_json(content, full_path), nil] + end + + / + (?^[-;]{3})[ ]*\r?\n + (?.*?)[ ]*\r?\n + (?^[-.;]{3})[ ]*\r?\n? + (?.*) + /mx =~ content + + return [{}, content] unless frontmatter + + case [start, stop] + when %w[--- ---], %w[--- ...] + [parse_yaml(frontmatter, full_path), additional_content] + when %w[;;; ;;;] + [parse_json(frontmatter, full_path), additional_content] + else + [{}, content] + end end # Parse YAML frontmatter out of a string # @param [String] content # @return [Array] - Contract String, Pathname, Bool => Maybe[[Hash, String]] - def parse_yaml(content, full_path, require_yaml=false) - total_delims = content.scan(/^(?:---|\.\.\.)\s*(?:\n|$)/).length - has_first_line_delim = !content.match(/\A(---\s*(?:\n|$))/).nil? - # has_closing_delim = (total_delims > 1 && has_first_line_delim) || (!has_first_line_delim && total_delims == 1) - - parts = content.split(/^(?:---|\.\.\.)\s*(?:\n|$)/) - parts.shift if parts[0].empty? - - yaml_string = nil - additional_content = nil - - if require_yaml - yaml_string = parts[0] - additional_content = parts[1] - else - if total_delims > 1 - if has_first_line_delim - yaml_string = parts[0] - additional_content = parts[1] - else - additional_content = content - end - else - additional_content = parts[0] - end - end - - return [{}, additional_content] if yaml_string.nil? - - begin - data = map_value(::YAML.load(yaml_string) || {}) - rescue *YAML_ERRORS => e - $stderr.puts "YAML Exception parsing #{full_path}: #{e.message}" - return nil - end - - [data, additional_content] - rescue - [{}, additional_content] + Contract String, Pathname, Bool => Hash + def parse_yaml(content, full_path) + map_value(YAML.load(content)) + rescue StandardError, Psych::SyntaxError => error + warn "YAML Exception parsing #{full_path}: #{error.message}" + {} end # Parse JSON frontmatter out of a string # @param [String] content # @return [Array] - Contract String, Pathname => Maybe[[Hash, String]] + Contract String, Pathname => Hash def parse_json(content, full_path) - begin - data = map_value(::JSON.parse(content)) - rescue => e - $stderr.puts "JSON Exception parsing #{full_path}: #{e.message}" - return nil - end - - [data, nil] - rescue - [{}, nil] + map_value(JSON.parse(content)) + rescue StandardError => error + warn "JSON Exception parsing #{full_path}: #{error.message}" + {} end def symbolize_recursive(hash) From 91a06a1a35169e8efe6bfe11d5b419e0857cc541 Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Sun, 20 Sep 2015 12:23:47 +0000 Subject: [PATCH 117/364] Refactor util/data.rb further --- .../lib/middleman-core/util/data.rb | 155 ++++++++---------- 1 file changed, 67 insertions(+), 88 deletions(-) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index c37c7bf4..c1d1e572 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -1,103 +1,82 @@ -# Core Pathname library used for traversal +require 'yaml' +require 'json' require 'pathname' - -# DbC +require 'middleman-core/util' require 'middleman-core/contracts' -# Shared util methods -require 'middleman-core/util' +module Middleman::Util::Data + include Contracts -# Parsing YAML data -require 'yaml' + module_function -# Parsing JSON data -require 'json' + # Get the frontmatter and plain content from a file + # @param [String] path + # @return [Array] + Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]] + def parse(full_path, known_type=nil) + return [{}, nil] if Middleman::Util.binary?(full_path) -module Middleman - module Util - module Data - include Contracts + # Avoid weird race condition when a file is renamed + begin + content = File.read(full_path) + rescue EOFError, IOError, Errno::ENOENT + return [{}, nil] + end - module_function + case known_type + when :yaml + return [parse_yaml(content, full_path), nil] + when :json + return [parse_json(content, full_path), nil] + end - # Get the frontmatter and plain content from a file - # @param [String] path - # @return [Array] - Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]] - def parse(full_path, known_type=nil) - return [{}, nil] if Middleman::Util.binary?(full_path) + / + (?^[-;]{3})[ ]*\r?\n + (?.*?)[ ]*\r?\n + (?^[-.;]{3})[ ]*\r?\n? + (?.*) + /mx =~ content - # Avoid weird race condition when a file is renamed - begin - content = File.read(full_path) - rescue EOFError, IOError, Errno::ENOENT - return [{}, nil] - end + case [start, stop] + when %w[--- ---], %w[--- ...] + [parse_yaml(frontmatter, full_path), additional_content] + when %w[;;; ;;;] + [parse_json(frontmatter, full_path), additional_content] + else + [{}, content] + end + end - case known_type - when :yaml - return [parse_yaml(content, full_path), nil] - when :json - return [parse_json(content, full_path), nil] - end + # Parse YAML frontmatter out of a string + # @param [String] content + # @return [Array] + Contract String, Pathname, Bool => Hash + def parse_yaml(content, full_path) + symbolize_recursive(YAML.load(content)) + rescue StandardError, Psych::SyntaxError => error + warn "YAML Exception parsing #{full_path}: #{error.message}" + {} + end - / - (?^[-;]{3})[ ]*\r?\n - (?.*?)[ ]*\r?\n - (?^[-.;]{3})[ ]*\r?\n? - (?.*) - /mx =~ content + # Parse JSON frontmatter out of a string + # @param [String] content + # @return [Array] + Contract String, Pathname => Hash + def parse_json(content, full_path) + symbolize_recursive(JSON.parse(content)) + rescue StandardError => error + warn "JSON Exception parsing #{full_path}: #{error.message}" + {} + end - return [{}, content] unless frontmatter - - case [start, stop] - when %w[--- ---], %w[--- ...] - [parse_yaml(frontmatter, full_path), additional_content] - when %w[;;; ;;;] - [parse_json(frontmatter, full_path), additional_content] - else - [{}, content] - end - end - - # Parse YAML frontmatter out of a string - # @param [String] content - # @return [Array] - Contract String, Pathname, Bool => Hash - def parse_yaml(content, full_path) - map_value(YAML.load(content)) - rescue StandardError, Psych::SyntaxError => error - warn "YAML Exception parsing #{full_path}: #{error.message}" - {} - end - - # Parse JSON frontmatter out of a string - # @param [String] content - # @return [Array] - Contract String, Pathname => Hash - def parse_json(content, full_path) - map_value(JSON.parse(content)) - rescue StandardError => error - warn "JSON Exception parsing #{full_path}: #{error.message}" - {} - end - - def symbolize_recursive(hash) - {}.tap do |h| - hash.each { |key, value| h[key.to_sym] = map_value(value) } - end - end - - def map_value(thing) - case thing - when Hash - symbolize_recursive(thing) - when Array - thing.map { |v| map_value(v) } - else - thing - end - end + def symbolize_recursive(value) + case value + when Hash + value.map { |k, v| [k.to_sym, symbolize_recursive(v)] }.to_h + when Array + value.map { |v| symbolize_recursive(v) } + else + value end end end From 47bdcb2d9c95fa1e482ad39023dd18c62e0fcaa2 Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Wed, 23 Sep 2015 20:06:11 +0000 Subject: [PATCH 118/364] Fix frontmatter parsing changes from #1608 Only allow frontmatter at the top of the page: Now manually removing encoding lines as before Fix handling of postscript data: If there is no frontmatter and the filetype is known, parse the whole file Allow empty frontmatter Update the documentation comments --- .../lib/middleman-core/util/data.rb | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index c1d1e572..76b53e82 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -23,20 +23,23 @@ module Middleman::Util::Data return [{}, nil] end - case known_type - when :yaml - return [parse_yaml(content, full_path), nil] - when :json - return [parse_json(content, full_path), nil] - end - / - (?^[-;]{3})[ ]*\r?\n - (?.*?)[ ]*\r?\n - (?^[-.;]{3})[ ]*\r?\n? + \A(.*?coding:.*?\n)? + (?[-;]{3})[ ]*\r?\n + (?.*?)[ ]*\r?\n? + (?[-.;]{3})[ ]*\r?\n? (?.*) /mx =~ content + unless frontmatter + case known_type + when :yaml + return [parse_yaml(content, full_path), nil] + when :json + return [parse_json(content, full_path), nil] + end + end + case [start, stop] when %w[--- ---], %w[--- ...] [parse_yaml(frontmatter, full_path), additional_content] @@ -49,10 +52,10 @@ module Middleman::Util::Data # Parse YAML frontmatter out of a string # @param [String] content - # @return [Array] + # @return [Hash] Contract String, Pathname, Bool => Hash def parse_yaml(content, full_path) - symbolize_recursive(YAML.load(content)) + symbolize_recursive(YAML.load(content) || {}) rescue StandardError, Psych::SyntaxError => error warn "YAML Exception parsing #{full_path}: #{error.message}" {} @@ -60,10 +63,10 @@ module Middleman::Util::Data # Parse JSON frontmatter out of a string # @param [String] content - # @return [Array] + # @return [Hash] Contract String, Pathname => Hash def parse_json(content, full_path) - symbolize_recursive(JSON.parse(content)) + symbolize_recursive(JSON.parse(content) || {}) rescue StandardError => error warn "JSON Exception parsing #{full_path}: #{error.message}" {} From ddc4a3cabc98443c8d315c8155f55ee2ad2832e9 Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Wed, 23 Sep 2015 23:40:42 +0100 Subject: [PATCH 119/364] Update data.rb --- middleman-core/lib/middleman-core/util/data.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index 76b53e82..c26439fb 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -27,7 +27,7 @@ module Middleman::Util::Data \A(.*?coding:.*?\n)? (?[-;]{3})[ ]*\r?\n (?.*?)[ ]*\r?\n? - (?[-.;]{3})[ ]*\r?\n? + (?^[-.;]{3})[ ]*\r?\n? (?.*) /mx =~ content From fe66beacc3986e0b77d0c8f2b563f99a34bc92e8 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 23 Sep 2015 16:20:16 -0700 Subject: [PATCH 120/364] Test fix WIP --- middleman-core/features/collections.feature | 3 +- .../step_definitions/builder_steps.rb | 47 ---------------- .../step_definitions/middleman_steps.rb | 53 ++++++++++++++++++- .../lib/middleman-core/util/data.rb | 4 +- .../source/stylesheets/_partial.sass | 2 + 5 files changed, 56 insertions(+), 53 deletions(-) create mode 100644 middleman-core/source/stylesheets/_partial.sass diff --git a/middleman-core/features/collections.feature b/middleman-core/features/collections.feature index 053986fd..e12ca0a5 100644 --- a/middleman-core/features/collections.feature +++ b/middleman-core/features/collections.feature @@ -197,11 +197,10 @@ Feature: Collections Given a fixture app "collections-app" And a file named "config.rb" with: """ - Dir.chdir(ENV['MM_ROOT']) ignore "/description_template.html" live { - Dir["descriptions/*.txt"] + Dir[File.join(root, "descriptions/*.txt")] }.each do |description_name| base = File.basename(description_name, '.txt') proxy "#{base}.html", "/description_template.html", locals: { diff --git a/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb index 3293c082..dc0b7c6d 100644 --- a/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb @@ -4,34 +4,6 @@ Before do @modification_times = Hash.new end -Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name| - target = File.join(PROJECT_ROOT_PATH, 'fixtures', path) - config_path = File.join(expand_path("."), "config-#{config_name}.rb") - config_dest = File.join(expand_path("."), 'config.rb') - FileUtils.cp(config_path, config_dest) -end - -Given /^an empty app$/ do - step %Q{a directory named "empty_app"} - step %Q{I cd to "empty_app"} - ENV['MM_ROOT'] = nil -end - -Given /^a fixture app "([^\"]*)"$/ do |path| - ENV['MM_ROOT'] = nil - - # This step can be reentered from several places but we don't want - # to keep re-copying and re-cd-ing into ever-deeper directories - next if File.basename(expand_path(".")) == path - - step %Q{a directory named "#{path}"} - - target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path) - FileUtils.cp_r(target_path, expand_path(".")) - - step %Q{I cd to "#{path}"} -end - Given /^a built app at "([^\"]*)"$/ do |path| step %Q{a fixture app "#{path}"} step %Q{I run `middleman build --verbose`} @@ -56,22 +28,3 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, step %Q{a built app at "#{path}" with flags "#{flags}"} step %Q{was successfully built} end - -Given /^a modification time for a file named "([^\"]*)"$/ do |file| - target = File.join(expand_path("."), file) - @modification_times[target] = File.mtime(target) -end - -Then /^the file "([^\"]*)" should not have been updated$/ do |file| - target = File.join(expand_path("."), file) - expect(File.mtime(target)).to eq(@modification_times[target]) -end - -# Provide this Aruba overload in case we're matching something with quotes in it -Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content| - expect(file).to have_file_content(Regexp.new(Regexp.escape(partial_content)), true) -end - -And /the file "(.*)" should be gzipped/ do |file| - expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*')) -end diff --git a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb index 8b2690cb..63236a10 100644 --- a/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb +++ b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb @@ -1,11 +1,60 @@ +require 'fileutils' + +Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name| + target = File.join(PROJECT_ROOT_PATH, 'fixtures', path) + config_path = File.join(expand_path("."), "config-#{config_name}.rb") + config_dest = File.join(expand_path("."), 'config.rb') + FileUtils.cp(config_path, config_dest) +end + +Given /^an empty app$/ do + step %Q{a directory named "empty_app"} + step %Q{I cd to "empty_app"} + ENV['MM_ROOT'] = nil +end + +Given /^a fixture app "([^\"]*)"$/ do |path| + ENV['MM_ROOT'] = nil + + # This step can be reentered from several places but we don't want + # to keep re-copying and re-cd-ing into ever-deeper directories + next if File.basename(expand_path(".")) == path + + step %Q{a directory named "#{path}"} + + target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path) + FileUtils.cp_r(target_path, expand_path(".")) + + step %Q{I cd to "#{path}"} +end + Then /^the file "([^\"]*)" has the contents$/ do |path, contents| - File.write(File.expand_path(path), contents) + write_file(path, contents) @server_inst.files.find_new_files! end Then /^the file "([^\"]*)" is removed$/ do |path| - File.delete(File.expand_path(path)) + step %Q{I remove the file "#{path}"} @server_inst.files.find_new_files! end + +Given /^a modification time for a file named "([^\"]*)"$/ do |file| + target = File.join(expand_path("."), file) + @modification_times[target] = File.mtime(target) +end + +Then /^the file "([^\"]*)" should not have been updated$/ do |file| + target = File.join(expand_path("."), file) + expect(File.mtime(target)).to eq(@modification_times[target]) +end + +# Provide this Aruba overload in case we're matching something with quotes in it +Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content| + expect(file).to have_file_content(Regexp.new(Regexp.escape(partial_content)), true) +end + +And /the file "(.*)" should be gzipped/ do |file| + expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*')) +end diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index c26439fb..e05d4d82 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -41,9 +41,9 @@ module Middleman::Util::Data end case [start, stop] - when %w[--- ---], %w[--- ...] + when %w(--- ---), %w(--- ...) [parse_yaml(frontmatter, full_path), additional_content] - when %w[;;; ;;;] + when %w(;;; ;;;) [parse_json(frontmatter, full_path), additional_content] else [{}, content] diff --git a/middleman-core/source/stylesheets/_partial.sass b/middleman-core/source/stylesheets/_partial.sass new file mode 100644 index 00000000..d3e1f391 --- /dev/null +++ b/middleman-core/source/stylesheets/_partial.sass @@ -0,0 +1,2 @@ +body + font-size: 14px \ No newline at end of file From 97cd1c141139a59122803500734a30841b867e41 Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Thu, 24 Sep 2015 20:27:36 +0100 Subject: [PATCH 121/364] Fix JSON frontmatter parsing --- middleman-core/lib/middleman-core/util/data.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index e05d4d82..8780e609 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -24,7 +24,7 @@ module Middleman::Util::Data end / - \A(.*?coding:.*?\n)? + \A(.*?coding:.*?\r?\n)? (?[-;]{3})[ ]*\r?\n (?.*?)[ ]*\r?\n? (?^[-.;]{3})[ ]*\r?\n? @@ -44,7 +44,7 @@ module Middleman::Util::Data when %w(--- ---), %w(--- ...) [parse_yaml(frontmatter, full_path), additional_content] when %w(;;; ;;;) - [parse_json(frontmatter, full_path), additional_content] + [parse_json("{#{frontmatter}}", full_path), additional_content] else [{}, content] end From 32891dc6fe9724c8619c11988371a9296552a5d3 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 28 Sep 2015 11:24:37 -0700 Subject: [PATCH 122/364] SassC, woot --- CHANGELOG.md | 1 + middleman-core/features/slim.feature | 2 +- .../source/stylesheets/base/_base.scss | 15 + .../source/stylesheets/base/_buttons.scss | 35 ++ .../source/stylesheets/base/_forms.scss | 90 ++++ .../stylesheets/base/_grid-settings.scss | 14 + .../source/stylesheets/base/_lists.scss | 31 ++ .../source/stylesheets/base/_tables.scss | 25 ++ .../source/stylesheets/base/_typography.scss | 49 +++ .../source/stylesheets/base/_variables.scss | 42 ++ .../bourbon/_bourbon-deprecated-upcoming.scss | 411 ++++++++++++++++++ .../source/stylesheets/bourbon/_bourbon.scss | 87 ++++ .../bourbon/addons/_border-color.scss | 26 ++ .../bourbon/addons/_border-radius.scss | 48 ++ .../bourbon/addons/_border-style.scss | 25 ++ .../bourbon/addons/_border-width.scss | 25 ++ .../stylesheets/bourbon/addons/_buttons.scss | 64 +++ .../stylesheets/bourbon/addons/_clearfix.scss | 25 ++ .../stylesheets/bourbon/addons/_ellipsis.scss | 30 ++ .../bourbon/addons/_font-stacks.scss | 31 ++ .../bourbon/addons/_hide-text.scss | 27 ++ .../stylesheets/bourbon/addons/_margin.scss | 26 ++ .../stylesheets/bourbon/addons/_padding.scss | 26 ++ .../stylesheets/bourbon/addons/_position.scss | 48 ++ .../stylesheets/bourbon/addons/_prefixer.scss | 66 +++ .../bourbon/addons/_retina-image.scss | 25 ++ .../stylesheets/bourbon/addons/_size.scss | 51 +++ .../bourbon/addons/_text-inputs.scss | 113 +++++ .../bourbon/addons/_timing-functions.scss | 34 ++ .../stylesheets/bourbon/addons/_triangle.scss | 63 +++ .../bourbon/addons/_word-wrap.scss | 29 ++ .../stylesheets/bourbon/css3/_animation.scss | 43 ++ .../stylesheets/bourbon/css3/_appearance.scss | 3 + .../bourbon/css3/_backface-visibility.scss | 3 + .../bourbon/css3/_background-image.scss | 42 ++ .../stylesheets/bourbon/css3/_background.scss | 55 +++ .../bourbon/css3/_border-image.scss | 59 +++ .../stylesheets/bourbon/css3/_calc.scss | 4 + .../stylesheets/bourbon/css3/_columns.scss | 47 ++ .../stylesheets/bourbon/css3/_filter.scss | 4 + .../stylesheets/bourbon/css3/_flex-box.scss | 287 ++++++++++++ .../stylesheets/bourbon/css3/_font-face.scss | 24 + .../bourbon/css3/_font-feature-settings.scss | 4 + .../bourbon/css3/_hidpi-media-query.scss | 10 + .../stylesheets/bourbon/css3/_hyphens.scss | 4 + .../bourbon/css3/_image-rendering.scss | 14 + .../stylesheets/bourbon/css3/_keyframes.scss | 36 ++ .../bourbon/css3/_linear-gradient.scss | 38 ++ .../bourbon/css3/_perspective.scss | 8 + .../bourbon/css3/_placeholder.scss | 8 + .../bourbon/css3/_radial-gradient.scss | 39 ++ .../stylesheets/bourbon/css3/_selection.scss | 42 ++ .../bourbon/css3/_text-decoration.scss | 19 + .../stylesheets/bourbon/css3/_transform.scss | 15 + .../stylesheets/bourbon/css3/_transition.scss | 71 +++ .../bourbon/css3/_user-select.scss | 3 + .../bourbon/functions/_assign-inputs.scss | 11 + .../bourbon/functions/_contains-falsy.scss | 20 + .../bourbon/functions/_contains.scss | 26 ++ .../bourbon/functions/_is-length.scss | 11 + .../bourbon/functions/_is-light.scss | 21 + .../bourbon/functions/_is-number.scss | 11 + .../bourbon/functions/_is-size.scss | 13 + .../bourbon/functions/_modular-scale.scss | 69 +++ .../bourbon/functions/_px-to-em.scss | 13 + .../bourbon/functions/_px-to-rem.scss | 15 + .../stylesheets/bourbon/functions/_shade.scss | 24 + .../bourbon/functions/_strip-units.scss | 17 + .../stylesheets/bourbon/functions/_tint.scss | 24 + .../functions/_transition-property-name.scss | 22 + .../bourbon/functions/_unpack.scss | 27 ++ .../bourbon/helpers/_convert-units.scss | 21 + .../bourbon/helpers/_directional-values.scss | 96 ++++ .../helpers/_font-source-declaration.scss | 43 ++ .../helpers/_gradient-positions-parser.scss | 13 + .../bourbon/helpers/_linear-angle-parser.scss | 25 ++ .../helpers/_linear-gradient-parser.scss | 41 ++ .../helpers/_linear-positions-parser.scss | 61 +++ .../helpers/_linear-side-corner-parser.scss | 31 ++ .../bourbon/helpers/_radial-arg-parser.scss | 69 +++ .../helpers/_radial-gradient-parser.scss | 50 +++ .../helpers/_radial-positions-parser.scss | 18 + .../bourbon/helpers/_render-gradients.scss | 26 ++ .../bourbon/helpers/_shape-size-stripper.scss | 10 + .../bourbon/helpers/_str-to-num.scss | 50 +++ .../bourbon/settings/_asset-pipeline.scss | 7 + .../bourbon/settings/_prefixer.scss | 9 + .../bourbon/settings/_px-to-em.scss | 1 + .../source/stylesheets/site.xcss.sass | 5 +- .../lib/middleman-core/renderers/sass.rb | 47 +- .../renderers/sass_functions.rb | 40 +- middleman-core/middleman-core.gemspec | 9 +- 92 files changed, 3401 insertions(+), 61 deletions(-) create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_base.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_buttons.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_forms.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_grid-settings.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_lists.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_tables.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_typography.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/base/_variables.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-color.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-radius.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-style.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-width.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_buttons.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_clearfix.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_ellipsis.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_font-stacks.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_hide-text.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_margin.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_padding.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_position.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_prefixer.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_retina-image.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_size.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_text-inputs.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_timing-functions.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_triangle.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_word-wrap.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_animation.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_appearance.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_backface-visibility.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background-image.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_border-image.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_calc.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_columns.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_filter.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_flex-box.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_font-face.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_font-feature-settings.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_hidpi-media-query.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_hyphens.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_image-rendering.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_keyframes.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_linear-gradient.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_perspective.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_placeholder.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_radial-gradient.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_selection.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_text-decoration.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transform.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transition.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_user-select.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_assign-inputs.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains-falsy.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-length.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-light.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-number.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-size.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_modular-scale.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-em.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-rem.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_shade.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_strip-units.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_tint.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_transition-property-name.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_unpack.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_convert-units.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_directional-values.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_font-source-declaration.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_gradient-positions-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-angle-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-gradient-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-positions-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-side-corner-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-arg-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-gradient-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-positions-parser.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_render-gradients.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_shape-size-stripper.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_str-to-num.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_asset-pipeline.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_prefixer.scss create mode 100644 middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_px-to-em.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c1b6569..55986de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ master === +* Switch from Ruby Sass to SassC. * `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers. # 4.0.0.rc.1 diff --git a/middleman-core/features/slim.feature b/middleman-core/features/slim.feature index 2cdabecd..031120f3 100644 --- a/middleman-core/features/slim.feature +++ b/middleman-core/features/slim.feature @@ -78,4 +78,4 @@ Feature: Support slim templating language When I go to "/sass.html" Then I should see "html,body,div" When I go to "/error.html" - Then I should see "Error: Invalid" + Then I should see "Error:" diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_base.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_base.scss new file mode 100644 index 00000000..b7659885 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_base.scss @@ -0,0 +1,15 @@ +// Bitters 1.1.0 +// http://bitters.bourbon.io +// Copyright 2013-2015 thoughtbot, inc. +// MIT License + +@import "variables"; + +// Neat Settings -- uncomment if using Neat -- must be imported before Neat +// @import "grid-settings"; + +@import "buttons"; +@import "forms"; +@import "lists"; +@import "tables"; +@import "typography"; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_buttons.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_buttons.scss new file mode 100644 index 00000000..6ac7894f --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_buttons.scss @@ -0,0 +1,35 @@ +#{$all-buttons} { + appearance: none; + background-color: $action-color; + border: 0; + border-radius: $base-border-radius; + color: #fff; + cursor: pointer; + display: inline-block; + font-family: $base-font-family; + font-size: $base-font-size; + -webkit-font-smoothing: antialiased; + font-weight: 600; + line-height: 1; + padding: $small-spacing $base-spacing; + text-decoration: none; + transition: background-color $base-duration $base-timing; + user-select: none; + vertical-align: middle; + white-space: nowrap; + + &:hover, + &:focus { + background-color: shade($action-color, 20%); + color: #fff; + } + + &:disabled { + cursor: not-allowed; + opacity: 0.5; + + &:hover { + background-color: $action-color; + } + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_forms.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_forms.scss new file mode 100644 index 00000000..e8ae80a2 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_forms.scss @@ -0,0 +1,90 @@ +fieldset { + background-color: $secondary-background-color; + border: $base-border; + margin: 0 0 $small-spacing; + padding: $base-spacing; +} + +input, +label, +select { + display: block; + font-family: $base-font-family; + font-size: $base-font-size; +} + +label { + font-weight: 600; + margin-bottom: $small-spacing / 2; + + &.required::after { + content: "*"; + } + + abbr { + display: none; + } +} + +#{$all-text-inputs}, +select[multiple=multiple] { + background-color: $base-background-color; + border: $base-border; + border-radius: $base-border-radius; + box-shadow: $form-box-shadow; + box-sizing: border-box; + font-family: $base-font-family; + font-size: $base-font-size; + margin-bottom: $small-spacing; + padding: $base-spacing / 3; + transition: border-color $base-duration $base-timing; + width: 100%; + + &:hover { + border-color: shade($base-border-color, 20%); + } + + &:focus { + border-color: $action-color; + box-shadow: $form-box-shadow-focus; + outline: none; + } + + &:disabled { + background-color: shade($base-background-color, 5%); + cursor: not-allowed; + + &:hover { + border: $base-border; + } + } +} + +textarea { + resize: vertical; +} + +input[type="search"] { + appearance: none; +} + +input[type="checkbox"], +input[type="radio"] { + display: inline; + margin-right: $small-spacing / 2; + + + label { + display: inline-block; + } +} + +input[type="file"] { + margin-bottom: $small-spacing; + width: 100%; +} + +select { + margin-bottom: $base-spacing; + max-width: 100%; + width: auto; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_grid-settings.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_grid-settings.scss new file mode 100644 index 00000000..8a98a743 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_grid-settings.scss @@ -0,0 +1,14 @@ +@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails + +// Neat Overrides +// $column: 90px; +// $gutter: 30px; +// $grid-columns: 12; +// $max-width: 1200px; + +// Neat Breakpoints +$medium-screen: 600px; +$large-screen: 900px; + +$medium-screen-up: new-breakpoint(min-width $medium-screen 4); +$large-screen-up: new-breakpoint(min-width $large-screen 8); diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_lists.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_lists.scss new file mode 100644 index 00000000..c989d90f --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_lists.scss @@ -0,0 +1,31 @@ +ul, +ol { + list-style-type: none; + margin: 0; + padding: 0; + + &%default-ul { + list-style-type: disc; + margin-bottom: $small-spacing; + padding-left: $base-spacing; + } + + &%default-ol { + list-style-type: decimal; + margin-bottom: $small-spacing; + padding-left: $base-spacing; + } +} + +dl { + margin-bottom: $small-spacing; + + dt { + font-weight: bold; + margin-top: $small-spacing; + } + + dd { + margin: 0; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_tables.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_tables.scss new file mode 100644 index 00000000..61f527d5 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_tables.scss @@ -0,0 +1,25 @@ +table { + border-collapse: collapse; + font-feature-settings: "kern", "liga", "tnum"; + margin: $small-spacing 0; + table-layout: fixed; + width: 100%; +} + +th { + border-bottom: 1px solid shade($base-border-color, 25%); + font-weight: 600; + padding: $small-spacing 0; + text-align: left; +} + +td { + border-bottom: $base-border; + padding: $small-spacing 0; +} + +tr, +td, +th { + vertical-align: middle; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_typography.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_typography.scss new file mode 100644 index 00000000..e60951db --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_typography.scss @@ -0,0 +1,49 @@ +body { + color: $base-font-color; + font-family: $base-font-family; + font-feature-settings: "kern", "liga", "pnum"; + font-size: $base-font-size; + line-height: $base-line-height; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: $heading-font-family; + font-size: $base-font-size; + line-height: $heading-line-height; + margin: 0 0 $small-spacing; +} + +p { + margin: 0 0 $small-spacing; +} + +a { + color: $action-color; + text-decoration: none; + transition: color $base-duration $base-timing; + + &:active, + &:focus, + &:hover { + color: shade($action-color, 25%); + } +} + +hr { + border-bottom: $base-border; + border-left: 0; + border-right: 0; + border-top: 0; + margin: $base-spacing 0; +} + +img, +picture { + margin: 0; + max-width: 100%; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_variables.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_variables.scss new file mode 100644 index 00000000..2a9d117a --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/base/_variables.scss @@ -0,0 +1,42 @@ +// Typography +$base-font-family: $helvetica; +$heading-font-family: $base-font-family; + +// Font Sizes +$base-font-size: 1em; + +// Line height +$base-line-height: 1.5; +$heading-line-height: 1.2; + +// Other Sizes +$base-border-radius: 3px; +$base-spacing: $base-line-height * 1em; +$small-spacing: $base-spacing / 2; +$base-z-index: 0; + +// Colors +$blue: #477dca; +$dark-gray: #333; +$medium-gray: #999; +$light-gray: #ddd; + +// Font Colors +$base-font-color: $dark-gray; +$action-color: $blue; + +// Border +$base-border-color: $light-gray; +$base-border: 1px solid $base-border-color; + +// Background Colors +$base-background-color: #fff; +$secondary-background-color: tint($base-border-color, 75%); + +// Forms +$form-box-shadow: inset 0 1px 3px rgba(#000, 0.06); +$form-box-shadow-focus: $form-box-shadow, 0 0 5px adjust-color($action-color, $lightness: -5%, $alpha: -0.3); + +// Animations +$base-duration: 150ms; +$base-timing: ease; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss new file mode 100644 index 00000000..e6d1b8ce --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss @@ -0,0 +1,411 @@ +// The following features have been deprecated and will be removed in the next MAJOR version release + +@mixin inline-block { + display: inline-block; + + @warn "The inline-block mixin is deprecated and will be removed in the next major version release"; +} + +@mixin button ($style: simple, $base-color: #4294f0, $text-size: inherit, $padding: 7px 18px) { + + @if type-of($style) == string and type-of($base-color) == color { + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == string and type-of($base-color) == number { + $padding: $text-size; + $text-size: $base-color; + $base-color: #4294f0; + + @if $padding == inherit { + $padding: 7px 18px; + } + + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == color and type-of($base-color) == color { + $base-color: $style; + $style: simple; + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == color and type-of($base-color) == number { + $padding: $text-size; + $text-size: $base-color; + $base-color: $style; + $style: simple; + + @if $padding == inherit { + $padding: 7px 18px; + } + + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + @if type-of($style) == number { + $padding: $base-color; + $text-size: $style; + $base-color: #4294f0; + $style: simple; + + @if $padding == #4294f0 { + $padding: 7px 18px; + } + + @include buttonstyle($style, $base-color, $text-size, $padding); + } + + &:disabled { + cursor: not-allowed; + opacity: 0.5; + } + + @warn "The button mixin is deprecated and will be removed in the next major version release"; +} + +// Selector Style Button +@mixin buttonstyle($type, $b-color, $t-size, $pad) { + // Grayscale button + @if $type == simple and $b-color == grayscale($b-color) { + @include simple($b-color, true, $t-size, $pad); + } + + @if $type == shiny and $b-color == grayscale($b-color) { + @include shiny($b-color, true, $t-size, $pad); + } + + @if $type == pill and $b-color == grayscale($b-color) { + @include pill($b-color, true, $t-size, $pad); + } + + @if $type == flat and $b-color == grayscale($b-color) { + @include flat($b-color, true, $t-size, $pad); + } + + // Colored button + @if $type == simple { + @include simple($b-color, false, $t-size, $pad); + } + + @else if $type == shiny { + @include shiny($b-color, false, $t-size, $pad); + } + + @else if $type == pill { + @include pill($b-color, false, $t-size, $pad); + } + + @else if $type == flat { + @include flat($b-color, false, $t-size, $pad); + } +} + +// Simple Button +@mixin simple($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + $border: adjust-color($base-color, $saturation: 9%, $lightness: -14%); + $inset-shadow: adjust-color($base-color, $saturation: -8%, $lightness: 15%); + $stop-gradient: adjust-color($base-color, $saturation: 9%, $lightness: -11%); + $text-shadow: adjust-color($base-color, $saturation: 15%, $lightness: -18%); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%); + } + + @if $grayscale == true { + $border: grayscale($border); + $inset-shadow: grayscale($inset-shadow); + $stop-gradient: grayscale($stop-gradient); + $text-shadow: grayscale($text-shadow); + } + + border: 1px solid $border; + border-radius: 3px; + box-shadow: inset 0 1px 0 0 $inset-shadow; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: bold; + @include linear-gradient ($base-color, $stop-gradient); + padding: $padding; + text-decoration: none; + text-shadow: 0 1px 0 $text-shadow; + background-clip: padding-box; + + &:hover:not(:disabled) { + $base-color-hover: adjust-color($base-color, $saturation: -4%, $lightness: -5%); + $inset-shadow-hover: adjust-color($base-color, $saturation: -7%, $lightness: 5%); + $stop-gradient-hover: adjust-color($base-color, $saturation: 8%, $lightness: -14%); + + @if $grayscale == true { + $base-color-hover: grayscale($base-color-hover); + $inset-shadow-hover: grayscale($inset-shadow-hover); + $stop-gradient-hover: grayscale($stop-gradient-hover); + } + + @include linear-gradient ($base-color-hover, $stop-gradient-hover); + + box-shadow: inset 0 1px 0 0 $inset-shadow-hover; + cursor: pointer; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $border-active: adjust-color($base-color, $saturation: 9%, $lightness: -14%); + $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%); + + @if $grayscale == true { + $border-active: grayscale($border-active); + $inset-shadow-active: grayscale($inset-shadow-active); + } + + border: 1px solid $border-active; + box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active; + } +} + +// Shiny Button +@mixin shiny($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + $border: adjust-color($base-color, $red: -117, $green: -111, $blue: -81); + $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122); + $fourth-stop: adjust-color($base-color, $red: -79, $green: -70, $blue: -46); + $inset-shadow: adjust-color($base-color, $red: 37, $green: 29, $blue: 12); + $second-stop: adjust-color($base-color, $red: -56, $green: -50, $blue: -33); + $text-shadow: adjust-color($base-color, $red: -140, $green: -141, $blue: -114); + $third-stop: adjust-color($base-color, $red: -86, $green: -75, $blue: -48); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%); + } + + @if $grayscale == true { + $border: grayscale($border); + $border-bottom: grayscale($border-bottom); + $fourth-stop: grayscale($fourth-stop); + $inset-shadow: grayscale($inset-shadow); + $second-stop: grayscale($second-stop); + $text-shadow: grayscale($text-shadow); + $third-stop: grayscale($third-stop); + } + + @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%); + + border: 1px solid $border; + border-bottom: 1px solid $border-bottom; + border-radius: 5px; + box-shadow: inset 0 1px 0 0 $inset-shadow; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: bold; + padding: $padding; + text-align: center; + text-decoration: none; + text-shadow: 0 -1px 1px $text-shadow; + + &:hover:not(:disabled) { + $first-stop-hover: adjust-color($base-color, $red: -13, $green: -15, $blue: -18); + $second-stop-hover: adjust-color($base-color, $red: -66, $green: -62, $blue: -51); + $third-stop-hover: adjust-color($base-color, $red: -93, $green: -85, $blue: -66); + $fourth-stop-hover: adjust-color($base-color, $red: -86, $green: -80, $blue: -63); + + @if $grayscale == true { + $first-stop-hover: grayscale($first-stop-hover); + $second-stop-hover: grayscale($second-stop-hover); + $third-stop-hover: grayscale($third-stop-hover); + $fourth-stop-hover: grayscale($fourth-stop-hover); + } + + @include linear-gradient(top, $first-stop-hover 0%, + $second-stop-hover 50%, + $third-stop-hover 50%, + $fourth-stop-hover 100%); + cursor: pointer; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122); + + @if $grayscale == true { + $inset-shadow-active: grayscale($inset-shadow-active); + } + + box-shadow: inset 0 0 20px 0 $inset-shadow-active; + } +} + +// Pill Button +@mixin pill($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + $border-bottom: adjust-color($base-color, $hue: 8, $saturation: -11%, $lightness: -26%); + $border-sides: adjust-color($base-color, $hue: 4, $saturation: -21%, $lightness: -21%); + $border-top: adjust-color($base-color, $hue: -1, $saturation: -30%, $lightness: -15%); + $inset-shadow: adjust-color($base-color, $hue: -1, $saturation: -1%, $lightness: 7%); + $stop-gradient: adjust-color($base-color, $hue: 8, $saturation: 14%, $lightness: -10%); + $text-shadow: adjust-color($base-color, $hue: 5, $saturation: -19%, $lightness: -15%); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%); + } + + @if $grayscale == true { + $border-bottom: grayscale($border-bottom); + $border-sides: grayscale($border-sides); + $border-top: grayscale($border-top); + $inset-shadow: grayscale($inset-shadow); + $stop-gradient: grayscale($stop-gradient); + $text-shadow: grayscale($text-shadow); + } + + border: 1px solid $border-top; + border-color: $border-top $border-sides $border-bottom; + border-radius: 16px; + box-shadow: inset 0 1px 0 0 $inset-shadow; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: normal; + line-height: 1; + @include linear-gradient ($base-color, $stop-gradient); + padding: $padding; + text-align: center; + text-decoration: none; + text-shadow: 0 -1px 1px $text-shadow; + background-clip: padding-box; + + &:hover:not(:disabled) { + $base-color-hover: adjust-color($base-color, $lightness: -4.5%); + $border-bottom: adjust-color($base-color, $hue: 8, $saturation: 13.5%, $lightness: -32%); + $border-sides: adjust-color($base-color, $hue: 4, $saturation: -2%, $lightness: -27%); + $border-top: adjust-color($base-color, $hue: -1, $saturation: -17%, $lightness: -21%); + $inset-shadow-hover: adjust-color($base-color, $saturation: -1%, $lightness: 3%); + $stop-gradient-hover: adjust-color($base-color, $hue: 8, $saturation: -4%, $lightness: -15.5%); + $text-shadow-hover: adjust-color($base-color, $hue: 5, $saturation: -5%, $lightness: -22%); + + @if $grayscale == true { + $base-color-hover: grayscale($base-color-hover); + $border-bottom: grayscale($border-bottom); + $border-sides: grayscale($border-sides); + $border-top: grayscale($border-top); + $inset-shadow-hover: grayscale($inset-shadow-hover); + $stop-gradient-hover: grayscale($stop-gradient-hover); + $text-shadow-hover: grayscale($text-shadow-hover); + } + + @include linear-gradient ($base-color-hover, $stop-gradient-hover); + + background-clip: padding-box; + border: 1px solid $border-top; + border-color: $border-top $border-sides $border-bottom; + box-shadow: inset 0 1px 0 0 $inset-shadow-hover; + cursor: pointer; + text-shadow: 0 -1px 1px $text-shadow-hover; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $active-color: adjust-color($base-color, $hue: 4, $saturation: -12%, $lightness: -10%); + $border-active: adjust-color($base-color, $hue: 6, $saturation: -2.5%, $lightness: -30%); + $border-bottom-active: adjust-color($base-color, $hue: 11, $saturation: 6%, $lightness: -31%); + $inset-shadow-active: adjust-color($base-color, $hue: 9, $saturation: 2%, $lightness: -21.5%); + $text-shadow-active: adjust-color($base-color, $hue: 5, $saturation: -12%, $lightness: -21.5%); + + @if $grayscale == true { + $active-color: grayscale($active-color); + $border-active: grayscale($border-active); + $border-bottom-active: grayscale($border-bottom-active); + $inset-shadow-active: grayscale($inset-shadow-active); + $text-shadow-active: grayscale($text-shadow-active); + } + + background: $active-color; + border: 1px solid $border-active; + border-bottom: 1px solid $border-bottom-active; + box-shadow: inset 0 0 6px 3px $inset-shadow-active; + text-shadow: 0 -1px 1px $text-shadow-active; + } +} + +// Flat Button +@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) { + $color: hsl(0, 0, 100%); + + @if is-light($base-color) { + $color: hsl(0, 0, 20%); + } + + background-color: $base-color; + border-radius: 3px; + border: 0; + color: $color; + display: inline-block; + font-size: $textsize; + font-weight: bold; + padding: $padding; + text-decoration: none; + background-clip: padding-box; + + &:hover:not(:disabled){ + $base-color-hover: adjust-color($base-color, $saturation: 4%, $lightness: 5%); + + @if $grayscale == true { + $base-color-hover: grayscale($base-color-hover); + } + + background-color: $base-color-hover; + cursor: pointer; + } + + &:active:not(:disabled), + &:focus:not(:disabled) { + $base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%); + + @if $grayscale == true { + $base-color-active: grayscale($base-color-active); + } + + background-color: $base-color-active; + cursor: pointer; + } +} + +// Flexible grid +@function flex-grid($columns, $container-columns: $fg-max-columns) { + $width: $columns * $fg-column + ($columns - 1) * $fg-gutter; + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($width / $container-width); + + @warn "The flex-grid function is deprecated and will be removed in the next major version release"; +} + +// Flexible gutter +@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) { + $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; + @return percentage($gutter / $container-width); + + @warn "The flex-gutter function is deprecated and will be removed in the next major version release"; +} + +@function grid-width($n) { + @return $n * $gw-column + ($n - 1) * $gw-gutter; + + @warn "The grid-width function is deprecated and will be removed in the next major version release"; +} + +@function golden-ratio($value, $increment) { + @return modular-scale($increment, $value, $ratio: $golden); + + @warn "The golden-ratio function is deprecated and will be removed in the next major version release. Please use the modular-scale function, instead."; +} + +@mixin box-sizing($box) { + @include prefixer(box-sizing, $box, webkit moz spec); + + @warn "The box-sizing mixin is deprecated and will be removed in the next major version release. This property can now be used un-prefixed."; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon.scss new file mode 100644 index 00000000..34b0cd47 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/_bourbon.scss @@ -0,0 +1,87 @@ +// Bourbon 4.2.5 +// http://bourbon.io +// Copyright 2011-2015 thoughtbot, inc. +// MIT License + +@import "settings/prefixer"; +@import "settings/px-to-em"; +@import "settings/asset-pipeline"; + +@import "functions/assign-inputs"; +@import "functions/contains"; +@import "functions/contains-falsy"; +@import "functions/is-length"; +@import "functions/is-light"; +@import "functions/is-number"; +@import "functions/is-size"; +@import "functions/px-to-em"; +@import "functions/px-to-rem"; +@import "functions/shade"; +@import "functions/strip-units"; +@import "functions/tint"; +@import "functions/transition-property-name"; +@import "functions/unpack"; +@import "functions/modular-scale"; + +@import "helpers/convert-units"; +@import "helpers/directional-values"; +@import "helpers/font-source-declaration"; +@import "helpers/gradient-positions-parser"; +@import "helpers/linear-angle-parser"; +@import "helpers/linear-gradient-parser"; +@import "helpers/linear-positions-parser"; +@import "helpers/linear-side-corner-parser"; +@import "helpers/radial-arg-parser"; +@import "helpers/radial-positions-parser"; +@import "helpers/radial-gradient-parser"; +@import "helpers/render-gradients"; +@import "helpers/shape-size-stripper"; +@import "helpers/str-to-num"; + +@import "css3/animation"; +@import "css3/appearance"; +@import "css3/backface-visibility"; +@import "css3/background"; +@import "css3/background-image"; +@import "css3/border-image"; +@import "css3/calc"; +@import "css3/columns"; +@import "css3/filter"; +@import "css3/flex-box"; +@import "css3/font-face"; +@import "css3/font-feature-settings"; +@import "css3/hidpi-media-query"; +@import "css3/hyphens"; +@import "css3/image-rendering"; +@import "css3/keyframes"; +@import "css3/linear-gradient"; +@import "css3/perspective"; +@import "css3/placeholder"; +@import "css3/radial-gradient"; +@import "css3/selection"; +@import "css3/text-decoration"; +@import "css3/transform"; +@import "css3/transition"; +@import "css3/user-select"; + +@import "addons/border-color"; +@import "addons/border-radius"; +@import "addons/border-style"; +@import "addons/border-width"; +@import "addons/buttons"; +@import "addons/clearfix"; +@import "addons/ellipsis"; +@import "addons/font-stacks"; +@import "addons/hide-text"; +@import "addons/margin"; +@import "addons/padding"; +@import "addons/position"; +@import "addons/prefixer"; +@import "addons/retina-image"; +@import "addons/size"; +@import "addons/text-inputs"; +@import "addons/timing-functions"; +@import "addons/triangle"; +@import "addons/word-wrap"; + +@import "bourbon-deprecated-upcoming"; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-color.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-color.scss new file mode 100644 index 00000000..6f6ab36c --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-color.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-color` on specific sides of a box. Use a `null` value to “skip†a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include border-color(#a60b55 #76cd9c null #e8ae1a); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-left-color: #e8ae1a; +/// border-right-color: #76cd9c; +/// border-top-color: #a60b55; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `border-color` + +@mixin border-color($vals...) { + @include directional-property(border, color, $vals...); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-radius.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-radius.scss new file mode 100644 index 00000000..1f658633 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-radius.scss @@ -0,0 +1,48 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-radius` on both corners on the side of a box. +/// +/// @param {Number} $radii +/// List of arguments +/// +/// @example scss - Usage +/// .element-one { +/// @include border-top-radius(5px); +/// } +/// +/// .element-two { +/// @include border-left-radius(3px); +/// } +/// +/// @example css - CSS Output +/// .element-one { +/// border-top-left-radius: 5px; +/// border-top-right-radius: 5px; +/// } +/// +/// .element-two { +/// border-bottom-left-radius: 3px; +/// border-top-left-radius: 3px; +/// } +/// +/// @output `border-radius` + +@mixin border-top-radius($radii) { + border-top-left-radius: $radii; + border-top-right-radius: $radii; +} + +@mixin border-right-radius($radii) { + border-bottom-right-radius: $radii; + border-top-right-radius: $radii; +} + +@mixin border-bottom-radius($radii) { + border-bottom-left-radius: $radii; + border-bottom-right-radius: $radii; +} + +@mixin border-left-radius($radii) { + border-bottom-left-radius: $radii; + border-top-left-radius: $radii; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-style.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-style.scss new file mode 100644 index 00000000..d86ee79d --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-style.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-style` on specific sides of a box. Use a `null` value to “skip†a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include border-style(dashed null solid); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-bottom-style: solid; +/// border-top-style: dashed; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `border-style` + +@mixin border-style($vals...) { + @include directional-property(border, style, $vals...); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-width.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-width.scss new file mode 100644 index 00000000..0ea2d4b7 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_border-width.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `border-width` on specific sides of a box. Use a `null` value to “skip†a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include border-width(1em null 20px); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-bottom-width: 20px; +/// border-top-width: 1em; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `border-width` + +@mixin border-width($vals...) { + @include directional-property(border, width, $vals...); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_buttons.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_buttons.scss new file mode 100644 index 00000000..debeabc5 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_buttons.scss @@ -0,0 +1,64 @@ +@charset "UTF-8"; + +/// Generates variables for all buttons. Please note that you must use interpolation on the variable: `#{$all-buttons}`. +/// +/// @example scss - Usage +/// #{$all-buttons} { +/// background-color: #f00; +/// } +/// +/// #{$all-buttons-focus}, +/// #{$all-buttons-hover} { +/// background-color: #0f0; +/// } +/// +/// #{$all-buttons-active} { +/// background-color: #00f; +/// } +/// +/// @example css - CSS Output +/// button, +/// input[type="button"], +/// input[type="reset"], +/// input[type="submit"] { +/// background-color: #f00; +/// } +/// +/// button:focus, +/// input[type="button"]:focus, +/// input[type="reset"]:focus, +/// input[type="submit"]:focus, +/// button:hover, +/// input[type="button"]:hover, +/// input[type="reset"]:hover, +/// input[type="submit"]:hover { +/// background-color: #0f0; +/// } +/// +/// button:active, +/// input[type="button"]:active, +/// input[type="reset"]:active, +/// input[type="submit"]:active { +/// background-color: #00f; +/// } +/// +/// @require assign-inputs +/// +/// @type List +/// +/// @todo Remove double assigned variables (Lines 59–62) in v5.0.0 + +$buttons-list: 'button', + 'input[type="button"]', + 'input[type="reset"]', + 'input[type="submit"]'; + +$all-buttons: assign-inputs($buttons-list); +$all-buttons-active: assign-inputs($buttons-list, active); +$all-buttons-focus: assign-inputs($buttons-list, focus); +$all-buttons-hover: assign-inputs($buttons-list, hover); + +$all-button-inputs: $all-buttons; +$all-button-inputs-active: $all-buttons-active; +$all-button-inputs-focus: $all-buttons-focus; +$all-button-inputs-hover: $all-buttons-hover; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_clearfix.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_clearfix.scss new file mode 100644 index 00000000..11313d66 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_clearfix.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +/// Provides an easy way to include a clearfix for containing floats. +/// +/// @link http://cssmojo.com/latest_new_clearfix_so_far/ +/// +/// @example scss - Usage +/// .element { +/// @include clearfix; +/// } +/// +/// @example css - CSS Output +/// .element::after { +/// clear: both; +/// content: ""; +/// display: table; +/// } + +@mixin clearfix { + &::after { + clear: both; + content: ""; + display: table; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_ellipsis.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_ellipsis.scss new file mode 100644 index 00000000..a367f651 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_ellipsis.scss @@ -0,0 +1,30 @@ +@charset "UTF-8"; + +/// Truncates text and adds an ellipsis to represent overflow. +/// +/// @param {Number} $width [100%] +/// Max-width for the string to respect before being truncated +/// +/// @example scss - Usage +/// .element { +/// @include ellipsis; +/// } +/// +/// @example css - CSS Output +/// .element { +/// display: inline-block; +/// max-width: 100%; +/// overflow: hidden; +/// text-overflow: ellipsis; +/// white-space: nowrap; +/// word-wrap: normal; +/// } + +@mixin ellipsis($width: 100%) { + display: inline-block; + max-width: $width; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-wrap: normal; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_font-stacks.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_font-stacks.scss new file mode 100644 index 00000000..57128f42 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_font-stacks.scss @@ -0,0 +1,31 @@ +@charset "UTF-8"; + +/// Georgia font stack. +/// +/// @type List + +$georgia: "Georgia", "Cambria", "Times New Roman", "Times", serif; + +/// Helvetica font stack. +/// +/// @type List + +$helvetica: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; + +/// Lucida Grande font stack. +/// +/// @type List + +$lucida-grande: "Lucida Grande", "Tahoma", "Verdana", "Arial", sans-serif; + +/// Monospace font stack. +/// +/// @type List + +$monospace: "Bitstream Vera Sans Mono", "Consolas", "Courier", monospace; + +/// Verdana font stack. +/// +/// @type List + +$verdana: "Verdana", "Geneva", sans-serif; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_hide-text.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_hide-text.scss new file mode 100644 index 00000000..4caf20ed --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_hide-text.scss @@ -0,0 +1,27 @@ +/// Hides the text in an element, commonly used to show an image. Some elements will need block-level styles applied. +/// +/// @link http://zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement +/// +/// @example scss - Usage +/// .element { +/// @include hide-text; +/// } +/// +/// @example css - CSS Output +/// .element { +/// overflow: hidden; +/// text-indent: 101%; +/// white-space: nowrap; +/// } +/// +/// @todo Remove height argument in v5.0.0 + +@mixin hide-text($height: null) { + overflow: hidden; + text-indent: 101%; + white-space: nowrap; + + @if $height { + @warn "The `hide-text` mixin has changed and no longer requires a height. The height argument will no longer be accepted in v5.0.0"; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_margin.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_margin.scss new file mode 100644 index 00000000..674f4e5f --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_margin.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `margin` on specific sides of a box. Use a `null` value to “skip†a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include margin(null 10px 3em 20vh); +/// } +/// +/// @example css - CSS Output +/// .element { +/// margin-bottom: 3em; +/// margin-left: 20vh; +/// margin-right: 10px; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `margin` + +@mixin margin($vals...) { + @include directional-property(margin, false, $vals...); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_padding.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_padding.scss new file mode 100644 index 00000000..40a5f006 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_padding.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Provides a quick method for targeting `padding` on specific sides of a box. Use a `null` value to “skip†a side. +/// +/// @param {Arglist} $vals +/// List of arguments +/// +/// @example scss - Usage +/// .element { +/// @include padding(12vh null 10px 5%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// padding-bottom: 10px; +/// padding-left: 5%; +/// padding-top: 12vh; +/// } +/// +/// @require {mixin} directional-property +/// +/// @output `padding` + +@mixin padding($vals...) { + @include directional-property(padding, false, $vals...); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_position.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_position.scss new file mode 100644 index 00000000..e460f3ff --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_position.scss @@ -0,0 +1,48 @@ +@charset "UTF-8"; + +/// Provides a quick method for setting an element’s position. Use a `null` value to “skip†a side. +/// +/// @param {Position} $position [relative] +/// A CSS position value +/// +/// @param {Arglist} $coordinates [null null null null] +/// List of values that correspond to the 4-value syntax for the edges of a box +/// +/// @example scss - Usage +/// .element { +/// @include position(absolute, 0 null null 10em); +/// } +/// +/// @example css - CSS Output +/// .element { +/// left: 10em; +/// position: absolute; +/// top: 0; +/// } +/// +/// @require {function} is-length +/// @require {function} unpack + +@mixin position($position: relative, $coordinates: null null null null) { + @if type-of($position) == list { + $coordinates: $position; + $position: relative; + } + + $coordinates: unpack($coordinates); + + $offsets: ( + top: nth($coordinates, 1), + right: nth($coordinates, 2), + bottom: nth($coordinates, 3), + left: nth($coordinates, 4) + ); + + position: $position; + + @each $offset, $value in $offsets { + @if is-length($value) { + #{$offset}: $value; + } + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_prefixer.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_prefixer.scss new file mode 100644 index 00000000..2b6f7313 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_prefixer.scss @@ -0,0 +1,66 @@ +@charset "UTF-8"; + +/// A mixin for generating vendor prefixes on non-standardized properties. +/// +/// @param {String} $property +/// Property to prefix +/// +/// @param {*} $value +/// Value to use +/// +/// @param {List} $prefixes +/// Prefixes to define +/// +/// @example scss - Usage +/// .element { +/// @include prefixer(border-radius, 10px, webkit ms spec); +/// } +/// +/// @example css - CSS Output +/// .element { +/// -webkit-border-radius: 10px; +/// -moz-border-radius: 10px; +/// border-radius: 10px; +/// } +/// +/// @require {variable} $prefix-for-webkit +/// @require {variable} $prefix-for-mozilla +/// @require {variable} $prefix-for-microsoft +/// @require {variable} $prefix-for-opera +/// @require {variable} $prefix-for-spec + +@mixin prefixer($property, $value, $prefixes) { + @each $prefix in $prefixes { + @if $prefix == webkit { + @if $prefix-for-webkit { + -webkit-#{$property}: $value; + } + } @else if $prefix == moz { + @if $prefix-for-mozilla { + -moz-#{$property}: $value; + } + } @else if $prefix == ms { + @if $prefix-for-microsoft { + -ms-#{$property}: $value; + } + } @else if $prefix == o { + @if $prefix-for-opera { + -o-#{$property}: $value; + } + } @else if $prefix == spec { + @if $prefix-for-spec { + #{$property}: $value; + } + } @else { + @warn "Unrecognized prefix: #{$prefix}"; + } + } +} + +@mixin disable-prefix-for-all() { + $prefix-for-webkit: false !global; + $prefix-for-mozilla: false !global; + $prefix-for-microsoft: false !global; + $prefix-for-opera: false !global; + $prefix-for-spec: false !global; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_retina-image.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_retina-image.scss new file mode 100644 index 00000000..7febbd75 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_retina-image.scss @@ -0,0 +1,25 @@ +@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) { + @if $asset-pipeline { + background-image: image-url("#{$filename}.#{$extension}"); + } @else { + background-image: url("#{$filename}.#{$extension}"); + } + + @include hidpi { + @if $asset-pipeline { + @if $retina-filename { + background-image: image-url("#{$retina-filename}.#{$extension}"); + } @else { + background-image: image-url("#{$filename}#{$retina-suffix}.#{$extension}"); + } + } @else { + @if $retina-filename { + background-image: url("#{$retina-filename}.#{$extension}"); + } @else { + background-image: url("#{$filename}#{$retina-suffix}.#{$extension}"); + } + } + + background-size: $background-size; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_size.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_size.scss new file mode 100644 index 00000000..a2992a34 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_size.scss @@ -0,0 +1,51 @@ +@charset "UTF-8"; + +/// Sets the `width` and `height` of the element. +/// +/// @param {List} $size +/// A list of at most 2 size values. +/// +/// If there is only a single value in `$size` it is used for both width and height. All units are supported. +/// +/// @example scss - Usage +/// .first-element { +/// @include size(2em); +/// } +/// +/// .second-element { +/// @include size(auto 10em); +/// } +/// +/// @example css - CSS Output +/// .first-element { +/// width: 2em; +/// height: 2em; +/// } +/// +/// .second-element { +/// width: auto; +/// height: 10em; +/// } +/// +/// @todo Refactor in 5.0.0 to use a comma-separated argument + +@mixin size($value) { + $width: nth($value, 1); + $height: $width; + + @if length($value) > 1 { + $height: nth($value, 2); + } + + @if is-size($height) { + height: $height; + } @else { + @warn "`#{$height}` is not a valid length for the `$height` parameter in the `size` mixin."; + } + + @if is-size($width) { + width: $width; + } @else { + @warn "`#{$width}` is not a valid length for the `$width` parameter in the `size` mixin."; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_text-inputs.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_text-inputs.scss new file mode 100644 index 00000000..1eb7a545 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_text-inputs.scss @@ -0,0 +1,113 @@ +@charset "UTF-8"; + +/// Generates variables for all text-based inputs. Please note that you must use interpolation on the variable: `#{$all-text-inputs}`. +/// +/// @example scss - Usage +/// #{$all-text-inputs} { +/// border: 1px solid #f00; +/// } +/// +/// #{$all-text-inputs-focus}, +/// #{$all-text-inputs-hover} { +/// border: 1px solid #0f0; +/// } +/// +/// #{$all-text-inputs-active} { +/// border: 1px solid #00f; +/// } +/// +/// @example css - CSS Output +/// input[type="color"], +/// input[type="date"], +/// input[type="datetime"], +/// input[type="datetime-local"], +/// input[type="email"], +/// input[type="month"], +/// input[type="number"], +/// input[type="password"], +/// input[type="search"], +/// input[type="tel"], +/// input[type="text"], +/// input[type="time"], +/// input[type="url"], +/// input[type="week"], +/// textarea { +/// border: 1px solid #f00; +/// } +/// +/// input[type="color"]:focus, +/// input[type="date"]:focus, +/// input[type="datetime"]:focus, +/// input[type="datetime-local"]:focus, +/// input[type="email"]:focus, +/// input[type="month"]:focus, +/// input[type="number"]:focus, +/// input[type="password"]:focus, +/// input[type="search"]:focus, +/// input[type="tel"]:focus, +/// input[type="text"]:focus, +/// input[type="time"]:focus, +/// input[type="url"]:focus, +/// input[type="week"]:focus, +/// textarea:focus, +/// input[type="color"]:hover, +/// input[type="date"]:hover, +/// input[type="datetime"]:hover, +/// input[type="datetime-local"]:hover, +/// input[type="email"]:hover, +/// input[type="month"]:hover, +/// input[type="number"]:hover, +/// input[type="password"]:hover, +/// input[type="search"]:hover, +/// input[type="tel"]:hover, +/// input[type="text"]:hover, +/// input[type="time"]:hover, +/// input[type="url"]:hover, +/// input[type="week"]:hover, +/// textarea:hover { +/// border: 1px solid #0f0; +/// } +/// +/// input[type="color"]:active, +/// input[type="date"]:active, +/// input[type="datetime"]:active, +/// input[type="datetime-local"]:active, +/// input[type="email"]:active, +/// input[type="month"]:active, +/// input[type="number"]:active, +/// input[type="password"]:active, +/// input[type="search"]:active, +/// input[type="tel"]:active, +/// input[type="text"]:active, +/// input[type="time"]:active, +/// input[type="url"]:active, +/// input[type="week"]:active, +/// textarea:active { +/// border: 1px solid #00f; +/// } +/// +/// @require assign-inputs +/// +/// @type List + +$text-inputs-list: 'input[type="color"]', + 'input[type="date"]', + 'input[type="datetime"]', + 'input[type="datetime-local"]', + 'input[type="email"]', + 'input[type="month"]', + 'input[type="number"]', + 'input[type="password"]', + 'input[type="search"]', + 'input[type="tel"]', + 'input[type="text"]', + 'input[type="time"]', + 'input[type="url"]', + 'input[type="week"]', + 'input:not([type])', + 'textarea'; + +$all-text-inputs: assign-inputs($text-inputs-list); +$all-text-inputs-active: assign-inputs($text-inputs-list, active); +$all-text-inputs-focus: assign-inputs($text-inputs-list, focus); +$all-text-inputs-hover: assign-inputs($text-inputs-list, hover); diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_timing-functions.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_timing-functions.scss new file mode 100644 index 00000000..20e5f1d4 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_timing-functions.scss @@ -0,0 +1,34 @@ +@charset "UTF-8"; + +/// CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie) +/// +/// Timing functions are the same as demoed here: http://jqueryui.com/resources/demos/effect/easing.html +/// +/// @type cubic-bezier + +$ease-in-quad: cubic-bezier(0.550, 0.085, 0.680, 0.530); +$ease-in-cubic: cubic-bezier(0.550, 0.055, 0.675, 0.190); +$ease-in-quart: cubic-bezier(0.895, 0.030, 0.685, 0.220); +$ease-in-quint: cubic-bezier(0.755, 0.050, 0.855, 0.060); +$ease-in-sine: cubic-bezier(0.470, 0.000, 0.745, 0.715); +$ease-in-expo: cubic-bezier(0.950, 0.050, 0.795, 0.035); +$ease-in-circ: cubic-bezier(0.600, 0.040, 0.980, 0.335); +$ease-in-back: cubic-bezier(0.600, -0.280, 0.735, 0.045); + +$ease-out-quad: cubic-bezier(0.250, 0.460, 0.450, 0.940); +$ease-out-cubic: cubic-bezier(0.215, 0.610, 0.355, 1.000); +$ease-out-quart: cubic-bezier(0.165, 0.840, 0.440, 1.000); +$ease-out-quint: cubic-bezier(0.230, 1.000, 0.320, 1.000); +$ease-out-sine: cubic-bezier(0.390, 0.575, 0.565, 1.000); +$ease-out-expo: cubic-bezier(0.190, 1.000, 0.220, 1.000); +$ease-out-circ: cubic-bezier(0.075, 0.820, 0.165, 1.000); +$ease-out-back: cubic-bezier(0.175, 0.885, 0.320, 1.275); + +$ease-in-out-quad: cubic-bezier(0.455, 0.030, 0.515, 0.955); +$ease-in-out-cubic: cubic-bezier(0.645, 0.045, 0.355, 1.000); +$ease-in-out-quart: cubic-bezier(0.770, 0.000, 0.175, 1.000); +$ease-in-out-quint: cubic-bezier(0.860, 0.000, 0.070, 1.000); +$ease-in-out-sine: cubic-bezier(0.445, 0.050, 0.550, 0.950); +$ease-in-out-expo: cubic-bezier(1.000, 0.000, 0.000, 1.000); +$ease-in-out-circ: cubic-bezier(0.785, 0.135, 0.150, 0.860); +$ease-in-out-back: cubic-bezier(0.680, -0.550, 0.265, 1.550); diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_triangle.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_triangle.scss new file mode 100644 index 00000000..8a1ed9cd --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_triangle.scss @@ -0,0 +1,63 @@ +@mixin triangle($size, $color, $direction) { + $width: nth($size, 1); + $height: nth($size, length($size)); + $foreground-color: nth($color, 1); + $background-color: if(length($color) == 2, nth($color, 2), transparent); + height: 0; + width: 0; + + @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) { + $width: $width / 2; + $height: if(length($size) > 1, $height, $height/2); + + @if $direction == up { + border-bottom: $height solid $foreground-color; + border-left: $width solid $background-color; + border-right: $width solid $background-color; + } @else if $direction == right { + border-bottom: $width solid $background-color; + border-left: $height solid $foreground-color; + border-top: $width solid $background-color; + } @else if $direction == down { + border-left: $width solid $background-color; + border-right: $width solid $background-color; + border-top: $height solid $foreground-color; + } @else if $direction == left { + border-bottom: $width solid $background-color; + border-right: $height solid $foreground-color; + border-top: $width solid $background-color; + } + } @else if ($direction == up-right) or ($direction == up-left) { + border-top: $height solid $foreground-color; + + @if $direction == up-right { + border-left: $width solid $background-color; + } @else if $direction == up-left { + border-right: $width solid $background-color; + } + } @else if ($direction == down-right) or ($direction == down-left) { + border-bottom: $height solid $foreground-color; + + @if $direction == down-right { + border-left: $width solid $background-color; + } @else if $direction == down-left { + border-right: $width solid $background-color; + } + } @else if ($direction == inset-up) { + border-color: $background-color $background-color $foreground-color; + border-style: solid; + border-width: $height $width; + } @else if ($direction == inset-down) { + border-color: $foreground-color $background-color $background-color; + border-style: solid; + border-width: $height $width; + } @else if ($direction == inset-right) { + border-color: $background-color $background-color $background-color $foreground-color; + border-style: solid; + border-width: $width $height; + } @else if ($direction == inset-left) { + border-color: $background-color $foreground-color $background-color $background-color; + border-style: solid; + border-width: $width $height; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_word-wrap.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_word-wrap.scss new file mode 100644 index 00000000..64856a92 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/addons/_word-wrap.scss @@ -0,0 +1,29 @@ +@charset "UTF-8"; + +/// Provides an easy way to change the `word-wrap` property. +/// +/// @param {String} $wrap [break-word] +/// Value for the `word-break` property. +/// +/// @example scss - Usage +/// .wrapper { +/// @include word-wrap(break-word); +/// } +/// +/// @example css - CSS Output +/// .wrapper { +/// overflow-wrap: break-word; +/// word-break: break-all; +/// word-wrap: break-word; +/// } + +@mixin word-wrap($wrap: break-word) { + overflow-wrap: $wrap; + word-wrap: $wrap; + + @if $wrap == break-word { + word-break: break-all; + } @else { + word-break: $wrap; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_animation.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_animation.scss new file mode 100644 index 00000000..aac675f5 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_animation.scss @@ -0,0 +1,43 @@ +// http://www.w3.org/TR/css3-animations/#the-animation-name-property- +// Each of these mixins support comma separated lists of values, which allows different transitions for individual properties to be described in a single style rule. Each value in the list corresponds to the value at that same position in the other properties. + +@mixin animation($animations...) { + @include prefixer(animation, $animations, webkit moz spec); +} + +@mixin animation-name($names...) { + @include prefixer(animation-name, $names, webkit moz spec); +} + +@mixin animation-duration($times...) { + @include prefixer(animation-duration, $times, webkit moz spec); +} + +@mixin animation-timing-function($motions...) { + // ease | linear | ease-in | ease-out | ease-in-out + @include prefixer(animation-timing-function, $motions, webkit moz spec); +} + +@mixin animation-iteration-count($values...) { + // infinite | + @include prefixer(animation-iteration-count, $values, webkit moz spec); +} + +@mixin animation-direction($directions...) { + // normal | alternate + @include prefixer(animation-direction, $directions, webkit moz spec); +} + +@mixin animation-play-state($states...) { + // running | paused + @include prefixer(animation-play-state, $states, webkit moz spec); +} + +@mixin animation-delay($times...) { + @include prefixer(animation-delay, $times, webkit moz spec); +} + +@mixin animation-fill-mode($modes...) { + // none | forwards | backwards | both + @include prefixer(animation-fill-mode, $modes, webkit moz spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_appearance.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_appearance.scss new file mode 100644 index 00000000..abddc020 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_appearance.scss @@ -0,0 +1,3 @@ +@mixin appearance($value) { + @include prefixer(appearance, $value, webkit moz ms o spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_backface-visibility.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_backface-visibility.scss new file mode 100644 index 00000000..fc68e2dd --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_backface-visibility.scss @@ -0,0 +1,3 @@ +@mixin backface-visibility($visibility) { + @include prefixer(backface-visibility, $visibility, webkit spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background-image.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background-image.scss new file mode 100644 index 00000000..6ed19ab5 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background-image.scss @@ -0,0 +1,42 @@ +//************************************************************************// +// Background-image property for adding multiple background images with +// gradients, or for stringing multiple gradients together. +//************************************************************************// + +@mixin background-image($images...) { + $webkit-images: (); + $spec-images: (); + + @each $image in $images { + $webkit-image: (); + $spec-image: (); + + @if (type-of($image) == string) { + $url-str: str-slice($image, 1, 3); + $gradient-type: str-slice($image, 1, 6); + + @if $url-str == "url" { + $webkit-image: $image; + $spec-image: $image; + } + + @else if $gradient-type == "linear" { + $gradients: _linear-gradient-parser($image); + $webkit-image: map-get($gradients, webkit-image); + $spec-image: map-get($gradients, spec-image); + } + + @else if $gradient-type == "radial" { + $gradients: _radial-gradient-parser($image); + $webkit-image: map-get($gradients, webkit-image); + $spec-image: map-get($gradients, spec-image); + } + } + + $webkit-images: append($webkit-images, $webkit-image, comma); + $spec-images: append($spec-images, $spec-image, comma); + } + + background-image: $webkit-images; + background-image: $spec-images; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background.scss new file mode 100644 index 00000000..019db0ed --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_background.scss @@ -0,0 +1,55 @@ +//************************************************************************// +// Background property for adding multiple backgrounds using shorthand +// notation. +//************************************************************************// + +@mixin background($backgrounds...) { + $webkit-backgrounds: (); + $spec-backgrounds: (); + + @each $background in $backgrounds { + $webkit-background: (); + $spec-background: (); + $background-type: type-of($background); + + @if $background-type == string or $background-type == list { + $background-str: if($background-type == list, nth($background, 1), $background); + + $url-str: str-slice($background-str, 1, 3); + $gradient-type: str-slice($background-str, 1, 6); + + @if $url-str == "url" { + $webkit-background: $background; + $spec-background: $background; + } + + @else if $gradient-type == "linear" { + $gradients: _linear-gradient-parser("#{$background}"); + $webkit-background: map-get($gradients, webkit-image); + $spec-background: map-get($gradients, spec-image); + } + + @else if $gradient-type == "radial" { + $gradients: _radial-gradient-parser("#{$background}"); + $webkit-background: map-get($gradients, webkit-image); + $spec-background: map-get($gradients, spec-image); + } + + @else { + $webkit-background: $background; + $spec-background: $background; + } + } + + @else { + $webkit-background: $background; + $spec-background: $background; + } + + $webkit-backgrounds: append($webkit-backgrounds, $webkit-background, comma); + $spec-backgrounds: append($spec-backgrounds, $spec-background, comma); + } + + background: $webkit-backgrounds; + background: $spec-backgrounds; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_border-image.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_border-image.scss new file mode 100644 index 00000000..cf568ce6 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_border-image.scss @@ -0,0 +1,59 @@ +@mixin border-image($borders...) { + $webkit-borders: (); + $spec-borders: (); + + @each $border in $borders { + $webkit-border: (); + $spec-border: (); + $border-type: type-of($border); + + @if $border-type == string or list { + $border-str: if($border-type == list, nth($border, 1), $border); + + $url-str: str-slice($border-str, 1, 3); + $gradient-type: str-slice($border-str, 1, 6); + + @if $url-str == "url" { + $webkit-border: $border; + $spec-border: $border; + } + + @else if $gradient-type == "linear" { + $gradients: _linear-gradient-parser("#{$border}"); + $webkit-border: map-get($gradients, webkit-image); + $spec-border: map-get($gradients, spec-image); + } + + @else if $gradient-type == "radial" { + $gradients: _radial-gradient-parser("#{$border}"); + $webkit-border: map-get($gradients, webkit-image); + $spec-border: map-get($gradients, spec-image); + } + + @else { + $webkit-border: $border; + $spec-border: $border; + } + } + + @else { + $webkit-border: $border; + $spec-border: $border; + } + + $webkit-borders: append($webkit-borders, $webkit-border, comma); + $spec-borders: append($spec-borders, $spec-border, comma); + } + + -webkit-border-image: $webkit-borders; + border-image: $spec-borders; + border-style: solid; +} + +//Examples: +// @include border-image(url("image.png")); +// @include border-image(url("image.png") 20 stretch); +// @include border-image(linear-gradient(45deg, orange, yellow)); +// @include border-image(linear-gradient(45deg, orange, yellow) stretch); +// @include border-image(linear-gradient(45deg, orange, yellow) 20 30 40 50 stretch round); +// @include border-image(radial-gradient(top, cover, orange, yellow, orange)); diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_calc.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_calc.scss new file mode 100644 index 00000000..0bfc738d --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_calc.scss @@ -0,0 +1,4 @@ +@mixin calc($property, $value) { + #{$property}: -webkit-calc(#{$value}); + #{$property}: calc(#{$value}); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_columns.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_columns.scss new file mode 100644 index 00000000..96117670 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_columns.scss @@ -0,0 +1,47 @@ +@mixin columns($arg: auto) { + // || + @include prefixer(columns, $arg, webkit moz spec); +} + +@mixin column-count($int: auto) { + // auto || integer + @include prefixer(column-count, $int, webkit moz spec); +} + +@mixin column-gap($length: normal) { + // normal || length + @include prefixer(column-gap, $length, webkit moz spec); +} + +@mixin column-fill($arg: auto) { + // auto || length + @include prefixer(column-fill, $arg, webkit moz spec); +} + +@mixin column-rule($arg) { + // || || + @include prefixer(column-rule, $arg, webkit moz spec); +} + +@mixin column-rule-color($color) { + @include prefixer(column-rule-color, $color, webkit moz spec); +} + +@mixin column-rule-style($style: none) { + // none | hidden | dashed | dotted | double | groove | inset | inset | outset | ridge | solid + @include prefixer(column-rule-style, $style, webkit moz spec); +} + +@mixin column-rule-width ($width: none) { + @include prefixer(column-rule-width, $width, webkit moz spec); +} + +@mixin column-span($arg: none) { + // none || all + @include prefixer(column-span, $arg, webkit moz spec); +} + +@mixin column-width($length: auto) { + // auto || length + @include prefixer(column-width, $length, webkit moz spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_filter.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_filter.scss new file mode 100644 index 00000000..b8f8ffb0 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_filter.scss @@ -0,0 +1,4 @@ +@mixin filter($function: none) { + // [ + @include prefixer(perspective, $depth, webkit moz spec); +} + +@mixin perspective-origin($value: 50% 50%) { + @include prefixer(perspective-origin, $value, webkit moz spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_placeholder.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_placeholder.scss new file mode 100644 index 00000000..5682fd09 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_placeholder.scss @@ -0,0 +1,8 @@ +@mixin placeholder { + $placeholders: ":-webkit-input" ":-moz" "-moz" "-ms-input"; + @each $placeholder in $placeholders { + &:#{$placeholder}-placeholder { + @content; + } + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_radial-gradient.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_radial-gradient.scss new file mode 100644 index 00000000..8da076e2 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_radial-gradient.scss @@ -0,0 +1,39 @@ +// Requires Sass 3.1+ +@mixin radial-gradient($g1, $g2, + $g3: null, $g4: null, + $g5: null, $g6: null, + $g7: null, $g8: null, + $g9: null, $g10: null, + $pos: null, + $shape-size: null, + $fallback: null) { + + $data: _radial-arg-parser($g1, $g2, $pos, $shape-size); + $g1: nth($data, 1); + $g2: nth($data, 2); + $pos: nth($data, 3); + $shape-size: nth($data, 4); + + $full: $g1, $g2, $g3, $g4, $g5, $g6, $g7, $g8, $g9, $g10; + + // Strip deprecated cover/contain for spec + $shape-size-spec: _shape-size-stripper($shape-size); + + // Set $g1 as the default fallback color + $first-color: nth($full, 1); + $fallback-color: nth($first-color, 1); + + @if (type-of($fallback) == color) or ($fallback == "transparent") { + $fallback-color: $fallback; + } + + // Add Commas and spaces + $shape-size: if($shape-size, "#{$shape-size}, ", null); + $pos: if($pos, "#{$pos}, ", null); + $pos-spec: if($pos, "at #{$pos}", null); + $shape-size-spec: if(($shape-size-spec != " ") and ($pos == null), "#{$shape-size-spec}, ", "#{$shape-size-spec} "); + + background-color: $fallback-color; + background-image: -webkit-radial-gradient(unquote(#{$pos}#{$shape-size}#{$full})); + background-image: unquote("radial-gradient(#{$shape-size-spec}#{$pos-spec}#{$full})"); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_selection.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_selection.scss new file mode 100644 index 00000000..cd71d4f5 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_selection.scss @@ -0,0 +1,42 @@ +@charset "UTF-8"; + +/// Outputs the spec and prefixed versions of the `::selection` pseudo-element. +/// +/// @param {Bool} $current-selector [false] +/// If set to `true`, it takes the current element into consideration. +/// +/// @example scss - Usage +/// .element { +/// @include selection(true) { +/// background-color: #ffbb52; +/// } +/// } +/// +/// @example css - CSS Output +/// .element::-moz-selection { +/// background-color: #ffbb52; +/// } +/// +/// .element::selection { +/// background-color: #ffbb52; +/// } + +@mixin selection($current-selector: false) { + @if $current-selector { + &::-moz-selection { + @content; + } + + &::selection { + @content; + } + } @else { + ::-moz-selection { + @content; + } + + ::selection { + @content; + } + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_text-decoration.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_text-decoration.scss new file mode 100644 index 00000000..9222746c --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_text-decoration.scss @@ -0,0 +1,19 @@ +@mixin text-decoration($value) { +// || || + @include prefixer(text-decoration, $value, moz); +} + +@mixin text-decoration-line($line: none) { +// none || underline || overline || line-through + @include prefixer(text-decoration-line, $line, moz); +} + +@mixin text-decoration-style($style: solid) { +// solid || double || dotted || dashed || wavy + @include prefixer(text-decoration-style, $style, moz webkit); +} + +@mixin text-decoration-color($color: currentColor) { +// currentColor || + @include prefixer(text-decoration-color, $color, moz); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transform.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transform.scss new file mode 100644 index 00000000..8ee6509f --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transform.scss @@ -0,0 +1,15 @@ +@mixin transform($property: none) { + // none | + @include prefixer(transform, $property, webkit moz ms o spec); +} + +@mixin transform-origin($axes: 50%) { + // x-axis - left | center | right | length | % + // y-axis - top | center | bottom | length | % + // z-axis - length + @include prefixer(transform-origin, $axes, webkit moz ms o spec); +} + +@mixin transform-style($style: flat) { + @include prefixer(transform-style, $style, webkit moz ms o spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transition.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transition.scss new file mode 100644 index 00000000..3c785ed5 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_transition.scss @@ -0,0 +1,71 @@ +// Shorthand mixin. Supports multiple parentheses-deliminated values for each variable. +// Example: @include transition (all 2s ease-in-out); +// @include transition (opacity 1s ease-in 2s, width 2s ease-out); +// @include transition-property (transform, opacity); + +@mixin transition($properties...) { + // Fix for vendor-prefix transform property + $needs-prefixes: false; + $webkit: (); + $moz: (); + $spec: (); + + // Create lists for vendor-prefixed transform + @each $list in $properties { + @if nth($list, 1) == "transform" { + $needs-prefixes: true; + $list1: -webkit-transform; + $list2: -moz-transform; + $list3: (); + + @each $var in $list { + $list3: join($list3, $var); + + @if $var != "transform" { + $list1: join($list1, $var); + $list2: join($list2, $var); + } + } + + $webkit: append($webkit, $list1); + $moz: append($moz, $list2); + $spec: append($spec, $list3); + } @else { + $webkit: append($webkit, $list, comma); + $moz: append($moz, $list, comma); + $spec: append($spec, $list, comma); + } + } + + @if $needs-prefixes { + -webkit-transition: $webkit; + -moz-transition: $moz; + transition: $spec; + } @else { + @if length($properties) >= 1 { + @include prefixer(transition, $properties, webkit moz spec); + } @else { + $properties: all 0.15s ease-out 0s; + @include prefixer(transition, $properties, webkit moz spec); + } + } +} + +@mixin transition-property($properties...) { + -webkit-transition-property: transition-property-names($properties, "webkit"); + -moz-transition-property: transition-property-names($properties, "moz"); + transition-property: transition-property-names($properties, false); +} + +@mixin transition-duration($times...) { + @include prefixer(transition-duration, $times, webkit moz spec); +} + +@mixin transition-timing-function($motions...) { + // ease | linear | ease-in | ease-out | ease-in-out | cubic-bezier() + @include prefixer(transition-timing-function, $motions, webkit moz spec); +} + +@mixin transition-delay($times...) { + @include prefixer(transition-delay, $times, webkit moz spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_user-select.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_user-select.scss new file mode 100644 index 00000000..d4e55510 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/css3/_user-select.scss @@ -0,0 +1,3 @@ +@mixin user-select($value: none) { + @include prefixer(user-select, $value, webkit moz ms spec); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_assign-inputs.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_assign-inputs.scss new file mode 100644 index 00000000..f8aba967 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_assign-inputs.scss @@ -0,0 +1,11 @@ +@function assign-inputs($inputs, $pseudo: null) { + $list: (); + + @each $input in $inputs { + $input: unquote($input); + $input: if($pseudo, $input + ":" + $pseudo, $input); + $list: append($list, $input, comma); + } + + @return $list; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains-falsy.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains-falsy.scss new file mode 100644 index 00000000..c096fdb9 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains-falsy.scss @@ -0,0 +1,20 @@ +@charset "UTF-8"; + +/// Checks if a list does not contains a value. +/// +/// @access private +/// +/// @param {List} $list +/// The list to check against. +/// +/// @return {Bool} + +@function contains-falsy($list) { + @each $item in $list { + @if not $item { + @return true; + } + } + + @return false; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains.scss new file mode 100644 index 00000000..3dec27db --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_contains.scss @@ -0,0 +1,26 @@ +@charset "UTF-8"; + +/// Checks if a list contains a value(s). +/// +/// @access private +/// +/// @param {List} $list +/// The list to check against. +/// +/// @param {List} $values +/// A single value or list of values to check for. +/// +/// @example scss - Usage +/// contains($list, $value) +/// +/// @return {Bool} + +@function contains($list, $values...) { + @each $value in $values { + @if type-of(index($list, $value)) != "number" { + @return false; + } + } + + @return true; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-length.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-length.scss new file mode 100644 index 00000000..5826e789 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-length.scss @@ -0,0 +1,11 @@ +@charset "UTF-8"; + +/// Checks for a valid CSS length. +/// +/// @param {String} $value + +@function is-length($value) { + @return type-of($value) != "null" and (str-slice($value + "", 1, 4) == "calc" + or index(auto inherit initial 0, $value) + or (type-of($value) == "number" and not(unitless($value)))); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-light.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-light.scss new file mode 100644 index 00000000..92d90ac3 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-light.scss @@ -0,0 +1,21 @@ +@charset "UTF-8"; + +/// Programatically determines whether a color is light or dark. +/// +/// @link http://robots.thoughtbot.com/closer-look-color-lightness +/// +/// @param {Color (Hex)} $color +/// +/// @example scss - Usage +/// is-light($color) +/// +/// @return {Bool} + +@function is-light($hex-color) { + $-local-red: red(rgba($hex-color, 1)); + $-local-green: green(rgba($hex-color, 1)); + $-local-blue: blue(rgba($hex-color, 1)); + $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255; + + @return $-local-lightness > 0.6; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-number.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-number.scss new file mode 100644 index 00000000..a64e0bf2 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-number.scss @@ -0,0 +1,11 @@ +@charset "UTF-8"; + +/// Checks for a valid number. +/// +/// @param {Number} $value +/// +/// @require {function} contains + +@function is-number($value) { + @return contains("0" "1" "2" "3" "4" "5" "6" "7" "8" "9" 0 1 2 3 4 5 6 7 8 9, $value); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-size.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-size.scss new file mode 100644 index 00000000..661789ab --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_is-size.scss @@ -0,0 +1,13 @@ +@charset "UTF-8"; + +/// Checks for a valid CSS size. +/// +/// @param {String} $value +/// +/// @require {function} contains +/// @require {function} is-length + +@function is-size($value) { + @return is-length($value) + or contains("fill" "fit-content" "min-content" "max-content", $value); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_modular-scale.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_modular-scale.scss new file mode 100644 index 00000000..20fa3881 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_modular-scale.scss @@ -0,0 +1,69 @@ +// Scaling Variables +$golden: 1.618; +$minor-second: 1.067; +$major-second: 1.125; +$minor-third: 1.2; +$major-third: 1.25; +$perfect-fourth: 1.333; +$augmented-fourth: 1.414; +$perfect-fifth: 1.5; +$minor-sixth: 1.6; +$major-sixth: 1.667; +$minor-seventh: 1.778; +$major-seventh: 1.875; +$octave: 2; +$major-tenth: 2.5; +$major-eleventh: 2.667; +$major-twelfth: 3; +$double-octave: 4; + +$modular-scale-ratio: $perfect-fourth !default; +$modular-scale-base: em($em-base) !default; + +@function modular-scale($increment, $value: $modular-scale-base, $ratio: $modular-scale-ratio) { + $v1: nth($value, 1); + $v2: nth($value, length($value)); + $value: $v1; + + // scale $v2 to just above $v1 + @while $v2 > $v1 { + $v2: ($v2 / $ratio); // will be off-by-1 + } + @while $v2 < $v1 { + $v2: ($v2 * $ratio); // will fix off-by-1 + } + + // check AFTER scaling $v2 to prevent double-counting corner-case + $double-stranded: $v2 > $v1; + + @if $increment > 0 { + @for $i from 1 through $increment { + @if $double-stranded and ($v1 * $ratio) > $v2 { + $value: $v2; + $v2: ($v2 * $ratio); + } @else { + $v1: ($v1 * $ratio); + $value: $v1; + } + } + } + + @if $increment < 0 { + // adjust $v2 to just below $v1 + @if $double-stranded { + $v2: ($v2 / $ratio); + } + + @for $i from $increment through -1 { + @if $double-stranded and ($v1 / $ratio) < $v2 { + $value: $v2; + $v2: ($v2 / $ratio); + } @else { + $v1: ($v1 / $ratio); + $value: $v1; + } + } + } + + @return $value; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-em.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-em.scss new file mode 100644 index 00000000..ae81a44a --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-em.scss @@ -0,0 +1,13 @@ +// Convert pixels to ems +// eg. for a relational value of 12px write em(12) when the parent is 16px +// if the parent is another value say 24px write em(12, 24) + +@function em($pxval, $base: $em-base) { + @if not unitless($pxval) { + $pxval: strip-units($pxval); + } + @if not unitless($base) { + $base: strip-units($base); + } + @return ($pxval / $base) * 1em; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-rem.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-rem.scss new file mode 100644 index 00000000..0ac941e7 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_px-to-rem.scss @@ -0,0 +1,15 @@ +// Convert pixels to rems +// eg. for a relational value of 12px write rem(12) +// Assumes $em-base is the font-size of + +@function rem($pxval) { + @if not unitless($pxval) { + $pxval: strip-units($pxval); + } + + $base: $em-base; + @if not unitless($base) { + $base: strip-units($base); + } + @return ($pxval / $base) * 1rem; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_shade.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_shade.scss new file mode 100644 index 00000000..8aaf2c6d --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_shade.scss @@ -0,0 +1,24 @@ +@charset "UTF-8"; + +/// Mixes a color with black. +/// +/// @param {Color} $color +/// +/// @param {Number (Percentage)} $percent +/// The amount of black to be mixed in. +/// +/// @example scss - Usage +/// .element { +/// background-color: shade(#ffbb52, 60%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// background-color: #664a20; +/// } +/// +/// @return {Color} + +@function shade($color, $percent) { + @return mix(#000, $color, $percent); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_strip-units.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_strip-units.scss new file mode 100644 index 00000000..6c5f3e81 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_strip-units.scss @@ -0,0 +1,17 @@ +@charset "UTF-8"; + +/// Strips the unit from a number. +/// +/// @param {Number (With Unit)} $value +/// +/// @example scss - Usage +/// $dimension: strip-units(10em); +/// +/// @example css - CSS Output +/// $dimension: 10; +/// +/// @return {Number (Unitless)} + +@function strip-units($value) { + @return ($value / ($value * 0 + 1)); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_tint.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_tint.scss new file mode 100644 index 00000000..2e338148 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_tint.scss @@ -0,0 +1,24 @@ +@charset "UTF-8"; + +/// Mixes a color with white. +/// +/// @param {Color} $color +/// +/// @param {Number (Percentage)} $percent +/// The amount of white to be mixed in. +/// +/// @example scss - Usage +/// .element { +/// background-color: tint(#6ecaa6, 40%); +/// } +/// +/// @example css - CSS Output +/// .element { +/// background-color: #a8dfc9; +/// } +/// +/// @return {Color} + +@function tint($color, $percent) { + @return mix(#fff, $color, $percent); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_transition-property-name.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_transition-property-name.scss new file mode 100644 index 00000000..18348b93 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_transition-property-name.scss @@ -0,0 +1,22 @@ +// Return vendor-prefixed property names if appropriate +// Example: transition-property-names((transform, color, background), moz) -> -moz-transform, color, background +//************************************************************************// +@function transition-property-names($props, $vendor: false) { + $new-props: (); + + @each $prop in $props { + $new-props: append($new-props, transition-property-name($prop, $vendor), comma); + } + + @return $new-props; +} + +@function transition-property-name($prop, $vendor: false) { + // put other properties that need to be prefixed here aswell + @if $vendor and $prop == transform { + @return unquote('-'+$vendor+'-'+$prop); + } + @else { + @return $prop; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_unpack.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_unpack.scss new file mode 100644 index 00000000..4367935d --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/functions/_unpack.scss @@ -0,0 +1,27 @@ +@charset "UTF-8"; + +/// Converts shorthand to the 4-value syntax. +/// +/// @param {List} $shorthand +/// +/// @example scss - Usage +/// .element { +/// margin: unpack(1em 2em); +/// } +/// +/// @example css - CSS Output +/// .element { +/// margin: 1em 2em 1em 2em; +/// } + +@function unpack($shorthand) { + @if length($shorthand) == 1 { + @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1); + } @else if length($shorthand) == 2 { + @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2); + } @else if length($shorthand) == 3 { + @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2); + } @else { + @return $shorthand; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_convert-units.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_convert-units.scss new file mode 100644 index 00000000..e0a65a05 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_convert-units.scss @@ -0,0 +1,21 @@ +//************************************************************************// +// Helper function for str-to-num fn. +// Source: http://sassmeister.com/gist/9647408 +//************************************************************************// +@function _convert-units($number, $unit) { + $strings: "px", "cm", "mm", "%", "ch", "pica", "in", "em", "rem", "pt", "pc", "ex", "vw", "vh", "vmin", "vmax", "deg", "rad", "grad", "turn"; + $units: 1px, 1cm, 1mm, 1%, 1ch, 1pica, 1in, 1em, 1rem, 1pt, 1pc, 1ex, 1vw, 1vh, 1vmin, 1vmax, 1deg, 1rad, 1grad, 1turn; + $index: index($strings, $unit); + + @if not $index { + @warn "Unknown unit `#{$unit}`."; + @return false; + } + + @if type-of($number) != "number" { + @warn "`#{$number} is not a number`"; + @return false; + } + + @return $number * nth($units, $index); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_directional-values.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_directional-values.scss new file mode 100644 index 00000000..6ee538db --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_directional-values.scss @@ -0,0 +1,96 @@ +@charset "UTF-8"; + +/// Directional-property mixins are shorthands for writing properties like the following +/// +/// @ignore You can also use `false` instead of `null`. +/// +/// @param {List} $vals +/// List of directional values +/// +/// @example scss - Usage +/// .element { +/// @include border-style(dotted null); +/// @include margin(null 0 10px); +/// } +/// +/// @example css - CSS Output +/// .element { +/// border-bottom-style: dotted; +/// border-top-style: dotted; +/// margin-bottom: 10px; +/// margin-left: 0; +/// margin-right: 0; +/// } +/// +/// @require {function} contains-falsy +/// +/// @return {List} + +@function collapse-directionals($vals) { + $output: null; + + $a: nth($vals, 1); + $b: if(length($vals) < 2, $a, nth($vals, 2)); + $c: if(length($vals) < 3, $a, nth($vals, 3)); + $d: if(length($vals) < 2, $a, nth($vals, if(length($vals) < 4, 2, 4))); + + @if $a == 0 { $a: 0; } + @if $b == 0 { $b: 0; } + @if $c == 0 { $c: 0; } + @if $d == 0 { $d: 0; } + + @if $a == $b and $a == $c and $a == $d { $output: $a; } + @else if $a == $c and $b == $d { $output: $a $b; } + @else if $b == $d { $output: $a $b $c; } + @else { $output: $a $b $c $d; } + + @return $output; +} + +/// Output directional properties, for instance `margin`. +/// +/// @access private +/// +/// @param {String} $pre +/// Prefix to use +/// @param {String} $suf +/// Suffix to use +/// @param {List} $vals +/// List of values +/// +/// @require {function} collapse-directionals +/// @require {function} contains-falsy + +@mixin directional-property($pre, $suf, $vals) { + // Property Names + $top: $pre + "-top" + if($suf, "-#{$suf}", ""); + $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", ""); + $left: $pre + "-left" + if($suf, "-#{$suf}", ""); + $right: $pre + "-right" + if($suf, "-#{$suf}", ""); + $all: $pre + if($suf, "-#{$suf}", ""); + + $vals: collapse-directionals($vals); + + @if contains-falsy($vals) { + @if nth($vals, 1) { #{$top}: nth($vals, 1); } + + @if length($vals) == 1 { + @if nth($vals, 1) { #{$right}: nth($vals, 1); } + } @else { + @if nth($vals, 2) { #{$right}: nth($vals, 2); } + } + + @if length($vals) == 2 { + @if nth($vals, 1) { #{$bottom}: nth($vals, 1); } + @if nth($vals, 2) { #{$left}: nth($vals, 2); } + } @else if length($vals) == 3 { + @if nth($vals, 3) { #{$bottom}: nth($vals, 3); } + @if nth($vals, 2) { #{$left}: nth($vals, 2); } + } @else if length($vals) == 4 { + @if nth($vals, 3) { #{$bottom}: nth($vals, 3); } + @if nth($vals, 4) { #{$left}: nth($vals, 4); } + } + } @else { + #{$all}: $vals; + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_font-source-declaration.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_font-source-declaration.scss new file mode 100644 index 00000000..7f17586c --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_font-source-declaration.scss @@ -0,0 +1,43 @@ +// Used for creating the source string for fonts using @font-face +// Reference: http://goo.gl/Ru1bKP + +@function font-url-prefixer($asset-pipeline) { + @if $asset-pipeline == true { + @return font-url; + } @else { + @return url; + } +} + +@function font-source-declaration( + $font-family, + $file-path, + $asset-pipeline, + $file-formats, + $font-url) { + + $src: (); + + $formats-map: ( + eot: "#{$file-path}.eot?#iefix" format("embedded-opentype"), + woff2: "#{$file-path}.woff2" format("woff2"), + woff: "#{$file-path}.woff" format("woff"), + ttf: "#{$file-path}.ttf" format("truetype"), + svg: "#{$file-path}.svg##{$font-family}" format("svg") + ); + + @each $key, $values in $formats-map { + @if contains($file-formats, $key) { + $file-path: nth($values, 1); + $font-format: nth($values, 2); + + @if $asset-pipeline == true { + $src: append($src, font-url($file-path) $font-format, comma); + } @else { + $src: append($src, url($file-path) $font-format, comma); + } + } + } + + @return $src; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_gradient-positions-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_gradient-positions-parser.scss new file mode 100644 index 00000000..07d30b6c --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_gradient-positions-parser.scss @@ -0,0 +1,13 @@ +@function _gradient-positions-parser($gradient-type, $gradient-positions) { + @if $gradient-positions + and ($gradient-type == linear) + and (type-of($gradient-positions) != color) { + $gradient-positions: _linear-positions-parser($gradient-positions); + } + @else if $gradient-positions + and ($gradient-type == radial) + and (type-of($gradient-positions) != color) { + $gradient-positions: _radial-positions-parser($gradient-positions); + } + @return $gradient-positions; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-angle-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-angle-parser.scss new file mode 100644 index 00000000..e0401ed8 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-angle-parser.scss @@ -0,0 +1,25 @@ +// Private function for linear-gradient-parser +@function _linear-angle-parser($image, $first-val, $prefix, $suffix) { + $offset: null; + $unit-short: str-slice($first-val, str-length($first-val) - 2, str-length($first-val)); + $unit-long: str-slice($first-val, str-length($first-val) - 3, str-length($first-val)); + + @if ($unit-long == "grad") or + ($unit-long == "turn") { + $offset: if($unit-long == "grad", -100grad * 3, -0.75turn); + } + + @else if ($unit-short == "deg") or + ($unit-short == "rad") { + $offset: if($unit-short == "deg", -90 * 3, 1.6rad); + } + + @if $offset { + $num: _str-to-num($first-val); + + @return ( + webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix, + spec-image: $image + ); + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-gradient-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-gradient-parser.scss new file mode 100644 index 00000000..48a8f77f --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-gradient-parser.scss @@ -0,0 +1,41 @@ +@function _linear-gradient-parser($image) { + $image: unquote($image); + $gradients: (); + $start: str-index($image, "("); + $end: str-index($image, ","); + $first-val: str-slice($image, $start + 1, $end - 1); + + $prefix: str-slice($image, 1, $start); + $suffix: str-slice($image, $end, str-length($image)); + + $has-multiple-vals: str-index($first-val, " "); + $has-single-position: unquote(_position-flipper($first-val) + ""); + $has-angle: is-number(str-slice($first-val, 1, 1)); + + @if $has-multiple-vals { + $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals); + } + + @else if $has-single-position != "" { + $pos: unquote($has-single-position + ""); + + $gradients: ( + webkit-image: -webkit- + $image, + spec-image: $prefix + "to " + $pos + $suffix + ); + } + + @else if $has-angle { + // Rotate degree for webkit + $gradients: _linear-angle-parser($image, $first-val, $prefix, $suffix); + } + + @else { + $gradients: ( + webkit-image: -webkit- + $image, + spec-image: $image + ); + } + + @return $gradients; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-positions-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-positions-parser.scss new file mode 100644 index 00000000..6d5cb6e1 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-positions-parser.scss @@ -0,0 +1,61 @@ +@function _linear-positions-parser($pos) { + $type: type-of(nth($pos, 1)); + $spec: null; + $degree: null; + $side: null; + $corner: null; + $length: length($pos); + // Parse Side and corner positions + @if ($length > 1) { + @if nth($pos, 1) == "to" { // Newer syntax + $side: nth($pos, 2); + + @if $length == 2 { // eg. to top + // Swap for backwards compatability + $degree: _position-flipper(nth($pos, 2)); + } + @else if $length == 3 { // eg. to top left + $corner: nth($pos, 3); + } + } + @else if $length == 2 { // Older syntax ("top left") + $side: _position-flipper(nth($pos, 1)); + $corner: _position-flipper(nth($pos, 2)); + } + + @if ("#{$side} #{$corner}" == "left top") or ("#{$side} #{$corner}" == "top left") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + @else if ("#{$side} #{$corner}" == "right top") or ("#{$side} #{$corner}" == "top right") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + @else if ("#{$side} #{$corner}" == "right bottom") or ("#{$side} #{$corner}" == "bottom right") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + @else if ("#{$side} #{$corner}" == "left bottom") or ("#{$side} #{$corner}" == "bottom left") { + $degree: _position-flipper(#{$side}) _position-flipper(#{$corner}); + } + $spec: to $side $corner; + } + @else if $length == 1 { + // Swap for backwards compatability + @if $type == string { + $degree: $pos; + $spec: to _position-flipper($pos); + } + @else { + $degree: -270 - $pos; //rotate the gradient opposite from spec + $spec: $pos; + } + } + $degree: unquote($degree + ","); + $spec: unquote($spec + ","); + @return $degree $spec; +} + +@function _position-flipper($pos) { + @return if($pos == left, right, null) + if($pos == right, left, null) + if($pos == top, bottom, null) + if($pos == bottom, top, null); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-side-corner-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-side-corner-parser.scss new file mode 100644 index 00000000..7a691253 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_linear-side-corner-parser.scss @@ -0,0 +1,31 @@ +// Private function for linear-gradient-parser +@function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) { + $val-1: str-slice($first-val, 1, $has-multiple-vals - 1); + $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val)); + $val-3: null; + $has-val-3: str-index($val-2, " "); + + @if $has-val-3 { + $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2)); + $val-2: str-slice($val-2, 1, $has-val-3 - 1); + } + + $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3); + $pos: unquote($pos + ""); + + // Use old spec for webkit + @if $val-1 == "to" { + @return ( + webkit-image: -webkit- + $prefix + $pos + $suffix, + spec-image: $image + ); + } + + // Bring the code up to spec + @else { + @return ( + webkit-image: -webkit- + $image, + spec-image: $prefix + "to " + $pos + $suffix + ); + } +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-arg-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-arg-parser.scss new file mode 100644 index 00000000..56c6030b --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-arg-parser.scss @@ -0,0 +1,69 @@ +@function _radial-arg-parser($g1, $g2, $pos, $shape-size) { + @each $value in $g1, $g2 { + $first-val: nth($value, 1); + $pos-type: type-of($first-val); + $spec-at-index: null; + + // Determine if spec was passed to mixin + @if type-of($value) == list { + $spec-at-index: if(index($value, at), index($value, at), false); + } + @if $spec-at-index { + @if $spec-at-index > 1 { + @for $i from 1 through ($spec-at-index - 1) { + $shape-size: $shape-size nth($value, $i); + } + @for $i from ($spec-at-index + 1) through length($value) { + $pos: $pos nth($value, $i); + } + } + @else if $spec-at-index == 1 { + @for $i from ($spec-at-index + 1) through length($value) { + $pos: $pos nth($value, $i); + } + } + $g1: null; + } + + // If not spec calculate correct values + @else { + @if ($pos-type != color) or ($first-val != "transparent") { + @if ($pos-type == number) + or ($first-val == "center") + or ($first-val == "top") + or ($first-val == "right") + or ($first-val == "bottom") + or ($first-val == "left") { + + $pos: $value; + + @if $pos == $g1 { + $g1: null; + } + } + + @else if + ($first-val == "ellipse") + or ($first-val == "circle") + or ($first-val == "closest-side") + or ($first-val == "closest-corner") + or ($first-val == "farthest-side") + or ($first-val == "farthest-corner") + or ($first-val == "contain") + or ($first-val == "cover") { + + $shape-size: $value; + + @if $value == $g1 { + $g1: null; + } + + @else if $value == $g2 { + $g2: null; + } + } + } + } + } + @return $g1, $g2, $pos, $shape-size; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-gradient-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-gradient-parser.scss new file mode 100644 index 00000000..5444d808 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-gradient-parser.scss @@ -0,0 +1,50 @@ +@function _radial-gradient-parser($image) { + $image: unquote($image); + $gradients: (); + $start: str-index($image, "("); + $end: str-index($image, ","); + $first-val: str-slice($image, $start + 1, $end - 1); + + $prefix: str-slice($image, 1, $start); + $suffix: str-slice($image, $end, str-length($image)); + + $is-spec-syntax: str-index($first-val, "at"); + + @if $is-spec-syntax and $is-spec-syntax > 1 { + $keyword: str-slice($first-val, 1, $is-spec-syntax - 2); + $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val)); + $pos: append($pos, $keyword, comma); + + $gradients: ( + webkit-image: -webkit- + $prefix + $pos + $suffix, + spec-image: $image + ); + } + + @else if $is-spec-syntax == 1 { + $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val)); + + $gradients: ( + webkit-image: -webkit- + $prefix + $pos + $suffix, + spec-image: $image + ); + } + + @else if str-index($image, "cover") or str-index($image, "contain") { + @warn "Radial-gradient needs to be updated to conform to latest spec."; + + $gradients: ( + webkit-image: null, + spec-image: $image + ); + } + + @else { + $gradients: ( + webkit-image: -webkit- + $image, + spec-image: $image + ); + } + + @return $gradients; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-positions-parser.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-positions-parser.scss new file mode 100644 index 00000000..3c552ad7 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_radial-positions-parser.scss @@ -0,0 +1,18 @@ +@function _radial-positions-parser($gradient-pos) { + $shape-size: nth($gradient-pos, 1); + $pos: nth($gradient-pos, 2); + $shape-size-spec: _shape-size-stripper($shape-size); + + $pre-spec: unquote(if($pos, "#{$pos}, ", null)) + unquote(if($shape-size, "#{$shape-size},", null)); + $pos-spec: if($pos, "at #{$pos}", null); + + $spec: "#{$shape-size-spec} #{$pos-spec}"; + + // Add comma + @if ($spec != " ") { + $spec: "#{$spec},"; + } + + @return $pre-spec $spec; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_render-gradients.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_render-gradients.scss new file mode 100644 index 00000000..57656768 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_render-gradients.scss @@ -0,0 +1,26 @@ +// User for linear and radial gradients within background-image or border-image properties + +@function _render-gradients($gradient-positions, $gradients, $gradient-type, $vendor: false) { + $pre-spec: null; + $spec: null; + $vendor-gradients: null; + @if $gradient-type == linear { + @if $gradient-positions { + $pre-spec: nth($gradient-positions, 1); + $spec: nth($gradient-positions, 2); + } + } + @else if $gradient-type == radial { + $pre-spec: nth($gradient-positions, 1); + $spec: nth($gradient-positions, 2); + } + + @if $vendor { + $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient(#{$pre-spec} $gradients); + } + @else if $vendor == false { + $vendor-gradients: "#{$gradient-type}-gradient(#{$spec} #{$gradients})"; + $vendor-gradients: unquote($vendor-gradients); + } + @return $vendor-gradients; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_shape-size-stripper.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_shape-size-stripper.scss new file mode 100644 index 00000000..ee5eda42 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_shape-size-stripper.scss @@ -0,0 +1,10 @@ +@function _shape-size-stripper($shape-size) { + $shape-size-spec: null; + @each $value in $shape-size { + @if ($value == "cover") or ($value == "contain") { + $value: null; + } + $shape-size-spec: "#{$shape-size-spec} #{$value}"; + } + @return $shape-size-spec; +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_str-to-num.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_str-to-num.scss new file mode 100644 index 00000000..3ef1d873 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/helpers/_str-to-num.scss @@ -0,0 +1,50 @@ +//************************************************************************// +// Helper function for linear/radial-gradient-parsers. +// Source: http://sassmeister.com/gist/9647408 +//************************************************************************// +@function _str-to-num($string) { + // Matrices + $strings: "0" "1" "2" "3" "4" "5" "6" "7" "8" "9"; + $numbers: 0 1 2 3 4 5 6 7 8 9; + + // Result + $result: 0; + $divider: 0; + $minus: false; + + // Looping through all characters + @for $i from 1 through str-length($string) { + $character: str-slice($string, $i, $i); + $index: index($strings, $character); + + @if $character == "-" { + $minus: true; + } + + @else if $character == "." { + $divider: 1; + } + + @else { + @if not $index { + $result: if($minus, $result * -1, $result); + @return _convert-units($result, str-slice($string, $i)); + } + + $number: nth($numbers, $index); + + @if $divider == 0 { + $result: $result * 10; + } + + @else { + // Move the decimal dot to the left + $divider: $divider * 10; + $number: $number / $divider; + } + + $result: $result + $number; + } + } + @return if($minus, $result * -1, $result); +} diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_asset-pipeline.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_asset-pipeline.scss new file mode 100644 index 00000000..4c6afc5b --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_asset-pipeline.scss @@ -0,0 +1,7 @@ +@charset "UTF-8"; + +/// A global setting to enable or disable the `$asset-pipeline` variable for all functions that accept it. +/// +/// @type Bool + +$asset-pipeline: false !default; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_prefixer.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_prefixer.scss new file mode 100644 index 00000000..8c390514 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_prefixer.scss @@ -0,0 +1,9 @@ +@charset "UTF-8"; + +/// Global variables to enable or disable vendor prefixes + +$prefix-for-webkit: true !default; +$prefix-for-mozilla: true !default; +$prefix-for-microsoft: true !default; +$prefix-for-opera: true !default; +$prefix-for-spec: true !default; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_px-to-em.scss b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_px-to-em.scss new file mode 100644 index 00000000..f2f9a3e8 --- /dev/null +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/bourbon/settings/_px-to-em.scss @@ -0,0 +1 @@ +$em-base: 16px !default; diff --git a/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass b/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass index 0cf9e7da..7e4fa8ca 100755 --- a/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass +++ b/middleman-core/fixtures/minify-css-app/source/stylesheets/site.xcss.sass @@ -1,5 +1,6 @@ -@import "compass/reset" +@import "bourbon/bourbon"; +@import "base/base"; @media handheld, only screen and (device-width: 768px) body - display: block \ No newline at end of file + display: block diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index ff449f4b..dcbe0bf3 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -1,33 +1,10 @@ require 'sass' -require 'compass/import-once' -GLOB = /\*|\[.+\]/ - -# Hack around broken sass globs when combined with import-once -# Targets compass-import-once 1.0.4 -# Tracking issue: https://github.com/chriseppstein/compass/issues/1529 -module Compass - module ImportOnce - module Importer - def find_relative(uri, base, options, *args) - if uri =~ GLOB - force_import = true - else - uri, force_import = handle_force_import(uri) - end - maybe_replace_with_dummy_engine(super(uri, base, options, *args), options, force_import) - end - - def find(uri, options, *args) - if uri =~ GLOB - force_import = true - else - uri, force_import = handle_force_import(uri) - end - maybe_replace_with_dummy_engine(super(uri, options, *args), options, force_import) - end - end - end +SASS_MODULE = begin + require 'sassc' + ::SassC +rescue LoadError => e + ::Sass end module Middleman @@ -47,6 +24,7 @@ module Middleman app.config.define_setting :sass, opts, 'Sass engine options' app.config.define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files' + app.config.define_setting :sass_source_maps, app.development?, 'Whether to inline sourcemap into Sass' # Tell Tilt to use it as well (for inline sass blocks) ::Tilt.register 'sass', SassPlusCSSFilenameTemplate @@ -56,8 +34,6 @@ module Middleman ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate ::Tilt.prefer(ScssPlusCSSFilenameTemplate) - ::Compass::ImportOnce.activate! - require 'middleman-core/renderers/sass_functions' end @@ -82,11 +58,12 @@ module Middleman # @return [String] def evaluate(context, _) @context ||= context - @engine = ::Sass::Engine.new(data, sass_options) + + @engine = SASS_MODULE::Engine.new(data, sass_options) begin @engine.render - rescue ::Sass::SyntaxError => e + rescue SASS_MODULE::SyntaxError => e ::Sass::SyntaxError.exception_to_css(e) end end @@ -104,6 +81,12 @@ module Middleman custom: (options[:custom] || {}).merge(middleman_context: ctx.app) } + if ctx.config[:sass_source_maps] + more_opts[:source_map_file] = "." + more_opts[:source_map_embed] = true + more_opts[:source_map_contents] = true + end + if ctx.is_a?(::Middleman::TemplateContext) && file more_opts[:css_filename] = file.sub(/\.s[ac]ss$/, '') end diff --git a/middleman-core/lib/middleman-core/renderers/sass_functions.rb b/middleman-core/lib/middleman-core/renderers/sass_functions.rb index 90583aee..a28dcc69 100644 --- a/middleman-core/lib/middleman-core/renderers/sass_functions.rb +++ b/middleman-core/lib/middleman-core/renderers/sass_functions.rb @@ -1,4 +1,4 @@ -module Sprockets +module Middleman module Sass module Functions # Using Middleman::Util#asset_path, return the full path @@ -92,25 +92,25 @@ module Sprockets end end -module Sass::Script::Functions - include Sprockets::Sass::Functions +module ::Sass::Script::Functions + include ::Middleman::Sass::Functions - # Hack to ensure previous API declarations (by Compass or whatever) - # don't take precedence. - [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method| - defined?(@signatures) && @signatures.delete(method) - end + # # Hack to ensure previous API declarations (by Compass or whatever) + # # don't take precedence. + # [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method| + # defined?(@signatures) && @signatures.delete(method) + # end - declare :asset_path, [:source], var_kwargs: true - declare :asset_path, [:source, :kind] - declare :asset_url, [:source], var_kwargs: true - declare :asset_url, [:source, :kind] - declare :image_path, [:source], var_kwargs: true - declare :image_url, [:source], var_kwargs: true - declare :image_url, [:source, :only_path] - declare :image_url, [:source, :only_path, :cache_buster] - declare :font_path, [:source], var_kwargs: true - declare :font_url, [:source], var_kwargs: true - declare :font_url, [:source, :only_path] - declare :asset_data_uri, [:source] + # declare :asset_path, [:source], var_kwargs: true + # declare :asset_path, [:source, :kind] + # declare :asset_url, [:source], var_kwargs: true + # declare :asset_url, [:source, :kind] + # declare :image_path, [:source], var_kwargs: true + # declare :image_url, [:source], var_kwargs: true + # declare :image_url, [:source, :only_path] + # declare :image_url, [:source, :only_path, :cache_buster] + # declare :font_path, [:source], var_kwargs: true + # declare :font_url, [:source], var_kwargs: true + # declare :font_url, [:source, :only_path] + # declare :asset_data_uri, [:source] end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index eb747036..4f5738b3 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_dependency('erubis') # Helpers - s.add_dependency('activesupport', ['~> 4.2.0']) + s.add_dependency('activesupport', ['~> 4.2']) s.add_dependency('padrino-helpers', ['~> 0.12.3']) s.add_dependency("addressable", ["~> 2.3.5"]) @@ -42,17 +42,14 @@ Gem::Specification.new do |s| s.add_dependency('fastimage', ['~> 1.6.2']) # Minify CSS - s.add_dependency('sass', ['>= 3.3.4']) - - # Work around Sass performance - s.add_dependency('compass-import-once', ['~> 1.0.4']) + s.add_dependency('sassc', ['>= 1.6.0']) # Minify JS s.add_dependency('uglifier', ['~> 2.6']) s.add_dependency('execjs', ['~> 2.0']) # Testing - s.add_dependency('contracts', ['~> 0.11.0']) + s.add_dependency('contracts', ['~> 0.12.0']) # Hash stuff s.add_dependency('hashie', ['~> 3.4']) From 04c133c90f59975c1d055daf9310630dbeb7bc64 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 28 Sep 2015 13:58:49 -0700 Subject: [PATCH 123/364] Fix minify css tests --- middleman-core/features/minify_css.feature | 28 ++++++++++++++++++---- middleman-core/middleman-core.gemspec | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/middleman-core/features/minify_css.feature b/middleman-core/features/minify_css.feature index 6da68c4e..dce7de16 100644 --- a/middleman-core/features/minify_css.feature +++ b/middleman-core/features/minify_css.feature @@ -5,16 +5,19 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false """ And the Server is running at "minify-css-app" When I go to "/stylesheets/site.css" Then I should see "7" lines And I should see "only screen and (device-width" - + Scenario: Rendering external css with the feature enabled Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + activate :minify_css """ And the Server is running at "minify-css-app" @@ -25,11 +28,13 @@ Feature: Minify CSS Then I should see "1" lines When I go to "/stylesheets/report.css" Then I should see "p{border:1px solid #ff6600}" - + Scenario: Rendering external css in a proxied resource Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + activate :minify_css proxy '/css-proxy', '/stylesheets/site.css', ignore: true """ @@ -42,6 +47,8 @@ Feature: Minify CSS Given a fixture app "passthrough-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + module ::PassThrough def self.compress(data) data @@ -58,6 +65,7 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false """ And the Server is running at "minify-css-app" When I go to "/inline-css.html" @@ -70,11 +78,13 @@ Feature: Minify CSS } """ - + Scenario: Rendering inline css with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + module ::PassThrough def self.compress(data) data @@ -100,6 +110,8 @@ Feature: Minify CSS Given a fixture app "passthrough-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + module ::HelloCompressor def self.compress(data) "Hello" @@ -118,11 +130,13 @@ Feature: Minify CSS Hello """ - + Scenario: Rendering inline css with the feature enabled Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + activate :minify_css, inline: true """ And the Server is running at "minify-css-app" @@ -138,6 +152,8 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + activate :minify_css, :inline => true """ And the Server is running at "minify-css-app" @@ -155,6 +171,8 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + activate :minify_css, :inline => true proxy '/inline-css-proxy', '/inline-css.html', ignore: true """ @@ -172,6 +190,8 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ + config[:sass_source_maps] = false + mime_type('.xcss', 'text/x-css') activate :minify_css, content_types: ['text/x-css'], inline: true, diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 4f5738b3..58e23107 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |s| s.add_dependency('listen', ['~> 3.0']) # Tests - s.add_dependency("capybara", ["~> 2.4.4"]) + s.add_dependency("capybara", ["~> 2.5.0"]) # i18n s.add_dependency('i18n', ['~> 0.7.0']) From d9fc7a95e1fc1768e2161cd52eea7b1f52216518 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 28 Sep 2015 14:52:16 -0700 Subject: [PATCH 124/364] Fix a bad i18n regression --- .../source/localizable/partials/index.html.erb | 4 +++- .../lib/middleman-core/core_extensions/i18n.rb | 18 ++++++++++-------- .../sitemap/extensions/proxies.rb | 5 +++++ .../lib/middleman-core/sitemap/resource.rb | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/middleman-core/fixtures/i18n-test-app/source/localizable/partials/index.html.erb b/middleman-core/fixtures/i18n-test-app/source/localizable/partials/index.html.erb index 7369572a..26e427ee 100644 --- a/middleman-core/fixtures/i18n-test-app/source/localizable/partials/index.html.erb +++ b/middleman-core/fixtures/i18n-test-app/source/localizable/partials/index.html.erb @@ -1,6 +1,8 @@ +<%= ::I18n.locale %> + Site: <%= partial :site %> Country: <%= partial :country %> Greeting: <%= partial :greeting %> State: <%= partial :state %> Flag: <%= partial "images/flag.svg" %> -President: <%= partial "images/president.svg" %> \ No newline at end of file +President: <%= partial "images/president.svg" %> diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-core/lib/middleman-core/core_extensions/i18n.rb index 3d719e43..3555f398 100644 --- a/middleman-core/lib/middleman-core/core_extensions/i18n.rb +++ b/middleman-core/lib/middleman-core/core_extensions/i18n.rb @@ -50,9 +50,6 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension @maps = {} @mount_at_root = options[:mount_at_root].nil? ? langs.first : options[:mount_at_root] - # Don't output localizable files - app.ignore File.join(options[:templates_dir], '**') - configure_i18n logger.info "== Locales: #{langs.join(', ')} (Default #{@mount_at_root})" @@ -96,7 +93,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension # Try /localizable partials_path = File.join(locals_dir, partial_name) - lang_suffix = current_resource.metadata[:locals] && current_resource.metadata[:locals][:lang] + lang_suffix = ::I18n.locale extname = File.extname(partial_name) maybe_static = extname.length > 0 @@ -138,7 +135,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension end # If it's a "localizable template" - localizable_folder_resources.map do |resource| + localizable_folder_resources.each do |resource| page_id = File.basename(resource.path, File.extname(resource.path)) langs.each do |lang| # Remove folder name @@ -146,18 +143,23 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension new_resources << build_resource(path, resource.path, page_id, lang) end + resource.ignore! + # This is for backwards compatibility with the old provides_metadata-based code # that used to be in this extension, but I don't know how much sense it makes. - next if resource.options[:lang] + # next if resource.options[:lang] - resource.add_metadata options: { lang: @mount_at_root }, locals: { lang: @mount_at_root } + # $stderr.puts "Defaulting #{resource.path} to #{@mount_at_root}" + # resource.add_metadata options: { lang: @mount_at_root }, locals: { lang: @mount_at_root } end # If it uses file extension localization - file_extension_resources.map do |resource| + file_extension_resources.each do |resource| result = parse_locale_extension(resource.path) ext_lang, path, page_id = result new_resources << build_resource(path, resource.path, page_id, ext_lang) + + resource.ignore! end @lookup = new_resources.each_with_object({}) do |desc, sum| diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 110d9890..f20f82b8 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -141,6 +141,11 @@ module Middleman target_resource.content_type end + + def to_s + "#<#{self.class.to_s} path=#{@path} target=#{@target}>" + end + alias_method :inspect, :to_s end end end diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 4a247cb8..9aa80864 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -194,7 +194,7 @@ module Middleman end def to_s - "#" + "#<#{self.class.to_s} path=#{@path}>" end alias_method :inspect, :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s end From 5e3ddbf988d7ef2f9eb97aed495455a6d5b34a82 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 29 Sep 2015 10:27:53 -0700 Subject: [PATCH 125/364] Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression --- .../features/nested_layouts.feature | 24 +++++++++++-------- .../source/another.html.markdown | 3 +-- .../nested-layout-app/source/index.html.erb | 5 ++-- .../source/layouts/inner.erb | 6 ++--- .../source/layouts/outer.erb | 6 ++--- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/middleman-core/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature index d70a7e23..8ff61bb8 100644 --- a/middleman-core/features/nested_layouts.feature +++ b/middleman-core/features/nested_layouts.feature @@ -7,26 +7,29 @@ Feature: Allow nesting of layouts """ Master

        Index Title

        - Outer - Inner - Template - + Outer + Inner + Template """ When I go to "/another.html" Then I should see: """ Master

        New Article Title

        - Outer - Inner -

        The Article Content

        + Outer + Inner +

        The Article Content

        """ - + Scenario: A page uses an inner layout when uses an outer layout (slim) Given the Server is running at "nested-layout-app" When I go to "/slim-test.html" - Then I should see "

        Master

        New Article Title

        Outer

        Inner

        The Article Content

        " - + Then I should see: + """ +

        Master

        New Article Title

        Outer

        Inner

        +

        The Article Content

        + """ + Scenario: A page uses an inner layout when uses an outer layout (haml) Given the Server is running at "nested-layout-app" When I go to "/haml-test.html" @@ -36,6 +39,7 @@ Feature: Allow nesting of layouts

        New Article Title

        Outer Inner +

        The Article Content

        """ diff --git a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown index 562ceae5..4d93a75f 100644 --- a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown +++ b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown @@ -1,7 +1,6 @@ ---- +--- title: "New Article Title" date: 2011-01-01 layout: inner --- - The Article Content diff --git a/middleman-core/fixtures/nested-layout-app/source/index.html.erb b/middleman-core/fixtures/nested-layout-app/source/index.html.erb index 253e9cea..8988e95a 100644 --- a/middleman-core/fixtures/nested-layout-app/source/index.html.erb +++ b/middleman-core/fixtures/nested-layout-app/source/index.html.erb @@ -1,6 +1,5 @@ ---- +--- title: "Index Title" layout: inner --- - -Template \ No newline at end of file +Template diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb index 62dfc12b..11e69061 100644 --- a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb +++ b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb @@ -1,4 +1,4 @@ <% wrap_layout :outer do %> - Inner - <%= yield %> -<% end %> \ No newline at end of file +Inner +<%= yield %> +<% end %> diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb index 643d8efc..510956f2 100644 --- a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb +++ b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb @@ -1,4 +1,4 @@ <% wrap_layout :master do %> - Outer - <%= yield %> -<% end %> \ No newline at end of file +Outer +<%= yield %> +<% end %> From 9df1a453015473321df082252c527d4197689c45 Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Wed, 30 Sep 2015 05:00:57 +0100 Subject: [PATCH 126/364] Strip newline after frontmatter Closes #1610 --- middleman-core/lib/middleman-core/util/data.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index 8780e609..ec41532e 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -28,6 +28,7 @@ module Middleman::Util::Data (?[-;]{3})[ ]*\r?\n (?.*?)[ ]*\r?\n? (?^[-.;]{3})[ ]*\r?\n? + \r?\n? (?.*) /mx =~ content From b389c26b4edacd03779a7452419c52d8002bdb5c Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Wed, 30 Sep 2015 05:45:34 +0100 Subject: [PATCH 127/364] Fix frontmatter regex --- middleman-core/lib/middleman-core/util/data.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index ec41532e..060b8f65 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -24,10 +24,10 @@ module Middleman::Util::Data end / - \A(.*?coding:.*?\r?\n)? - (?[-;]{3})[ ]*\r?\n + \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)? + (?---|;;;)[ ]*\r?\n (?.*?)[ ]*\r?\n? - (?^[-.;]{3})[ ]*\r?\n? + ^(?---|\.\.\.|;;;)[ ]*\r?\n? \r?\n? (?.*) /mx =~ content From 0698d7f5aa9dd00215af4395a76b3608ccc807c2 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 30 Sep 2015 10:24:12 -0700 Subject: [PATCH 128/364] Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression" This reverts commit 5e3ddbf988d7ef2f9eb97aed495455a6d5b34a82. --- .../features/nested_layouts.feature | 24 ++++++++----------- .../source/another.html.markdown | 3 ++- .../nested-layout-app/source/index.html.erb | 5 ++-- .../source/layouts/inner.erb | 6 ++--- .../source/layouts/outer.erb | 6 ++--- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/middleman-core/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature index 8ff61bb8..d70a7e23 100644 --- a/middleman-core/features/nested_layouts.feature +++ b/middleman-core/features/nested_layouts.feature @@ -7,29 +7,26 @@ Feature: Allow nesting of layouts """ Master

        Index Title

        - Outer - Inner - Template + Outer + Inner + Template + """ When I go to "/another.html" Then I should see: """ Master

        New Article Title

        - Outer - Inner -

        The Article Content

        + Outer + Inner +

        The Article Content

        """ - + Scenario: A page uses an inner layout when uses an outer layout (slim) Given the Server is running at "nested-layout-app" When I go to "/slim-test.html" - Then I should see: - """ -

        Master

        New Article Title

        Outer

        Inner

        -

        The Article Content

        - """ - + Then I should see "

        Master

        New Article Title

        Outer

        Inner

        The Article Content

        " + Scenario: A page uses an inner layout when uses an outer layout (haml) Given the Server is running at "nested-layout-app" When I go to "/haml-test.html" @@ -39,7 +36,6 @@ Feature: Allow nesting of layouts

        New Article Title

        Outer Inner -

        The Article Content

        """ diff --git a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown index 4d93a75f..562ceae5 100644 --- a/middleman-core/fixtures/nested-layout-app/source/another.html.markdown +++ b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown @@ -1,6 +1,7 @@ ---- +--- title: "New Article Title" date: 2011-01-01 layout: inner --- + The Article Content diff --git a/middleman-core/fixtures/nested-layout-app/source/index.html.erb b/middleman-core/fixtures/nested-layout-app/source/index.html.erb index 8988e95a..253e9cea 100644 --- a/middleman-core/fixtures/nested-layout-app/source/index.html.erb +++ b/middleman-core/fixtures/nested-layout-app/source/index.html.erb @@ -1,5 +1,6 @@ ---- +--- title: "Index Title" layout: inner --- -Template + +Template \ No newline at end of file diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb index 11e69061..62dfc12b 100644 --- a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb +++ b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb @@ -1,4 +1,4 @@ <% wrap_layout :outer do %> -Inner -<%= yield %> -<% end %> + Inner + <%= yield %> +<% end %> \ No newline at end of file diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb index 510956f2..643d8efc 100644 --- a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb +++ b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb @@ -1,4 +1,4 @@ <% wrap_layout :master do %> -Outer -<%= yield %> -<% end %> + Outer + <%= yield %> +<% end %> \ No newline at end of file From d82806718938ff901f336f97ebdc30c237d07761 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 30 Sep 2015 11:16:57 -0700 Subject: [PATCH 129/364] Fix sass helpers in SassC context --- .../lib/middleman-core/renderers/sass.rb | 5 +- .../renderers/sass_functions.rb | 56 ++++++++++++------- .../lib/middleman-core/template_context.rb | 24 ++++---- 3 files changed, 52 insertions(+), 33 deletions(-) diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index dcbe0bf3..5db51c34 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -78,7 +78,10 @@ module Middleman filename: eval_file, line: line, syntax: syntax, - custom: (options[:custom] || {}).merge(middleman_context: ctx.app) + custom: (options[:custom] || {}).merge( + middleman_context: ctx.app, + current_resource: ctx.current_resource + ) } if ctx.config[:sass_source_maps] diff --git a/middleman-core/lib/middleman-core/renderers/sass_functions.rb b/middleman-core/lib/middleman-core/renderers/sass_functions.rb index a28dcc69..899dadd6 100644 --- a/middleman-core/lib/middleman-core/renderers/sass_functions.rb +++ b/middleman-core/lib/middleman-core/renderers/sass_functions.rb @@ -1,6 +1,11 @@ module Middleman module Sass module Functions + def asset_path(source, options) + # current_resource + + end + # Using Middleman::Util#asset_path, return the full path # for the given +source+ as a Sass String. This supports keyword # arguments that mirror the +options+. @@ -81,36 +86,47 @@ module Middleman options[:custom][:middleman_context] end + # Returns a reference to Middleman's current resource. + def current_resource # :nodoc: + options[:custom][:current_resource] + end + # Returns an options hash where the keys are symbolized # and the values are unwrapped Sass literals. def map_options(options={}) # :nodoc: ::Sass::Util.map_hash(options) do |key, value| [key.to_sym, value.respond_to?(:value) ? value.value : value] end + + options[:current_resource] = current_resource + + options end end end end -module ::Sass::Script::Functions - include ::Middleman::Sass::Functions +::SassC::Script::Functions.send :include, ::Middleman::Sass::Functions - # # Hack to ensure previous API declarations (by Compass or whatever) - # # don't take precedence. - # [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method| - # defined?(@signatures) && @signatures.delete(method) - # end +# module SASS_MODULE::Script::Functions +# include ::Middleman::Sass::Functions - # declare :asset_path, [:source], var_kwargs: true - # declare :asset_path, [:source, :kind] - # declare :asset_url, [:source], var_kwargs: true - # declare :asset_url, [:source, :kind] - # declare :image_path, [:source], var_kwargs: true - # declare :image_url, [:source], var_kwargs: true - # declare :image_url, [:source, :only_path] - # declare :image_url, [:source, :only_path, :cache_buster] - # declare :font_path, [:source], var_kwargs: true - # declare :font_url, [:source], var_kwargs: true - # declare :font_url, [:source, :only_path] - # declare :asset_data_uri, [:source] -end +# # # Hack to ensure previous API declarations (by Compass or whatever) +# # # don't take precedence. +# # [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method| +# # defined?(@signatures) && @signatures.delete(method) +# # end + +# # declare :asset_path, [:source], var_kwargs: true +# # declare :asset_path, [:source, :kind] +# # declare :asset_url, [:source], var_kwargs: true +# # declare :asset_url, [:source, :kind] +# # declare :image_path, [:source], var_kwargs: true +# # declare :image_url, [:source], var_kwargs: true +# # declare :image_url, [:source, :only_path] +# # declare :image_url, [:source, :only_path, :cache_buster] +# # declare :font_path, [:source], var_kwargs: true +# # declare :font_url, [:source], var_kwargs: true +# # declare :font_url, [:source, :only_path] +# # declare :asset_data_uri, [:source] +# end diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb index 6771ddbe..f424c2b1 100644 --- a/middleman-core/lib/middleman-core/template_context.rb +++ b/middleman-core/lib/middleman-core/template_context.rb @@ -152,6 +152,18 @@ module Middleman partial_file || nil end + def current_path + @locs[:current_path] + end + + # Get the resource object for the current path + # @return [Middleman::Sitemap::Resource] + def current_resource + return nil unless current_path + sitemap.find_resource_by_destination_path(current_path) + end + alias_method :current_page, :current_resource + protected # Render a path with locs, opts and contents block. @@ -188,17 +200,5 @@ module Middleman content end - - def current_path - @locs[:current_path] - end - - # Get the resource object for the current path - # @return [Middleman::Sitemap::Resource] - def current_resource - return nil unless current_path - sitemap.find_resource_by_destination_path(current_path) - end - alias_method :current_page, :current_resource end end From fd6a2376bda8dee7de8549d2d090ddd3c152377f Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 1 Oct 2015 10:25:53 -0700 Subject: [PATCH 130/364] Fix frontmatter on 2.0 --- middleman-core/lib/middleman-core/util/data.rb | 1 + middleman-core/middleman-core.gemspec | 1 + 2 files changed, 2 insertions(+) diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index 060b8f65..5ed00a4f 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -3,6 +3,7 @@ require 'json' require 'pathname' require 'middleman-core/util' require 'middleman-core/contracts' +require 'backports/2.1.0/array/to_h' module Middleman::Util::Data include Contracts diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 58e23107..001a828e 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -54,4 +54,5 @@ Gem::Specification.new do |s| # Hash stuff s.add_dependency('hashie', ['~> 3.4']) s.add_dependency('hamster', ['~> 1.0']) + s.add_dependency('backports', ['~> 3.6']) end From 67fc3d0c050a1cdf9db298483bc51c1ecf34ac8f Mon Sep 17 00:00:00 2001 From: inoue_sachiro Date: Wed, 30 Sep 2015 21:23:27 +0900 Subject: [PATCH 131/364] Fix: Can't clean files when the project is under a hidden directory. --- middleman-core/features/clean_build.feature | 18 ++++++++++++++++++ .../clean-app/config-hidden-dir-after.rb | 5 +++++ .../clean-app/config-hidden-dir-before.rb | 1 + middleman-core/lib/middleman-core/builder.rb | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 middleman-core/fixtures/clean-app/config-hidden-dir-after.rb create mode 100644 middleman-core/fixtures/clean-app/config-hidden-dir-before.rb diff --git a/middleman-core/features/clean_build.feature b/middleman-core/features/clean_build.feature index e5254df4..eaa9942e 100644 --- a/middleman-core/features/clean_build.feature +++ b/middleman-core/features/clean_build.feature @@ -42,3 +42,21 @@ Feature: Build Clean Then the following files should not exist: | sub/dir/about.html | | sub/dir/nested/nested.html | + + Scenario: Build and clean an app under a hidden directory + Given a fixture app "clean-app" + And app "clean-app" is using config "hidden-dir-before" + And a built app at "clean-app" + Then the following files should exist: + | .build/index.html | + | .build/should_be_ignored.html | + | .build/should_be_ignored2.html | + | .build/should_be_ignored3.html | + Given app "clean-app" is using config "hidden-dir-after" + And a built app at "clean-app" + Then the following files should exist: + | .build/index.html | + And the following files should not exist: + | .build/should_be_ignored.html | + | .build/should_be_ignored2.html | + | .build/should_be_ignored3.html | diff --git a/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb b/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb new file mode 100644 index 00000000..454d5cf8 --- /dev/null +++ b/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb @@ -0,0 +1,5 @@ +set :build_dir, ".build" + +ignore "/should_be_ignored.html" +page "/should_be_ignored2.html", :ignore => true +page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true diff --git a/middleman-core/fixtures/clean-app/config-hidden-dir-before.rb b/middleman-core/fixtures/clean-app/config-hidden-dir-before.rb new file mode 100644 index 00000000..69609a81 --- /dev/null +++ b/middleman-core/fixtures/clean-app/config-hidden-dir-before.rb @@ -0,0 +1 @@ +set :build_dir, ".build" diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb index e386c2d0..f0a57aa1 100644 --- a/middleman-core/lib/middleman-core/builder.rb +++ b/middleman-core/lib/middleman-core/builder.rb @@ -213,7 +213,7 @@ module Middleman end @to_clean = paths.select do |path| - path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/ + path.realpath.relative_path_from(@build_dir.realpath).to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/ end # handle UTF-8-MAC filename on MacOS From e9abfe11345e974c75d5701fb98fbab29b557145 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 1 Oct 2015 13:54:54 -0700 Subject: [PATCH 132/364] rubocop --- middleman-core/lib/middleman-core/renderers/sass.rb | 2 +- middleman-core/lib/middleman-core/renderers/sass_functions.rb | 3 +-- .../lib/middleman-core/sitemap/extensions/proxies.rb | 2 +- middleman-core/lib/middleman-core/sitemap/resource.rb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index 5db51c34..cf373408 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -85,7 +85,7 @@ module Middleman } if ctx.config[:sass_source_maps] - more_opts[:source_map_file] = "." + more_opts[:source_map_file] = '.' more_opts[:source_map_embed] = true more_opts[:source_map_contents] = true end diff --git a/middleman-core/lib/middleman-core/renderers/sass_functions.rb b/middleman-core/lib/middleman-core/renderers/sass_functions.rb index 899dadd6..2e71c8f9 100644 --- a/middleman-core/lib/middleman-core/renderers/sass_functions.rb +++ b/middleman-core/lib/middleman-core/renderers/sass_functions.rb @@ -1,9 +1,8 @@ module Middleman module Sass module Functions - def asset_path(source, options) + def asset_path(_source, _options) # current_resource - end # Using Middleman::Util#asset_path, return the full path diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index f20f82b8..82856aa3 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -143,7 +143,7 @@ module Middleman end def to_s - "#<#{self.class.to_s} path=#{@path} target=#{@target}>" + "#<#{self.class} path=#{@path} target=#{@target}>" end alias_method :inspect, :to_s end diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 9aa80864..dfd7e46b 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -194,7 +194,7 @@ module Middleman end def to_s - "#<#{self.class.to_s} path=#{@path}>" + "#<#{self.class} path=#{@path}>" end alias_method :inspect, :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s end From e26f83e1c29758675405bb473a99ab7b34e19b1a Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sun, 4 Oct 2015 07:24:21 +0900 Subject: [PATCH 133/364] remove unnecessary require `require 'rubygems'` is already required in Ruby 1.9 or later. --- Rakefile | 1 - gem_rake_helper.rb | 1 - middleman-core/Rakefile | 1 - 3 files changed, 3 deletions(-) diff --git a/Rakefile b/Rakefile index 09806b6b..236a2d83 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,3 @@ -require 'rubygems' unless defined?(Gem) require 'rake' require File.expand_path('../middleman-core/lib/middleman-core/version.rb', __FILE__) diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb index 5dbbdd9a..ea46e6a7 100644 --- a/gem_rake_helper.rb +++ b/gem_rake_helper.rb @@ -1,4 +1,3 @@ -require 'rubygems' unless defined?(Gem) require 'rake' require 'yard' diff --git a/middleman-core/Rakefile b/middleman-core/Rakefile index c36c1d35..3efd63ea 100644 --- a/middleman-core/Rakefile +++ b/middleman-core/Rakefile @@ -1,5 +1,4 @@ # coding:utf-8 RAKE_ROOT = __FILE__ GEM_NAME = ENV['NAME'] || 'middleman-core' -require 'rubygems' require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') From eb82f402a008ce86dc02d179b3f5c63819330bee Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 5 Oct 2015 09:48:04 -0700 Subject: [PATCH 134/364] gem bumps --- Gemfile | 3 +-- middleman-core/middleman-core.gemspec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3da827cc..e91581b9 100644 --- a/Gemfile +++ b/Gemfile @@ -20,13 +20,12 @@ gem 'liquid', '>= 2.6', require: false gem 'stylus', '>= 1.0', require: false gem 'sinatra', '>= 1.4', require: false gem 'redcarpet', '>= 3.1', require: false unless RUBY_ENGINE == 'jruby' -gem 'asciidoctor', '~> 0.1', require: false # Dns server to test preview server gem 'rubydns', '~> 1.0.1', require: false # To test javascript -gem 'poltergeist', '~> 1.6.0', require: false +gem 'poltergeist', '~> 1.7.0', require: false # For less, note there is no compatible JS runtime for windows gem 'therubyrhino', '>= 2.0', platforms: :jruby diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 001a828e..e70487de 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |s| s.add_dependency('i18n', ['~> 0.7.0']) # Automatic Image Sizes - s.add_dependency('fastimage', ['~> 1.6.2']) + s.add_dependency('fastimage', ['~> 1.7.0']) # Minify CSS s.add_dependency('sassc', ['>= 1.6.0']) From 6357f4f5b8773d75f6712ffd314c5bd656d77e82 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 12 Oct 2015 12:37:07 -0700 Subject: [PATCH 135/364] Add back app.set, but mark as deprecated --- .../features/extension_api_deprecations.feature | 10 ++++++++++ .../extension-api-deprecations-app/config.rb | 11 +++++++++++ .../source/index.html.erb | 1 + .../source/layouts/layout.erb | 3 +++ middleman-core/lib/middleman-core/application.rb | 15 +++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 middleman-core/features/extension_api_deprecations.feature create mode 100644 middleman-core/fixtures/extension-api-deprecations-app/config.rb create mode 100644 middleman-core/fixtures/extension-api-deprecations-app/source/index.html.erb create mode 100644 middleman-core/fixtures/extension-api-deprecations-app/source/layouts/layout.erb diff --git a/middleman-core/features/extension_api_deprecations.feature b/middleman-core/features/extension_api_deprecations.feature new file mode 100644 index 00000000..8c9dd216 --- /dev/null +++ b/middleman-core/features/extension_api_deprecations.feature @@ -0,0 +1,10 @@ +Feature: Extension author could use some hooks + + Scenario: When build + Given a fixture app "extension-api-deprecations-app" + When I run `middleman build` + Then the exit status should be 0 + And the output should contain "`set :layout` is deprecated" + And the file "build/index.html" should contain "In Index" + And the file "build/index.html" should not contain "In Layout" + diff --git a/middleman-core/fixtures/extension-api-deprecations-app/config.rb b/middleman-core/fixtures/extension-api-deprecations-app/config.rb new file mode 100644 index 00000000..bcadf949 --- /dev/null +++ b/middleman-core/fixtures/extension-api-deprecations-app/config.rb @@ -0,0 +1,11 @@ +class LayoutDisabler < Middleman::Extension + def initialize(app, options_hash = {}, &block) + super + + app.set :layout, false + end +end + +::Middleman::Extensions.register(:layout_disabler, LayoutDisabler) + +activate :layout_disabler diff --git a/middleman-core/fixtures/extension-api-deprecations-app/source/index.html.erb b/middleman-core/fixtures/extension-api-deprecations-app/source/index.html.erb new file mode 100644 index 00000000..e9e81333 --- /dev/null +++ b/middleman-core/fixtures/extension-api-deprecations-app/source/index.html.erb @@ -0,0 +1 @@ +In Index diff --git a/middleman-core/fixtures/extension-api-deprecations-app/source/layouts/layout.erb b/middleman-core/fixtures/extension-api-deprecations-app/source/layouts/layout.erb new file mode 100644 index 00000000..ead9c2a9 --- /dev/null +++ b/middleman-core/fixtures/extension-api-deprecations-app/source/layouts/layout.erb @@ -0,0 +1,3 @@ +In Layout + +<%= yield %> diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index 0712eed1..4e46ed82 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -391,6 +391,21 @@ module Middleman execute_callbacks(:before_shutdown) end + + # Set attributes (global variables) + # + # @deprecated Prefer accessing settings through "config". + # + # @param [Symbol] key Name of the attribue + # @param value Attribute value + # @return [void] + def set(key, value=nil, &block) + logger.warn "Warning: `set :#{key}` is deprecated. Use `config[:#{key}] =` instead." + + value = block if block_given? + config[key] = value + end + # Work around this bug: http://bugs.ruby-lang.org/issues/4521 # where Ruby will call to_s/inspect while printing exception # messages, which can take a long time (minutes at full CPU) From d2251de8985d4e55092c6151d08cbdc360d6f1fe Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 12 Oct 2015 12:37:33 -0700 Subject: [PATCH 136/364] Bump Padrino --- middleman-core/middleman-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index e70487de..6fda5d8e 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| # Helpers s.add_dependency('activesupport', ['~> 4.2']) - s.add_dependency('padrino-helpers', ['~> 0.12.3']) + s.add_dependency('padrino-helpers', ['~> 0.13.0']) s.add_dependency("addressable", ["~> 2.3.5"]) # Watcher From 62d7fa0676efd6f47fd6ec1868e302b569b5a7fe Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Mon, 12 Oct 2015 12:37:42 -0700 Subject: [PATCH 137/364] remove unused file --- middleman-core/source/stylesheets/_partial.sass | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 middleman-core/source/stylesheets/_partial.sass diff --git a/middleman-core/source/stylesheets/_partial.sass b/middleman-core/source/stylesheets/_partial.sass deleted file mode 100644 index d3e1f391..00000000 --- a/middleman-core/source/stylesheets/_partial.sass +++ /dev/null @@ -1,2 +0,0 @@ -body - font-size: 14px \ No newline at end of file From 3cd84eb4d182614329b6629df9d97909972b5a2c Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 22 Oct 2015 20:23:39 -0700 Subject: [PATCH 138/364] move_file as a replacement for import_asset --- middleman-core/features/move_files.feature | 44 ++++++++++++ .../sitemap/extensions/move_file.rb | 68 +++++++++++++++++++ .../lib/middleman-core/sitemap/store.rb | 6 ++ 3 files changed, 118 insertions(+) create mode 100644 middleman-core/features/move_files.feature create mode 100644 middleman-core/lib/middleman-core/sitemap/extensions/move_file.rb diff --git a/middleman-core/features/move_files.feature b/middleman-core/features/move_files.feature new file mode 100644 index 00000000..a6b1e975 --- /dev/null +++ b/middleman-core/features/move_files.feature @@ -0,0 +1,44 @@ +Feature: Move files + + Scenario: Move one path to another + Given a fixture app "large-build-app" + And a file named "config.rb" with: + """ + move_file "/static.html", "/static2.html" + """ + And the Server is running at "large-build-app" + When I go to "/static.html" + Then I should see 'Not Found' + When I go to "/static2.html" + Then I should see 'Static, no code!' + + Scenario: Move one path to another with directory indexes + Given a fixture app "large-build-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + move_file "/static.html", "/static2.html" + """ + And the Server is running at "large-build-app" + When I go to "/static.html" + Then I should see 'Not Found' + When I go to "/static/index.html" + Then I should see 'Not Found' + When I go to "/static2.html" + Then I should see 'Static, no code!' + + Scenario: Move one path to another with directory indexes (using dest path) + Given a fixture app "large-build-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + move_file "/static/index.html", "/static2.html" + """ + And the Server is running at "large-build-app" + When I go to "/static.html" + Then I should see 'Not Found' + When I go to "/static/index.html" + Then I should see 'Not Found' + When I go to "/static2.html" + Then I should see 'Static, no code!' + diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/move_file.rb b/middleman-core/lib/middleman-core/sitemap/extensions/move_file.rb new file mode 100644 index 00000000..8ef81298 --- /dev/null +++ b/middleman-core/lib/middleman-core/sitemap/extensions/move_file.rb @@ -0,0 +1,68 @@ +require 'middleman-core/sitemap/resource' +require 'middleman-core/core_extensions/collections/step_context' + +module Middleman + module Sitemap + module Extensions + # Manages the list of proxy configurations and manipulates the sitemap + # to include new resources based on those configurations + class MoveFile < Extension + MoveFileDescriptor = Struct.new(:from, :to) + + self.resource_list_manipulator_priority = 101 + + # Expose `create_move_file` to config as `move_file` + expose_to_config move_file: :create_move_file + + def initialize(app, config={}, &block) + super + + @move_configs = Set.new + end + + def after_configuration + ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(:move_file, &method(:create_move_file)) + end + + # Setup a move from one path to another + # @param [String] from The original path. + # @param [String] to The new path. + # @return [void] + Contract String, String, Maybe[Hash] => Any + def create_move_file(from, to) + @move_configs << create_anonymous_move(from, to) + @app.sitemap.rebuild_resource_list!(:added_move_file) + end + + # Setup a move from one path to another + # @param [String] from The original path. + # @param [String] to The new path. + # @return [MoveFileDescriptor] + Contract String, String => MoveFileDescriptor + def create_anonymous_move(from, to) + MoveFileDescriptor.new( + ::Middleman::Util.normalize_path(from), + ::Middleman::Util.normalize_path(to) + ) + end + + # Update the main sitemap resource list + # @return Array + Contract ResourceList => ResourceList + def manipulate_resource_list(resources) + resources.each do |r| + matches = @move_configs.select do |c| + c.from == r.path || c.from == r.destination_path + end + + if c = matches.last + r.destination_path = c.to + end + end + + resources + end + end + end + end +end diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 46131276..24a26442 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -33,6 +33,12 @@ Middleman::Extensions.register :sitemap_redirects, auto_activate: :before_config Middleman::Sitemap::Extensions::Redirects end +# Move Files +Middleman::Extensions.register :sitemap_move_files, auto_activate: :before_configuration do + require 'middleman-core/sitemap/extensions/move_file' + Middleman::Sitemap::Extensions::MoveFile +end + require 'middleman-core/contracts' module Middleman From 19d21d2295ffce27afcaddeb867f4821b150781d Mon Sep 17 00:00:00 2001 From: Eliott Appleford Date: Fri, 23 Oct 2015 09:08:09 +0000 Subject: [PATCH 139/364] make frontmatter delims configurable --- middleman-core/features/front-matter.feature | 7 +++- .../fixtures/frontmatter-app/config.rb | 1 + .../source/front-matter-haml.html.haml | 6 +++ .../frontmatter-neighbor-app/config.rb | 2 +- .../config.rb | 2 +- .../lib/middleman-core/application.rb | 6 +++ .../middleman-core/core_extensions/data.rb | 4 +- .../core_extensions/front_matter.rb | 5 ++- .../lib/middleman-core/util/data.rb | 39 +++++++++++++------ 9 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 middleman-core/fixtures/frontmatter-app/source/front-matter-haml.html.haml diff --git a/middleman-core/features/front-matter.feature b/middleman-core/features/front-matter.feature index 83795236..64bcb94b 100644 --- a/middleman-core/features/front-matter.feature +++ b/middleman-core/features/front-matter.feature @@ -28,13 +28,18 @@ Feature: YAML Front Matter Then I should not see "layout: false" Then I should not see "title: Pandoc likes trailing dots..." + Scenario: Rendering Haml (yaml) + Given the Server is running at "frontmatter-app" + When I go to "/front-matter-haml.html" + Then I should see "

        This is the title

        " + Then I should not see "---" Scenario: YAML not on first line, no encoding Given the Server is running at "frontmatter-app" When I go to "/front-matter-line-2.html" Then I should see "

        " Then I should see "---" - + Scenario: YAML not on first line, with encoding Given the Server is running at "frontmatter-app" When I go to "/front-matter-encoding.html" diff --git a/middleman-core/fixtures/frontmatter-app/config.rb b/middleman-core/fixtures/frontmatter-app/config.rb index e69de29b..c65e50e1 100644 --- a/middleman-core/fixtures/frontmatter-app/config.rb +++ b/middleman-core/fixtures/frontmatter-app/config.rb @@ -0,0 +1 @@ +config[:frontmatter_delims][:yaml] << %w(\\--- \\---) diff --git a/middleman-core/fixtures/frontmatter-app/source/front-matter-haml.html.haml b/middleman-core/fixtures/frontmatter-app/source/front-matter-haml.html.haml new file mode 100644 index 00000000..13bbf11e --- /dev/null +++ b/middleman-core/fixtures/frontmatter-app/source/front-matter-haml.html.haml @@ -0,0 +1,6 @@ +\--- +layout: false +title: This is the title +\--- + +%h1= current_page.data.title diff --git a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb index b9f82b36..6fa6e37c 100644 --- a/middleman-core/fixtures/frontmatter-neighbor-app/config.rb +++ b/middleman-core/fixtures/frontmatter-neighbor-app/config.rb @@ -15,7 +15,7 @@ class NeighborFrontmatter < ::Middleman::Extension next unless file - fmdata = ::Middleman::Util::Data.parse(file[:full_path], :yaml).first + fmdata = ::Middleman::Util::Data.parse(file[:full_path], app.config[:frontmatter_delims], :yaml).first opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type) opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options) ignored = fmdata.delete(:ignored) diff --git a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb index 93cd8f1f..a7e0fc55 100644 --- a/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb +++ b/middleman-core/fixtures/frontmatter-settings-neighbor-app/config.rb @@ -26,7 +26,7 @@ class NeighborFrontmatter < ::Middleman::Extension end def apply_neighbor_data(resource, file) - fmdata = ::Middleman::Util::Data.parse(file[:full_path], :yaml).first + fmdata = ::Middleman::Util::Data.parse(file[:full_path], app.config[:frontmatter_delims], :yaml).first opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type) opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options) ignored = fmdata.delete(:ignored) diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index 4e46ed82..7277474b 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -185,6 +185,12 @@ module Middleman end }, 'Callbacks that can exclude paths from the sitemap' + # Set textual delimiters that denote the start and end of frontmatter + define_setting :frontmatter_delims, { + json: [%w(;;; ;;;)], + yaml: [%w(--- ---), %w(--- ...)] + }, 'Allowed frontmatter delimiters' + define_setting :watcher_disable, false, 'If the Listen watcher should not run' define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode' define_setting :watcher_latency, nil, 'The Listen watcher latency' diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb index 9169410a..f1762e43 100644 --- a/middleman-core/lib/middleman-core/core_extensions/data.rb +++ b/middleman-core/lib/middleman-core/core_extensions/data.rb @@ -99,10 +99,10 @@ module Middleman basename = File.basename(data_path, extension) if %w(.yaml .yml).include?(extension) - data, postscript = ::Middleman::Util::Data.parse(file[:full_path], :yaml) + data, postscript = ::Middleman::Util::Data.parse(file[:full_path], @app.config[:frontmatter_delims], :yaml) data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash) elsif extension == '.json' - data, _postscript = ::Middleman::Util::Data.parse(file[:full_path], :json) + data, _postscript = ::Middleman::Util::Data.parse(file[:full_path], @app.config[:frontmatter_delims], :json) else return end diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index a133d0ef..b1488c1a 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -65,7 +65,10 @@ module Middleman::CoreExtensions return [{}, nil] unless file - @cache[file[:full_path]] ||= ::Middleman::Util::Data.parse(file[:full_path]) + @cache[file[:full_path]] ||= ::Middleman::Util::Data.parse( + file[:full_path], + app.config[:frontmatter_delims] + ) end Contract ArrayOf[IsA['Middleman::SourceFile']], ArrayOf[IsA['Middleman::SourceFile']] => Any diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index 5ed00a4f..d2668dda 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -14,7 +14,7 @@ module Middleman::Util::Data # @param [String] path # @return [Array] Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]] - def parse(full_path, known_type=nil) + def parse(full_path, frontmatter_delims, known_type=nil) return [{}, nil] if Middleman::Util.binary?(full_path) # Avoid weird race condition when a file is renamed @@ -24,16 +24,22 @@ module Middleman::Util::Data return [{}, nil] end - / + start_delims, stop_delims = frontmatter_delims + .values + .flatten(1) + .transpose + .map(&Regexp.method(:union)) + + match = / \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)? - (?---|;;;)[ ]*\r?\n + (?#{start_delims})[ ]*\r?\n (?.*?)[ ]*\r?\n? - ^(?---|\.\.\.|;;;)[ ]*\r?\n? + ^(?#{stop_delims})[ ]*\r?\n? \r?\n? (?.*) - /mx =~ content + /mx.match(content) || {} - unless frontmatter + unless match[:frontmatter] case known_type when :yaml return [parse_yaml(content, full_path), nil] @@ -42,13 +48,22 @@ module Middleman::Util::Data end end - case [start, stop] - when %w(--- ---), %w(--- ...) - [parse_yaml(frontmatter, full_path), additional_content] - when %w(;;; ;;;) - [parse_json("{#{frontmatter}}", full_path), additional_content] + case [match[:start], match[:stop]] + when *frontmatter_delims[:yaml] + [ + parse_yaml(match[:frontmatter], full_path), + match[:additional_content] + ] + when *frontmatter_delims[:json] + [ + parse_json("{#{match[:frontmatter]}}", full_path), + match[:additional_content] + ] else - [{}, content] + [ + {}, + content + ] end end From c07af953f81bd8d58741e14adb748563eb25cbc2 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sun, 25 Oct 2015 23:58:39 -0600 Subject: [PATCH 140/364] Ignore .ruby-gemset file Ignore the .ruby-gemset file used to define an RVM gemset. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 535aec06..591c32b0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Gemfile.lock docs .rbenv-* .ruby-version +.ruby-gemset .*.swp build doc @@ -20,4 +21,4 @@ Makefile .idea *.sublime-workspace /bin -middleman-core/fixtures/compass-sprites-app/source/images/icon-s0de2218f58.png \ No newline at end of file +middleman-core/fixtures/compass-sprites-app/source/images/icon-s0de2218f58.png From 4995bd23d77dbe4e6a8e62ebbad234dd5b655b45 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Mon, 26 Oct 2015 00:35:40 -0600 Subject: [PATCH 141/364] resolves #1653 don't rewrite paths that start with // --- middleman-core/features/asset_host.feature | 4 +++- .../fixtures/asset-host-app/source/asset_host.html.erb | 4 +++- middleman-core/lib/middleman-core/util.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature index bcd4c06c..47ef143e 100644 --- a/middleman-core/features/asset_host.feature +++ b/middleman-core/features/asset_host.feature @@ -11,6 +11,7 @@ Feature: Alternate between multiple asset hosts Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"' Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} + Then I should see content matching %r{'//www.example.com/script.js'} When I go to "/stylesheets/asset_host.css" Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} @@ -28,6 +29,7 @@ Feature: Alternate between multiple asset hosts Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"' Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} + Then I should see content matching %r{'//www.example.com/script.js'} When I go to "/stylesheets/asset_host.css" Then I should see content matching %r{http://assets1.example.com/} - Then I should not see content matching %r{http://assets1.example.com//} \ No newline at end of file + Then I should not see content matching %r{http://assets1.example.com//} diff --git a/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb index 41490760..a528d275 100755 --- a/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb +++ b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb @@ -39,4 +39,6 @@ <%= image_tag "blank1031.gif" %> <%= image_tag "blank1032.gif" %> <%= image_tag "blank1033.gif" %> -<%= image_tag "blank1034.gif" %> \ No newline at end of file +<%= image_tag "blank1034.gif" %> + + diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index b27633e3..b06593f0 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -333,7 +333,7 @@ module Middleman asset_path = $2 uri = ::Addressable::URI.parse(asset_path) - if uri.relative? && result = yield(asset_path) + if uri.relative? && uri.host.nil? && (result = yield(asset_path)) "#{opening_character}#{result}" else match From c48c81cbbad55adc0e862e6869749e1ea541395e Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Mon, 26 Oct 2015 00:58:34 -0600 Subject: [PATCH 142/364] resolves #1656 don't mangle URL inside tag --- middleman-core/features/asset_host.feature | 2 ++ .../fixtures/asset-host-app/source/asset_host.html.erb | 2 ++ middleman-core/lib/middleman-core/util.rb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature index 47ef143e..a8778d29 100644 --- a/middleman-core/features/asset_host.feature +++ b/middleman-core/features/asset_host.feature @@ -11,6 +11,7 @@ Feature: Alternate between multiple asset hosts Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"' Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} + Then I should see content matching %r{Angular.js} Then I should see content matching %r{'//www.example.com/script.js'} When I go to "/stylesheets/asset_host.css" Then I should see content matching %r{http://assets1.example.com/} @@ -29,6 +30,7 @@ Feature: Alternate between multiple asset hosts Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"' Then I should see content matching %r{http://assets1.example.com/} Then I should not see content matching %r{http://assets1.example.com//} + Then I should see content matching %r{Angular.js} Then I should see content matching %r{'//www.example.com/script.js'} When I go to "/stylesheets/asset_host.css" Then I should see content matching %r{http://assets1.example.com/} diff --git a/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb index a528d275..30843176 100755 --- a/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb +++ b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb @@ -41,4 +41,6 @@ <%= image_tag "blank1033.gif" %> <%= image_tag "blank1034.gif" %> +Angular.js + diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index b06593f0..8e9c0c41 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -328,7 +328,7 @@ module Middleman Contract String, String, ArrayOf[String], Proc => String def rewrite_paths(body, _path, exts, &_block) - body.dup.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]+(#{Regexp.union(exts)}))/) do |match| + body.dup.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/) do |match| opening_character = $1 asset_path = $2 From a61b2e3b870dfb4f8d51ccdb748daf60dff83c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Sat, 7 Nov 2015 18:50:55 +0100 Subject: [PATCH 143/364] Move HTTPS to server_information --- .../lib/middleman-core/preview_server.rb | 14 +++++--------- .../preview_server/server_information.rb | 13 +++++++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 40275df5..3d58fc4e 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -15,10 +15,6 @@ module Middleman attr_reader :app, :ssl_certificate, :ssl_private_key, :environment, :server_information - def https? - @https == true - end - # Start an instance of Middleman::Application # @return [void] def start(opts={}) @@ -28,6 +24,7 @@ module Middleman @options = opts @server_information = ServerInformation.new + @server_information.https = (@options[:https] == true) # New app evaluates the middleman configuration. Since this can be # invalid as well, we need to evaluate the configuration BEFORE @@ -44,9 +41,9 @@ module Middleman app.logger.debug %(== Server information is provided by #{server_information.handler}) app.logger.debug %(== The Middleman is running in "#{environment}" environment) - app.logger.debug format('== The Middleman preview server is bound to %s', ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: https?).to_bind_addresses.join(', ')) - app.logger.info format('== View your site at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_urls.join(', ')) - app.logger.info format('== Inspect your site configuration at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: https?).to_config_urls.join(', ')) + app.logger.debug format('== The Middleman preview server is bound to %s', ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: server_information.https?).to_bind_addresses.join(', ')) + app.logger.info format('== View your site at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: server_information.https?).to_urls.join(', ')) + app.logger.info format('== Inspect your site configuration at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: server_information.https?).to_config_urls.join(', ')) @initialized ||= false return if @initialized @@ -170,7 +167,6 @@ module Middleman app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless app.config[:port] == configured_port - @https = app.config[:https] @environment = app.config[:environment] @ssl_certificate = app.config[:ssl_certificate] @@ -216,7 +212,7 @@ module Middleman DoNotReverseLookup: true } - if https? + if server_information.https? http_opts[:SSLEnable] = true if ssl_certificate || ssl_private_key diff --git a/middleman-core/lib/middleman-core/preview_server/server_information.rb b/middleman-core/lib/middleman-core/preview_server/server_information.rb index 937efdd5..345da1c7 100644 --- a/middleman-core/lib/middleman-core/preview_server/server_information.rb +++ b/middleman-core/lib/middleman-core/preview_server/server_information.rb @@ -20,6 +20,8 @@ module Middleman public + attr_writer :https + def initialize(opts={}) @resolver = opts.fetch(:resolver, DnsResolver.new) @validator = opts.fetch(:validator, ServerInformationValidator.new) @@ -64,10 +66,12 @@ module Middleman @bind_address = config[:bind_address] @port = config[:port] @server_name = config[:server_name] + @https = config[:https] config[:bind_address] = bind_address - config[:port] = port - config[:server_name] = server_name + config[:port] = port + config[:server_name] = server_name + config[:https] = https? end # Make information of internal server class avaible to make debugging @@ -139,6 +143,11 @@ module Middleman def listeners information.listeners end + + # Is https enabled? + def https? + @https == true + end end end end From 0f8ea86119bb68515cdcbadb266c6ea8ab16f53b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Sat, 7 Nov 2015 18:51:19 +0100 Subject: [PATCH 144/364] Add hook for before_server --- .../features/cli/preview_server-hook.feature | 17 +++++++++ .../preview-server-hook-app/config.rb | 19 ++++++++++ .../source/index.html.erb | 9 +++++ .../lib/middleman-core/application.rb | 3 +- .../lib/middleman-core/preview_server.rb | 3 ++ .../server_information_callback_proxy.rb | 35 +++++++++++++++++++ .../preview_server/server_url.rb | 21 ++++++++--- 7 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 middleman-core/features/cli/preview_server-hook.feature create mode 100644 middleman-core/fixtures/preview-server-hook-app/config.rb create mode 100644 middleman-core/fixtures/preview-server-hook-app/source/index.html.erb create mode 100644 middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb diff --git a/middleman-core/features/cli/preview_server-hook.feature b/middleman-core/features/cli/preview_server-hook.feature new file mode 100644 index 00000000..15f6cba0 --- /dev/null +++ b/middleman-core/features/cli/preview_server-hook.feature @@ -0,0 +1,17 @@ +Feature: Run preview server before hook + + Scenario: When run + Given a fixture app "preview-server-hook-app" + And the default aruba timeout is 30 seconds + When I run `middleman server --server-name localhost --bind-address 127.0.0.1` interactively + And I stop middleman if the output contains: + """ + ### END ### + """ + Then the output should contain: + """ + /// 127.0.0.1:4567 /// + /// 4567 /// + /// localhost /// + /// http://localhost:4567 /// + """ diff --git a/middleman-core/fixtures/preview-server-hook-app/config.rb b/middleman-core/fixtures/preview-server-hook-app/config.rb new file mode 100644 index 00000000..9892009e --- /dev/null +++ b/middleman-core/fixtures/preview-server-hook-app/config.rb @@ -0,0 +1,19 @@ +set :layout, false + +class MyFeature < Middleman::Extension + def initialize(app, options_hash = {}, &block) + super + + app.before_server do |server_information| + puts "/// #{server_information.listeners.first} ///" + puts "/// #{server_information.port} ///" + puts "/// #{server_information.server_name} ///" + puts "/// #{server_information.site_addresses.first} ///" + puts "/// ### END ### ///" + end + end +end + +::Middleman::Extensions.register(:my_feature, MyFeature) + +activate :my_feature diff --git a/middleman-core/fixtures/preview-server-hook-app/source/index.html.erb b/middleman-core/fixtures/preview-server-hook-app/source/index.html.erb new file mode 100644 index 00000000..ca390d46 --- /dev/null +++ b/middleman-core/fixtures/preview-server-hook-app/source/index.html.erb @@ -0,0 +1,9 @@ + + + + preview-server-hook-app + + +

        preview-server-hook-app

        + + diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index 4e46ed82..cf5cfd66 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -216,7 +216,8 @@ module Middleman :before_shutdown, :before, # Before Rack requests :before_render, - :after_render + :after_render, + :before_server ]) @middleware = Set.new diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 3d58fc4e..ffed7f21 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -6,6 +6,7 @@ require 'middleman-core/logger' require 'middleman-core/rack' require 'middleman-core/preview_server/server_information' require 'middleman-core/preview_server/server_url' +require 'middleman-core/preview_server/server_information_callback_proxy' # rubocop:disable GlobalVars module Middleman @@ -55,6 +56,8 @@ module Middleman # reloading later on. ::Middleman::Profiling.report('server_start') + app.execute_callbacks(:before_server, [ServerInformationCallbackProxy.new(server_information)]) + loop do @webrick.start diff --git a/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb b/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb new file mode 100644 index 00000000..106abba0 --- /dev/null +++ b/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb @@ -0,0 +1,35 @@ +module Middleman + class PreviewServer + # This class wraps server information to be used in call back + # + # * listeners + # * port + # * server name + # * site_addresses + # + # All information is "dupped" and the callback is not meant to be used to + # modify these information. + class ServerInformationCallbackProxy + attr_reader :server_name, :port, :site_addresses, :listeners + + def initialize(server_information) + @listeners = ServerUrl.new( + hosts: server_information.listeners, + port: server_information.port, + https: server_information.https?, + format_output: false + ).to_bind_addresses + + @port = server_information.port + @server_name = server_information.server_name.dup unless server_information.server_name == nil + + @site_addresses = ServerUrl.new( + hosts: server_information.site_addresses, + port: server_information.port, + https: server_information.https?, + format_output: false + ).to_urls + end + end + end +end diff --git a/middleman-core/lib/middleman-core/preview_server/server_url.rb b/middleman-core/lib/middleman-core/preview_server/server_url.rb index 9b7a5b29..bc18da55 100644 --- a/middleman-core/lib/middleman-core/preview_server/server_url.rb +++ b/middleman-core/lib/middleman-core/preview_server/server_url.rb @@ -6,7 +6,7 @@ module Middleman class ServerUrl private - attr_reader :hosts, :port, :https + attr_reader :hosts, :port, :https, :format_output public @@ -14,6 +14,7 @@ module Middleman @hosts = opts.fetch(:hosts) @port = opts.fetch(:port) @https = opts.fetch(:https, false) + @format_output = opts.fetch(:format_output, true) end # Return bind addresses @@ -21,7 +22,11 @@ module Middleman # @return [Array] # List of bind addresses of format host:port def to_bind_addresses - hosts.map { |l| format('"%s:%s"', l.to_s, port) } + if format_output + hosts.map { |l| format('"%s:%s"', l.to_s, port) } + else + hosts.map { |l| format('%s:%s', l.to_s, port) } + end end # Return server urls @@ -29,7 +34,11 @@ module Middleman # @return [Array] # List of urls of format http://host:port def to_urls - hosts.map { |l| format('"%s://%s:%s"', https? ? 'https' : 'http', l.to_browser, port) } + if format_output + hosts.map { |l| format('"%s://%s:%s"', https? ? 'https' : 'http', l.to_browser, port) } + else + hosts.map { |l| format('%s://%s:%s', https? ? 'https' : 'http', l.to_browser, port) } + end end # Return server config urls @@ -37,7 +46,11 @@ module Middleman # @return [Array] # List of urls of format http://host:port/__middleman def to_config_urls - hosts.map { |l| format('"%s://%s:%s/__middleman"', https? ? 'https' : 'http', l.to_browser, port) } + if format_output + hosts.map { |l| format('"%s://%s:%s/__middleman"', https? ? 'https' : 'http', l.to_browser, port) } + else + hosts.map { |l| format('%s://%s:%s/__middleman', https? ? 'https' : 'http', l.to_browser, port) } + end end private From 684a80c9061fd5cabe4b78c1c2bce9785fbaf000 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 11 Nov 2015 12:58:07 -0800 Subject: [PATCH 145/364] Change no-layout to the default, except for .html --- CHANGELOG.md | 1 + middleman-core/features/cli_init.feature | 6 +- .../features/default-layout.feature | 90 +++++++++++++++++++ .../lib/middleman-core/sitemap/resource.rb | 2 +- 4 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 middleman-core/features/default-layout.feature diff --git a/CHANGELOG.md b/CHANGELOG.md index 55986de6..78bc4f20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ master === +* Rather than applying layouts to all files which are not .txt, .css, .js, .json: the new behavior is to only default layouts to active for .html * Switch from Ruby Sass to SassC. * `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers. diff --git a/middleman-core/features/cli_init.feature b/middleman-core/features/cli_init.feature index 1eb9e840..52aa8f7b 100644 --- a/middleman-core/features/cli_init.feature +++ b/middleman-core/features/cli_init.feature @@ -57,11 +57,11 @@ Feature: Middleman CLI Then a directory named "MY_PROJECT" should exist Scenario: Create a new project using Middleman directory - When I run `middleman init MY_PROJECT -T amicus` + When I run `middleman init MY_PROJECT -T blog` Then a directory named "MY_PROJECT" should exist When I cd to "MY_PROJECT" - And the file "README.md" should contain "Amicus" - And the file ".gitignore" should not exist + And the file "Gemfile" should contain "middleman-blog" + And the file ".gitignore" should exist Scenario: Create a new project using github(user/repository) When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default` interactively diff --git a/middleman-core/features/default-layout.feature b/middleman-core/features/default-layout.feature new file mode 100644 index 00000000..82fbeeff --- /dev/null +++ b/middleman-core/features/default-layout.feature @@ -0,0 +1,90 @@ +Feature: Describe which files get layouts + + Background: + Given an empty app + And a file named "config.rb" with: + """ + page "/about.html", layout: :layout2 + """ + And a file named "source/layouts/layout.erb" with: + """ + In Layout + <%= yield %> + """ + And a file named "source/layouts/layout2.erb" with: + """ + + Second Layout + <%= yield %> + + """ + And a file named "source/index.html.erb" with: + """ + In Index + """ + And a file named "source/about.html.erb" with: + """ + In About + """ + And a file named "source/style.css.scss" with: + """ + html { border: 1; } + """ + And a file named "source/style2.scss" with: + """ + html { border: 2; } + """ + And a file named "source/data.json" with: + """ + { "hello": "world" } + """ + And a file named "source/script.js" with: + """ + helloWorld(); + """ + And a file named "source/test.xml.erb" with: + """ + --- + layout: layout2 + --- + + Hi + """ + And the Server is running at "empty_app" + + Scenario: Normal Template + When I go to "/index.html" + Then I should see "In Index" + And I should see "In Layout" + + Scenario: Normal Template with override + When I go to "/about.html" + Then I should see "In About" + And I should see "Second Layout" + And I should not see "In Layout" + + Scenario: Sass + When I go to "/style.css" + Then I should see "border: 1" + And I should not see "In Layout" + + Scenario: Sass with extension + When I go to "/style2" + Then I should see "border: 2" + And I should not see "In Layout" + + Scenario: JSON + When I go to "/data.json" + Then I should see "hello" + And I should not see "In Layout" + + Scenario: JS + When I go to "/script.js" + Then I should see "helloWorld()" + And I should not see "In Layout" + + Scenario: XML + When I go to "/test.xml" + Then I should see "Hi" + And I should see "Second Layout" + diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index dfd7e46b..cb054460 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -134,7 +134,7 @@ module Middleman # Certain output file types don't use layouts unless opts.key?(:layout) - opts[:layout] = false if %w(.js .json .css .txt).include?(ext) + opts[:layout] = false if ext != '.html' end renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s) From 916a5a508b72721a0536702d382b2880ea03d55e Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 11 Nov 2015 13:46:09 -0800 Subject: [PATCH 146/364] fix some tests --- middleman-core/features/asset_hash.feature | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature index 8dddc6d2..7b44c0bf 100644 --- a/middleman-core/features/asset_hash.feature +++ b/middleman-core/features/asset_hash.feature @@ -63,21 +63,21 @@ Feature: Assets get file hashes appended to them and references to them are upda Given the Server is running at "asset-hash-app" When I go to "/" Then I should see 'href="apple-touch-icon.png"' - And I should see 'href="stylesheets/site-7474cadd.css"' + And I should see 'href="stylesheets/site-c876f66c.css"' And I should see 'src="javascripts/application-1d8d5276.js"' And I should see 'src="images/100px-5fd6fb90.jpg"' And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"' When I go to "/subdir/" - Then I should see 'href="../stylesheets/site-7474cadd.css"' + Then I should see 'href="../stylesheets/site-c876f66c.css"' And I should see 'src="../javascripts/application-1d8d5276.js"' And I should see 'src="../images/100px-5fd6fb90.jpg"' When I go to "/other/" - Then I should see 'href="../stylesheets/site-7474cadd.css"' + Then I should see 'href="../stylesheets/site-c876f66c.css"' And I should see 'src="../javascripts/application-1d8d5276.js"' And I should see 'src="../images/100px-5fd6fb90.jpg"' When I go to "/javascripts/application-1d8d5276.js" Then I should see "img.src = '/images/100px-5fd6fb90.jpg'" - When I go to "/stylesheets/site-7474cadd.css" + When I go to "/stylesheets/site-c876f66c.css" Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")' When I go to "/api.json" Then I should see 'images/100px-5fd6fb90.gif' @@ -98,13 +98,13 @@ Feature: Assets get file hashes appended to them and references to them are upda Scenario: Enabling an asset host still produces hashed files and references Given the Server is running at "asset-hash-host-app" When I go to "/" - Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' When I go to "/subdir/" - Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' When I go to "/other/" - Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' Scenario: The asset hash should change when a SASS partial changes @@ -115,14 +115,14 @@ Feature: Assets get file hashes appended to them and references to them are upda font-size: 14px """ When I go to "/partials/" - Then I should see 'href="../stylesheets/uses_partials-423a00f7.css' + Then I should see 'href="../stylesheets/uses_partials-e1b802a2.css' And the file "source/stylesheets/_partial.sass" has the contents """ body font-size: 18px !important """ When I go to "/partials/" - Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css' + Then I should see 'href="../stylesheets/uses_partials-023a2e4d.css' Scenario: The asset hash should change when a Rack-based filter changes Given a fixture app "asset-hash-app" @@ -136,8 +136,8 @@ Feature: Assets get file hashes appended to them and references to them are upda """ Given the Server is running at "asset-hash-app" When I go to "/" - Then I should see 'href="stylesheets/site-ac2166fd.css' - When I go to "stylesheets/site-ac2166fd.css" + Then I should see 'href="stylesheets/site-79a70922.css' + When I go to "stylesheets/site-79a70922.css" Then I should see 'background-image' Then I should see 'Added by Rack filter' When I go to "stylesheets/site-7474cadd.css" From 8c7e156bd45108df54b2523e7a38bb2b01dfcc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Wed, 11 Nov 2015 22:20:37 +0100 Subject: [PATCH 147/364] Make middleman's preview server a daemon --- middleman-cli/lib/middleman-cli/server.rb | 8 +++++++- middleman-core/lib/middleman-core/preview_server.rb | 13 +++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/middleman-cli/lib/middleman-cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb index f8516fc1..ab387ee6 100644 --- a/middleman-cli/lib/middleman-cli/server.rb +++ b/middleman-cli/lib/middleman-cli/server.rb @@ -49,6 +49,11 @@ module Middleman::Cli aliases: '-l', default: 0.5, desc: 'Set file watcher latency, in seconds' + class_option :daemon, + type: :boolean, + aliases: '-d', + default: false, + desc: 'Daemonize preview server' # Start the server def server @@ -73,7 +78,8 @@ module Middleman::Cli disable_watcher: options['disable_watcher'], reload_paths: options['reload_paths'], force_polling: options['force_polling'], - latency: options['latency'] + latency: options['latency'], + daemon: options['daemon'] } puts '== The Middleman is loading' diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index ffed7f21..25bb5276 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -58,6 +58,19 @@ module Middleman app.execute_callbacks(:before_server, [ServerInformationCallbackProxy.new(server_information)]) + if @options[:daemon] + # To output the child PID, let's make preview server a daemon by hand + if child_pid = fork + app.logger.info "== Middleman preview server is running in background with PID #{child_pid}" + Process.detach child_pid + exit 0 + else + $stdout.reopen('/dev/null', 'w') + $stderr.reopen('/dev/null', 'w') + $stdin.reopen('/dev/null', 'r') + end + end + loop do @webrick.start From ce998cf68550cc10bd7e512afe00fef89d1b7eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Wed, 11 Nov 2015 22:27:43 +0100 Subject: [PATCH 148/364] Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78bc4f20..e070195c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ master * Rather than applying layouts to all files which are not .txt, .css, .js, .json: the new behavior is to only default layouts to active for .html * Switch from Ruby Sass to SassC. * `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers. +* Add `before_server`-hook to the preview server which is run before the Webrick server is started +* Add `-d` to `middleman server` to make it run as daemon # 4.0.0.rc.1 From 022779ef271d152d5bedd1237f8866173cf74a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?= Date: Wed, 11 Nov 2015 23:30:49 +0100 Subject: [PATCH 149/364] Add warning for master as well --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1b005ec..2cb5a0ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,6 +29,9 @@ Ideally, a bug report should include a pull request with failing specs. [gist]: https://gist.github.com/ ## Submitting a Pull Request + +**WE DO NOT ACCEPT NEW FEATURES FOR THE V3 BRANCH ANYMORE** + 1. [Fork the repository.][fork] 2. Create a topic [branch]. `git checkout -b local_topic_branch` 3. Add specs for your unimplemented feature or bug fix. From 37d96a9b149bc0a7a31065d5c77a0947695dad0a Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 11 Nov 2015 15:30:26 -0800 Subject: [PATCH 150/364] Adapt to style changes and removal of on --- middleman-core/features/asset_hash.feature | 22 +++++++++---------- middleman-core/features/minify_css.feature | 4 ++-- .../features/minify_javascript.feature | 18 +++++++-------- .../clean-app/config-hidden-dir-after.rb | 4 ++-- .../partials-app/source/locals.html.erb | 2 +- .../preview-server-app/bin/dns_server.rb | 2 +- .../middleman-core/core_extensions/routing.rb | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature index 7b44c0bf..0b61cb42 100644 --- a/middleman-core/features/asset_hash.feature +++ b/middleman-core/features/asset_hash.feature @@ -63,21 +63,21 @@ Feature: Assets get file hashes appended to them and references to them are upda Given the Server is running at "asset-hash-app" When I go to "/" Then I should see 'href="apple-touch-icon.png"' - And I should see 'href="stylesheets/site-c876f66c.css"' + And I should see 'href="stylesheets/site-d2959d87.css"' And I should see 'src="javascripts/application-1d8d5276.js"' And I should see 'src="images/100px-5fd6fb90.jpg"' And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"' When I go to "/subdir/" - Then I should see 'href="../stylesheets/site-c876f66c.css"' + Then I should see 'href="../stylesheets/site-d2959d87.css"' And I should see 'src="../javascripts/application-1d8d5276.js"' And I should see 'src="../images/100px-5fd6fb90.jpg"' When I go to "/other/" - Then I should see 'href="../stylesheets/site-c876f66c.css"' + Then I should see 'href="../stylesheets/site-d2959d87.css"' And I should see 'src="../javascripts/application-1d8d5276.js"' And I should see 'src="../images/100px-5fd6fb90.jpg"' When I go to "/javascripts/application-1d8d5276.js" Then I should see "img.src = '/images/100px-5fd6fb90.jpg'" - When I go to "/stylesheets/site-c876f66c.css" + When I go to "/stylesheets/site-d2959d87.css" Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")' When I go to "/api.json" Then I should see 'images/100px-5fd6fb90.gif' @@ -98,13 +98,13 @@ Feature: Assets get file hashes appended to them and references to them are upda Scenario: Enabling an asset host still produces hashed files and references Given the Server is running at "asset-hash-host-app" When I go to "/" - Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' When I go to "/subdir/" - Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' When I go to "/other/" - Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' Scenario: The asset hash should change when a SASS partial changes @@ -115,14 +115,14 @@ Feature: Assets get file hashes appended to them and references to them are upda font-size: 14px """ When I go to "/partials/" - Then I should see 'href="../stylesheets/uses_partials-e1b802a2.css' + Then I should see 'href="../stylesheets/uses_partials-44fb2764.css' And the file "source/stylesheets/_partial.sass" has the contents """ body font-size: 18px !important """ When I go to "/partials/" - Then I should see 'href="../stylesheets/uses_partials-023a2e4d.css' + Then I should see 'href="../stylesheets/uses_partials-10d8ae33.css' Scenario: The asset hash should change when a Rack-based filter changes Given a fixture app "asset-hash-app" @@ -136,8 +136,8 @@ Feature: Assets get file hashes appended to them and references to them are upda """ Given the Server is running at "asset-hash-app" When I go to "/" - Then I should see 'href="stylesheets/site-79a70922.css' - When I go to "stylesheets/site-79a70922.css" + Then I should see 'href="stylesheets/site-30784643.css' + When I go to "stylesheets/site-30784643.css" Then I should see 'background-image' Then I should see 'Added by Rack filter' When I go to "stylesheets/site-7474cadd.css" diff --git a/middleman-core/features/minify_css.feature b/middleman-core/features/minify_css.feature index dce7de16..cbf03fe3 100644 --- a/middleman-core/features/minify_css.feature +++ b/middleman-core/features/minify_css.feature @@ -154,7 +154,7 @@ Feature: Minify CSS """ config[:sass_source_maps] = false - activate :minify_css, :inline => true + activate :minify_css, inline: true """ And the Server is running at "minify-css-app" When I go to "/inline-css.php" @@ -173,7 +173,7 @@ Feature: Minify CSS """ config[:sass_source_maps] = false - activate :minify_css, :inline => true + activate :minify_css, inline: true proxy '/inline-css-proxy', '/inline-css.html', ignore: true """ And the Server is running at "minify-css-app" diff --git a/middleman-core/features/minify_javascript.feature b/middleman-core/features/minify_javascript.feature index 6c672790..262d977a 100644 --- a/middleman-core/features/minify_javascript.feature +++ b/middleman-core/features/minify_javascript.feature @@ -38,7 +38,7 @@ Feature: Minify Javascript I'm a jQuery {{template}}. """ - + Scenario: Rendering inline js with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -119,7 +119,7 @@ Feature: Minify Javascript I'm a jQuery {{template}}. """ - + Scenario: Rendering inline js with the feature enabled Given a fixture app "minify-js-app" And a file named "config.rb" with: @@ -150,7 +150,7 @@ Feature: Minify Javascript Given a fixture app "minify-js-app" And a file named "config.rb" with: """ - activate :minify_javascript, :inline => true + activate :minify_javascript, inline: true """ And the Server is running at "minify-js-app" When I go to "/inline-js.php" @@ -175,7 +175,7 @@ Feature: Minify Javascript Given a fixture app "minify-js-app" And a file named "config.rb" with: """ - activate :minify_javascript, :inline => true + activate :minify_javascript, inline: true proxy '/inline-js-proxy', '/inline-js.html', ignore: true """ And the Server is running at "minify-js-app" @@ -193,7 +193,7 @@ Feature: Minify Javascript Then I should see "1" lines When I go to "/more-js/other.js" Then I should see "1" lines - + Scenario: Rendering external js in a proxied resource Given a fixture app "minify-js-app" And a file named "config.rb" with: @@ -219,7 +219,7 @@ Feature: Minify Javascript And the Server is running at "minify-js-app" When I go to "/inline-coffeescript.html" Then I should see "3" lines - + Scenario: Rendering external js (coffeescript) with the feature enabled Given a fixture app "minify-js-app" And a file named "config.rb" with: @@ -229,7 +229,7 @@ Feature: Minify Javascript And the Server is running at "minify-js-app" When I go to "/javascripts/coffee_test.js" Then I should see "1" lines - + Scenario: Rendering inline js (coffeescript) with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -247,7 +247,7 @@ Feature: Minify Javascript And the Server is running at "passthrough-app" When I go to "/inline-coffeescript.html" Then I should see "13" lines - + Scenario: Rendering external js (coffeescript) with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -263,4 +263,4 @@ Feature: Minify Javascript And the Server is running at "passthrough-app" When I go to "/javascripts/coffee_test.js" Then I should see "11" lines - \ No newline at end of file + diff --git a/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb b/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb index 454d5cf8..ec0deea7 100644 --- a/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb +++ b/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb @@ -1,5 +1,5 @@ set :build_dir, ".build" ignore "/should_be_ignored.html" -page "/should_be_ignored2.html", :ignore => true -page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true +ignore "/should_be_ignored2.html" +proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true diff --git a/middleman-core/fixtures/partials-app/source/locals.html.erb b/middleman-core/fixtures/partials-app/source/locals.html.erb index 389ef2a5..149c37e4 100644 --- a/middleman-core/fixtures/partials-app/source/locals.html.erb +++ b/middleman-core/fixtures/partials-app/source/locals.html.erb @@ -1 +1 @@ -<%= partial 'locals', locals: { :foo => 'bar' } %> +<%= partial 'locals', locals: { foo: 'bar' } %> diff --git a/middleman-core/fixtures/preview-server-app/bin/dns_server.rb b/middleman-core/fixtures/preview-server-app/bin/dns_server.rb index 78726f59..f4f16455 100755 --- a/middleman-core/fixtures/preview-server-app/bin/dns_server.rb +++ b/middleman-core/fixtures/preview-server-app/bin/dns_server.rb @@ -24,7 +24,7 @@ interfaces = [ # Start the RubyDNS server -RubyDNS::run_server(:listen => interfaces) do +RubyDNS::run_server(listen: interfaces) do db.each do |matcher, result| match(matcher, Resolv::DNS::Resource::IN::A) do |transaction| transaction.respond!(result) diff --git a/middleman-core/lib/middleman-core/core_extensions/routing.rb b/middleman-core/lib/middleman-core/core_extensions/routing.rb index 3e66f3dc..db773d29 100644 --- a/middleman-core/lib/middleman-core/core_extensions/routing.rb +++ b/middleman-core/lib/middleman-core/core_extensions/routing.rb @@ -28,7 +28,7 @@ module Middleman PageDescriptor = Struct.new(:path, :metadata) # The page method allows options to be set for a given source path, regex, or glob. - # Options that may be set include layout, locals, proxy, andx ignore. + # Options that may be set include layout, locals, andx ignore. # # @example # page '/about.html', layout: false From f16fc2229e8ee8162269ed00ac8296643a32136e Mon Sep 17 00:00:00 2001 From: Steven Sloan Date: Fri, 13 Nov 2015 16:33:59 -0500 Subject: [PATCH 151/364] feat(testing): add a fixture/file helper for rspec tests --- middleman-core/spec/spec_helper.rb | 2 ++ middleman-core/spec/support/given.rb | 42 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 middleman-core/spec/support/given.rb diff --git a/middleman-core/spec/spec_helper.rb b/middleman-core/spec/spec_helper.rb index 4e363fc6..c7b3d141 100644 --- a/middleman-core/spec/spec_helper.rb +++ b/middleman-core/spec/spec_helper.rb @@ -12,6 +12,8 @@ RSpec.configure do |config| config.include Aruba::Api end +require_relative 'support/given' + # encoding: utf-8 RSpec.configure do |config| config.filter_run :focus diff --git a/middleman-core/spec/support/given.rb b/middleman-core/spec/support/given.rb new file mode 100644 index 00000000..499fcb78 --- /dev/null +++ b/middleman-core/spec/support/given.rb @@ -0,0 +1,42 @@ +module Given + ROOT = File.expand_path( '../..', File.dirname( File.realpath(__FILE__) ) ) + TMP = File.join( ROOT, 'tmp' ) + + class << self + + def fixture name + cleanup! + + `rsync -av #{File.join( ROOT, 'fixtures', name )}/ #{TMP}/` + Dir.chdir TMP + ENV['MM_ROOT'] = TMP + end + + def no_file name + FileUtils.rm name, force: true + end + + def symlink source, destination + no_file destination + FileUtils.symlink File.expand_path(source), + File.expand_path(destination), + force: true + end + + def file name, content + file_path = File.join( TMP, name ) + FileUtils.mkdir_p( File.dirname(file_path) ) + File.open( file_path, 'w' ) do |file| + file.write content + end + end + + def cleanup! + Dir.chdir ROOT + if File.exist? TMP + `rm -rf #{TMP}` + end + end + + end +end From 49a7435dc9d0fd13cd30ca686c5b589585d283af Mon Sep 17 00:00:00 2001 From: Steven Sloan Date: Fri, 13 Nov 2015 16:37:58 -0500 Subject: [PATCH 152/364] spec(Util::asset_url): add specs covering each conditional branch --- .../spec/middleman-core/util_spec.rb | 74 ++++++++++++++++++- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb index 447d1abd..f50d7555 100644 --- a/middleman-core/spec/middleman-core/util_spec.rb +++ b/middleman-core/spec/middleman-core/util_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'middleman-core/util' +require 'middleman-core' describe Middleman::Util do @@ -57,7 +57,7 @@ describe Middleman::Util do it "returns Hashie extended Hash if given a hash" do input = {test: "subject"} subject = Middleman::Util.recursively_enhance input - + expect( subject.test ).to eq "subject" end @@ -73,4 +73,72 @@ describe Middleman::Util do end end -end \ No newline at end of file + describe "::asset_url" do + + after(:each) do + Given.cleanup! + end + + context "when http_prefix is activated" do + + before(:each) do + Given.fixture 'clean-dir-app' + Given.file 'source/images/blank.gif', '' + @mm = Middleman::Application.new do + config[:http_prefix] = 'http_prefix' + end + end + + it "returns path with http_prefix pre-pended if resource is found" do + expect( Middleman::Util.asset_url( @mm, 'blank.gif', 'images', http_prefix: 'http_prefix' ) ).to eq 'http_prefix/images/blank.gif' + end + + it "returns path with http_prefix pre-pended if resource is not found" do + expect( Middleman::Util.asset_url( @mm, 'missing.gif', 'images', http_prefix: 'http_prefix' ) ).to eq 'http_prefix/images/missing.gif' + end + end + + context "when relative is true" do + + before(:each) do + Given.fixture 'relative-assets-app' + @mm = Middleman::Application.new + end + + it "returns path relative to the provided current_resource" do + current_resource = instance_double("Middleman::Sitemap::Resource", destination_path: 'a-path/index.html') + expect( Middleman::Util.asset_url( @mm, 'blank.gif', 'images', current_resource: current_resource, + relative: true ) ).to eq '../images/blank.gif' + end + + it "raises error if not given a current_resource" do + expect{ + Middleman::Util.asset_url( @mm, 'blank.gif', 'images', relative: true ) + }.to raise_error ArgumentError + end + end + + it "returns path if it is already a full path" do + expect( Middleman::Util.asset_url( @mm, 'http://example.com' ) ).to eq 'http://example.com' + expect( Middleman::Util.asset_url( @mm, 'data:example' ) ).to eq 'data:example' + end + + it "returns a resource url if given a resource's destination path" do + Given.fixture 'clean-dir-app' # includes directory indexes extension + Given.file 'source/how/about/that.html', '' + @mm = Middleman::Application.new + + expect( Middleman::Util.asset_url( @mm, '/how/about/that/index.html' ) ).to eq '/how/about/that/' + end + + it "returns a resource url if given a resources path" do + Given.fixture 'clean-dir-app' # includes directory indexes extension + Given.file 'source/how/about/that.html', '' + @mm = Middleman::Application.new + + expect( Middleman::Util.asset_url( @mm, '/how/about/that.html' ) ).to eq '/how/about/that/' + end + + end + +end From 6ab6669456cf5ea67c68a71349903bf562db44ab Mon Sep 17 00:00:00 2001 From: Steven Sloan Date: Fri, 13 Nov 2015 16:42:08 -0500 Subject: [PATCH 153/364] fix(Util::asset_url): allow use without passing a current_resource MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most cases the current_resource isn’t actually needed, so calls could be made from extensions and still get the correct path back. An exception will be raised with a descriptive message if the current_resource is needed but not given. (for example, if relative is true — it needs a resource to base the url on) --- middleman-core/lib/middleman-core/util.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index 8e9c0c41..139bca08 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -201,7 +201,7 @@ module Middleman Contract IsA['Middleman::Application'], String, String, Hash => String def asset_url(app, path, prefix='', options={}) # Don't touch assets which already have a full path - if path.include?('//') || path.start_with?('data:') || !options[:current_resource] + if path.include?('//') || path.start_with?('data:') path else # rewrite paths to use their destination path result = if resource = app.sitemap.find_resource_by_destination_path(url_for(app, path)) @@ -218,6 +218,10 @@ module Middleman if options[:relative] != true result else + unless options[:current_resource] + raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true' + end + current_dir = Pathname('/' + options[:current_resource].destination_path) Pathname(result).relative_path_from(current_dir.dirname).to_s end From 13a14d43d4bc1ecd8348da852c65c705be4661b1 Mon Sep 17 00:00:00 2001 From: Johnny Shields Date: Fri, 27 Nov 2015 15:20:20 +0900 Subject: [PATCH 154/364] In SourceWatcher, add a subroutine to find files which should be considered "also dirty" when a given file is touched. --- .../middleman-core/sources/source_watcher.rb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index 129b0a8a..3f496594 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -222,6 +222,8 @@ module Middleman return if updated.empty? && removed.empty? + updated |= find_related_files(updated + removed) + update(updated.map { |s| Pathname(s) }, removed.map { |s| Pathname(s) }) end @@ -304,5 +306,24 @@ module Middleman ::Middleman::SourceFile.new(Pathname(relative_path), path, @directory, types) end + + # Finds files which should also be considered to be dirty when + # the given file(s) are touched. + # + # @param [Array] files The original touched file paths. + # @return [Array] All related file paths, not including the source file paths. + Contract ArrayOf[String] => ArrayOf[String] + def find_related_files(files) + files.map do |file| + related_files = [] + + # If any SASS file changes, reload all non-partials + if file =~ /\.(sass|scss)$/ + related_files |= Dir[File.join(@directory, app.config[:css_dir], '**/[^_]*.{scss,sass}')] + end + + related_files + end.flatten.uniq - files + end end end From 4594f46fb8ca8227e50e51a9706224cdd1ea5397 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 27 Nov 2015 14:16:55 -0800 Subject: [PATCH 155/364] Minor tweak to #1695 --- .../lib/middleman-core/application.rb | 1 - .../lib/middleman-core/file_renderer.rb | 3 ++- .../lib/middleman-core/preview_server.rb | 4 ++-- .../server_information_callback_proxy.rb | 6 ++--- .../lib/middleman-core/sitemap/resource.rb | 4 +--- .../middleman-core/sources/source_watcher.rb | 24 +++++-------------- .../lib/middleman-core/template_context.rb | 3 ++- .../lib/middleman-core/util/data.rb | 8 +++---- 8 files changed, 20 insertions(+), 33 deletions(-) diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index 75713c2f..5b8cbe9d 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -398,7 +398,6 @@ module Middleman execute_callbacks(:before_shutdown) end - # Set attributes (global variables) # # @deprecated Prefer accessing settings through "config". diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb index 31b1e799..2d2137e6 100644 --- a/middleman-core/lib/middleman-core/file_renderer.rb +++ b/middleman-core/lib/middleman-core/file_renderer.rb @@ -37,7 +37,8 @@ module Middleman engine = extension[1..-1].to_sym # Store last engine for later (could be inside nested renders) - context.current_engine, engine_was = engine, context.current_engine + context.current_engine = engine + engine_was = context.current_engine # Save current buffer for later buf_was = context.save_buffer diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb index 25bb5276..8080868a 100644 --- a/middleman-core/lib/middleman-core/preview_server.rb +++ b/middleman-core/lib/middleman-core/preview_server.rb @@ -62,7 +62,7 @@ module Middleman # To output the child PID, let's make preview server a daemon by hand if child_pid = fork app.logger.info "== Middleman preview server is running in background with PID #{child_pid}" - Process.detach child_pid + Process.detach child_pid exit 0 else $stdout.reopen('/dev/null', 'w') @@ -183,7 +183,7 @@ module Middleman app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless app.config[:port] == configured_port - @environment = app.config[:environment] + @environment = app.config[:environment] @ssl_certificate = app.config[:ssl_certificate] @ssl_private_key = app.config[:ssl_private_key] diff --git a/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb b/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb index 106abba0..e913612d 100644 --- a/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb +++ b/middleman-core/lib/middleman-core/preview_server/server_information_callback_proxy.rb @@ -13,15 +13,15 @@ module Middleman attr_reader :server_name, :port, :site_addresses, :listeners def initialize(server_information) - @listeners = ServerUrl.new( + @listeners = ServerUrl.new( hosts: server_information.listeners, - port: server_information.port, + port: server_information.port, https: server_information.https?, format_output: false ).to_bind_addresses @port = server_information.port - @server_name = server_information.server_name.dup unless server_information.server_name == nil + @server_name = server_information.server_name.dup unless server_information.server_name.nil? @site_addresses = ServerUrl.new( hosts: server_information.site_addresses, diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index cb054460..c763cdf8 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -133,9 +133,7 @@ module Middleman locs[:current_path] ||= destination_path # Certain output file types don't use layouts - unless opts.key?(:layout) - opts[:layout] = false if ext != '.html' - end + opts[:layout] = false unless opts.key?(:layout) || !ext != '.html' renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s) renderer.render(locs, opts) diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index 3f496594..1280cec1 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -182,14 +182,8 @@ module Middleman # @return [void] Contract Any def poll_once! - removed = @files.keys - - updated = [] - - ::Middleman::Util.all_files_under(@directory.to_s).each do |filepath| - removed.delete(filepath) - updated << filepath - end + updated = ::Middleman::Util.all_files_under(@directory.to_s) + removed = @files.keys.reject { |p| updated.include?(p) } update(updated, removed) @@ -314,16 +308,10 @@ module Middleman # @return [Array] All related file paths, not including the source file paths. Contract ArrayOf[String] => ArrayOf[String] def find_related_files(files) - files.map do |file| - related_files = [] - - # If any SASS file changes, reload all non-partials - if file =~ /\.(sass|scss)$/ - related_files |= Dir[File.join(@directory, app.config[:css_dir], '**/[^_]*.{scss,sass}')] - end - - related_files - end.flatten.uniq - files + files.flat_map do |file| + # If any partial file changes, reload all non-partials + Dir[File.join(@directory, app.config[:source], "**/[^_]*.#{File.extname(file)}")] if File.basename(file).start_with?('_') + end.compact.uniq - files end end end diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb index f424c2b1..1461e185 100644 --- a/middleman-core/lib/middleman-core/template_context.rb +++ b/middleman-core/lib/middleman-core/template_context.rb @@ -42,7 +42,8 @@ module Middleman # @api private # @return [String] The old buffer. def save_buffer - @_out_buf, buf_was = '', @_out_buf + buf_was = @_out_buf + @_out_buf = '' buf_was end diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb index d2668dda..0b3d0967 100644 --- a/middleman-core/lib/middleman-core/util/data.rb +++ b/middleman-core/lib/middleman-core/util/data.rb @@ -25,10 +25,10 @@ module Middleman::Util::Data end start_delims, stop_delims = frontmatter_delims - .values - .flatten(1) - .transpose - .map(&Regexp.method(:union)) + .values + .flatten(1) + .transpose + .map(&Regexp.method(:union)) match = / \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)? From 822a9f0eccbf9a3e508dde5a1a03dd7422f4181b Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 27 Nov 2015 14:26:34 -0800 Subject: [PATCH 156/364] Fix layout detection on non-html files --- middleman-core/lib/middleman-core/sitemap/resource.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index c763cdf8..980927ca 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -133,7 +133,7 @@ module Middleman locs[:current_path] ||= destination_path # Certain output file types don't use layouts - opts[:layout] = false unless opts.key?(:layout) || !ext != '.html' + opts[:layout] = false if !opts.key?(:layout) && ext != '.html' renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s) renderer.render(locs, opts) From e23bd151bf723b856487f6081eb83ab3d3f4c4a9 Mon Sep 17 00:00:00 2001 From: Zac Pullar-Strecker Date: Sat, 28 Nov 2015 12:16:13 +1300 Subject: [PATCH 157/364] Added rubyinstaller-devkit dependency for windows. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b9b9c0b0..b7203403 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ These days, many websites are built with an API in mind. Rather than package the ## Installation -Middleman is built on Ruby and uses the RubyGems package manager for installation. These are usually pre-installed on Mac OS X and Linux. Windows users can install both using [RubyInstaller]. +Middleman is built on Ruby and uses the RubyGems package manager for installation. These are usually pre-installed on Mac OS X and Linux. Windows users can install both using [RubyInstaller]. For windows [RubyInstaller-Devkit] is also required. ``` gem install middleman @@ -121,5 +121,6 @@ Copyright (c) 2010-2015 Thomas Reynolds. MIT Licensed, see [LICENSE] for details [codeclimate]: https://codeclimate.com/github/middleman/middleman [gittip]: https://www.gittip.com/middleman/ [rubyinstaller]: http://rubyinstaller.org/ +[RubyInstaller-Devkit]: http:rubyinstaller.org/add-ons/devkit/ [rubydoc]: http://rubydoc.info/github/middleman/middleman [LICENSE]: https://github.com/middleman/middleman/blob/master/LICENSE.md From dd0ee24ca3ae728b00f8987d74c360557c910946 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 27 Nov 2015 15:26:46 -0800 Subject: [PATCH 158/364] Work around Listen :only weirdness. Addresses #1637 --- .rubocop.yml | 4 ++++ .../lib/middleman-core/callback_manager.rb | 6 +++--- .../core_extensions/collections/step_context.rb | 2 +- .../lib/middleman-core/core_extensions/i18n.rb | 4 ++-- .../lib/middleman-core/file_renderer.rb | 3 +-- .../lib/middleman-core/sitemap/store.rb | 2 +- middleman-core/lib/middleman-core/sources.rb | 4 ++-- .../lib/middleman-core/sources/source_watcher.rb | 16 ++++++++-------- .../lib/middleman-core/template_context.rb | 3 +-- middleman-core/middleman-core.gemspec | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index e4beee7e..30e6b9ee 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -57,3 +57,7 @@ Metrics/AbcSize: Enabled: false Metrics/PerceivedComplexity: Enabled: false +Style/ParallelAssignment: + Enabled: false +Style/BlockDelimiters: + Enabled: false diff --git a/middleman-core/lib/middleman-core/callback_manager.rb b/middleman-core/lib/middleman-core/callback_manager.rb index b2b03ba8..4315256a 100644 --- a/middleman-core/lib/middleman-core/callback_manager.rb +++ b/middleman-core/lib/middleman-core/callback_manager.rb @@ -8,8 +8,8 @@ module Middleman Contract Any def initialize - @callbacks = ::Hamster.hash - @subscribers = ::Hamster.vector + @callbacks = ::Hamster::Hash.empty + @subscribers = ::Hamster::Vector.empty end Contract RespondTo[:define_singleton_method], ArrayOf[Symbol] => Any @@ -55,7 +55,7 @@ module Middleman Contract Or[Symbol, ArrayOf[Symbol]] => ::Hamster::Vector def callbacks_for(keys) immutable_keys = keys.is_a?(Symbol) ? keys : ::Hamster::Vector.new(keys) - @callbacks.get(immutable_keys) || ::Hamster.vector + @callbacks.get(immutable_keys) || ::Hamster::Vector.empty end end end diff --git a/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb b/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb index fcf1d11f..c33c0833 100644 --- a/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb +++ b/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb @@ -11,7 +11,7 @@ module Middleman attr_reader :descriptors def initialize - @descriptors = ::Hamster.set + @descriptors = ::Hamster::Set.empty end def method_missing(name, *args, &block) diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-core/lib/middleman-core/core_extensions/i18n.rb index 3555f398..b9b112d6 100644 --- a/middleman-core/lib/middleman-core/core_extensions/i18n.rb +++ b/middleman-core/lib/middleman-core/core_extensions/i18n.rb @@ -183,12 +183,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension def on_file_changed(_updated_files, _removed_files) @_langs = nil # Clear langs cache - # TODO, add new file to ::I18n.load_path + ::I18n.load_path |= app.files.by_type(:locales).files.map { |p| p[:full_path].to_s } ::I18n.reload! end def configure_i18n - ::I18n.load_path += app.files.by_type(:locales).files.map { |p| p[:full_path].to_s } + ::I18n.load_path |= app.files.by_type(:locales).files.map { |p| p[:full_path].to_s } ::I18n.reload! ::I18n.default_locale = @mount_at_root diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb index 2d2137e6..31b1e799 100644 --- a/middleman-core/lib/middleman-core/file_renderer.rb +++ b/middleman-core/lib/middleman-core/file_renderer.rb @@ -37,8 +37,7 @@ module Middleman engine = extension[1..-1].to_sym # Store last engine for later (could be inside nested renders) - context.current_engine = engine - engine_was = context.current_engine + context.current_engine, engine_was = engine, context.current_engine # Save current buffer for later buf_was = context.save_buffer diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 24a26442..2d1e052d 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -69,7 +69,7 @@ module Middleman @resources = [] @update_count = 0 - @resource_list_manipulators = ::Hamster.vector + @resource_list_manipulators = ::Hamster::Vector.empty @needs_sitemap_rebuild = true @lock = Monitor.new diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb index 7a7c7af9..3d5edaae 100644 --- a/middleman-core/lib/middleman-core/sources.rb +++ b/middleman-core/lib/middleman-core/sources.rb @@ -47,10 +47,10 @@ module Middleman @options = options # Set of procs wanting to be notified of changes - @on_change_callbacks = ::Hamster.vector + @on_change_callbacks = ::Hamster::Vector.empty # Global ignores - @ignores = ::Hamster.hash + @ignores = ::Hamster::Hash.empty # Whether we're "running", which means we're in a stable # watch state after all initialization and config. diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index 1280cec1..ff18c6f9 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -161,7 +161,7 @@ module Middleman @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change)) @listener.ignore(/^\.sass-cache/) - @listener.only(@only) unless @only.empty? + # @listener.only(@only) unless @only.empty? @listener.start end @@ -216,8 +216,6 @@ module Middleman return if updated.empty? && removed.empty? - updated |= find_related_files(updated + removed) - update(updated.map { |s| Pathname(s) }, removed.map { |s| Pathname(s) }) end @@ -227,7 +225,7 @@ module Middleman # @return [void] Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any def update(updated_paths, removed_paths) - valid_updates = updated_paths + valid_updates = (updated_paths | find_related_files(updated_paths + removed_paths)) .lazy .map(&method(:path_to_source_file)) .select(&method(:valid?)) @@ -304,13 +302,15 @@ module Middleman # Finds files which should also be considered to be dirty when # the given file(s) are touched. # - # @param [Array] files The original touched file paths. - # @return [Array] All related file paths, not including the source file paths. - Contract ArrayOf[String] => ArrayOf[String] + # @param [Pathname] files The original touched file paths. + # @return [Pathname] All related file paths, not including the source file paths. + Contract ArrayOf[Pathname] => ArrayOf[Pathname] def find_related_files(files) files.flat_map do |file| # If any partial file changes, reload all non-partials - Dir[File.join(@directory, app.config[:source], "**/[^_]*.#{File.extname(file)}")] if File.basename(file).start_with?('_') + if File.basename(file).start_with?('_') + Dir[File.join(@directory, app.config[:source], "**/[^_]*.#{File.extname(file)}")].map { |p| Pathname(p) } + end end.compact.uniq - files end end diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb index 1461e185..f424c2b1 100644 --- a/middleman-core/lib/middleman-core/template_context.rb +++ b/middleman-core/lib/middleman-core/template_context.rb @@ -42,8 +42,7 @@ module Middleman # @api private # @return [String] The old buffer. def save_buffer - buf_was = @_out_buf - @_out_buf = '' + @_out_buf, buf_was = '', @_out_buf buf_was end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 6fda5d8e..e910d6b9 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -53,6 +53,6 @@ Gem::Specification.new do |s| # Hash stuff s.add_dependency('hashie', ['~> 3.4']) - s.add_dependency('hamster', ['~> 1.0']) + s.add_dependency('hamster', ['~> 2.0']) s.add_dependency('backports', ['~> 3.6']) end From 6de88a832e065bbf93b494b96010bef833d7d914 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 27 Nov 2015 15:41:42 -0800 Subject: [PATCH 159/364] Make Ruby Sass the default, but use SassC if available. Addresses #1648 --- Gemfile | 1 + .../lib/middleman-core/renderers/sass.rb | 17 ++++++++--------- .../middleman-core/renderers/sass_functions.rb | 8 +++++++- middleman-core/middleman-core.gemspec | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index e91581b9..f497569a 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ gem 'cucumber', '~> 2.0', require: false # Optional middleman dependencies, included for tests gem 'haml', '>= 4.0.5', require: false +gem 'sassc', '~> 1.8' gem 'coffee-script', '~> 2.2', require: false gem 'kramdown', '~> 1.2', require: false gem 'slim', '>= 2.0', require: false diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index cf373408..1b57c292 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -1,12 +1,5 @@ require 'sass' -SASS_MODULE = begin - require 'sassc' - ::SassC -rescue LoadError => e - ::Sass -end - module Middleman module Renderers # Sass renderer @@ -59,11 +52,17 @@ module Middleman def evaluate(context, _) @context ||= context - @engine = SASS_MODULE::Engine.new(data, sass_options) + sass_module = if defined?(::SassC) + ::SassC + else + ::Sass + end + + @engine = sass_module::Engine.new(data, sass_options) begin @engine.render - rescue SASS_MODULE::SyntaxError => e + rescue sass_module::SyntaxError => e ::Sass::SyntaxError.exception_to_css(e) end end diff --git a/middleman-core/lib/middleman-core/renderers/sass_functions.rb b/middleman-core/lib/middleman-core/renderers/sass_functions.rb index 2e71c8f9..2a587b50 100644 --- a/middleman-core/lib/middleman-core/renderers/sass_functions.rb +++ b/middleman-core/lib/middleman-core/renderers/sass_functions.rb @@ -105,7 +105,13 @@ module Middleman end end -::SassC::Script::Functions.send :include, ::Middleman::Sass::Functions +SASS_MODULE = if defined?(::SassC) + ::SassC +else + ::Sass +end + +SASS_MODULE::Script::Functions.send :include, ::Middleman::Sass::Functions # module SASS_MODULE::Script::Functions # include ::Middleman::Sass::Functions diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index e910d6b9..a58e33c6 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -42,7 +42,7 @@ Gem::Specification.new do |s| s.add_dependency('fastimage', ['~> 1.7.0']) # Minify CSS - s.add_dependency('sassc', ['>= 1.6.0']) + s.add_dependency('sass', ['>= 3.4']) # Minify JS s.add_dependency('uglifier', ['~> 2.6']) From 309733b0672dcd1ab77772a8172cb290587ba921 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 27 Nov 2015 15:47:32 -0800 Subject: [PATCH 160/364] Disable Travis OSX again... --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e910ee34..f3150364 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ rvm: - 2.0 os: - linux - - osx + # - osx matrix: fast_finish: true allow_failures: From f2db1567a46e8d079c485875820efdcf1d2cf761 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 27 Nov 2015 16:19:26 -0800 Subject: [PATCH 161/364] Use SassC in tests --- Gemfile | 2 +- middleman-core/features/support/env.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f497569a..90e9fd5b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'cucumber', '~> 2.0', require: false # Optional middleman dependencies, included for tests gem 'haml', '>= 4.0.5', require: false -gem 'sassc', '~> 1.8' +gem 'sassc', '~> 1.8', require: false gem 'coffee-script', '~> 2.2', require: false gem 'kramdown', '~> 1.2', require: false gem 'slim', '>= 2.0', require: false diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb index 0e5f3434..4c122ea1 100644 --- a/middleman-core/features/support/env.rb +++ b/middleman-core/features/support/env.rb @@ -1,6 +1,8 @@ ENV["TEST"] = "true" ENV["AUTOLOAD_SPROCKETS"] ||= "false" +require 'sassc' + require 'simplecov' SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..')) From a546e0f5239fafcfe9eff4beb82a568b3af5dfa6 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 28 Nov 2015 14:51:37 -0800 Subject: [PATCH 162/364] See if that fixes travis --- middleman-core/features/cli/preview_server.feature | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/middleman-core/features/cli/preview_server.feature b/middleman-core/features/cli/preview_server.feature index 200cda6f..1ba26f21 100644 --- a/middleman-core/features/cli/preview_server.feature +++ b/middleman-core/features/cli/preview_server.feature @@ -42,7 +42,7 @@ Feature: Run the preview server Inspect your site configuration at "http:// """ - @ruby-2.1 + @ruby-2.1 Scenario: Start the server with defaults in verbose mode, when a local mdns server resolves the local hostname Given I start a mdns server for the local hostname When I run `middleman server --verbose` interactively @@ -359,6 +359,7 @@ Feature: Run the preview server The Middleman preview server is bound to ":::65432", "0.0.0.0:65432" """ + @ruby-2.1 Scenario: Start the server when port is blocked by other middleman instance Given `middleman server` is running in background When I run `middleman server --verbose` interactively From 16b997498bbcdfdc3336ea1b497c56357f651d7b Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 28 Nov 2015 16:48:08 -0800 Subject: [PATCH 163/364] Generic related files check --- .rubocop.yml | 2 + Gemfile | 1 + .../fixtures/related-files-app/config.rb | 0 .../related-files-app/source/index.html.erb | 0 .../source/partials/_test.erb | 0 .../source/partials/_test2.haml | 0 .../source/stylesheets/_include3.sass | 0 .../source/stylesheets/_include4.scss | 0 .../source/stylesheets/include1.css | 0 .../source/stylesheets/include2.css.scss | 0 .../source/stylesheets/site.css.scss | 0 .../lib/middleman-core/sitemap/store.rb | 12 +-- .../middleman-core/sources/source_watcher.rb | 54 ++++------- middleman-core/lib/middleman-core/util.rb | 89 +++++++++++++++++++ .../spec/middleman-core/util_spec.rb | 40 +++++++++ 15 files changed, 149 insertions(+), 49 deletions(-) create mode 100644 middleman-core/fixtures/related-files-app/config.rb create mode 100644 middleman-core/fixtures/related-files-app/source/index.html.erb create mode 100644 middleman-core/fixtures/related-files-app/source/partials/_test.erb create mode 100644 middleman-core/fixtures/related-files-app/source/partials/_test2.haml create mode 100644 middleman-core/fixtures/related-files-app/source/stylesheets/_include3.sass create mode 100644 middleman-core/fixtures/related-files-app/source/stylesheets/_include4.scss create mode 100644 middleman-core/fixtures/related-files-app/source/stylesheets/include1.css create mode 100644 middleman-core/fixtures/related-files-app/source/stylesheets/include2.css.scss create mode 100644 middleman-core/fixtures/related-files-app/source/stylesheets/site.css.scss diff --git a/.rubocop.yml b/.rubocop.yml index 30e6b9ee..8346729e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -61,3 +61,5 @@ Style/ParallelAssignment: Enabled: false Style/BlockDelimiters: Enabled: false +Style/MultilineBlockChain: + Enabled: false diff --git a/Gemfile b/Gemfile index 90e9fd5b..295d773e 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,7 @@ gem 'yard', '~> 0.8', require: false # Test tools gem 'pry', '~> 0.10', group: :development, require: false gem 'pry-byebug' +gem 'pry-stack_explorer' gem 'aruba', '~> 0.7.4', require: false gem 'rspec', '~> 3.0', require: false gem 'cucumber', '~> 2.0', require: false diff --git a/middleman-core/fixtures/related-files-app/config.rb b/middleman-core/fixtures/related-files-app/config.rb new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/index.html.erb b/middleman-core/fixtures/related-files-app/source/index.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/partials/_test.erb b/middleman-core/fixtures/related-files-app/source/partials/_test.erb new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/partials/_test2.haml b/middleman-core/fixtures/related-files-app/source/partials/_test2.haml new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/stylesheets/_include3.sass b/middleman-core/fixtures/related-files-app/source/stylesheets/_include3.sass new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/stylesheets/_include4.scss b/middleman-core/fixtures/related-files-app/source/stylesheets/_include4.scss new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/stylesheets/include1.css b/middleman-core/fixtures/related-files-app/source/stylesheets/include1.css new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/stylesheets/include2.css.scss b/middleman-core/fixtures/related-files-app/source/stylesheets/include2.css.scss new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/fixtures/related-files-app/source/stylesheets/site.css.scss b/middleman-core/fixtures/related-files-app/source/stylesheets/site.css.scss new file mode 100644 index 00000000..e69de29b diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb index 2d1e052d..7a0a8736 100644 --- a/middleman-core/lib/middleman-core/sitemap/store.rb +++ b/middleman-core/lib/middleman-core/sitemap/store.rb @@ -180,7 +180,7 @@ module Middleman Contract String => String def extensionless_path(file) path = file.dup - remove_templating_extensions(path) + ::Middleman::Util.remove_templating_extensions(path) end # Actually update the resource list, assuming anything has called @@ -224,16 +224,6 @@ module Middleman end end - # Removes the templating extensions, while keeping the others - # @param [String] path - # @return [String] - Contract String => String - def remove_templating_extensions(path) - # Strip templating extensions as long as Tilt knows them - path = path.sub(/#{::Regexp.escape(File.extname(path))}$/, '') while ::Tilt[path] - path - end - # Remove the locale token from the end of the path # @param [String] path # @return [String] diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index ff18c6f9..85234816 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -225,15 +225,23 @@ module Middleman # @return [void] Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any def update(updated_paths, removed_paths) - valid_updates = (updated_paths | find_related_files(updated_paths + removed_paths)) - .lazy - .map(&method(:path_to_source_file)) + valid_updates = updated_paths + .map { |p| ::Middleman::Util.path_to_source_file(p, @directory, @type) } .select(&method(:valid?)) - .to_a - .each do |f| - add_file_to_cache(f) - logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}" - end + + valid_updates.each do |f| + add_file_to_cache(f) + logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}" + end + + related_updates = ::Middleman::Util.find_related_files(app, (updated_paths + removed_paths)).select(&method(:valid?)) + + related_updates.each do |f| + add_file_to_cache(f) + logger.debug "== Possible Change (#{f[:types].inspect}): #{f[:relative_path]}" + end + + valid_updates |= related_updates valid_removes = removed_paths .lazy @@ -283,35 +291,5 @@ module Middleman @only.any? { |reg| reg.match(file[:relative_path].to_s) } end end - - # Convert a path to a file resprentation. - # - # @param [Pathname] path The path. - # @return [Middleman::SourceFile] - Contract Pathname => IsA['Middleman::SourceFile'] - def path_to_source_file(path) - types = Set.new([@type]) - - relative_path = path.relative_path_from(@directory) - destination_dir = @options.fetch(:destination_dir, false) - relative_path = File.join(destination_dir, relative_path) if destination_dir - - ::Middleman::SourceFile.new(Pathname(relative_path), path, @directory, types) - end - - # Finds files which should also be considered to be dirty when - # the given file(s) are touched. - # - # @param [Pathname] files The original touched file paths. - # @return [Pathname] All related file paths, not including the source file paths. - Contract ArrayOf[Pathname] => ArrayOf[Pathname] - def find_related_files(files) - files.flat_map do |file| - # If any partial file changes, reload all non-partials - if File.basename(file).start_with?('_') - Dir[File.join(@directory, app.config[:source], "**/[^_]*.#{File.extname(file)}")].map { |p| Pathname(p) } - end - end.compact.uniq - files - end end end diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index 139bca08..15964b17 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -430,6 +430,95 @@ module Middleman end end + Contract String => String + def step_through_extensions(path) + while ::Tilt[path] + yield File.extname(path) if block_given? + + # Strip templating extensions as long as Tilt knows them + path = path.sub(/#{::Regexp.escape(File.extname(path))}$/, '') + end + + yield File.extname(path) if block_given? + + path + end + + # Removes the templating extensions, while keeping the others + # @param [String] path + # @return [String] + Contract String => String + def remove_templating_extensions(path) + step_through_extensions(path) + end + + # Removes the templating extensions, while keeping the others + # @param [String] path + # @return [String] + Contract String => ArrayOf[String] + def collect_extensions(path) + result = [] + + step_through_extensions(path) { |e| result << e } + + result + end + + # Convert a path to a file resprentation. + # + # @param [Pathname] path The path. + # @return [Middleman::SourceFile] + Contract Pathname, Pathname, Symbol => IsA['Middleman::SourceFile'] + def path_to_source_file(path, directory, type) + types = Set.new([type]) + + relative_path = path.relative_path_from(directory) + # destination_dir = @options.fetch(:destination_dir, false) + # relative_path = File.join(destination_dir, relative_path) if destination_dir + + ::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types) + end + + # Finds files which should also be considered to be dirty when + # the given file(s) are touched. + # + # @param [Middleman::Application] app The app. + # @param [Pathname] files The original touched file paths. + # @return [Middleman::SourceFile] All related file paths, not including the source file paths. + Contract IsA['Middleman::Application'], ArrayOf[Pathname] => ArrayOf[IsA['Middleman::SourceFile']] + def find_related_files(app, files) + all_extensions = files.flat_map { |f| collect_extensions(f.to_s) } + + sass_type_aliasing = ['.scss', '.sass'] + erb_type_aliasing = ['.erb', '.haml', '.slim'] + + if (all_extensions & sass_type_aliasing).length > 0 + all_extensions |= sass_type_aliasing + end + + if (all_extensions & erb_type_aliasing).length > 0 + all_extensions |= erb_type_aliasing + end + + all_extensions.uniq! + + app.sitemap.resources.select { |r| + local_extensions = collect_extensions(r.file_descriptor[:relative_path].to_s) + + if (local_extensions & sass_type_aliasing).length > 0 + local_extensions |= sass_type_aliasing + end + + if (local_extensions & erb_type_aliasing).length > 0 + local_extensions |= erb_type_aliasing + end + + local_extensions.uniq! + + ((all_extensions & local_extensions).length > 0) && files.none? { |f| f == r.file_descriptor[:full_path] } + }.map(&:file_descriptor) + end + # Handy methods for dealing with URI templates. Mix into whatever class. module UriTemplates module_function diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb index f50d7555..ccac1885 100644 --- a/middleman-core/spec/middleman-core/util_spec.rb +++ b/middleman-core/spec/middleman-core/util_spec.rb @@ -141,4 +141,44 @@ describe Middleman::Util do end + describe "::find_related_files" do + after(:each) do + Given.cleanup! + end + + before(:each) do + Given.fixture 'related-files-app' + @mm = Middleman::Application.new + end + + def source_file(path) + Pathname(File.expand_path("source/#{path}")) + end + + it "Finds partials possibly related to ERb files" do + related = Middleman::Util.find_related_files(@mm, [source_file('partials/_test.erb')]).map { |f| f[:full_path].to_s } + expect(related).to include File.expand_path("source/index.html.erb") + + related = Middleman::Util.find_related_files(@mm, [source_file('partials/_test2.haml')]).map { |f| f[:full_path].to_s } + expect(related).to include File.expand_path("source/index.html.erb") + end + + it "Finds partials possible related to Scss files" do + related = Middleman::Util.find_related_files(@mm, [source_file('stylesheets/_include4.scss')]).map { |f| f[:full_path].to_s } + expect(related).to include File.expand_path("source/stylesheets/site.css.scss") + expect(related).to include File.expand_path("source/stylesheets/include2.css.scss") + + related = Middleman::Util.find_related_files(@mm, [source_file('stylesheets/include2.css.scss')]).map { |f| f[:full_path].to_s } + expect(related).to include File.expand_path("source/stylesheets/site.css.scss") + expect(related).not_to include File.expand_path("source/stylesheets/include2.css.scss") + + related = Middleman::Util.find_related_files(@mm, [source_file('stylesheets/include1.css')]).map { |f| f[:full_path].to_s } + expect(related).to include File.expand_path("source/stylesheets/site.css.scss") + expect(related).to include File.expand_path("source/stylesheets/include2.css.scss") + + related = Middleman::Util.find_related_files(@mm, [source_file('stylesheets/_include3.sass')]).map { |f| f[:full_path].to_s } + expect(related).to include File.expand_path("source/stylesheets/site.css.scss") + expect(related).to include File.expand_path("source/stylesheets/include2.css.scss") + end + end end From e47b0ae29a03c4b30fc321d3ad5e8a3e58a2103e Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 28 Nov 2015 18:02:45 -0800 Subject: [PATCH 164/364] import_file and import_path APIs. Addresses #1632 --- CHANGELOG.md | 2 + middleman-core/features/import_files.feature | 17 + middleman-core/fixtures/import-app/bower.json | 21 + .../bower_components/jquery/.bower.json | 39 + .../bower_components/jquery/MIT-LICENSE.txt | 21 + .../bower_components/jquery/bower.json | 28 + .../bower_components/jquery/dist/jquery.js | 9210 +++++++++++++++++ .../jquery/dist/jquery.min.js | 5 + .../jquery/dist/jquery.min.map | 1 + .../bower_components/jquery/src/ajax.js | 786 ++ .../bower_components/jquery/src/ajax/jsonp.js | 89 + .../bower_components/jquery/src/ajax/load.js | 75 + .../jquery/src/ajax/parseJSON.js | 13 + .../jquery/src/ajax/parseXML.js | 28 + .../jquery/src/ajax/script.js | 64 + .../jquery/src/ajax/var/nonce.js | 5 + .../jquery/src/ajax/var/rquery.js | 3 + .../bower_components/jquery/src/ajax/xhr.js | 136 + .../bower_components/jquery/src/attributes.js | 11 + .../jquery/src/attributes/attr.js | 141 + .../jquery/src/attributes/classes.js | 158 + .../jquery/src/attributes/prop.js | 94 + .../jquery/src/attributes/support.js | 35 + .../jquery/src/attributes/val.js | 161 + .../bower_components/jquery/src/callbacks.js | 205 + .../bower_components/jquery/src/core.js | 502 + .../jquery/src/core/access.js | 60 + .../bower_components/jquery/src/core/init.js | 123 + .../jquery/src/core/parseHTML.js | 39 + .../bower_components/jquery/src/core/ready.js | 97 + .../jquery/src/core/var/rsingleTag.js | 4 + .../bower_components/jquery/src/css.js | 450 + .../jquery/src/css/addGetHookIf.js | 22 + .../bower_components/jquery/src/css/curCSS.js | 57 + .../jquery/src/css/defaultDisplay.js | 70 + .../jquery/src/css/hiddenVisibleSelectors.js | 15 + .../jquery/src/css/support.js | 96 + .../bower_components/jquery/src/css/swap.js | 28 + .../jquery/src/css/var/cssExpand.js | 3 + .../jquery/src/css/var/getStyles.js | 12 + .../jquery/src/css/var/isHidden.js | 13 + .../jquery/src/css/var/rmargin.js | 3 + .../jquery/src/css/var/rnumnonpx.js | 5 + .../bower_components/jquery/src/data.js | 178 + .../bower_components/jquery/src/data/Data.js | 181 + .../jquery/src/data/accepts.js | 20 + .../jquery/src/data/var/data_priv.js | 5 + .../jquery/src/data/var/data_user.js | 5 + .../bower_components/jquery/src/deferred.js | 149 + .../bower_components/jquery/src/deprecated.js | 13 + .../bower_components/jquery/src/dimensions.js | 50 + .../bower_components/jquery/src/effects.js | 648 ++ .../jquery/src/effects/Tween.js | 114 + .../jquery/src/effects/animatedSelector.js | 13 + .../bower_components/jquery/src/event.js | 868 ++ .../bower_components/jquery/src/event/ajax.js | 13 + .../jquery/src/event/alias.js | 39 + .../jquery/src/event/support.js | 9 + .../jquery/src/exports/amd.js | 24 + .../jquery/src/exports/global.js | 32 + .../bower_components/jquery/src/intro.js | 44 + .../bower_components/jquery/src/jquery.js | 37 + .../jquery/src/manipulation.js | 580 ++ .../jquery/src/manipulation/_evalUrl.js | 18 + .../jquery/src/manipulation/support.js | 32 + .../src/manipulation/var/rcheckableType.js | 3 + .../bower_components/jquery/src/offset.js | 207 + .../bower_components/jquery/src/outro.js | 1 + .../bower_components/jquery/src/queue.js | 142 + .../jquery/src/queue/delay.js | 22 + .../jquery/src/selector-native.js | 172 + .../jquery/src/selector-sizzle.js | 14 + .../bower_components/jquery/src/selector.js | 1 + .../bower_components/jquery/src/serialize.js | 111 + .../jquery/src/sizzle/dist/sizzle.js | 2067 ++++ .../jquery/src/sizzle/dist/sizzle.min.js | 3 + .../jquery/src/sizzle/dist/sizzle.min.map | 1 + .../bower_components/jquery/src/traversing.js | 199 + .../jquery/src/traversing/findFilter.js | 100 + .../src/traversing/var/rneedsContext.js | 6 + .../bower_components/jquery/src/var/arr.js | 3 + .../jquery/src/var/class2type.js | 4 + .../bower_components/jquery/src/var/concat.js | 5 + .../bower_components/jquery/src/var/hasOwn.js | 5 + .../jquery/src/var/indexOf.js | 5 + .../bower_components/jquery/src/var/pnum.js | 3 + .../bower_components/jquery/src/var/push.js | 5 + .../jquery/src/var/rnotwhite.js | 3 + .../bower_components/jquery/src/var/slice.js | 5 + .../jquery/src/var/strundefined.js | 3 + .../jquery/src/var/support.js | 4 + .../jquery/src/var/toString.js | 5 + .../bower_components/jquery/src/wrap.js | 79 + middleman-core/fixtures/import-app/config.rb | 7 + .../fixtures/import-app/source/test.html | 0 .../fixtures/import-app/static.html | 1 + .../middleman-core/core_extensions/data.rb | 4 +- .../lib/middleman-core/file_renderer.rb | 2 +- .../lib/middleman-core/renderers/liquid.rb | 2 +- .../sitemap/extensions/import.rb | 108 + .../sitemap/extensions/move_file.rb | 2 +- .../lib/middleman-core/sitemap/store.rb | 6 + .../middleman-core/sources/source_watcher.rb | 1 - middleman-core/lib/middleman-core/util.rb | 4 +- 104 files changed, 19326 insertions(+), 8 deletions(-) create mode 100644 middleman-core/features/import_files.feature create mode 100644 middleman-core/fixtures/import-app/bower.json create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/.bower.json create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/MIT-LICENSE.txt create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/bower.json create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/dist/jquery.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/dist/jquery.min.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/dist/jquery.min.map create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/jsonp.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/load.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/parseJSON.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/parseXML.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/script.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/var/nonce.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/var/rquery.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/ajax/xhr.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/attributes.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/attributes/attr.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/attributes/classes.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/attributes/prop.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/attributes/support.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/attributes/val.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/callbacks.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/core.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/core/access.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/core/init.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/core/parseHTML.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/core/ready.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/core/var/rsingleTag.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/addGetHookIf.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/curCSS.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/defaultDisplay.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/hiddenVisibleSelectors.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/support.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/swap.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/var/cssExpand.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/var/getStyles.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/var/isHidden.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/var/rmargin.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/css/var/rnumnonpx.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/data.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/data/Data.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/data/accepts.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/data/var/data_priv.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/data/var/data_user.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/deferred.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/deprecated.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/dimensions.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/effects.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/effects/Tween.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/effects/animatedSelector.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/event.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/event/ajax.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/event/alias.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/event/support.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/exports/amd.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/exports/global.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/intro.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/jquery.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/manipulation.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/manipulation/_evalUrl.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/manipulation/support.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/manipulation/var/rcheckableType.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/offset.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/outro.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/queue.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/queue/delay.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/selector-native.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/selector-sizzle.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/selector.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/serialize.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/sizzle/dist/sizzle.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/sizzle/dist/sizzle.min.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/sizzle/dist/sizzle.min.map create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/traversing.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/traversing/findFilter.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/traversing/var/rneedsContext.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/arr.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/class2type.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/concat.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/hasOwn.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/indexOf.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/pnum.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/push.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/rnotwhite.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/slice.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/strundefined.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/support.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/var/toString.js create mode 100644 middleman-core/fixtures/import-app/bower_components/jquery/src/wrap.js create mode 100644 middleman-core/fixtures/import-app/config.rb create mode 100644 middleman-core/fixtures/import-app/source/test.html create mode 100644 middleman-core/fixtures/import-app/static.html create mode 100644 middleman-core/lib/middleman-core/sitemap/extensions/import.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index e070195c..f2430bda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ master * `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers. * Add `before_server`-hook to the preview server which is run before the Webrick server is started * Add `-d` to `middleman server` to make it run as daemon +* Trigger "Possible File Change" events on files which share an output or template type with a changed file. Allows LiveReload to update on partial changes. +* Added `import_file SOURCE, TARGET` and `import_path SOURCE_FOLDER` to copy resources from outside the project in. Does NOT do file change watching. Perfect for `bower_components`. # 4.0.0.rc.1 diff --git a/middleman-core/features/import_files.feature b/middleman-core/features/import_files.feature new file mode 100644 index 00000000..b45f1256 --- /dev/null +++ b/middleman-core/features/import_files.feature @@ -0,0 +1,17 @@ +Feature: Import files + + Scenario: Move one path to another + Given the Server is running at "import-app" + When I go to "/static.html" + Then I should see 'Not Found' + When I go to "/static2.html" + Then I should see 'Static, no code!' + + Scenario: Import all of bower + Given the Server is running at "import-app" + When I go to "/bower_components/jquery/dist/jquery.js" + Then I should see 'jQuery' + When I go to "/bower_components2/jquery/dist/jquery.js" + Then I should see 'jQuery' + + diff --git a/middleman-core/fixtures/import-app/bower.json b/middleman-core/fixtures/import-app/bower.json new file mode 100644 index 00000000..8fcfd896 --- /dev/null +++ b/middleman-core/fixtures/import-app/bower.json @@ -0,0 +1,21 @@ +{ + "name": "import-app", + "homepage": "https://github.com/middleman/middleman", + "authors": [ + "Thomas Reynolds " + ], + "description": "", + "main": "", + "moduleType": [], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "jquery": "~2.1.4" + } +} diff --git a/middleman-core/fixtures/import-app/bower_components/jquery/.bower.json b/middleman-core/fixtures/import-app/bower_components/jquery/.bower.json new file mode 100644 index 00000000..49cf1b54 --- /dev/null +++ b/middleman-core/fixtures/import-app/bower_components/jquery/.bower.json @@ -0,0 +1,39 @@ +{ + "name": "jquery", + "version": "2.1.4", + "main": "dist/jquery.js", + "license": "MIT", + "ignore": [ + "**/.*", + "build", + "dist/cdn", + "speed", + "test", + "*.md", + "AUTHORS.txt", + "Gruntfile.js", + "package.json" + ], + "devDependencies": { + "sizzle": "2.1.1-jquery.2.1.2", + "requirejs": "2.1.10", + "qunit": "1.14.0", + "sinon": "1.8.1" + }, + "keywords": [ + "jquery", + "javascript", + "library" + ], + "homepage": "https://github.com/jquery/jquery", + "_release": "2.1.4", + "_resolution": { + "type": "version", + "tag": "2.1.4", + "commit": "7751e69b615c6eca6f783a81e292a55725af6b85" + }, + "_source": "git://github.com/jquery/jquery.git", + "_target": "~2.1.4", + "_originalSource": "jquery", + "_direct": true +} \ No newline at end of file diff --git a/middleman-core/fixtures/import-app/bower_components/jquery/MIT-LICENSE.txt b/middleman-core/fixtures/import-app/bower_components/jquery/MIT-LICENSE.txt new file mode 100644 index 00000000..cdd31b5c --- /dev/null +++ b/middleman-core/fixtures/import-app/bower_components/jquery/MIT-LICENSE.txt @@ -0,0 +1,21 @@ +Copyright 2014 jQuery Foundation and other contributors +http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/middleman-core/fixtures/import-app/bower_components/jquery/bower.json b/middleman-core/fixtures/import-app/bower_components/jquery/bower.json new file mode 100644 index 00000000..0c80cd53 --- /dev/null +++ b/middleman-core/fixtures/import-app/bower_components/jquery/bower.json @@ -0,0 +1,28 @@ +{ + "name": "jquery", + "version": "2.1.4", + "main": "dist/jquery.js", + "license": "MIT", + "ignore": [ + "**/.*", + "build", + "dist/cdn", + "speed", + "test", + "*.md", + "AUTHORS.txt", + "Gruntfile.js", + "package.json" + ], + "devDependencies": { + "sizzle": "2.1.1-jquery.2.1.2", + "requirejs": "2.1.10", + "qunit": "1.14.0", + "sinon": "1.8.1" + }, + "keywords": [ + "jquery", + "javascript", + "library" + ] +} diff --git a/middleman-core/fixtures/import-app/bower_components/jquery/dist/jquery.js b/middleman-core/fixtures/import-app/bower_components/jquery/dist/jquery.js new file mode 100644 index 00000000..eed17778 --- /dev/null +++ b/middleman-core/fixtures/import-app/bower_components/jquery/dist/jquery.js @@ -0,0 +1,9210 @@ +/*! + * jQuery JavaScript Library v2.1.4 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2015-04-28T16:01Z + */ + +(function( global, factory ) { + + if ( typeof module === "object" && typeof module.exports === "object" ) { + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get jQuery. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info. + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Support: Firefox 18+ +// Can't be in strict mode, several libs including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// + +var arr = []; + +var slice = arr.slice; + +var concat = arr.concat; + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var support = {}; + + + +var + // Use the correct document accordingly with window argument (sandbox) + document = window.document, + + version = "2.1.4", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Support: Android<4.1 + // Make sure we trim BOM and NBSP + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; + +jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // Start with an empty selector + selector: "", + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num != null ? + + // Return just the one element from the set + ( num < 0 ? this[ num + this.length ] : this[ num ] ) : + + // Return all the elements in a clean array + slice.call( this ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + ret.context = this.context; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray, + + isWindow: function( obj ) { + return obj != null && obj === obj.window; + }, + + isNumeric: function( obj ) { + // parseFloat NaNs numeric-cast false positives (null|true|false|"") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + // adding 1 corrects loss of precision from parseFloat (#15100) + return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; + }, + + isPlainObject: function( obj ) { + // Not plain objects: + // - Any object or value whose internal [[Class]] property is not "[object Object]" + // - DOM nodes + // - window + if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.constructor && + !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { + return false; + } + + // If the function hasn't returned already, we're confident that + // |obj| is a plain object, created by {} or constructed with new Object + return true; + }, + + isEmptyObject: function( obj ) { + var name; + for ( name in obj ) { + return false; + } + return true; + }, + + type: function( obj ) { + if ( obj == null ) { + return obj + ""; + } + // Support: Android<4.0, iOS<6 (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call(obj) ] || "object" : + typeof obj; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + var script, + indirect = eval; + + code = jQuery.trim( code ); + + if ( code ) { + // If the code includes a valid, prologue position + // strict mode pragma, execute code by injecting a + // script tag into the document. + if ( code.indexOf("use strict") === 1 ) { + script = document.createElement("script"); + script.text = code; + document.head.appendChild( script ).parentNode.removeChild( script ); + } else { + // Otherwise, avoid the DOM node creation, insertion + // and removal by using an indirect global eval + indirect( code ); + } + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Support: IE9-11+ + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + }, + + // args is for internal usage only + each: function( obj, callback, args ) { + var value, + i = 0, + length = obj.length, + isArray = isArraylike( obj ); + + if ( args ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } + } + + return obj; + }, + + // Support: Android<4.1 + trim: function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, + i = 0, + length = elems.length, + isArray = isArraylike( elems ), + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + now: Date.now, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +}); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +function isArraylike( obj ) { + + // Support: iOS 8.2 (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = "length" in obj && obj.length, + type = jQuery.type( obj ); + + if ( type === "function" || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.nodeType === 1 && length ) { + return true; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v2.2.0-pre + * http://sizzlejs.com/ + * + * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2014-12-16 + */ +(function( window ) { + +var i, + support, + Expr, + getText, + isXML, + tokenize, + compile, + select, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + 1 * new Date(), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // General-purpose constants + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf as it's faster than native + // http://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { + var i = 0, + len = list.length; + for ( ; i < len; i++ ) { + if ( list[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace + + // Operator (capture 2) + "*([*^$|!~]?=)" + whitespace + + // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + + "*\\]", + + pseudos = ":(" + characterEncoding + ")(?:\\((" + + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: + // 1. quoted (capture 3; capture 4 or capture 5) + "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + + // 2. simple (capture 6) + "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + + // 3. anything else (capture 2) + ".*" + + ")\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox<24 + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + high < 0 ? + // BMP codepoint + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + + context = context || document; + results = results || []; + nodeType = context.nodeType; + + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { + + return results; + } + + if ( !seed && documentIsHTML ) { + + // Try to shortcut find operations when possible (e.g., not under DocumentFragment) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document (jQuery #6963) + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; + } + } + + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType !== 1 && selector; + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", nid ); + } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; + newSelector = groups.join(","); + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key + " " ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== "undefined" && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, parent, + doc = node ? node.ownerDocument || node : preferredDoc; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Set our document + document = doc; + docElem = doc.documentElement; + parent = doc.defaultView; + + // Support: IE>8 + // If iframe document is assigned to "document" variable and if iframe has been reloaded, + // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent !== parent.top ) { + // IE11 does not have attachEvent, so all must suffer + if ( parent.addEventListener ) { + parent.addEventListener( "unload", unloadHandler, false ); + } else if ( parent.attachEvent ) { + parent.attachEvent( "onunload", unloadHandler ); + } + } + + /* Support tests + ---------------------------------------------------------------------- */ + documentIsHTML = !isXML( doc ); + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Support: IE<9 + support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [ m ] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); + } + } : + + function( tag, context ) { + var elem, + tmp = [], + i = 0, + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + docElem.appendChild( div ).innerHTML = "" + + ""; + + // Support: IE8, Opera 11-12.16 + // Nothing should be selected when empty strings follow ^= or $= or *= + // The test attribute must be unknown in Opera but "safe" for WinRT + // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section + if ( div.querySelectorAll("[msallowcapture^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ + if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push("~="); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibing-combinator selector` fails + if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push(".#.+[+~]"); + } + }); + + assert(function( div ) { + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( div.querySelectorAll("[name=d]").length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || + docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch (e) {} + } + + return Sizzle( expr, document, null, [ elem ] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + while ( (node = elem[i++]) ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[6] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] ) { + match[2] = match[4] || match[5] || ""; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + // Don't keep the element (issue #299) + input[0] = null; + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + text = text.replace( runescape, funescape ); + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +tokenize = Sizzle.tokenize = function( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( (tokens = []) ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +}; + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (oldCache = outerCache[ dir ]) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return (newCache[ 2 ] = oldCache[ 2 ]); + } else { + // Reuse newcache so results back-propagate to previous elements + outerCache[ dir ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), + len = elems.length; + + if ( outermost ) { + outermostContext = context !== document && context; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id + for ( ; i !== len && (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !match ) { + match = tokenize( selector ); + } + i = match.length; + while ( i-- ) { + cached = matcherFromTokens( match[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + + // Save selector and tokenization + cached.selector = selector; + } + return cached; +}; + +/** + * A low-level selection function that works with Sizzle's compiled + * selector functions + * @param {String|Function} selector A selector or a pre-compiled + * selector function built with Sizzle.compile + * @param {Element} context + * @param {Array} [results] + * @param {Array} [seed] A set of elements to match against + */ +select = Sizzle.select = function( selector, context, results, seed ) { + var i, tokens, token, type, find, + compiled = typeof selector === "function" && selector, + match = !seed && tokenize( (selector = compiled.selector || selector) ); + + results = results || []; + + // Try to minimize operations if there is no seed and only one group + if ( match.length === 1 ) { + + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + + // Precompiled matchers will still verify ancestry, so step up a level + } else if ( compiled ) { + context = context.parentNode; + } + + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + + // Compile and execute a filtering function if one is not provided + // Provide `match` to avoid retokenization if we modified the selector above + ( compiled || compile( selector, match ) )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +}; + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome 14-35+ +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + null; + } + }); +} + +return Sizzle; + +})( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + + +var rneedsContext = jQuery.expr.match.needsContext; + +var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); + + + +var risSimple = /^.[^:#\[\.,]*$/; + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; + }); + + } + + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + }); + + } + + if ( typeof qualifier === "string" ) { + if ( risSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; + }); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); +}; + +jQuery.fn.extend({ + find: function( selector ) { + var i, + len = this.length, + ret = [], + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }) ); + } + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; + return ret; + }, + filter: function( selector ) { + return this.pushStack( winnow(this, selector || [], false) ); + }, + not: function( selector ) { + return this.pushStack( winnow(this, selector || [], true) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +}); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, + + init = jQuery.fn.init = function( selector, context ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + + // Option to run scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[2] ); + + // Support: Blackberry 4.6 + // gEBID returns nodes no longer in the document (#6963) + if ( elem && elem.parentNode ) { + // Inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return typeof rootjQuery.ready !== "undefined" ? + rootjQuery.ready( selector ) : + // Execute immediately if ready is not present + selector( jQuery ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + // Methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.extend({ + dir: function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; + }, + + sibling: function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; + } +}); + +jQuery.fn.extend({ + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter(function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( ; i < l; i++ ) { + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { + + matched.push( cur ); + break; + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); + }, + + // Determine the position of an element within the set + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // Index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.unique( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter(selector) + ); + } +}); + +function sibling( cur, dir ) { + while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return elem.contentDocument || jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.unique( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +}); +var rnotwhite = (/\S+/g); + + + +// String to Object options format cache +var optionsCache = {}; + +// Convert String-formatted options into Object-formatted ones and store in cache +function createOptions( options ) { + var object = optionsCache[ options ] = {}; + jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + }); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + ( optionsCache[ options ] || createOptions( options ) ) : + jQuery.extend( {}, options ); + + var // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list was already fired + fired, + // Flag to know if list is currently firing + firing, + // First callback to fire (used internally by add and fireWith) + firingStart, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = !options.once && [], + // Fire callbacks + fire = function( data ) { + memory = options.memory && data; + fired = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + firing = true; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + memory = false; // To prevent further calls using add + break; + } + } + firing = false; + if ( list ) { + if ( stack ) { + if ( stack.length ) { + fire( stack.shift() ); + } + } else if ( memory ) { + list = []; + } else { + self.disable(); + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + // First, we save the current length + var start = list.length; + (function add( args ) { + jQuery.each( args, function( _, arg ) { + var type = jQuery.type( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && type !== "string" ) { + // Inspect recursively + add( arg ); + } + }); + })( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away + } else if ( memory ) { + firingStart = start; + fire( memory ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + // Handle firing indexes + if ( firing ) { + if ( index <= firingLength ) { + firingLength--; + } + if ( index <= firingIndex ) { + firingIndex--; + } + } + } + }); + } + return this; + }, + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + }, + // Remove all callbacks from the list + empty: function() { + list = []; + firingLength = 0; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + if ( firing ) { + stack.push( args ); + } else { + fire( args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + +jQuery.extend({ + + Deferred: function( func ) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], + [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], + [ "notify", "progress", jQuery.Callbacks("memory") ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred(function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); + }); + fns = null; + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Keep pipe for back-compat + promise.pipe = promise.then; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; + + // promise[ done | fail | progress ] = list.add + promise[ tuple[1] ] = list.add; + + // Handle state + if ( stateString ) { + list.add(function() { + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); + } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[0] + "With" ] = list.fireWith; + }); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, + + progressValues, progressContexts, resolveContexts; + + // Add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ) + .progress( updateFunc( i, progressContexts, progressValues ) ); + } else { + --remaining; + } + } + } + + // If we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); + } + + return deferred.promise(); + } +}); + + +// The deferred used on DOM ready +var readyList; + +jQuery.fn.ready = function( fn ) { + // Add the callback + jQuery.ready.promise().done( fn ); + + return this; +}; + +jQuery.extend({ + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + jQuery( document ).off( "ready" ); + } + } +}); + +/** + * The ready event handler and self cleanup method + */ +function completed() { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); + jQuery.ready(); +} + +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { + + readyList = jQuery.Deferred(); + + // Catch cases where $(document).ready() is called after the browser event has already occurred. + // We once tried to use readyState "interactive" here, but it caused issues like the one + // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + setTimeout( jQuery.ready ); + + } else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed, false ); + } + } + return readyList.promise( obj ); +}; + +// Kick off the DOM ready check even if the user does not +jQuery.ready.promise(); + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( jQuery.type( key ) === "object" ) { + chainable = true; + for ( i in key ) { + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); + } + } + } + + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + len ? fn( elems[0], key ) : emptyGet; +}; + + +/** + * Determines whether an object can have data + */ +jQuery.acceptData = function( owner ) { + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + /* jshint -W018 */ + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + +function Data() { + // Support: Android<4, + // Old WebKit does not have Object.preventExtensions/freeze method, + // return new empty object instead with no [[set]] accessor + Object.defineProperty( this.cache = {}, 0, { + get: function() { + return {}; + } + }); + + this.expando = jQuery.expando + Data.uid++; +} + +Data.uid = 1; +Data.accepts = jQuery.acceptData; + +Data.prototype = { + key: function( owner ) { + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return the key for a frozen object. + if ( !Data.accepts( owner ) ) { + return 0; + } + + var descriptor = {}, + // Check if the owner object already has a cache key + unlock = owner[ this.expando ]; + + // If not, create one + if ( !unlock ) { + unlock = Data.uid++; + + // Secure it in a non-enumerable, non-writable property + try { + descriptor[ this.expando ] = { value: unlock }; + Object.defineProperties( owner, descriptor ); + + // Support: Android<4 + // Fallback to a less secure definition + } catch ( e ) { + descriptor[ this.expando ] = unlock; + jQuery.extend( owner, descriptor ); + } + } + + // Ensure the cache object + if ( !this.cache[ unlock ] ) { + this.cache[ unlock ] = {}; + } + + return unlock; + }, + set: function( owner, data, value ) { + var prop, + // There may be an unlock assigned to this node, + // if there is no entry for this "owner", create one inline + // and set the unlock as though an owner entry had always existed + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + // Handle: [ owner, key, value ] args + if ( typeof data === "string" ) { + cache[ data ] = value; + + // Handle: [ owner, { properties } ] args + } else { + // Fresh assignments by object are shallow copied + if ( jQuery.isEmptyObject( cache ) ) { + jQuery.extend( this.cache[ unlock ], data ); + // Otherwise, copy the properties one-by-one to the cache object + } else { + for ( prop in data ) { + cache[ prop ] = data[ prop ]; + } + } + } + return cache; + }, + get: function( owner, key ) { + // Either a valid cache is found, or will be created. + // New caches will be created and the unlock returned, + // allowing direct access to the newly created + // empty data object. A valid owner object must be provided. + var cache = this.cache[ this.key( owner ) ]; + + return key === undefined ? + cache : cache[ key ]; + }, + access: function( owner, key, value ) { + var stored; + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ((key && typeof key === "string") && value === undefined) ) { + + stored = this.get( owner, key ); + + return stored !== undefined ? + stored : this.get( owner, jQuery.camelCase(key) ); + } + + // [*]When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, name, camel, + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + if ( key === undefined ) { + this.cache[ unlock ] = {}; + + } else { + // Support array or space separated string of keys + if ( jQuery.isArray( key ) ) { + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = key.concat( key.map( jQuery.camelCase ) ); + } else { + camel = jQuery.camelCase( key ); + // Try the string as a key before any manipulation + if ( key in cache ) { + name = [ key, camel ]; + } else { + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + name = camel; + name = name in cache ? + [ name ] : ( name.match( rnotwhite ) || [] ); + } + } + + i = name.length; + while ( i-- ) { + delete cache[ name[ i ] ]; + } + } + }, + hasData: function( owner ) { + return !jQuery.isEmptyObject( + this.cache[ owner[ this.expando ] ] || {} + ); + }, + discard: function( owner ) { + if ( owner[ this.expando ] ) { + delete this.cache[ owner[ this.expando ] ]; + } + } +}; +var data_priv = new Data(); + +var data_user = new Data(); + + + +// Implementation Summary +// +// 1. Enforce API surface and semantic compatibility with 1.9.x branch +// 2. Improve the module's maintainability by reducing the storage +// paths to a single mechanism. +// 3. Use the same single mechanism to support "private" and "user" data. +// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) +// 5. Avoid exposing implementation details on user objects (eg. expando properties) +// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 + +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /([A-Z])/g; + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + data_user.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend({ + hasData: function( elem ) { + return data_user.hasData( elem ) || data_priv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return data_user.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + data_user.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to data_priv methods, these can be deprecated. + _data: function( elem, name, data ) { + return data_priv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + data_priv.remove( elem, name ); + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = data_user.get( elem ); + + if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + + // Support: IE11+ + // The attrs elements can be null (#14894) + if ( attrs[ i ] ) { + name = attrs[ i ].name; + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.slice(5) ); + dataAttr( elem, name, data[ name ] ); + } + } + } + data_priv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each(function() { + data_user.set( this, key ); + }); + } + + return access( this, function( value ) { + var data, + camelKey = jQuery.camelCase( key ); + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + // Attempt to get data from the cache + // with the key as-is + data = data_user.get( elem, key ); + if ( data !== undefined ) { + return data; + } + + // Attempt to get data from the cache + // with the key camelized + data = data_user.get( elem, camelKey ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, camelKey, undefined ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + this.each(function() { + // First, attempt to store a copy or reference of any + // data that might've been store with a camelCased key. + var data = data_user.get( this, camelKey ); + + // For HTML5 data-* attribute interop, we have to + // store property names with dashes in a camelCase form. + // This might not apply to all properties...* + data_user.set( this, camelKey, value ); + + // *... In the case of properties that might _actually_ + // have dashes, we need to also store a copy of that + // unchanged property. + if ( key.indexOf("-") !== -1 && data !== undefined ) { + data_user.set( this, key, value ); + } + }); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each(function() { + data_user.remove( this, key ); + }); + } +}); + + +jQuery.extend({ + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = data_priv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray( data ) ) { + queue = data_priv.access( elem, type, jQuery.makeArray(data) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // Clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // Not public - generate a queueHooks object, or return the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return data_priv.get( elem, key ) || data_priv.access( elem, key, { + empty: jQuery.Callbacks("once memory").add(function() { + data_priv.remove( elem, [ type + "queue", key ] ); + }) + }); + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[0], type ); + } + + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + // Ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = data_priv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +}); +var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var isHidden = function( elem, el ) { + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); + }; + +var rcheckableType = (/^(?:checkbox|radio)$/i); + + + +(function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ), + input = document.createElement( "input" ); + + // Support: Safari<=5.1 + // Check state lost if the name is set (#11217) + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Safari<=5.1, Android<4.2 + // Older WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE<=11+ + // Make sure textarea (and checkbox) defaultValue is properly cloned + div.innerHTML = ""; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; +})(); +var strundefined = typeof undefined; + + + +support.focusinBubbles = "onfocusin" in window; + + +var + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.get( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !(events = elemData.events) ) { + events = elemData.events = {}; + } + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !(handlers = events[ type ]) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.hasData( elem ) && data_priv.get( elem ); + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; + data_priv.remove( elem, "events" ); + } + }, + + trigger: function( event, data, elem, onlyHandlers ) { + + var i, cur, tmp, bubbleType, ontype, handle, special, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; + + cur = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf(".") >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf(":") < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { + + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && jQuery.acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, j, ret, matched, handleObj, + handlerQueue = [], + args = slice.call( arguments ), + handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or 2) have namespace(s) + // a subset or equal to those in the bound event (both can have no namespace). + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( (event.result = ret) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, matches, sel, handleObj, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.disabled !== true || event.type !== "click" ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } + + return handlerQueue; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: Cordova 2.5 (WebKit) (#13255) + // All events should have a target; Cordova deviceready doesn't + if ( !event.target ) { + event.target = document; + } + + // Support: Safari 6.0+, Chrome<28 + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + this.focus(); + return false; + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +jQuery.removeEvent = function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } +}; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + // Support: Android<4.0 + src.returnValue === false ? + returnTrue : + returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e && e.preventDefault ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e && e.stopPropagation ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e && e.stopImmediatePropagation ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +// Support: Chrome 15+ +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +}); + +// Support: Firefox, Chrome, Safari +// Create "bubbling" focus and blur events +if ( !support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + data_priv.remove( doc, fix ); + + } else { + data_priv.access( doc, fix, attaches ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + var elem = this[0]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +}); + + +var + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, + rtagName = /<([\w:]+)/, + rhtml = /<|&#?\w+;/, + rnoInnerhtml = /<(?:script|style|link)/i, + // checked="checked" or checked + rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, + rscriptType = /^$|\/(?:java|ecma)script/i, + rscriptTypeMasked = /^true\/(.*)/, + rcleanScript = /^\s*\s*$/g, + + // We have to close these tags to support XHTML (#13200) + wrapMap = { + + // Support: IE9 + option: [ 1, "" ], + + thead: [ 1, "", "
        " ], + col: [ 2, "", "
        " ], + tr: [ 2, "", "
        " ], + td: [ 3, "", "
        " ], + + _default: [ 0, "", "" ] + }; + +// Support: IE9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// Support: 1.x compatibility +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName("tbody")[0] || + elem.appendChild( elem.ownerDocument.createElement("tbody") ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + + if ( match ) { + elem.type = match[ 1 ]; + } else { + elem.removeAttribute("type"); + } + + return elem; +} + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + data_priv.set( + elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) + ); + } +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( data_priv.hasData( src ) ) { + pdataOld = data_priv.access( src ); + pdataCur = data_priv.set( dest, pdataOld ); + events = pdataOld.events; + + if ( events ) { + delete pdataCur.handle; + pdataCur.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( data_user.hasData( src ) ) { + udataOld = data_user.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + data_user.set( dest, udataCur ); + } +} + +function getAll( context, tag ) { + var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : + context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : + []; + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], ret ) : + ret; +} + +// Fix IE bugs, see support tests +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +jQuery.extend({ + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = jQuery.contains( elem.ownerDocument, elem ); + + // Fix IE cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + buildFragment: function( elems, context, scripts, selection ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + // Support: QtWebKit, PhantomJS + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement("div") ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: QtWebKit, PhantomJS + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( (elem = nodes[ i++ ]) ) { + + // #4087 - If origin and destination elements are the same, and this is + // that element, do not do anything + if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( (elem = tmp[ j++ ]) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; + }, + + cleanData: function( elems ) { + var data, elem, type, key, + special = jQuery.event.special, + i = 0; + + for ( ; (elem = elems[ i ]) !== undefined; i++ ) { + if ( jQuery.acceptData( elem ) ) { + key = elem[ data_priv.expando ]; + + if ( key && (data = data_priv.cache[ key ]) ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + if ( data_priv.cache[ key ] ) { + // Discard any remaining `private` data + delete data_priv.cache[ key ]; + } + } + } + // Discard any remaining `user` data + delete data_user.cache[ elem[ data_user.expando ] ]; + } + } +}); + +jQuery.fn.extend({ + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each(function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + }); + }, null, value, arguments.length ); + }, + + append: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + }); + }, + + prepend: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + }); + }, + + before: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + }); + }, + + after: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + }); + }, + + remove: function( selector, keepData /* Internal Use Only */ ) { + var elem, + elems = selector ? jQuery.filter( selector, this ) : this, + i = 0; + + for ( ; (elem = elems[i]) != null; i++ ) { + if ( !keepData && elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem ) ); + } + + if ( elem.parentNode ) { + if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { + setGlobalEval( getAll( elem, "script" ) ); + } + elem.parentNode.removeChild( elem ); + } + } + + return this; + }, + + empty: function() { + var elem, + i = 0; + + for ( ; (elem = this[i]) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map(function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + }); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = value.replace( rxhtmlTag, "<$1>" ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var arg = arguments[ 0 ]; + + // Make the changes, replacing each context element with the new content + this.domManip( arguments, function( elem ) { + arg = this.parentNode; + + jQuery.cleanData( getAll( this ) ); + + if ( arg ) { + arg.replaceChild( elem, this ); + } + }); + + // Force removal if there was no new content (e.g., from empty arguments) + return arg && (arg.length || arg.nodeType) ? this : this.remove(); + }, + + detach: function( selector ) { + return this.remove( selector, true ); + }, + + domManip: function( args, callback ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = this.length, + set = this, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return this.each(function( index ) { + var self = set.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + self.domManip( args, callback ); + }); + } + + if ( l ) { + fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + if ( first ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + // Support: QtWebKit + // jQuery.merge because push.apply(_, arraylike) throws + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( this[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + + if ( node.src ) { + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + } + } + } + } + } + } + + return this; + } +}); + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: QtWebKit + // .get() because push.apply(_, arraylike) throws + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +}); + + +var iframe, + elemdisplay = {}; + +/** + * Retrieve the actual display of a element + * @param {String} name nodeName of the element + * @param {Object} doc Document object + */ +// Called only from within defaultDisplay +function actualDisplay( name, doc ) { + var style, + elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + + // getDefaultComputedStyle might be reliably used only on attached element + display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? + + // Use of this method is a temporary fix (more like optimization) until something better comes along, + // since it was removed from specification and supported only in FF + style.display : jQuery.css( elem[ 0 ], "display" ); + + // We don't have any data stored on the element, + // so use "detach" method as fast way to get rid of the element + elem.detach(); + + return display; +} + +/** + * Try to determine the default display value of an element + * @param {String} nodeName + */ +function defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + + // Use the already-created iframe if possible + iframe = (iframe || jQuery( "