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/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 96% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md index b1b005ec..2cb5a0ac 100644 --- a/CONTRIBUTING.md +++ b/.github/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. diff --git a/.gitignore b/.gitignore index 535aec06..aabe272b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +.byebug_history +npm-debug.log +manifest.yaml /.bundle .DS_Store coverage @@ -10,6 +13,7 @@ Gemfile.lock docs .rbenv-* .ruby-version +.ruby-gemset .*.swp build doc @@ -20,4 +24,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 diff --git a/.rubocop.yml b/.rubocop.yml index 652f08fb..c92b709f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -10,11 +10,13 @@ AllCops: - '**/tmp/**/*' - '**/bin/**/*' - 'middleman-core/lib/middleman-core/step_definitions/**/*' - - 'middleman-core/lib/vendored-middleman-deps/**/*' - - 'middleman-cli/lib/middleman-templates/**/*' - 'middleman-core/fixtures/**/*' - 'middleman-core/features/**/*' - 'middleman-core/spec/**/*' + - 'middleman-cli/lib/middleman-cli/templates/**/*' + - 'middleman-cli/fixtures/**/*' + - 'middleman-cli/features/**/*' + - 'middleman-cli/spec/**/*' DoubleNegation: Enabled: false LineLength: @@ -25,14 +27,10 @@ ClassLength: Enabled: false Documentation: Enabled: false -Encoding: - Enabled: false HashSyntax: EnforcedStyle: ruby19 SpaceAroundEqualsInParameterDefault: EnforcedStyle: no_space -BlockDelimiters: - Enabled: false PerlBackrefs: Enabled: false ClassAndModuleChildren: @@ -41,8 +39,6 @@ AssignmentInCondition: Enabled: false CyclomaticComplexity: Enabled: false -AbcSize: - Enabled: false HandleExceptions: Enabled: false EndAlignment: @@ -56,8 +52,20 @@ FormatString: CaseIndentation: IndentWhenRelativeTo: end TrivialAccessors: - ExactNameMatch: true + Enabled: false +SingleLineBlockParams: + Enabled: false Metrics/AbcSize: Enabled: false Metrics/PerceivedComplexity: Enabled: false +Style/ParallelAssignment: + Enabled: false +Style/BlockDelimiters: + Enabled: false +Style/MultilineBlockChain: + Enabled: false +Style/SpecialGlobalVars: + Enabled: false +Style/FrozenStringLiteralComment: + Enabled: false diff --git a/.travis.yml b/.travis.yml index 36463c2b..ac5a7f06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,25 +5,19 @@ before_script: - bundle update rvm: - ruby-head - - jruby-head - - jruby-19mode - - 2.2 - - 2.1 - - 2.0 + - 2.3.1 + - 2.2.4 os: - linux - - osx + # - osx matrix: fast_finish: true allow_failures: - rvm: ruby-head - - rvm: jruby-19mode - - rvm: jruby-head env: global: - - JRUBY_OPTS='-J-Xmx1024M' - TEST=true - - CODECLIMATE_REPO_TOKEN=81787f7b1c3bfa937edadcafbc94f807bf5af5c1142c7b793f2d9969a271de1f + - CODECLIMATE_REPO_TOKEN=81787f7b1c3bfa937edadcafbc94f807bf5af5c1142c7b793f2d9969a271de1f script: bundle exec rake test notifications: slack: middleman:JW9OvXmn1m3XrSERe8866nBR diff --git a/CHANGELOG.md b/CHANGELOG.md index 4173cb0b..148aa2e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,135 @@ master === +# 4.1.13 + +* Change how config options are passed to Thor. Removes new Thor warnings from #2017 + +# 4.1.12 + +* Fix broken `ignore { |p| true }` form. + +# 4.1.11 + +* Upgrade to Rack 2. + +# 4.1.10 + +* Fix unicode issues in URL deeplinks. +* Add prefix option to asset_hash (#1949) + +# 4.1.9 + +* Fix `--watcher-*` CLI flags. +* Allow spaces in paths to work with `link_to`. Fixes #1914 +* Add support for dotenv +* Fix asset_url with asset_hash (#1919) +* Allow partial lookups without a current_resource (#1912) + +# 4.1.8 + +* Expose `development?` and `production?` helpers to template context. +* require the `try` core extension (#1911) +* Fix contract for Sitemap::Store.register_resource_list_manipulator (#1907) +* Loosen contract on Resource#source_file to Maybe[String] (#1906) +* Let collection loops access ConfigContext for helpers. #1879 +* Use https:// to clone templates (#1901) +* Allow numbers to be unique page_ids (#1886) +* Prevent infinite loop when encountering files where base filename is a possible templating engine + +# 4.1.7 + +* Upgrade fastimage to 2.0 +* Fix shutdown of external_pipeline commands when config.rb is changed. #1877 +* Allow calls to `app.` to work as collections after initial config parse. #1876 + + +# 4.1.5-4.1.6 + +* Fix file recursion when looking for possible asset dependencies. Major preview server performance improvement. + +# 4.1.4 + +* Unify default extensions for all URL processing extensions. #1855 +* Fix URL regex for `content: ` context of CSS. #1853 +* Make sure CLI config over-rides `config.rb` order. +* Fix relative assets in some contexts. #1842 + +# 4.1.3 + +* Expose all top-level config options to CLI (flags now match config. latency -> watcher_latency, etc). +* Fix directory indexes with `.htm` and `.xhtml` files. #1821 + +# 4.1.2 + +* Add `page_id` concept. Using the `id` key in frontmatter, proxy or page will set an ID on a resource which can be referenced by `url_for` and `link_to`. +* Allow looking for `Gemfile` when setting up a project to fail gracefully. +* Send correct exit code when external_pipeline fails during build. +* Fix error when customizing `layouts_dir`. #1028 +* Fix collections (commands in loops) not being processed by `page` command. #1226 +* Correctly asset_hash sourcemap references. + +# 4.1.1 + +* Fix bad code that made `/__middleman/` break. + +# 4.1.0 + +* Add rewrite_ignore option to asset_hash, asset_host, cache_buster & relative_assets. This proc let's you opt-out of the extension behavior on a per-path basis. +* gzip extension now compresses svgs by default +* Fix the `encoding` option. +* Fix relative paths on `image_tag` helper. +* Correctly exit with error code on failed `init` +* Fixed `asset_hash` when path has query string or #hashes +* Fix new extension template +* Don't parse frontmatter on ignored files. +* Fix displaying frontmatter on `/__middleman/sitemap` +* Add `skip_build_clean` config which when set to a block, will avoid removing non-generated paths from build, like .git #1716 +* Minor performance improvements +* DRY-up config.rb-specific commands like `ignore` or `path`. +* Fix automatic images with absolute (or images dir missing) paths in markdown. Fixes #1755 +* Fix asset_host in combination with Google Analytics snippet. #1751 +* Show an error message when git CLI is not available. #1765 +* Correctly show file names of GZIP'ed assets. #1364 +* Build file output is now parallel-ized! Use `middleman build --no-parallel` to disable. +* Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]` +* Remove `=` from inline url matcher. This means paths in HTML attributes MUST be quoted. Fixes #1780 + +# 4.0.0 + +* Add `:locales` and `:data` source types to the list of files which trigger a live-reload. +* Rename i18n `lang` and `langs` to `locale` and `locales`. +* Avoid matching URLs across new lines. #1689 +* Load Middleman Directory when doing `init` over SSL +* Fix `external_pipeline` first runs running out of sequence. + +# 4.0.0.rc.2 + +* 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 +* 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 + +* 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. +* Pull in `--ssl` option from stable. +* Replace `hooks` gem with custom callback solution. + +# 4.0.0.beta.1 + * Add `resources` class method to extensions to allow simple string-based resource generation. * rename `app.add_to_instance` to `Extension.expose_to_application` for adding extension-local methods to the shared app instance. * rename `app.add_to_config_context` to `Extension.expose_to_config` for adding extension-local methods to the sandboxed scope of `config.rb` -* Add `Extension.expose_to_templates`, which auto binds copies of extension-local methods into a Template context. +* Add `Extension.expose_to_template`, which auto binds copies of extension-local methods into a Template context. * Remove side-loading of CLI tasks from `tasks/` * Add the option of naming `config.rb` as `middleman.rb`. * Builder extracted from Thor. `after_build` hook now passes an instance of a Builder instead of the Thor CLI. @@ -33,3 +158,4 @@ master * Remove deprecated `request` instance * Remove old module-style extension support * Placed all `config.rb` evaluation inside the `ConfigContext` class +* The preview server can now serve over HTTPS using the `--https` flag. It will use an automatic self-signed cert which can be overridden using `--ssl_certificate` and `--ssl_private_key`. These settings can also be set in `config.rb` diff --git a/Gemfile b/Gemfile index 61e9e125..db4043a0 100644 --- a/Gemfile +++ b/Gemfile @@ -5,25 +5,34 @@ gem 'rake', '~> 10.3', require: false 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 'byebug' +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 +gem 'addressable', '~> 2.4.0', require: false + +# Pry tools +gem 'pry' +gem 'pry-stack_explorer' +gem 'pry-rescue' # Optional middleman dependencies, included for tests gem 'haml', '>= 4.0.5', require: false +gem 'sassc', '~> 1.8', 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 -gem 'sinatra', '>= 1.4', require: false -gem 'redcarpet', '>= 3.1', require: false unless RUBY_ENGINE == 'jruby' -gem 'asciidoctor', '~> 0.1', require: false +gem 'sinatra', '>= 2.0.0.beta2', require: false +gem 'redcarpet', '>= 3.1', require: false + +# Dns server to test preview server +gem 'rubydns', '~> 1.0.1', require: false + +# To test javascript +gem 'poltergeist', '~> 1.8', require: false +gem 'phantomjs', '~> 2.1.1.0', require: false # For less, note there is no compatible JS runtime for windows gem 'therubyrhino', '>= 2.0', platforms: :jruby @@ -31,12 +40,13 @@ gem 'therubyracer', '>= 0.12', platforms: :ruby # Code Quality gem 'rubocop', '~> 0.24', require: false -gem 'simplecov', '~> 0.9', require: false +gem 'simplecov', '~> 0.10', require: false gem 'coveralls', '~> 0.8', require: false gem 'codeclimate-test-reporter', '~> 0.3', require: false, group: :test # Middleman itself gem 'middleman-cli', path: 'middleman-cli' gem 'middleman-core', path: 'middleman-core' + # gem 'middleman-compass', github: 'middleman/middleman-compass', require: false # gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', require: false diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..6d2dc0e0 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,9 @@ +## Expected behavior and actual behavior + +## Steps to reproduce the problem (from a clean middleman installation) + +## Additional information + +- Ruby version: +- Middleman version: +- OS version: diff --git a/README.md b/README.md index b9b9c0b0..df4497f7 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The last few years have seen an explosion in the amount and variety of tools dev * [Sass](http://sass-lang.com/) for DRY stylesheets * [CoffeeScript](http://coffeescript.org/) for safer and less verbose javascript -* Multiple asset management solutions, including [Sprockets](https://github.com/sstephenson/sprockets) +* Multiple asset management solutions, including [Sprockets](https://github.com/rails/sprockets) * [ERb](http://ruby-doc.org/stdlib-2.0.0/libdoc/erb/rdoc/ERB.html) & [Haml](http://haml.info/) for dynamic pages and simplified HTML syntax **Middleman** gives the stand-alone developer access to all these tools and many, many more. Why would you use a stand-alone framework instead of Ruby on Rails? @@ -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 @@ -91,7 +91,7 @@ The best way to get quick responses to your issues and swift fixes to your bugs ## Donate -[Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3) +[Click here to lend your support to Middleman](https://plasso.co/s/4dXbHBorC3) ## Versioning @@ -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 diff --git a/Rakefile b/Rakefile index 8affa54c..508c3a1d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,10 +1,9 @@ -require 'rubygems' unless defined?(Gem) require 'rake' require File.expand_path('../middleman-core/lib/middleman-core/version.rb', __FILE__) ROOT = File.expand_path(File.dirname(__FILE__)) -GEM_NAME = 'middleman' +GEM_NAME = 'middleman'.freeze middleman_gems = %w(middleman-core middleman-cli middleman) GEM_PATHS = middleman_gems.freeze @@ -37,7 +36,7 @@ end desc 'Generate documentation for all middleman gems' task :doc do GEM_PATHS.each do |g| - Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake yard" } + Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake yard" } end end @@ -46,16 +45,14 @@ task :test do Rake::Task['rubocop'].invoke GEM_PATHS.each do |g| - Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake test" } + Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake test" } end - - Rake::Task['rubocop'].invoke end desc 'Run specs for all middleman gems' task :spec do GEM_PATHS.each do |g| - Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake spec" } + Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake spec" } end end diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb index 5f95c90e..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' @@ -21,15 +20,14 @@ 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| exempt_tags = ['--tags @wip'] - 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 = "--require features --color #{exempt_tags.join(' ')} --strict" # --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" end require 'rspec/core/rake_task' diff --git a/middleman-cli/Rakefile b/middleman-cli/Rakefile index a7cd6621..db0d1cb8 100644 --- a/middleman-cli/Rakefile +++ b/middleman-cli/Rakefile @@ -1,4 +1,4 @@ # coding:utf-8 -RAKE_ROOT = __FILE__ -GEM_NAME = 'middleman-cli' +RAKE_ROOT = __FILE__.freeze +GEM_NAME = 'middleman-cli'.freeze require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman index 165b7bc9..8b381a08 100755 --- a/middleman-cli/bin/middleman +++ b/middleman-cli/bin/middleman @@ -4,11 +4,37 @@ require 'middleman-core/profiling' if ARGV.include? '--profile' Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new end -Middleman::Profiling.start +# Middleman::Profiling.start require "middleman-core/load_paths" Middleman.setup_load_paths +require 'dotenv' +::Dotenv.load + +require 'middleman-core' +require 'middleman-core/logger' + +module Middleman::Cli + class << self + attr_accessor :config + end + + def self.import_config(base) + ::Middleman::Cli.config.all_settings.each do |setting| + if setting.default.is_a?(String) || setting.default.is_a?(NilClass) + base.class_option setting.key, + type: :string, + desc: setting.description + elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass) + base.class_option setting.key, + type: :boolean, + desc: setting.description + end + end + end +end + require "middleman-cli" # Change directory to the root @@ -19,5 +45,26 @@ if ARGV[0] != 'help' && (ARGV.length < 1 || ARGV.first.include?('-')) ARGV.unshift('server') end +::Middleman::Logger.singleton(3) +::Middleman::Cli.config = ::Middleman::Application.new do + # + config[:environment] = (ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development').to_sym + config[:mode] = :config + config[:exit_before_ready] = true + config[:watcher_disable] = true + config[:disable_sitemap] = true +end.config + +# Require the Middleman version +require 'middleman-core/version' + +# Include the core CLI items +require 'middleman-cli/init' +require 'middleman-cli/extension' +require 'middleman-cli/server' +require 'middleman-cli/build' +require 'middleman-cli/console' +require 'middleman-cli/config' + # Start the CLI Middleman::Cli::Base.start(ARGV) diff --git a/middleman-core/features/cli_extension.feature b/middleman-cli/features/cli_extension.feature similarity index 91% rename from middleman-core/features/cli_extension.feature rename to middleman-cli/features/cli_extension.feature index b762664c..5385a622 100644 --- a/middleman-core/features/cli_extension.feature +++ b/middleman-cli/features/cli_extension.feature @@ -9,6 +9,6 @@ Feature: Middleman New Extension CLI | Rakefile | | my-extension-library.gemspec | | features/support/env.rb | - | lib/middleman_extension.rb | + | lib/my-extension-library/extension.rb | | lib/my-extension-library.rb | | .gitignore | diff --git a/middleman-core/features/cli_init.feature b/middleman-cli/features/cli_init.feature similarity index 90% rename from middleman-core/features/cli_init.feature rename to middleman-cli/features/cli_init.feature index 1eb9e840..96595422 100644 --- a/middleman-core/features/cli_init.feature +++ b/middleman-cli/features/cli_init.feature @@ -57,11 +57,15 @@ 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 an invalid project using Middleman directory + When I run `middleman init MY_PROJECT -T does-not-exist-for-reals` + Then the exit status should be 1 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-cli/features/preview_server-hook.feature b/middleman-cli/features/preview_server-hook.feature new file mode 100644 index 00000000..15f6cba0 --- /dev/null +++ b/middleman-cli/features/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-cli/features/preview_server.feature b/middleman-cli/features/preview_server.feature new file mode 100644 index 00000000..94ecc5b2 --- /dev/null +++ b/middleman-cli/features/preview_server.feature @@ -0,0 +1,536 @@ +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 bound 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:// + """ + + @wip + 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 bound 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 bound 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 bound 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" + """ + + @wip + 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound 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 bound to ":::65432", "0.0.0.0:65432" + """ + + @wip + 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 bound 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 + @wip + 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 bound 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 + @wip + 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 bound 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-cli/features/support/env.rb b/middleman-cli/features/support/env.rb new file mode 100644 index 00000000..8044deab --- /dev/null +++ b/middleman-cli/features/support/env.rb @@ -0,0 +1,19 @@ +ENV["TEST"] = "true" + +require 'sassc' + +require 'simplecov' +SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..')) + +require 'phantomjs/poltergeist' +Capybara.javascript_driver = :poltergeist + +require 'coveralls' +Coveralls.wear! + +require 'codeclimate-test-reporter' +CodeClimate::TestReporter.start + +PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__))) +require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-cli') +require File.join(File.dirname(PROJECT_ROOT_PATH), 'middleman-core', 'lib', 'middleman-core', 'step_definitions') diff --git a/middleman-cli/fixtures/preview-server-app/bin/dns_server.rb b/middleman-cli/fixtures/preview-server-app/bin/dns_server.rb new file mode 100755 index 00000000..f4f16455 --- /dev/null +++ b/middleman-cli/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/twitter-bootstrap-app/config.rb b/middleman-cli/fixtures/preview-server-app/config.rb similarity index 100% rename from middleman-core/fixtures/twitter-bootstrap-app/config.rb rename to middleman-cli/fixtures/preview-server-app/config.rb diff --git a/middleman-cli/fixtures/preview-server-app/source/index.html.erb b/middleman-cli/fixtures/preview-server-app/source/index.html.erb new file mode 100755 index 00000000..f47aba51 --- /dev/null +++ b/middleman-cli/fixtures/preview-server-app/source/index.html.erb @@ -0,0 +1 @@ +

Welcome

\ No newline at end of file diff --git a/middleman-cli/fixtures/preview-server-app/source/layout.erb b/middleman-cli/fixtures/preview-server-app/source/layout.erb new file mode 100644 index 00000000..b72f66e9 --- /dev/null +++ b/middleman-cli/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-cli/fixtures/preview-server-app/source/layouts/custom.erb b/middleman-cli/fixtures/preview-server-app/source/layouts/custom.erb new file mode 100755 index 00000000..c8a83373 --- /dev/null +++ b/middleman-cli/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-cli/fixtures/preview-server-app/source/real.html b/middleman-cli/fixtures/preview-server-app/source/real.html new file mode 100644 index 00000000..cb312952 --- /dev/null +++ b/middleman-cli/fixtures/preview-server-app/source/real.html @@ -0,0 +1 @@ +I am real \ No newline at end of file diff --git a/middleman-cli/fixtures/preview-server-app/source/real/index.html.erb b/middleman-cli/fixtures/preview-server-app/source/real/index.html.erb new file mode 100644 index 00000000..190d84ec --- /dev/null +++ b/middleman-cli/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-cli/fixtures/preview-server-app/source/should_be_ignored.html b/middleman-cli/fixtures/preview-server-app/source/should_be_ignored.html new file mode 100644 index 00000000..fb81d5c0 --- /dev/null +++ b/middleman-cli/fixtures/preview-server-app/source/should_be_ignored.html @@ -0,0 +1 @@ +

Ignore me!

\ No newline at end of file diff --git a/middleman-cli/fixtures/preview-server-app/source/should_be_ignored2.html b/middleman-cli/fixtures/preview-server-app/source/should_be_ignored2.html new file mode 100644 index 00000000..0940fd7c --- /dev/null +++ b/middleman-cli/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-cli/fixtures/preview-server-app/source/should_be_ignored3.html b/middleman-cli/fixtures/preview-server-app/source/should_be_ignored3.html new file mode 100644 index 00000000..98007c81 --- /dev/null +++ b/middleman-cli/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-cli/fixtures/preview-server-app/source/static.html b/middleman-cli/fixtures/preview-server-app/source/static.html new file mode 100755 index 00000000..7e50df4e --- /dev/null +++ b/middleman-cli/fixtures/preview-server-app/source/static.html @@ -0,0 +1 @@ +Static, no code! \ No newline at end of file diff --git a/middleman-cli/fixtures/preview-server-hook-app/config.rb b/middleman-cli/fixtures/preview-server-hook-app/config.rb new file mode 100644 index 00000000..9892009e --- /dev/null +++ b/middleman-cli/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-cli/fixtures/preview-server-hook-app/source/index.html.erb b/middleman-cli/fixtures/preview-server-hook-app/source/index.html.erb new file mode 100644 index 00000000..ca390d46 --- /dev/null +++ b/middleman-cli/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-cli/lib/middleman-cli.rb b/middleman-cli/lib/middleman-cli.rb index 67565f3e..e17137e7 100644 --- a/middleman-cli/lib/middleman-cli.rb +++ b/middleman-cli/lib/middleman-cli.rb @@ -21,13 +21,3 @@ module Middleman::Cli end end end - -# Require the Middleman version -require 'middleman-core/version' - -# Include the core CLI items -require 'middleman-cli/init' -require 'middleman-cli/extension' -require 'middleman-cli/server' -require 'middleman-cli/build' -require 'middleman-cli/console' diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb index 46e30f2e..9e521dde 100644 --- a/middleman-cli/lib/middleman-cli/build.rb +++ b/middleman-cli/lib/middleman-cli/build.rb @@ -1,3 +1,5 @@ +require 'middleman-core/application' + # CLI Module module Middleman::Cli # The CLI Build class @@ -8,12 +10,15 @@ module Middleman::Cli class_option :environment, aliases: '-e', - default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'production', - desc: 'The environment Middleman will run under' + default: ENV['MM_ENV'] || ENV['RACK_ENV'] || :production class_option :clean, type: :boolean, default: true, desc: 'Remove orphaned files from build (--no-clean to disable)' + class_option :parallel, + type: :boolean, + default: true, + desc: 'Output files in parallel (--no-parallel to disable)' class_option :glob, type: :string, aliases: '-g', @@ -24,7 +29,7 @@ module Middleman::Cli default: false, desc: 'Print debug messages' class_option :instrument, - type: :string, + type: :boolean, default: false, desc: 'Print instrument messages' class_option :profile, @@ -32,6 +37,8 @@ module Middleman::Cli default: false, desc: 'Generate profiling report for the build' + Middleman::Cli.import_config(self) + # Core build Thor command # @return [void] def build @@ -44,34 +51,44 @@ module Middleman::Cli require 'middleman-core/builder' require 'fileutils' - env = options['environment'].to_sym verbose = options['verbose'] ? 0 : 1 instrument = options['instrument'] - @app = ::Middleman::Application.new do - config[:mode] = :build - config[:environment] = env - config[:show_exceptions] = false - ::Middleman::Logger.singleton(verbose, instrument) + builder = nil + cli_options = options + + ::Middleman::Logger.singleton(verbose, instrument) + + ::Middleman::Util.instrument 'builder.setup' do + @app = ::Middleman::Application.new do + config[:mode] = :build + config[:show_exceptions] = false + config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum| + sum[k] = v + end + end + + builder = Middleman::Builder.new(@app, + glob: options['glob'], + clean: options['clean'], + parallel: options['parallel']) + builder.thor = self + builder.on_build_event(&method(:on_event)) end - builder = Middleman::Builder.new(@app, - glob: options['glob'], - clean: options['clean'], - parallel: options['parallel']) - builder.thor = self - builder.on_build_event(&method(:on_event)) + ::Middleman::Util.instrument 'builder.run' do + if builder.run! + clean_directories! if options['clean'] + shell.say 'Project built successfully.' + else + msg = 'There were errors during this build' + unless options['verbose'] + msg << ', re-run with `middleman build --verbose` to see the full exception.' + end + shell.say msg, :red - if builder.run! - clean_directories! if options['clean'] - else - msg = 'There were errors during this build' - unless options['verbose'] - msg << ', re-run with `middleman build --verbose` to see the full exception.' + exit(1) end - shell.say msg, :red - - exit(1) end end diff --git a/middleman-cli/lib/middleman-cli/config.rb b/middleman-cli/lib/middleman-cli/config.rb new file mode 100644 index 00000000..add8730a --- /dev/null +++ b/middleman-cli/lib/middleman-cli/config.rb @@ -0,0 +1,41 @@ +# 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' + require 'middleman-core/logger' + + opts = { + environment: options['environment'] + } + + # Don't output info messages + ::Middleman::Logger.singleton(2, false) + + app = ::Middleman::Application.new do + config[:mode] = :config + config[:disable_sitemap] = true + config[:watcher_disable] = true + config[:exit_before_ready] = true + 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-cli/lib/middleman-cli/extension.rb b/middleman-cli/lib/middleman-cli/extension.rb index 1b079f4d..69e073fb 100644 --- a/middleman-cli/lib/middleman-cli/extension.rb +++ b/middleman-cli/lib/middleman-cli/extension.rb @@ -30,8 +30,8 @@ module Middleman::Cli template 'extension/Rakefile', File.join(name, 'Rakefile') template 'extension/gemspec', File.join(name, "#{name}.gemspec") template 'extension/Gemfile', File.join(name, 'Gemfile') - template 'extension/lib/middleman_extension.rb', File.join(name, 'lib', 'middleman_extension.rb') template 'extension/lib/lib.rb', File.join(name, 'lib', "#{name}.rb") + template 'extension/lib/lib/extension.rb', File.join(name, 'lib', name, 'extension.rb') template 'extension/features/support/env.rb', File.join(name, 'features', 'support', 'env.rb') empty_directory File.join(name, 'fixtures') end diff --git a/middleman-cli/lib/middleman-cli/init.rb b/middleman-cli/lib/middleman-cli/init.rb index bcb72400..e8e5770c 100644 --- a/middleman-cli/lib/middleman-cli/init.rb +++ b/middleman-cli/lib/middleman-cli/init.rb @@ -4,6 +4,8 @@ module Middleman::Cli class Init < Thor::Group include Thor::Actions + GIT_CMD = 'git'.freeze + check_unknown_options! argument :target, type: :string, default: '.' @@ -25,11 +27,18 @@ module Middleman::Cli require 'fileutils' require 'tmpdir' + unless git_present? + msg = 'You need to install the git command line tool to initialize a new project. ' + msg << "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git" + say msg, :red + exit 1 + end + repo_path, repo_branch = if shortname?(options[:template]) require 'open-uri' require 'json' - api = 'http://directory.middlemanapp.com/api' + api = 'https://directory.middlemanapp.com/api' uri = ::URI.parse("#{api}/#{options[:template]}.json") begin @@ -39,7 +48,7 @@ module Middleman::Cli rescue ::OpenURI::HTTPError say "Template `#{options[:template]}` not found in Middleman Directory." say 'Did you mean to use a full `user/repo` path?' - exit + exit 1 end else repo_name, repo_branch = options[:template].split('#') @@ -51,11 +60,12 @@ module Middleman::Cli begin branch_cmd = repo_branch ? "-b #{repo_branch} " : '' - run("git clone --depth 1 #{branch_cmd}#{repo_path} #{dir}") + git_path = "#{branch_cmd}#{repo_path}" + run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}") - unless File.directory?(dir) - say 'Git clone failed, maybe the url is invalid or you don\'t have the permissions?', :red - exit + unless $?.success? + say "Git clone command failed. Make sure git repository exists: #{git_path}", :red + exit 1 end inside(target) do @@ -79,12 +89,31 @@ module Middleman::Cli protected + # Copied from Bundler + def git_present? + return @git_present if defined?(@git_present) + @git_present = which(GIT_CMD) || which('git.exe') + end + + # Copied from Bundler + def which(executable) + if File.file?(executable) && File.executable?(executable) + executable + elsif ENV['PATH'] + path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p| + abs_path = File.join(p, executable) + File.file?(abs_path) && File.executable?(abs_path) + end + path && File.expand_path(executable, path) + end + end + def shortname?(repo) repo.split('/').length == 1 end def repository_path(repo) - repo.include?('://') || repo.include?('git@') ? repo : "git://github.com/#{repo}.git" + repo.include?('://') || repo.include?('git@') ? repo : "https://github.com/#{repo}.git" end # Add to CLI diff --git a/middleman-cli/lib/middleman-cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb index 75a8cbfa..85e75a9f 100644 --- a/middleman-cli/lib/middleman-cli/server.rb +++ b/middleman-cli/lib/middleman-cli/server.rb @@ -5,41 +5,32 @@ module Middleman::Cli check_unknown_options! class_option :environment, - aliases: '-e', - default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', - desc: 'The environment Middleman will run under' - class_option :host, - type: :string, - aliases: '-h', - desc: 'Bind to HOST address' + aliases: '-e' class_option :port, - aliases: '-p', - desc: 'The port Middleman will listen on' + aliases: '-p' + class_option :server_name, + aliases: '-s' + class_option :bind_address, + aliases: '-b' class_option :verbose, type: :boolean, default: false, desc: 'Print debug messages' class_option :instrument, - type: :string, - default: false, - desc: 'Print instrument messages' - class_option :disable_watcher, type: :boolean, default: false, - desc: 'Disable the file change and delete watcher process' + desc: 'Print instrument messages' class_option :profile, type: :boolean, default: false, desc: 'Generate profiling report for server startup' - class_option :force_polling, + class_option :daemon, type: :boolean, + aliases: '-d', default: false, - desc: 'Force file watcher into polling mode' - class_option :latency, - type: :numeric, - aliases: '-l', - default: 0.5, - desc: 'Set file watcher latency, in seconds' + desc: 'Daemonize preview server' + + Middleman::Cli.import_config(self) # Start the server def server @@ -52,19 +43,14 @@ module Middleman::Cli end params = { - port: options['port'], - host: options['host'], - environment: options['environment'], debug: options['verbose'], instrumenting: options['instrument'], - disable_watcher: options['disable_watcher'], reload_paths: options['reload_paths'], - force_polling: options['force_polling'], - latency: options['latency'] + daemon: options['daemon'] } puts '== The Middleman is loading' - ::Middleman::PreviewServer.start(params) + ::Middleman::PreviewServer.start(params, options) end # Add to CLI 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..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 --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}" + t.cucumber_opts = '--color --tags ~@wip --strict' end require 'rake/clean' diff --git a/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb index 8a3c5dc6..48038a71 100644 --- a/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb +++ b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb @@ -1,38 +1,6 @@ -# Require core library -require 'middleman-core' +require "middleman-core" -# Extension namespace -class MyExtension < ::Middleman::Extension - option :my_option, 'default', 'An example option' - - def initialize(app, options_hash={}, &block) - # Call super to build options from the options_hash - super - - # Require libraries only when activated - # require 'necessary/library' - - # set up your extension - # puts options.my_option - end - - def after_configuration - # Do something - end - - # A Sitemap Manipulator - # def manipulate_resource_list(resources) - # end - - # helpers do - # def a_helper - # end - # end +Middleman::Extensions.register :<%= name %> do + require "my-extension/extension" + MyExtension end - -# Register extensions which can be activated -# Make sure we have the version of Middleman we expect -# Name param may be omited, it will default to underscored -# version of class name - -# MyExtension.register(:my_extension) diff --git a/middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb new file mode 100644 index 00000000..f831386f --- /dev/null +++ b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb @@ -0,0 +1,31 @@ +# Require core library +require 'middleman-core' + +# Extension namespace +class MyExtension < ::Middleman::Extension + option :my_option, 'default', 'An example option' + + def initialize(app, options_hash={}, &block) + # Call super to build options from the options_hash + super + + # Require libraries only when activated + # require 'necessary/library' + + # set up your extension + # puts options.my_option + end + + def after_configuration + # Do something + end + + # A Sitemap Manipulator + # def manipulate_resource_list(resources) + # end + + # helpers do + # def a_helper + # end + # end +end diff --git a/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb deleted file mode 100644 index 6fba3c06..00000000 --- a/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb +++ /dev/null @@ -1 +0,0 @@ -require '<%= name %>' diff --git a/middleman-cli/middleman-cli.gemspec b/middleman-cli/middleman-cli.gemspec index 05f5c456..e9447a9c 100644 --- a/middleman-cli/middleman-cli.gemspec +++ b/middleman-cli/middleman-cli.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0") s.executable = 'middleman' s.require_path = 'lib' - s.required_ruby_version = '>= 1.9.3' + s.required_ruby_version = '>= 2.2.0' # CLI s.add_dependency('thor', ['>= 0.17.0', '< 2.0']) 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/Rakefile b/middleman-core/Rakefile index c36c1d35..198f09ee 100644 --- a/middleman-core/Rakefile +++ b/middleman-core/Rakefile @@ -1,5 +1,4 @@ # coding:utf-8 -RAKE_ROOT = __FILE__ +RAKE_ROOT = __FILE__.freeze GEM_NAME = ENV['NAME'] || 'middleman-core' -require 'rubygems' require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') 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 diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature index ea3b9d67..7c173800 100644 --- a/middleman-core/features/asset_hash.feature +++ b/middleman-core/features/asset_hash.feature @@ -12,7 +12,7 @@ Feature: Assets get file hashes appended to them and references to them are upda | images/300px-59adce76.jpg | | images/100px-5fd6fb90.gif | | javascripts/application-1d8d5276.js | - | stylesheets/site-7474cadd.css | + | stylesheets/site-8bc55985.css | | index.html | | subdir/index.html | | other/index.html | @@ -26,21 +26,21 @@ Feature: Assets get file hashes appended to them and references to them are upda | stylesheets/site.css | And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'" - And the file "stylesheets/site-7474cadd.css" should contain: + And the file "stylesheets/site-8bc55985.css" should contain: """ background-image: url("../images/100px-5fd6fb90.jpg") """ And the file "index.html" should contain 'href="apple-touch-icon.png"' - And the file "index.html" should contain 'href="stylesheets/site-7474cadd.css"' + And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"' And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"' And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"' - And the file "subdir/index.html" should contain 'href="../stylesheets/site-7474cadd.css"' + And the file "subdir/index.html" should contain 'href="../stylesheets/site-8bc55985.css"' And the file "index.html" should contain 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"' And the file "index.html" should contain 'src="images/100px-5fd6fb90.gif"' And the file "index.html" should contain 'src="images/100px-1242c368.png"' And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"' And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"' - And the file "other/index.html" should contain 'href="../stylesheets/site-7474cadd.css"' + And the file "other/index.html" should contain 'href="../stylesheets/site-8bc55985.css"' And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"' And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"' And the file "api.json" should contain 'images/100px-5fd6fb90.gif' @@ -50,26 +50,42 @@ Feature: Assets get file hashes appended to them and references to them are upda And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.jpg' And the file "subdir/api.json" should contain 'images/100px-1242c368.png' + Scenario: Hashed fonts assets work with woff and woff2 extension + Given a successfully built app at "asset-hash-app" + When I cd to "build" + Then the following files should exist: + | fonts/fontawesome-webfont-56ce13e7.woff | + | fonts/fontawesome-webfont-10752316.woff2 | + And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "src: url('../fonts/fontawesome-webfont-10752316.woff2')" + And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "url('../fonts/fontawesome-webfont-56ce13e7.woff')" + Scenario: Hashed assets work in preview server 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-d1a750ca.css"' + And I should see 'href="stylesheets/fragment-99b76247.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"' + And I should see 'src="images/100px-5fd6fb90.jpg?test"' + And I should see 'src="images/100px-5fd6fb90.jpg?#test"' + And I should see 'src="images/100px-5fd6fb90.jpg#test"' When I go to "/subdir/" - Then I should see 'href="../stylesheets/site-7474cadd.css"' + Then I should see 'href="../stylesheets/site-d1a750ca.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-d1a750ca.css"' And I should see 'src="../javascripts/application-1d8d5276.js"' And I should see 'src="../images/100px-5fd6fb90.jpg"' + And I should see 'src="../images/100px-5fd6fb90.jpg?test"' + And I should see 'src="../images/100px-5fd6fb90.jpg?#test"' + And I should see 'src="../images/100px-5fd6fb90.jpg#test"' 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" - Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")' + When I go to "/stylesheets/site-d1a750ca.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' And I should see 'images/100px-5fd6fb90.jpg' @@ -78,6 +94,11 @@ Feature: Assets get file hashes appended to them and references to them are upda Then I should see 'images/100px-5fd6fb90.gif' And I should see 'images/100px-5fd6fb90.jpg' And I should see 'images/100px-1242c368.png' + When I go to "/stylesheets/fragment-99b76247.css" + And I should see 'url("../images/100px-5fd6fb90.jpg");' + And I should see 'url("../images/100px-5fd6fb90.jpg?test");' + And I should see 'url("../images/100px-5fd6fb90.jpg?#test");' + And I should see 'url("../images/100px-5fd6fb90.jpg#test");' Scenario: Hashed assets work with Slim Given the Server is running at "asset-hash-app" @@ -86,17 +107,69 @@ Feature: Assets get file hashes appended to them and references to them are upda 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"' - Scenario: Enabling an asset host still produces hashed files and references + Scenario: Enabling an asset host still produces hashed files and references (hash first) + Given a fixture app "asset-hash-host-app" + And a file named "config.rb" with: + """ + set :sass_source_maps, false + activate :asset_hash + activate :directory_indexes + activate :asset_host, host: 'http://middlemanapp.com' + """ 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-7474cadd.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"' 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-7474cadd.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-7474cadd.css"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"' + When I go to "/stylesheets/fragment-2902933e.css" + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");' + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");' + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");' + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test");' + + Scenario: Enabling an asset host still produces hashed files and references (host first) + Given a fixture app "asset-hash-host-app" + And a file named "config.rb" with: + """ + set :sass_source_maps, false + activate :asset_host, host: 'http://middlemanapp.com' + activate :directory_indexes + activate :asset_hash + """ + Given the Server is running at "asset-hash-host-app" + When I go to "/" + Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"' + Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"' + When I go to "/subdir/" + Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.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-7474cadd.css"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"' + And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"' + When I go to "/stylesheets/fragment-2902933e.css" + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")' + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")' + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")' + And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")' Scenario: The asset hash should change when a SASS partial changes Given the Server is running at "asset-hash-app" @@ -106,14 +179,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-4d4e34e6.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-ec347271.css' Scenario: The asset hash should change when a Rack-based filter changes Given a fixture app "asset-hash-app" @@ -127,12 +200,10 @@ 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 'background-image' + Then I should see 'href="stylesheets/site-5ad7def0.css' + When I go to "stylesheets/site-5ad7def0.css" + Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")' Then I should see 'Added by Rack filter' - When I go to "stylesheets/site-7474cadd.css" - Then I should see 'Not Found' Scenario: Hashed-asset files are not produced for ignored paths Given a fixture app "asset-hash-app" @@ -170,16 +241,84 @@ Feature: Assets get file hashes appended to them and references to them are upda | javascripts/application-1d8d5276.js | | stylesheets/site-7474cadd.css | - # @wip Currently broken, we should move all asset-host functionality out of Compass and into something more similar to asset_hash with Rack-based rewrites - # Scenario: Enabling an asset host and referencing assets in CSS with URL fragments are rewritten correctly - # Given a successfully built app at "asset-hash-host-app" - # When I cd to "build" + Scenario: Hashed-asset files are not replaced for rewrite ignored paths + Given a fixture app "asset-hash-app" + And a file named "config.rb" with: + """ + is_stylesheet = proc { |path| path.start_with? '/stylesheets' } + activate :asset_hash, rewrite_ignore: [ + %r(javascripts/*), + '/subdir/*', + is_stylesheet + ] + activate :relative_assets + activate :directory_indexes + """ + And a successfully built app at "asset-hash-app" + When I cd to "build" + Then the following files should exist: + | index.html | + | subdir/index.html | + | images/100px-5fd6fb90.jpg | + | javascripts/application-1d8d5276.js | + | stylesheets/site-8bc55985.css | + And the following files should not exist: + | images/100px.jpg | + | javascripts/application.js | + | stylesheets/site.css | + And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px.jpg'" + And the file "stylesheets/site-8bc55985.css" should contain: + """ + background-image: url("../images/100px.jpg") + """ + And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"' + And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"' + And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"' + And the file "subdir/index.html" should contain: + """ +

Image url3:

+

+ """ - # Then the following files should exist: - # | images/100px-5fd6fb90.jpg | - # | stylesheets/fragment-c058ecb2.css | - # And the following files should not exist: - # | images/100px.jpg | + Scenario: Already minified files should still be hashed + Given a successfully built app at "asset-hash-minified-app" + When I cd to "build" + Then the following files should exist: + | javascripts/jquery.min-276c87ff.js | + | stylesheets/test-7de2ad06.css | + And the following files should not exist: + | javascripts/jquery.min.js | + And the file "stylesheets/test-7de2ad06.css" should contain: + """ + .no-bug{background-image:url(/images/100px-5fd6fb90.jpg)} + .bug{content:"";background-image:url(/images/100px-5fd6fb90.jpg)} + .no-bug{content:""; background-image:url(/images/100px-5fd6fb90.jpg)} + """ - # And the file "stylesheets/fragment-c058ecb2.css" should contain "http://middlemanapp.com/images/100px-5fd6fb90.jpg#test" - # And the file "stylesheets/fragment-c058ecb2.css" should not contain "http://middlemanapp.com/images/100px.jpg#test" + Scenario: Source map paths include the hash + Given a successfully built app at "asset-hash-source-map" + When I cd to "build" + Then the following files should exist: + | index.html | + | javascripts/application-4553338c.js | + | javascripts/application.js-22cc2b5f.map | + | index.html | + And the following files should not exist: + | javascripts/application.js | + | javascripts/application.js.map | + + And the file "javascripts/application-4553338c.js" should contain "//# sourceMappingURL=application.js-22cc2b5f.map" + + Scenario: Hashes can contain a prefix + Given a successfully built app at "asset-hash-prefix" + When I cd to "build" + Then the following files should exist: + | index.html | + | javascripts/application-myprefix-4553338c.js | + | javascripts/application.js-myprefix-22cc2b5f.map | + | index.html | + And the following files should not exist: + | javascripts/application.js | + | javascripts/application.js.map | + + And the file "javascripts/application-myprefix-4553338c.js" should contain "//# sourceMappingURL=application.js-myprefix-22cc2b5f.map" diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature index bcd4c06c..0433b61b 100644 --- a/middleman-core/features/asset_host.feature +++ b/middleman-core/features/asset_host.feature @@ -8,19 +8,25 @@ Feature: Alternate between multiple asset hosts """ And the Server is running When I go to "/asset_host.html" + Then I should see "'.google-analytics.com/ga.js'" 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/} Then I should not see content matching %r{http://assets1.example.com//} + When I go to "/javascripts/asset_host.js" + Then I should not see content matching %r{http://assets1.example.com/} Scenario: Set proc host with inline-option Given a fixture app "asset-host-app" And a file named "config.rb" with: """ activate :asset_host, host: Proc.new { |asset| - "http://assets%d.example.com" % (asset.hash % 4) + hash = Digest::MD5.digest(asset).bytes.map!(&:ord).reduce(&:+) + "http://assets%d.example.com" % (hash % 4) } """ And the Server is running @@ -28,6 +34,22 @@ 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/} - 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//} + + Scenario: Hosts are not rewritten for rewrite ignored paths + Given a fixture app "asset-host-app" + And a file named "config.rb" with: + """ + activate :asset_host, host: "http://assets1.example.com", rewrite_ignore: [ + '/stylesheets/asset_host.css', + ] + """ + And the Server is running + When I go to "/asset_host.html" + Then I should see content matching %r{http://assets1.example.com/} + When I go to "/stylesheets/asset_host.css" + Then I should not see content matching %r{http://assets1.example.com/} diff --git a/middleman-core/features/automatic_image_sizes.feature b/middleman-core/features/automatic_image_sizes.feature index 89f9d7a5..50a0b02e 100644 --- a/middleman-core/features/automatic_image_sizes.feature +++ b/middleman-core/features/automatic_image_sizes.feature @@ -2,15 +2,28 @@ Feature: Automatically detect and insert image dimensions into tags In order to speed up development and appease YSlow Scenario: Rendering an image with the feature disabled - Given "automatic_image_sizes" feature is "disabled" + Given a fixture app "automatic-image-size-app" + And a file named "config.rb" with: + """ + """ And the Server is running at "automatic-image-size-app" When I go to "/auto-image-sizes.html" Then I should not see "width=" And I should not see "height=" - + When I go to "/markdown-sizes.html" + Then I should not see "width=" + And I should not see "height=" + Scenario: Rendering an image with the feature enabled - Given "automatic_image_sizes" feature is "enabled" + Given a fixture app "automatic-image-size-app" + And a file named "config.rb" with: + """ + activate :automatic_image_sizes + """ And the Server is running at "automatic-image-size-app" When I go to "/auto-image-sizes.html" - Then I should see "width=" - And I should see "height=" \ No newline at end of file + Then I should see 'width="1"' + And I should see 'height="1"' + When I go to "/markdown-sizes.html" + Then I should see 'width="1"' + And I should see 'height="1"' diff --git a/middleman-core/features/builder.feature b/middleman-core/features/builder.feature index 92e4310d..d99c165c 100644 --- a/middleman-core/features/builder.feature +++ b/middleman-core/features/builder.feature @@ -20,13 +20,13 @@ Feature: Builder | layout | | layouts/custom | | layouts/content_for | - + And the file "index.html" should contain "Comment in layout" And the file "index.html" should contain "

Welcome

" And the file "static.html" should contain "Static, no code!" And the file "services/index.html" should contain "Services" And the file "stylesheets/static.css" should contain "body" - + Scenario: Build glob Given a successfully built app at "glob-app" with flags "--glob '*.css'" When I cd to "build" @@ -34,16 +34,28 @@ Feature: Builder | index.html | Then the following files should exist: | stylesheets/site.css | - + Scenario: Build with errors Given a built app at "build-with-errors-app" Then the exit status should be 1 - + Scenario: Build empty errors Given a built app at "empty-app" Then the exit status should be 1 + Scenario: Build external_pipeline errors + Given a built app at "external-pipeline-error" + Then the exit status should be 1 + Scenario: Build alias (b) Given a fixture app "large-build-app" When I run `middleman b` - Then was successfully built \ No newline at end of file + Then was successfully built + + Scenario: Builded text file(ex: html, css, xml, txt)'s permission is 0644 + Given a successfully built app at "large-build-app" + When I cd to "build" + Then the mode of filesystem object "index.html" should match "0644" + And the mode of filesystem object "stylesheets/static.css" should match "0644" + And the mode of filesystem object "feed.xml" should match "0644" + And the mode of filesystem object ".htaccess" should match "0644" diff --git a/middleman-core/features/cache_buster.feature b/middleman-core/features/cache_buster.feature index d452234e..bea898e3 100644 --- a/middleman-core/features/cache_buster.feature +++ b/middleman-core/features/cache_buster.feature @@ -39,4 +39,18 @@ Feature: Generate mtime-based query string for busting browser caches And the Server is running at "cache-buster-app" When I go to "/cache-buster.html" Then I should see "site.css?" - Then I should see "blank.gif?" \ No newline at end of file + Then I should see "blank.gif?" + + Scenario: URLs are not rewritten for rewrite ignored paths + Given a fixture app "cache-buster-app" + And a file named "config.rb" with: + """ + activate :cache_buster, rewrite_ignore: [ + '/cache-buster.html', + ] + """ + And the Server is running at "cache-buster-app" + When I go to "/cache-buster.html" + Then I should see 'site.css"' + Then I should see 'empty-with-include.js"' + Then I should see 'blank.gif"' diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature index 7f538b65..27135bf6 100644 --- a/middleman-core/features/chained_templates.feature +++ b/middleman-core/features/chained_templates.feature @@ -7,16 +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.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.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" @@ -29,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 @@ -58,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 @@ -87,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/features/clean_build.feature b/middleman-core/features/clean_build.feature index e5254df4..60c18578 100644 --- a/middleman-core/features/clean_build.feature +++ b/middleman-core/features/clean_build.feature @@ -16,6 +16,22 @@ Feature: Build Clean | build/should_be_ignored3.html | And the file "build/index.html" should contain "Comment in layout" + Scenario: Clean build has a whitelist + Given a fixture app "clean-app" + When a file named "build/.test" with: + """ + Hello + """ + When a file named "config.rb" with: + """ + set :skip_build_clean do |path| + path =~ /\.test/ + end + """ + Given a built app at "clean-app" + Then the following files should exist: + | build/.test | + Scenario: Clean build an app with newly ignored files and a nested output directory Given a fixture app "clean-nested-app" When a file named "config.rb" with: @@ -42,3 +58,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/features/collections.feature b/middleman-core/features/collections.feature index 5b4f5625..2d313a3c 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" @@ -144,6 +144,33 @@ Feature: Collections And I should see 'Article: Blog3 Another Article' And I should see 'Article: Blog2 Yet Another Article' + Scenario: Work with local helpers + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + module TestHelper + def help_me + "ok" + end + end + + include TestHelper + + data.articles.each_with_index do |a, i| + proxy "/#{i}-#{help_me}.html", a + end + """ + And a file named "data/articles.yaml" with: + """ + --- + - "/blog1/2011-01-01-new-article.html" + - "/blog2/2011-01-02-another-article.html" + """ + Given the Server is running at "collections-app" + When I go to "0-ok.html" + Then I should see 'Newer Article Content' + When I go to "1-ok.html" + Then I should see 'Another Article Content' Scenario: Collected data update with file changes Given a fixture app "collections-app" @@ -192,4 +219,47 @@ Feature: Collections Then I should see 'Newer Article Content' When I go to "2.html" Then I should see 'Again' - \ No newline at end of file + + Scenario: Arbitrary live datasets + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + ignore "/description_template.html" + + live { + Dir[File.join(root, "descriptions/*.txt")] + }.each do |description_name| + base = File.basename(description_name, '.txt') + proxy "#{base}.html", "/description_template.html", locals: { + contents: File.read(description_name) + } + end + """ + And a file named "source/description_template.html.erb" with: + """ + <%= contents %> + """ + And a file named "descriptions/test1.txt" with: + """ + Test1 + """ + Given the Server is running at "collections-app" + When I go to "test1.html" + Then I should see 'Test1' + When I go to "test2.html" + Then I should see 'Not Found' + + When the file "descriptions/test2.txt" has the contents + """ + Test2 + """ + When I go to "test1.html" + Then I should see 'Test1' + When I go to "test2.html" + Then I should see 'Test2' + + When the file "descriptions/test1.txt" is removed + When I go to "test1.html" + Then I should see 'Not Found' + When I go to "test2.html" + Then I should see 'Test2' diff --git a/middleman-core/features/content_type.feature b/middleman-core/features/content_type.feature index 96c88ccc..8d05d6a5 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/custom_layouts.feature b/middleman-core/features/custom_layouts.feature index 27f7df08..dfe52344 100644 --- a/middleman-core/features/custom_layouts.feature +++ b/middleman-core/features/custom_layouts.feature @@ -11,6 +11,22 @@ Feature: Custom layouts When I go to "/custom-layout.html" Then I should see "Custom Layout" + Scenario: Using custom :layout attribute with proxy + Given a fixture app "custom-layout-app2" + And a file named "config.rb" with: + """ + page '/test/*', layout: :custom + proxy "/test/me.html", "/custom-layout.html" + live { %w(you) }.each do |who| + proxy "/test/#{who}.html", "/custom-layout.html" + end + """ + And the Server is running at "custom-layout-app2" + When I go to "/test/me.html" + Then I should see "Custom Layout" + When I go to "/test/you.html" + Then I should see "Custom Layout" + Scenario: Using custom :layout attribute with folders Given a fixture app "custom-layout-app2" And a file named "config.rb" with: @@ -65,4 +81,4 @@ Feature: Custom layouts When I go to "/path/index.html" Then I should see "Alt" And I should see "Monde" - And I should not see "Hello" \ No newline at end of file + And I should not see "Hello" 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/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/features/directory_index.feature b/middleman-core/features/directory_index.feature index f8c87a21..ddbd703f 100644 --- a/middleman-core/features/directory_index.feature +++ b/middleman-core/features/directory_index.feature @@ -9,6 +9,7 @@ Feature: Directory Index | a_folder/needs_index/index.html | | leave_me_alone.html | | wildcard_leave_me_alone.html | + | regex_leave_me_alone2.html | | evil spaces/index.html | | regular/index.html | | .htaccess | @@ -21,12 +22,13 @@ Feature: Directory Index | a_folder/needs_index.html | | leave_me_alone/index.html | | wildcard_leave_me_alone/index.html | + | regex_leave_me_alone2/index.html | And the file "needs_index/index.html" should contain "Indexable" And the file "a_folder/needs_index/index.html" should contain "Indexable" And the file "leave_me_alone.html" should contain "Stay away" And the file "regular/index.html" should contain "Regular" And the file "evil spaces/index.html" should contain "Filled with Evil Spaces" - + Scenario: Preview normal file Given the Server is running at "indexable-app" When I go to "/needs_index/" diff --git a/middleman-core/features/dynamic_pages.feature b/middleman-core/features/dynamic_pages.feature index 6d1b59ac..fc886ffd 100644 --- a/middleman-core/features/dynamic_pages.feature +++ b/middleman-core/features/dynamic_pages.feature @@ -31,7 +31,8 @@ Feature: Dynamic Pages | should_be_ignored6.html | | should_be_ignored7.html | | should_be_ignored8.html | - + | should_be_ignored9.html | + Scenario: Preview basic proxy Given the Server is running at "dynamic-pages-app" When I go to "/fake.html" @@ -42,46 +43,46 @@ Feature: Dynamic Pages Then I should see "I am real" When I go to "/fake4.html" Then I should see "I am real" - + Scenario: Preview proxy with variable one Given the Server is running at "dynamic-pages-app" When I go to "/fake/one.html" Then I should see "I am real: one" Then I should see "Global: I am one glob" Then I should see "All: I am all glob" - + When I go to "/fake2/one.html" Then I should see "I am real: one" Then I should see "Global: I am two glob" Then I should see "All: I am all glob" - + When I go to "/fake3/one.html" Then I should see "I am real: one" Then I should see "Global: I am three glob" Then I should see "All: I am all glob" - + When I go to "/fake4/one.html" Then I should see "I am real: one" Then I should see "Global: I am four glob" Then I should see "All: I am all glob" - + Scenario: Preview proxy with variable two Given the Server is running at "dynamic-pages-app" When I go to "/fake/two.html" Then I should see "I am real: two" Then I should see "Global: I am one glob" Then I should see "All: I am all glob" - + When I go to "/fake2/two.html" Then I should see "I am real: two" Then I should see "Global: I am two glob" Then I should see "All: I am all glob" - + When I go to "/fake3/two.html" Then I should see "I am real: two" Then I should see "Global: I am three glob" Then I should see "All: I am all glob" - + When I go to "/fake4/two.html" Then I should see "I am real: two" Then I should see "Global: I am four glob" @@ -101,7 +102,7 @@ Feature: Dynamic Pages Then the file "fake3/one.html" should contain "I am real: one" Then the file "fake3/one.html" should contain "Global: I am three glob" Then the file "fake3/one.html" should contain "All: I am all glob" - + Scenario: Target ignore Given the Server is running at "dynamic-pages-app" When I go to "/target_ignore.html" @@ -112,7 +113,7 @@ Feature: Dynamic Pages Then I should see "Ignore me! 7" When I go to "/target_ignore4.html" Then I should see "Ignore me! 8" - + Scenario: Preview ignored paths Given the Server is running at "dynamic-pages-app" When I go to "/should_be_ignored.html" @@ -130,4 +131,6 @@ Feature: Dynamic Pages When I go to "/should_be_ignored7.html" Then I should see "File Not Found" When I go to "/should_be_ignored8.html" - Then I should see "File Not Found" \ No newline at end of file + Then I should see "File Not Found" + When I go to "/should_be_ignored9.html" + Then I should see "File Not Found" diff --git a/middleman-core/features/encoding_option.feature b/middleman-core/features/encoding_option.feature new file mode 100644 index 00000000..6244e420 --- /dev/null +++ b/middleman-core/features/encoding_option.feature @@ -0,0 +1,28 @@ +# encoding: iso-8859-1 +Feature: encoding option + + Scenario: No encoding set + Given a fixture app "clean-app" + Given the Server is running at "clean-app" + + When I go to "/index.html" + Then the "Content-Type" header should contain "text/html" + Then the "Content-Type" header should contain "charset=utf-8" + + @wip + Scenario: Custom encoding set + Given a fixture app "i-8859-1-app" + And a file named "config.rb" with: + """ + set :encoding, "ISO-8859-1" + + ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=iso-8859-1' + ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=iso-8859-1' + ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=iso-8859-1' + """ + Given the Server is running at "i-8859-1-app" + + When I go to "/index.html" + Then the "Content-Type" header should contain "text/html" + Then the "Content-Type" header should contain "charset=iso-8859-1" + Then I should see "äöü" 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/features/extension_hooks.feature b/middleman-core/features/extension_hooks.feature new file mode 100644 index 00000000..1dedd9a9 --- /dev/null +++ b/middleman-core/features/extension_hooks.feature @@ -0,0 +1,13 @@ +Feature: Extension author could use some hooks + + Scenario: When build + Given a fixture app "extension-hooks-app" + When I run `middleman build` + Then the exit status should be 0 + And the output should contain "/// after_configuration ///" + And the output should contain "/// ready ///" + And the output should contain "/// before_build ///" + And the output should contain "/// before ///" + And the output should contain "/// before_render ///" + And the output should contain "/// after_render ///" + And the output should contain "/// after_build ///" diff --git a/middleman-core/features/front-matter-neighbor.feature b/middleman-core/features/front-matter-neighbor.feature index 08b4f57c..9260ff41 100644 --- a/middleman-core/features/front-matter-neighbor.feature +++ b/middleman-core/features/front-matter-neighbor.feature @@ -22,7 +22,7 @@ Feature: Neighboring YAML Front Matter Then I should not see "---" When I go to "/raw-front-matter.php.frontmatter" Then I should see "File Not Found" - + Scenario: YAML not on first line, with encoding Given the Server is running at "frontmatter-neighbor-app" When I go to "/front-matter-encoding.html" @@ -30,23 +30,12 @@ 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 " + FileA <%= current_page.data.title %> """ And the file "source/front-matter-change.html.erb.frontmatter" has the contents """ @@ -54,6 +43,8 @@ Feature: Neighboring YAML Front Matter title: Hello World layout: false --- + + FileB """ When I go to "/front-matter-change.html" Then I should see "Hello World" @@ -63,6 +54,8 @@ Feature: Neighboring YAML Front Matter title: Hola Mundo layout: false --- + + FileC """ When I go to "/front-matter-change.html" Then I should see "Hola Mundo" diff --git a/middleman-core/features/front-matter.feature b/middleman-core/features/front-matter.feature index df5e9b5e..64bcb94b 100644 --- a/middleman-core/features/front-matter.feature +++ b/middleman-core/features/front-matter.feature @@ -28,40 +28,23 @@ 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" 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/features/gzip.feature b/middleman-core/features/gzip.feature index 2f74cc9a..643972bc 100644 --- a/middleman-core/features/gzip.feature +++ b/middleman-core/features/gzip.feature @@ -22,7 +22,7 @@ Feature: GZIP assets during build Given a fixture app "gzip-app" And a file named "config.rb" with: """ - activate :gzip, exts: %w(.js .html .htm) + activate :gzip, exts: %w(.htm .html .js .xhtml) """ And a successfully built app at "gzip-app" Then the following files should exist: diff --git a/middleman-core/features/helpers_link_to.feature b/middleman-core/features/helpers_link_to.feature index 90b6f08a..fe8e8530 100644 --- a/middleman-core/features/helpers_link_to.feature +++ b/middleman-core/features/helpers_link_to.feature @@ -40,19 +40,29 @@ Feature: link_to helper """ absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %> relative: <%= link_to "Relative", "needs_index.html", relative: true %> + + absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %> + relative spaces: <%= link_to "Spaces Relative", "evil spaces.html", relative: true %> """ And a file named "source/link_to/sub.html.erb" with: """ absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %> relative: <%= link_to "Relative", "../needs_index.html", relative: true %> + + absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %> + relative spaces: <%= link_to "Spaces Relative", "../evil spaces.html", relative: true %> """ And the Server is running at "indexable-app" When I go to "/link_to.html" Then I should see 'absolute: Needs Index' Then I should see 'relative: Relative' + Then I should see 'absolute spaces: Spaces Index' + Then I should see 'relative spaces: Spaces Relative' When I go to "/link_to/sub.html" Then I should see 'absolute: Needs Index' Then I should see 'relative: Relative' + Then I should see 'absolute spaces: Spaces Index' + Then I should see 'relative spaces: Spaces Relative' Scenario: link_to relative works with strip_index_file Given a fixture app "indexable-app" @@ -113,7 +123,7 @@ Feature: link_to helper When I go to "/link_to/sub.html" Then I should see 'absolute: Needs Index' Then I should see 'relative: Relative' - + Scenario: link_to knows about directory indexes Given a fixture app "indexable-app" And a file named "source/link_to.html.erb" with: diff --git a/middleman-core/features/i18n_link_to.feature b/middleman-core/features/i18n_link_to.feature new file mode 100644 index 00000000..9d3f0682 --- /dev/null +++ b/middleman-core/features/i18n_link_to.feature @@ -0,0 +1,209 @@ +Feature: i18n Paths + + Scenario: link_to is i18n aware + Given a fixture app "empty-app" + And a file named "data/pages.yml" with: + """ + - hello.html + """ + And a file named "locales/en.yml" with: + """ + --- + en: + msg: Hello + home: Home + """ + And a file named "locales/es.yml" with: + """ + --- + es: + paths: + hello: "hola" + msg: Hola + home: Casa + """ + And a file named "source/localizable/index.html.erb" with: + """ + Page: <%= t(:hom) %> + """ + And a file named "source/localizable/hello.html.erb" with: + """ + Page: <%= t(:msg) %> + + <%= link_to "Current Home", "/index.html", class: 'current' %> + <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %> + <% link_to "/index.html", class: 'current' do %>Home: Current Block<% end %> + <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %>Home: Other Block<% end %> + + <% data.pages.each_with_index do |p, i| %> + <%= link_to "Current #{p}", "/#{p}", class: 'current' %> + <%= link_to "Other #{p}", "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en %> + <% link_to "/#{p}", class: 'current' do %>Current Block<% end %> + <% link_to "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en do %>Other Block<% end %> + <% end %> + """ + And a file named "config.rb" with: + """ + set :strip_index_file, false + activate :i18n, mount_at_root: :en + """ + Given the Server is running at "empty-app" + When I go to "/hello.html" + Then I should see "Page: Hello" + Then I should see 'Current Home' + Then I should see 'Other Home' + Then I should see 'Home: Current Block' + Then I should see 'Home: Other Block' + Then I should see 'Current hello.html' + Then I should see 'Other hello.html' + Then I should see 'Current Block' + Then I should see 'Other Block' + When I go to "/es/hola.html" + Then I should see "Page: Hola" + Then I should see 'Current Home' + Then I should see 'Other Home' + Then I should see 'Home: Current Block' + Then I should see 'Home: Other Block' + Then I should see 'Current hello.html' + Then I should see 'Other hello.html' + Then I should see 'Current Block' + Then I should see 'Other Block' + + Scenario: link_to is i18n aware and supports relative_links + Given a fixture app "empty-app" + And a file named "locales/en.yml" with: + """ + --- + en: + msg: Hello + home: Home + """ + And a file named "locales/es.yml" with: + """ + --- + es: + paths: + hello: "hola" + msg: Hola + home: Casa + """ + And a file named "source/assets/css/main.css.scss" with: + """ + $color: red; + body { background: $color; } + """ + And a file named "source/localizable/index.html.erb" with: + """ + Page: <%= t(:home) %> + <%= stylesheet_link_tag :main %> + """ + And a file named "source/localizable/hello.html.erb" with: + """ + Page: <%= t(:msg) %> + + <%= link_to "Current Home", "/index.html", class: 'current' %> + <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %> + <% link_to "/index.html", class: 'current' do %>Home: Current Block<% end %> + <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %>Home: Other Block<% end %> + + <%= link_to "Current hello.html", "/hello.html", class: 'current' %> + <%= link_to "Other hello.html", "/hello.html", title: "Other hello.html", locale: ::I18n.locale == :en ? :es : :en %> + <% link_to "/hello.html", class: 'current' do %>Current Block<% end %> + <% link_to "/hello.html", title: "Other hello.html", locale: ::I18n.locale == :en ? :es : :en do %>Other Block<% end %> + """ + And a file named "config.rb" with: + """ + set :css_dir, 'assets/css' + set :relative_links, true + set :strip_index_file, false + activate :i18n, mount_at_root: :en + activate :relative_assets + """ + Given the Server is running at "empty-app" + When I go to "/index.html" + Then I should see "assets/css/main.css" + When I go to "/hello.html" + Then I should see "Page: Hello" + Then I should see 'Current Home' + Then I should see 'Other Home' + Then I should see 'Home: Current Block' + Then I should see 'Home: Other Block' + Then I should see 'Current hello.html' + Then I should see 'Other hello.html' + Then I should see 'Current Block' + Then I should see 'Other Block' + When I go to "/es/hola.html" + Then I should see "Page: Hola" + Then I should see 'Current Home' + Then I should see 'Other Home' + Then I should see 'Home: Current Block' + Then I should see 'Home: Other Block' + Then I should see 'Current hello.html' + Then I should see 'Other hello.html' + Then I should see 'Current Block' + Then I should see 'Other Block' + + Scenario: url_for is i18n aware + Given a fixture app "empty-app" + And a file named "data/pages.yml" with: + """ + - hello.html + - article.html + """ + And a file named "locales/en.yml" with: + """ + --- + en: + msg: Hello + """ + And a file named "locales/es.yml" with: + """ + --- + es: + paths: + hello: "hola" + msg: Hola + """ + And a file named "source/localizable/hello.html.erb" with: + """ + Page: <%= t(:msg) %> + <% data.pages.each_with_index do |p, i| %> + Current: <%= url_for "/#{p}" %> + Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %> + <% end %> + """ + And a file named "source/localizable/article.html.erb" with: + """ + Page Lang: Default + + Current: <%= url_for "/article.html" %> + Other: <%= url_for "/article.html", locale: ::I18n.locale == :en ? :es : :en %> + """ + And a file named "source/localizable/article.es.html.erb" with: + """ + Page Lang: Spanish + + Current: <%= url_for "/article.html" %> + Other: <%= url_for "/article.html", locale: :en %> + """ + And a file named "config.rb" with: + """ + activate :i18n, mount_at_root: :en + """ + Given the Server is running at "empty-app" + When I go to "/hello.html" + Then I should see "Page: Hello" + Then I should see 'Current: /hello.html' + Then I should see 'Other: /es/hola.html' + When I go to "/es/hola.html" + Then I should see "Page: Hola" + Then I should see 'Current: /es/hola.html' + Then I should see 'Other: /hello.html' + When I go to "/article.html" + Then I should see "Page Lang: Default" + Then I should see 'Current: /article.html' + Then I should see 'Other: /es/article.html' + When I go to "/es/article.html" + Then I should see "Page Lang: Spanish" + Then I should see 'Current: /es/article.html' + Then I should see 'Other: /article.html' diff --git a/middleman-core/features/i18n_mixed_sources.feature b/middleman-core/features/i18n_mixed_sources.feature new file mode 100644 index 00000000..7ea92028 --- /dev/null +++ b/middleman-core/features/i18n_mixed_sources.feature @@ -0,0 +1,39 @@ +Feature: i18n merging path trees + + Scenario: Mixing localized and non-localized sources and merging the path trees (see issue #1709) + Given a fixture app "i18n-test-app" + And a file named "config.rb" with: + """ + activate :i18n, mount_at_root: :en, langs: [:en, :es] + """ + Given the Server is running at "i18n-mixed-sources" + + When I go to "/" + Then I should see "Current locale: en" + Then I should see "path: is-localized Home" + When I go to "/es" + Then I should see "Current locale: es" + Then I should see "path: is-localized Home" + + When I go to "/a/" + Then I should see "Current locale: en" + Then I should see "path: is-localized Home # a/index.html.erb" + When I go to "/es/a/" + Then I should see "Current locale: es" + Then I should see "path: is-localized Home # a/index.html.erb" + + When I go to "/b/" + Then I should see "Current locale: en" + Then I should see "path: is-localized Home # b/index.html.erb" + + When I go to "/a/sub.html" + Then I should see "Current locale: en" + Then I should see "path: is-localized Home # a/index.html.erb # a/sub.html.erb" + + When I go to "/b/sub.html" + Then I should see "Current locale: en" + Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb" + + When I go to "/es/b/sub.html" + Then I should see "Current locale: es" + Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb" diff --git a/middleman-core/features/ignore.feature b/middleman-core/features/ignore.feature index 166002c5..9e3d4688 100644 --- a/middleman-core/features/ignore.feature +++ b/middleman-core/features/ignore.feature @@ -12,7 +12,7 @@ Feature: Ignoring paths And the following files should not exist: | build/plain.html | | build/about.html | - + Scenario: Ignore a single path (server) Given a fixture app "ignore-app" And a file named "config.rb" with: @@ -28,6 +28,35 @@ Feature: Ignoring paths When I go to "/about.html" Then I should see "File Not Found" + Scenario: Ignoring collected values + Given a fixture app "ignore-app" + And a file named "data/ignores.yaml" with: + """ + --- + - "plain" + """ + And a file named "config.rb" with: + """ + data.ignores.each do |name| + ignore "#{name}.html" + end + """ + And the Server is running + When I go to "/plain.html" + Then I should see "File Not Found" + When I go to "/about.html" + Then I should not see "File Not Found" + + When the file "data/ignores.yaml" has the contents + """ + --- + - "about" + """ + When I go to "/plain.html" + Then I should not see "File Not Found" + When I go to "/about.html" + Then I should see "File Not Found" + Scenario: Ignore a globbed path (build) Given a fixture app "ignore-app" And a file named "config.rb" with: @@ -47,7 +76,7 @@ Feature: Ignoring paths | build/reports/index.html | | build/reports/another.html | | build/images/icons/messages.png | - + Scenario: Ignore a globbed path (server) Given a fixture app "ignore-app" And a file named "config.rb" with: @@ -93,7 +122,7 @@ Feature: Ignoring paths | build/reports/index.html | | build/reports/another.html | | build/images/icons/messages.png | - + Scenario: Ignore a regex (server) Given a fixture app "ignore-app" And a file named "config.rb" with: @@ -118,4 +147,4 @@ Feature: Ignoring paths When I go to "/reports/another.html" Then I should see "File Not Found" When I go to "/images/icons/messages.png" - Then I should see "File Not Found" \ No newline at end of file + Then I should see "File Not Found" diff --git a/middleman-core/features/import_files.feature b/middleman-core/features/import_files.feature new file mode 100644 index 00000000..faaf2039 --- /dev/null +++ b/middleman-core/features/import_files.feature @@ -0,0 +1,15 @@ +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/features/javascript-testing.feature b/middleman-core/features/javascript-testing.feature new file mode 100644 index 00000000..031d70d0 --- /dev/null +++ b/middleman-core/features/javascript-testing.feature @@ -0,0 +1,18 @@ +Feature: Test a site with javascript included + + As a software developer + I want to develop a site using javascript + I would like to have a server step rendering javascript correctly in order to test it + + @javascript + Scenario: Existing app with javascript + Given the Server is running at "javascript-app" + When I go to "/index.html" + Then I should see: + """ + Local Hour + """ + And I should see: + """ + Local Minutes + """ 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/features/markdown_redcarpet.feature b/middleman-core/features/markdown_redcarpet.feature index 947e59b1..c0f744ac 100644 --- a/middleman-core/features/markdown_redcarpet.feature +++ b/middleman-core/features/markdown_redcarpet.feature @@ -1,4 +1,3 @@ -@nojava Feature: Markdown (Redcarpet) support In order to test included Redcarpet support diff --git a/middleman-core/features/markdown_redcarpet_in_haml.feature b/middleman-core/features/markdown_redcarpet_in_haml.feature index a0f10160..c8adfd73 100644 --- a/middleman-core/features/markdown_redcarpet_in_haml.feature +++ b/middleman-core/features/markdown_redcarpet_in_haml.feature @@ -1,4 +1,3 @@ -@nojava Feature: Markdown support in Haml In order to test support of the Haml markdown filter diff --git a/middleman-core/features/markdown_redcarpet_in_slim.feature b/middleman-core/features/markdown_redcarpet_in_slim.feature new file mode 100644 index 00000000..250c6857 --- /dev/null +++ b/middleman-core/features/markdown_redcarpet_in_slim.feature @@ -0,0 +1,41 @@ +Feature: Markdown support in Slim + In order to test support of the Slim markdown filter + + Scenario: Markdown filter in Slim works + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :redcarpet + 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 + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :redcarpet + activate :directory_indexes + """ + And a file named "source/link_and_image.html.slim" with: + """ + markdown: + [A link](/link_target.html) + + ![image](blank.gif) + """ + 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 'src="/images/blank.gif"' diff --git a/middleman-core/features/minify_css.feature b/middleman-core/features/minify_css.feature index 066eb530..cbf03fe3 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,27 @@ 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 + """ + 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: """ + config[:sass_source_maps] = false + module ::PassThrough def self.compress(data) data @@ -46,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" @@ -58,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 @@ -88,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" @@ -106,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" @@ -120,4 +146,60 @@ 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: + """ + config[:sass_source_maps] = false + + 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: + """ + config[:sass_source_maps] = false + + 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: + """ + config[:sass_source_maps] = false + + 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 d358a975..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: @@ -86,7 +86,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: """ @@ -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: @@ -146,6 +146,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: @@ -157,7 +193,18 @@ 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: + """ + 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" @@ -172,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: @@ -182,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: @@ -200,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: @@ -216,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/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/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature index d70a7e23..f51831fb 100644 --- a/middleman-core/features/nested_layouts.feature +++ b/middleman-core/features/nested_layouts.feature @@ -5,37 +5,37 @@ Feature: Allow nesting of layouts When I go to "/index.html" Then I should see: """ - Master + Master Erb

Index Title

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

New Article Title

- Outer - Inner + I am Outer + I am 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 Slim

New Article Title

I am Outer

I am 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" Then I should see: """ - Master + Master Haml

New Article Title

- Outer - Inner + I am Outer + I am Inner

The Article Content

""" @@ -43,13 +43,16 @@ Feature: Allow nesting of layouts Given the Server is running at "nested-layout-app" When I go to "/data-one.html" Then I should see "Page Number One" - And I should see "Inner" + And I should see "Page #1" + And I should see "I am Inner" + And I should see "I am Outer" + And I should see "Master Erb" When I go to "/data-two.html" Then I should see "Page Number Two" - And I should not see "Inner" + And I should not see "I am Inner" When I go to "/data-one.html" Then I should see "Page Number One" - And I should see "Inner" + And I should see "I am Inner" When I go to "/data-two.html" Then I should see "Page Number Two" - And I should not see "Inner" + And I should not see "I am Inner" diff --git a/middleman-core/features/page-id.feature b/middleman-core/features/page-id.feature new file mode 100644 index 00000000..74d08cb5 --- /dev/null +++ b/middleman-core/features/page-id.feature @@ -0,0 +1,72 @@ +Feature: Page IDs + + Scenario: link_to works with blocks (erb) + Given the Server is running at "page-id-app" + When I go to "/index.html" + Then I should see "I am: index" + And I should see "URL1: /fm.html" + And I should see "URL2: /2.html" + And I should see 'URL3: Hi' + And I should see 'URL4: Sym' + And I should see 'URL5: Imp' + And I should see 'URL6: Foldern' + And I should see 'URL7: Feed' + + When I go to "/fm.html" + Then I should see "I am: frontmatter" + When I go to "/implicit.html" + Then I should see "I am: implicit" + When I go to "/feed.xml" + Then I should see "I am: feed.xml" + When I go to "/folder/foldern.html" + Then I should see "I am: folder/foldern" + + When I go to "/1.html" + Then I should see "I am: page1" + When I go to "/2.html" + Then I should see "I am: page2" + When I go to "/3.html" + Then I should see "I am: page3" + + When I go to "/overwrites/from-default.html" + Then I should see "I am: something-else" + + When I go to "/overwrites/from-frontmatter.html" + Then I should see "I am: from_frontmatter" + + Scenario: Override page ID derivation with a proc + Given a fixture app "page-id-app" + And app "page-id-app" is using config "proc" + And the Server is running at "page-id-app" + + When I go to "/index.html" + Then I should see "I am: index.html-foo" + And I should see "URL1: /fm.html" + And I should see "URL2: /2.html" + And I should see 'URL3: Hi' + And I should see 'URL4: Sym' + And I should see 'URL8: Imp' + And I should see 'URL9: Foldern' + And I should see 'URL10: Feed' + + When I go to "/fm.html" + Then I should see "I am: frontmatter" + When I go to "/implicit.html" + Then I should see "I am: implicit.html-foo" + When I go to "/feed.xml" + Then I should see "I am: feed.xml-foo" + When I go to "/folder/foldern.html" + Then I should see "I am: folder/foldern.html-foo" + + When I go to "/1.html" + Then I should see "I am: page1" + When I go to "/2.html" + Then I should see "I am: page2" + When I go to "/3.html" + Then I should see "I am: page3" + + When I go to "/overwrites/from-default.html" + Then I should see "I am: something-else" + + When I go to "/overwrites/from-frontmatter.html" + Then I should see "I am: from_frontmatter" diff --git a/middleman-core/features/partials.feature b/middleman-core/features/partials.feature index 86509027..8a0154c2 100644 --- a/middleman-core/features/partials.feature +++ b/middleman-core/features/partials.feature @@ -5,25 +5,30 @@ Feature: Provide Sane Defaults for Partial Behavior When I go to "/index.html" Then I should see "Header" And I should see "Footer" - + Scenario: Finds shared partials relative to the root (sub) Given the Server is running at "partials-app" When I go to "/sub/index.html" Then I should see "Header" And I should see "Footer" - + + Scenario: Flags error when partial is not found + Given the Server is running at "partials-app" + When I go to "/index_missing.html" + Then I should see "Error: Could not locate partial" + Scenario: Prefers partials of the same engine type Given the Server is running at "partials-app" When I go to "/index.html" Then I should see "ERb Main" - + Scenario: Prefers partials of the same engine type Given the Server is running at "partials-app" When I go to "/second.html" Then I should see "Str Main" And I should see "Header" And I should see "Footer" - + Scenario: Finds partial relative to template Given the Server is running at "partials-app" When I go to "/sub/index.html" @@ -33,7 +38,7 @@ Feature: Provide Sane Defaults for Partial Behavior Given the Server is running at "partials-app" When I go to "/locals.html" Then I should see "Local var is bar" - + Scenario: Partial and Layout use different engines Given the Server is running at "different-engine-partial" When I go to "/index.html" @@ -50,3 +55,10 @@ Feature: Provide Sane Defaults for Partial Behavior Then I should see "File Not Found" When I go to "/_code_snippet.html" Then I should see "File Not Found" + +Scenario: Works with blocks + Given the Server is running at "partials-app" + When I go to "/block.html" + Then I should see "Start" + And I should see "Contents" + And I should see "End" diff --git a/middleman-core/features/redirects.feature b/middleman-core/features/redirects.feature index 242be842..c1549128 100644 --- a/middleman-core/features/redirects.feature +++ b/middleman-core/features/redirects.feature @@ -8,6 +8,7 @@ Feature: Meta redirects """ And the Server is running at "large-build-app" When I go to "/hello.html" + Then I should see '' + Then I should see '' \ No newline at end of file + Then I should see '' + + Scenario: URLs are not rewritten for rewrite ignored paths + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + activate :relative_assets, rewrite_ignore: [ + '/stylesheets/fonts.css', + ] + """ + And the Server is running at "relative-assets-app" + When I go to "/stylesheets/relative_assets.css" + Then I should see 'url("../images/blank.gif' + When I go to "/stylesheets/fonts.css" + Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot' diff --git a/middleman-core/features/relative_assets_helpers_only.feature b/middleman-core/features/relative_assets_helpers_only.feature new file mode 100644 index 00000000..194c8b37 --- /dev/null +++ b/middleman-core/features/relative_assets_helpers_only.feature @@ -0,0 +1,123 @@ +Feature: Relative Assets (Helpers Only) + + Scenario: Rendering css with the feature enabled + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + activate :relative_assets, helpers_only: true + """ + And a file named "source/stylesheets/relative_assets.css.sass.erb" with: + """ + h1 + background: url("<%= asset_url('images/blank.gif') %>") + h2 + background: url("<%= asset_url('/images/blank2.gif') %>") + """ + And a file named "source/javascripts/application.js.erb" with: + """ + function foo() { + var img = document.createElement('img'); + img.src = '<%= asset_url("images/100px.jpg") %>'; + var body = document.getElementsByTagName('body')[0]; + body.insertBefore(img, body.firstChild); + } + + window.onload = foo; + """ + And a file named "source/stylesheets/fonts3.css.erb" with: + """ + @font-face { + font-family: 'Roboto2'; + src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>); + src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'), + url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'), + url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'), + url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg'); + font-weight: normal; + font-style: normal; + } + """ + And the Server is running at "relative-assets-app" + When I go to "/stylesheets/relative_assets.css" + Then I should see 'url("../images/blank.gif' + And I should see 'url("../images/blank2.gif' + When I go to "/javascripts/application.js" + Then I should not see "../" + When I go to "/stylesheets/fonts3.css" + Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg' + + Scenario: Relative css reference with directory indexes + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + activate :relative_assets, helpers_only: true + """ + And the Server is running at "relative-assets-app" + When I go to "/relative_image/index.html" + Then I should see "../stylesheets/relative_assets.css" + + Scenario: Relative assets via image_tag + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + activate :relative_assets, helpers_only: true + """ + And a file named "source/sub/image_tag.html.erb" with: + """ + <%= image_tag '/img/blank.gif' %> + """ + And the Server is running at "relative-assets-app" + When I go to "/sub/image_tag.html" + Then I should see ' + """ + And the Server is running at "relative-assets-app" + When I go to "/sub/image_tag.html" + Then I should see '' + + Scenario: URLs are not rewritten for rewrite ignored paths + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + activate :relative_assets, rewrite_ignore: [ + '/stylesheets/fonts3.css', + ], helpers_only: true + """ + And a file named "source/stylesheets/relative_assets.css.sass.erb" with: + """ + h1 + background: url("<%= asset_url('images/blank.gif') %>") + h2 + background: url("<%= asset_url('/images/blank2.gif') %>") + """ + And a file named "source/stylesheets/fonts3.css.erb" with: + """ + @font-face { + font-family: 'Roboto2'; + src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>); + src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'), + url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'), + url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'), + url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg'); + font-weight: normal; + font-style: normal; + } + """ + And the Server is running at "relative-assets-app" + When I go to "/stylesheets/relative_assets.css" + Then I should see 'url("../images/blank.gif' + When I go to "/stylesheets/fonts3.css" + Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot' diff --git a/middleman-core/features/sass_in_slim.feature b/middleman-core/features/sass_in_slim.feature new file mode 100644 index 00000000..d04055e4 --- /dev/null +++ b/middleman-core/features/sass_in_slim.feature @@ -0,0 +1,40 @@ +Feature: Sass/SCSS support in Slim + In order to test support of the Slim sass and scss filters + + Scenario: Sass filter in Slim works + Given a fixture app "sass-in-slim-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + """ + And a file named "source/sass_filter.html.slim" with: + """ + sass: + .sass + margin: 0 + """ + Given the Server is running at "sass-in-slim-app" + When I go to "/sass_filter/" + Then I should see "text/css" + Then I should see ".sass" + Then I should see "margin:0" + + + Scenario: SCSS filter in Slim works + Given a fixture app "sass-in-slim-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + """ + And a file named "source/scss_filter.html.slim" with: + """ + scss: + .scss { + margin: 0; + } + """ + Given the Server is running at "sass-in-slim-app" + When I go to "/scss_filter/" + Then I should see "text/css" + Then I should see ".scss" + Then I should see "margin:0" 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/features/stylus.feature b/middleman-core/features/stylus.feature index df17962b..15b44f18 100644 --- a/middleman-core/features/stylus.feature +++ b/middleman-core/features/stylus.feature @@ -1,4 +1,3 @@ -@nojava Feature: Stylus Updates and Partials Scenario: The preview server should update stylesheets when Stylus changes Given the Server is running at "stylus-preview-app" diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb index 61891d8b..77cfbb06 100644 --- a/middleman-core/features/support/env.rb +++ b/middleman-core/features/support/env.rb @@ -1,9 +1,13 @@ ENV["TEST"] = "true" -ENV["AUTOLOAD_SPROCKETS"] ||= "false" + +require 'sassc' require 'simplecov' SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..')) +require 'phantomjs/poltergeist' +Capybara.javascript_driver = :poltergeist + require 'coveralls' Coveralls.wear! 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/features/template-key-collision.feature b/middleman-core/features/template-key-collision.feature new file mode 100644 index 00000000..9e530dc1 --- /dev/null +++ b/middleman-core/features/template-key-collision.feature @@ -0,0 +1,26 @@ +Feature: Don't allow template locals to overwrite template helpers + + Scenario: Normal Template + Given an empty app + And a file named "config.rb" with: + """ + class TestExt < ::Middleman::Extension + expose_to_template foo: :foo + + def foo + "bar" + end + end + + ::Middleman::Extensions.register :test, TestExt + + activate :test + + page "/index.html", locals: { foo: false } + """ + And a file named "source/index.html.erb" with: + """ + <%= foo %> + """ + Given a built app at "empty_app" + Then the exit status should be 1 diff --git a/middleman-core/features/twitter-bootstrap-compile.feature b/middleman-core/features/twitter-bootstrap-compile.feature deleted file mode 100644 index 04ffc0ce..00000000 --- a/middleman-core/features/twitter-bootstrap-compile.feature +++ /dev/null @@ -1,6 +0,0 @@ -@nojava @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/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/asset-hash-app/source/fonts/fontawesome-webfont.woff b/middleman-core/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff new file mode 100644 index 00000000..8b280b98 Binary files /dev/null and b/middleman-core/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff differ diff --git a/middleman-core/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff2 b/middleman-core/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff2 new file mode 100644 index 00000000..3311d585 Binary files /dev/null and b/middleman-core/fixtures/asset-hash-app/source/fonts/fontawesome-webfont.woff2 differ diff --git a/middleman-core/fixtures/asset-hash-app/source/index.html.erb b/middleman-core/fixtures/asset-hash-app/source/index.html.erb index 59a9c54f..de017654 100644 --- a/middleman-core/fixtures/asset-hash-app/source/index.html.erb +++ b/middleman-core/fixtures/asset-hash-app/source/index.html.erb @@ -4,6 +4,9 @@

Image url:

+<%= image_tag('100px.jpg?test') %> +<%= image_tag('100px.jpg?#test') %> +<%= image_tag('100px.jpg#test') %>

Ignored path:

diff --git a/middleman-core/fixtures/asset-hash-app/source/layout.erb b/middleman-core/fixtures/asset-hash-app/source/layout.erb index a21259a3..3a1079a7 100644 --- a/middleman-core/fixtures/asset-hash-app/source/layout.erb +++ b/middleman-core/fixtures/asset-hash-app/source/layout.erb @@ -3,16 +3,16 @@ - <%= stylesheet_link_tag "site" %> + <%= stylesheet_link_tag "site", "fragment" %> <%= javascript_include_tag "application" %> <%= yield_content :head %> - +
<%= yield %>
- + diff --git a/middleman-core/fixtures/asset-hash-app/source/other.html.erb b/middleman-core/fixtures/asset-hash-app/source/other.html.erb index 2e6f276f..cc258936 100644 --- a/middleman-core/fixtures/asset-hash-app/source/other.html.erb +++ b/middleman-core/fixtures/asset-hash-app/source/other.html.erb @@ -1,2 +1,5 @@

Image url:

+ + + diff --git a/middleman-core/fixtures/asset-hash-app/source/stylesheets/fragment.css.scss b/middleman-core/fixtures/asset-hash-app/source/stylesheets/fragment.css.scss new file mode 100644 index 00000000..4e175489 --- /dev/null +++ b/middleman-core/fixtures/asset-hash-app/source/stylesheets/fragment.css.scss @@ -0,0 +1,7 @@ +#main { + padding: 50px; + background-image: image-url('100px.jpg'); + background-image: image-url('100px.jpg?test'); + background-image: image-url('100px.jpg?#test'); + background-image: image-url('100px.jpg#test'); +} diff --git a/middleman-core/fixtures/asset-hash-app/source/stylesheets/site.css.scss b/middleman-core/fixtures/asset-hash-app/source/stylesheets/site.css.scss index 0d193a5c..58d760bc 100644 --- a/middleman-core/fixtures/asset-hash-app/source/stylesheets/site.css.scss +++ b/middleman-core/fixtures/asset-hash-app/source/stylesheets/site.css.scss @@ -1,4 +1,4 @@ #main { padding: 50px; - background-image: image-url('100px.jpg'); -} \ No newline at end of file + background-image: url('/images/100px.jpg'); +} diff --git a/middleman-core/fixtures/asset-hash-app/source/stylesheets/uses_fonts.css b/middleman-core/fixtures/asset-hash-app/source/stylesheets/uses_fonts.css new file mode 100644 index 00000000..629429d0 --- /dev/null +++ b/middleman-core/fixtures/asset-hash-app/source/stylesheets/uses_fonts.css @@ -0,0 +1,4 @@ +@font-face { + font-family: 'FontAwesome'; + src: url('../fonts/fontawesome-webfont.woff2') format('woff2'), url('../fonts/fontawesome-webfont.woff') format('woff'); +} diff --git a/middleman-core/fixtures/asset-hash-host-app/config.rb b/middleman-core/fixtures/asset-hash-host-app/config.rb deleted file mode 100644 index 085caeb7..00000000 --- a/middleman-core/fixtures/asset-hash-host-app/config.rb +++ /dev/null @@ -1,4 +0,0 @@ - -activate :asset_hash -activate :directory_indexes -activate :asset_host, host: 'http://middlemanapp.com' diff --git a/middleman-core/fixtures/asset-hash-host-app/source/index.html.erb b/middleman-core/fixtures/asset-hash-host-app/source/index.html.erb index 3616ba64..c9fefc2a 100644 --- a/middleman-core/fixtures/asset-hash-host-app/source/index.html.erb +++ b/middleman-core/fixtures/asset-hash-host-app/source/index.html.erb @@ -3,4 +3,7 @@ <% end %>

Image url:

-<%= image_tag('100px.jpg') %> + +<%= image_tag('100px.jpg?test') %> +<%= image_tag('100px.jpg?#test') %> +<%= image_tag('100px.jpg#test') %> diff --git a/middleman-core/fixtures/asset-hash-host-app/source/layout.erb b/middleman-core/fixtures/asset-hash-host-app/source/layout.erb index 443b3645..a6aa4a0c 100644 --- a/middleman-core/fixtures/asset-hash-host-app/source/layout.erb +++ b/middleman-core/fixtures/asset-hash-host-app/source/layout.erb @@ -3,15 +3,15 @@ - <%= stylesheet_link_tag "site" %> + <%= stylesheet_link_tag "site", "fragment" %> <%= yield_content :head %> - +
<%= yield %>
- + diff --git a/middleman-core/fixtures/asset-hash-host-app/source/other.html.erb b/middleman-core/fixtures/asset-hash-host-app/source/other.html.erb index 2e6f276f..cc258936 100644 --- a/middleman-core/fixtures/asset-hash-host-app/source/other.html.erb +++ b/middleman-core/fixtures/asset-hash-host-app/source/other.html.erb @@ -1,2 +1,5 @@

Image url:

+ + + diff --git a/middleman-core/fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss b/middleman-core/fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss index b169b432..4e175489 100644 --- a/middleman-core/fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss +++ b/middleman-core/fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss @@ -1,4 +1,7 @@ #main { padding: 50px; + background-image: image-url('100px.jpg'); + background-image: image-url('100px.jpg?test'); + background-image: image-url('100px.jpg?#test'); background-image: image-url('100px.jpg#test'); } diff --git a/middleman-core/fixtures/asset-hash-minified-app/config.rb b/middleman-core/fixtures/asset-hash-minified-app/config.rb new file mode 100644 index 00000000..94db1542 --- /dev/null +++ b/middleman-core/fixtures/asset-hash-minified-app/config.rb @@ -0,0 +1,5 @@ +configure :build do + # Minify Javascript on build + activate :minify_javascript + activate :asset_hash +end diff --git a/middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg b/middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg new file mode 100644 index 00000000..557d0278 Binary files /dev/null and b/middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg differ diff --git a/middleman-core/fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js b/middleman-core/fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js new file mode 100644 index 00000000..0f60b7bd --- /dev/null +++ b/middleman-core/fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js @@ -0,0 +1,5 @@ +/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1; + +return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/\s*$/g,ra={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?""!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("