Compare commits
172 Commits
Author | SHA1 | Date |
---|---|---|
Thomas Reynolds | b6167b1369 | |
Thomas Reynolds | 30217d2c04 | |
Thomas Reynolds | 073f273fe4 | |
Thomas Reynolds | e30f413376 | |
Stanislav | a680fb30c5 | |
Jonathan Allard | 42e31c8c5e | |
sandstrom | 046d15cfa5 | |
Thomas Reynolds | 5adea781c9 | |
James Pearson | 97082d5fc4 | |
René Klačan | 604c0e2b5d | |
Mike Vastola | 7c968b9572 | |
Kevin Glowacz | 197093b36c | |
Kevin Glowacz | ea2115f3f8 | |
Thomas Reynolds | 07651c63a6 | |
Mark Rowe | 65462cbc43 | |
Eliott Appleford | c264b05906 | |
Mark Rowe | dcd36a4f99 | |
Thomas Reynolds | 7027b4933a | |
Peter Sankauskas | cbad571338 | |
sandstrom | ffef14deb4 | |
Thomas Reynolds | 62dba443a0 | |
Adam Heath | 389e3f5a8c | |
Thomas Reynolds | ea39d16d81 | |
Peter Suschlik | 1581bfc27e | |
Thomas Reynolds | e8f10fe3c2 | |
Thomas Reynolds | 1efa585c11 | |
Shawn Van Ittersum | 0d5c9e4313 | |
Thomas Reynolds | 51ccfe1143 | |
Thomas Reynolds | 4ffaa9dde5 | |
Thomas Reynolds | 6440d53e7a | |
Ben Hollis | 38a9025560 | |
Steven Sloan | 5de9e86a55 | |
Thomas Reynolds | ccc1cc1288 | |
Thomas Reynolds | 849fc65260 | |
Matthew Lehner | 3e4187568b | |
PiotrMisiurek | 1c57626445 | |
Steven Sloan | cf4d40caff | |
Dennis Günnewig | 599cf1e6d3 | |
Thomas Reynolds | 3ebd902ec3 | |
Thomas Reynolds | 158c3e9f25 | |
Thomas Reynolds | cdcd2bd42d | |
Thomas Bruketta | 4918704800 | |
Nick Giancola | 8a8ee768ac | |
Thomas Reynolds | 71a20bb3ee | |
Daniel Bayerlein | ce58073539 | |
Thomas Reynolds | 13d62cb276 | |
Thomas Reynolds | 0f2bc1e0ea | |
Thomas Reynolds | a14934e08b | |
Morton Fox | a95f721490 | |
Thomas Reynolds | 2b0f720850 | |
Thomas Reynolds | b386dcdc40 | |
Thomas Reynolds | 0ac5650229 | |
Thomas Reynolds | 7e3baed196 | |
Thomas Reynolds | 09a7d89fd3 | |
Thomas Reynolds | 6872e07d34 | |
Thomas Reynolds | a01656df39 | |
Thomas Reynolds | f2535f4fda | |
Thomas Reynolds | dd2413857e | |
Thomas Reynolds | b058d26564 | |
Thomas Reynolds | b794961916 | |
Thomas Reynolds | 4791e01f10 | |
Thomas Reynolds | ac974ca05f | |
Thomas Reynolds | c7669609e6 | |
Thomas Reynolds | e99649b33e | |
Thomas Reynolds | ec213efb95 | |
Joshua Lusk | 21f4f40e21 | |
Thomas Reynolds | 16c82fe57a | |
Thomas Reynolds | 058a63a0de | |
Thomas Reynolds | 49da6156a0 | |
Thomas Reynolds | 3cbd9fdede | |
Thomas Reynolds | 7ae8e904a6 | |
Thomas Reynolds | 55230229f6 | |
Jim Derry | 9e774b608a | |
Thomas Reynolds | b950af89ac | |
Thomas Reynolds | 5a2f9c8ca6 | |
Thomas Reynolds | bca8b854dd | |
Thomas Reynolds | ebc2baa13f | |
Brad Gessler | 179d6c0be4 | |
Thomas Reynolds | 2701bede2a | |
James | cc25c784f9 | |
Thomas Reynolds | 9d29cd58de | |
Adam Heath | 025e35f6a1 | |
FearGoidte | f5a668d380 | |
Thomas Reynolds | 0df7f0d6ac | |
FearGoidte | d461473f81 | |
Thomas Reynolds | 8425692b86 | |
Thomas Reynolds | aab7bac8a6 | |
Thomas Reynolds | 7e42954258 | |
Thomas Reynolds | 02a0b557f6 | |
Gregory McIntyre | d539d4aa3d | |
Gregory McIntyre | 0436c211c6 | |
Thomas Reynolds | d22bd914ae | |
Thomas Reynolds | dfa389bde4 | |
Thomas Reynolds | 5337d0640b | |
Thomas Reynolds | 7484c9f242 | |
Gregory McIntyre | 563da9d45b | |
Thomas Reynolds | 0904652c6f | |
Thomas Reynolds | 1f3bf47e3c | |
Thomas Reynolds | d624dc4601 | |
Thomas Reynolds | 260a9cd94c | |
Greg Tarsa | fbc572f920 | |
Thomas Reynolds | 737e6f5e64 | |
Thomas Reynolds | 7b59f240d5 | |
Thomas Reynolds | c44f7482b1 | |
Thomas Reynolds | e14107ba65 | |
Thomas Reynolds | d776f07bfc | |
Adam Heath | d883152e99 | |
Thomas Reynolds | 0d983231d0 | |
Thomas Reynolds | 4733488e8d | |
Thomas Reynolds | edb1a53060 | |
Thomas Reynolds | b695f6da1e | |
Thomas Reynolds | e36fd3f476 | |
Thomas Reynolds | eaac03ab4b | |
Adam Heath | 351003b4fe | |
Thomas Reynolds | 476287452d | |
Steven Sloan | fc0f5d24d6 | |
Thomas Reynolds | a24e5986a2 | |
Melvin Lammerts | b7886aa14c | |
Thomas Reynolds | 6c8fc2ee07 | |
Jim Cushing | 7bd417fad1 | |
Thomas Reynolds | d7967a86bb | |
Jim Cushing | b1778a92cd | |
Thomas Reynolds | a2181a2fd9 | |
Thomas Reynolds | 6de25dfd0e | |
Thomas Reynolds | f596d8ebf5 | |
Thomas Reynolds | 3f18efeed9 | |
Thomas Reynolds | c5aabbbe4f | |
Thomas Reynolds | 598d72480f | |
Thomas Reynolds | 8c27d9a2e7 | |
FearGoidte | d863733160 | |
FearGoidte | 13c351f2bf | |
James | 17f5f19002 | |
FearGoidte | 007c626d58 | |
Thomas Reynolds | e169d3d07e | |
Jim Dalton | cc36267de5 | |
FearGoidte | 475fa41de0 | |
Thomas Reynolds | 2bba7888b0 | |
Thomas Reynolds | 0c29fd4abf | |
Thomas Reynolds | 9553796731 | |
Thomas Reynolds | 24ef35026e | |
Ben Hollis | 8881389b42 | |
Thomas Reynolds | e7d9c8ad0e | |
Thomas Reynolds | deae5d2216 | |
Thomas Reynolds | 4deaa65a6d | |
Thomas Reynolds | c7a4618166 | |
Thomas Reynolds | b8c0fd34e7 | |
Thomas Reynolds | e0818e2118 | |
Thomas Reynolds | 4e8273295b | |
Thomas Reynolds | 92d96f6604 | |
Thomas Reynolds | 8bacc35bf2 | |
Jim Dalton | 68127003b9 | |
Thomas Reynolds | 5586784947 | |
Thomas Reynolds | 6d1c3562a7 | |
Thomas Reynolds | ffa662a917 | |
Thomas Reynolds | 827d5fbb1d | |
Thomas Reynolds | 2864902fa0 | |
Thomas Reynolds | 6077ae43e9 | |
Thomas Reynolds | 65aebc1887 | |
Thomas Reynolds | 801a83f7cb | |
Thomas Reynolds | c2999786ee | |
Thomas Reynolds | 2b88773640 | |
Thomas Reynolds | 7bf4e4681f | |
Juhamatti Niemelä | 22812cb340 | |
Thomas Reynolds | 732ac7cbe9 | |
Jim Dalton | dc3eac9e96 | |
Thomas Reynolds | 03c95f0863 | |
Thomas Reynolds | 5529062bc4 | |
Thomas Reynolds | a47b2138f8 | |
Thomas Reynolds | be2788b6ca | |
Thomas Reynolds | ff9c34bca9 | |
Thomas Reynolds | d82ac590db | |
Thomas Reynolds | 5f8beba4b3 |
|
@ -1,3 +1,6 @@
|
|||
.byebug_history
|
||||
npm-debug.log
|
||||
manifest.yaml
|
||||
/.bundle
|
||||
.DS_Store
|
||||
coverage
|
||||
|
|
16
.rubocop.yml
16
.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-cli/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:
|
||||
|
@ -37,8 +39,6 @@ AssignmentInCondition:
|
|||
Enabled: false
|
||||
CyclomaticComplexity:
|
||||
Enabled: false
|
||||
AbcSize:
|
||||
Enabled: false
|
||||
HandleExceptions:
|
||||
Enabled: false
|
||||
EndAlignment:
|
||||
|
@ -52,7 +52,9 @@ FormatString:
|
|||
CaseIndentation:
|
||||
IndentWhenRelativeTo: end
|
||||
TrivialAccessors:
|
||||
ExactNameMatch: true
|
||||
Enabled: false
|
||||
SingleLineBlockParams:
|
||||
Enabled: false
|
||||
Metrics/AbcSize:
|
||||
Enabled: false
|
||||
Metrics/PerceivedComplexity:
|
||||
|
@ -63,3 +65,7 @@ Style/BlockDelimiters:
|
|||
Enabled: false
|
||||
Style/MultilineBlockChain:
|
||||
Enabled: false
|
||||
Style/SpecialGlobalVars:
|
||||
Enabled: false
|
||||
Style/FrozenStringLiteralComment:
|
||||
Enabled: false
|
||||
|
|
|
@ -5,17 +5,14 @@ before_script:
|
|||
- bundle update
|
||||
rvm:
|
||||
- ruby-head
|
||||
- 2.3.0
|
||||
- 2.3.1
|
||||
- 2.2.4
|
||||
- 2.1
|
||||
- 2.0
|
||||
os:
|
||||
- linux
|
||||
# - osx
|
||||
matrix:
|
||||
fast_finish: true
|
||||
allow_failures:
|
||||
- rvm: 2.3.0
|
||||
- rvm: ruby-head
|
||||
env:
|
||||
global:
|
||||
|
|
81
CHANGELOG.md
81
CHANGELOG.md
|
@ -1,6 +1,78 @@
|
|||
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.
|
||||
|
@ -13,6 +85,15 @@ master
|
|||
* 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
|
||||
|
||||
|
|
14
Gemfile
14
Gemfile
|
@ -5,12 +5,16 @@ 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 'byebug'
|
||||
gem 'aruba', '~> 0.7.4', require: false
|
||||
gem 'rspec', '~> 3.0', 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
|
||||
|
@ -20,7 +24,7 @@ gem 'kramdown', '~> 1.2', 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 'sinatra', '>= 2.0.0.beta2', require: false
|
||||
gem 'redcarpet', '>= 3.1', require: false
|
||||
|
||||
# Dns server to test preview server
|
||||
|
@ -28,7 +32,7 @@ gem 'rubydns', '~> 1.0.1', require: false
|
|||
|
||||
# To test javascript
|
||||
gem 'poltergeist', '~> 1.8', require: false
|
||||
gem 'phantomjs', '~> 1.9.8.0', 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
|
||||
|
|
|
@ -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:
|
|
@ -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?
|
||||
|
@ -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,6 +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/
|
||||
[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
|
||||
|
|
8
Rakefile
8
Rakefile
|
@ -3,7 +3,7 @@ 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
|
||||
|
@ -36,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
|
||||
|
||||
|
@ -45,14 +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
|
||||
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
|
||||
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -63,6 +63,10 @@ Feature: Middleman CLI
|
|||
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
|
||||
And I type "y"
|
|
@ -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')
|
|
@ -21,14 +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'
|
||||
require 'middleman-cli/config'
|
||||
|
|
|
@ -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,35 +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']
|
||||
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.'
|
||||
exit(1)
|
||||
end
|
||||
shell.say msg, :red
|
||||
|
||||
exit(1)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -23,6 +23,9 @@ module Middleman::Cli
|
|||
::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
|
||||
|
|
|
@ -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,6 +27,13 @@ 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'
|
||||
|
@ -51,10 +60,11 @@ 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
|
||||
unless $?.success?
|
||||
say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
|
||||
exit 1
|
||||
end
|
||||
|
||||
|
@ -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
|
||||
|
|
|
@ -5,56 +5,33 @@ 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'
|
||||
aliases: '-e'
|
||||
class_option :port,
|
||||
aliases: '-p',
|
||||
desc: 'The port Middleman will listen on'
|
||||
aliases: '-p'
|
||||
class_option :server_name,
|
||||
aliases: '-s',
|
||||
desc: 'The server name Middleman will use'
|
||||
aliases: '-s'
|
||||
class_option :bind_address,
|
||||
aliases: '-b',
|
||||
desc: 'The bind address Middleman will listen on'
|
||||
class_option :https,
|
||||
type: :boolean,
|
||||
desc: 'Serve the preview server over SSL/TLS'
|
||||
class_option :ssl_certificate,
|
||||
desc: 'Path to an X.509 certificate to use for the preview server'
|
||||
class_option :ssl_private_key,
|
||||
desc: "Path to an RSA private key for the preview server's certificate"
|
||||
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,
|
||||
type: :boolean,
|
||||
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'
|
||||
class_option :daemon,
|
||||
type: :boolean,
|
||||
aliases: '-d',
|
||||
default: false,
|
||||
desc: 'Daemonize preview server'
|
||||
|
||||
Middleman::Cli.import_config(self)
|
||||
|
||||
# Start the server
|
||||
def server
|
||||
require 'middleman-core'
|
||||
|
@ -66,24 +43,14 @@ module Middleman::Cli
|
|||
end
|
||||
|
||||
params = {
|
||||
port: options['port'],
|
||||
bind_address: options['bind_address'],
|
||||
https: options['https'],
|
||||
server_name: options['server_name'],
|
||||
ssl_certificate: options['ssl_certificate'],
|
||||
ssl_private_key: options['ssl_private_key'],
|
||||
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
|
||||
|
|
|
@ -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 = '>= 2.0.0'
|
||||
s.required_ruby_version = '>= 2.2.0'
|
||||
|
||||
# CLI
|
||||
s.add_dependency('thor', ['>= 0.17.0', '< 2.0'])
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# coding:utf-8
|
||||
RAKE_ROOT = __FILE__
|
||||
RAKE_ROOT = __FILE__.freeze
|
||||
GEM_NAME = ENV['NAME'] || 'middleman-core'
|
||||
require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
|
||||
|
|
|
@ -63,8 +63,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
|
|||
Given the Server is running at "asset-hash-app"
|
||||
When I go to "/"
|
||||
Then I should see 'href="apple-touch-icon.png"'
|
||||
And I should see 'href="stylesheets/site-d2959d87.css"'
|
||||
And I should see 'href="stylesheets/fragment-a06f0dfc.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"'
|
||||
|
@ -72,11 +72,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
|
|||
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-d2959d87.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-d2959d87.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"'
|
||||
|
@ -84,8 +84,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
|
|||
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-d2959d87.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'
|
||||
|
@ -94,11 +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-a06f0dfc.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")'
|
||||
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"
|
||||
|
@ -107,25 +107,65 @@ 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-e587b659.css"'
|
||||
Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7af0b5ab.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-e587b659.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-e587b659.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-7af0b5ab.css"
|
||||
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")'
|
||||
|
@ -139,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-44fb2764.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-10d8ae33.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"
|
||||
|
@ -160,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-30784643.css'
|
||||
When I go to "stylesheets/site-30784643.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"
|
||||
|
@ -247,5 +285,40 @@ Feature: Assets get file hashes appended to them and references to them are upda
|
|||
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)}
|
||||
"""
|
||||
|
||||
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"
|
||||
|
|
|
@ -8,6 +8,7 @@ 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//}
|
||||
|
@ -16,13 +17,16 @@ Feature: Alternate between multiple asset hosts
|
|||
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
|
||||
|
|
|
@ -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="
|
||||
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"'
|
||||
|
|
|
@ -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 "<h1>Welcome</h1>"
|
||||
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,15 +34,19 @@ 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`
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
And I should not see "Hello"
|
||||
|
|
|
@ -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"
|
||||
Then I should see "File Not Found"
|
||||
When I go to "/should_be_ignored9.html"
|
||||
Then I should see "File Not Found"
|
||||
|
|
|
@ -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"
|
||||
|
@ -35,7 +35,7 @@ Feature: Neighboring YAML Front Matter
|
|||
Given the Server is running at "frontmatter-neighbor-app"
|
||||
And the file "source/front-matter-change.html.erb" has the contents
|
||||
"""
|
||||
<%= current_page.data.title %>
|
||||
FileA <%= current_page.data.title %>
|
||||
"""
|
||||
And the file "source/front-matter-change.html.erb.frontmatter" has the contents
|
||||
"""
|
||||
|
@ -43,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"
|
||||
|
@ -52,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"
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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: <a href="needs_index.html">Needs Index</a>'
|
||||
Then I should see 'relative: <a href="needs_index.html">Relative</a>'
|
||||
Then I should see 'absolute spaces: <a href="evil%20spaces.html">Spaces Index</a>'
|
||||
Then I should see 'relative spaces: <a href="evil%20spaces.html">Spaces Relative</a>'
|
||||
When I go to "/link_to/sub.html"
|
||||
Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
|
||||
Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
|
||||
Then I should see 'absolute spaces: <a href="../evil%20spaces.html">Spaces Index</a>'
|
||||
Then I should see 'relative spaces: <a href="../evil%20spaces.html">Spaces Relative</a>'
|
||||
|
||||
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: <a href="../needs_index.html">Needs Index</a>'
|
||||
Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
|
||||
|
||||
|
||||
Scenario: link_to knows about directory indexes
|
||||
Given a fixture app "indexable-app"
|
||||
And a file named "source/link_to.html.erb" with:
|
||||
|
|
|
@ -4,7 +4,7 @@ Feature: i18n Paths
|
|||
Given a fixture app "empty-app"
|
||||
And a file named "data/pages.yml" with:
|
||||
"""
|
||||
- hello.html
|
||||
- hello.html
|
||||
"""
|
||||
And a file named "locales/en.yml" with:
|
||||
"""
|
||||
|
@ -50,24 +50,24 @@ Feature: i18n Paths
|
|||
Given the Server is running at "empty-app"
|
||||
When I go to "/hello.html"
|
||||
Then I should see "Page: Hello"
|
||||
Then I should see '<a class="current" href="/index.html">Current Home</a>'
|
||||
Then I should see '<a title="Other Home" href="/es/index.html">Other Home</a>'
|
||||
Then I should see '<a class="current" href="/index.html"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a title="Other Home" href="/es/index.html"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a class="current" href="/hello.html">Current hello.html</a>'
|
||||
Then I should see '<a title="Other hello.html" href="/es/hola.html">Other hello.html</a>'
|
||||
Then I should see '<a class="current" href="/hello.html"><span>Current Block</span></a>'
|
||||
Then I should see '<a title="Other hello.html" href="/es/hola.html"><span>Other Block</span></a>'
|
||||
Then I should see '<a href="/index.html" class="current">Current Home</a>'
|
||||
Then I should see '<a href="/es/index.html" title="Other Home">Other Home</a>'
|
||||
Then I should see '<a href="/index.html" class="current"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a href="/es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a href="/hello.html" class="current">Current hello.html</a>'
|
||||
Then I should see '<a href="/es/hola.html" title="Other hello.html">Other hello.html</a>'
|
||||
Then I should see '<a href="/hello.html" class="current"><span>Current Block</span></a>'
|
||||
Then I should see '<a href="/es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
|
||||
When I go to "/es/hola.html"
|
||||
Then I should see "Page: Hola"
|
||||
Then I should see '<a class="current" href="/es/index.html">Current Home</a>'
|
||||
Then I should see '<a title="Other Home" href="/index.html">Other Home</a>'
|
||||
Then I should see '<a class="current" href="/es/index.html"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a title="Other Home" href="/index.html"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a class="current" href="/es/hola.html">Current hello.html</a>'
|
||||
Then I should see '<a title="Other hello.html" href="/hello.html">Other hello.html</a>'
|
||||
Then I should see '<a class="current" href="/es/hola.html"><span>Current Block</span></a>'
|
||||
Then I should see '<a title="Other hello.html" href="/hello.html"><span>Other Block</span></a>'
|
||||
Then I should see '<a href="/es/index.html" class="current">Current Home</a>'
|
||||
Then I should see '<a href="/index.html" title="Other Home">Other Home</a>'
|
||||
Then I should see '<a href="/es/index.html" class="current"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a href="/index.html" title="Other Home"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a href="/es/hola.html" class="current">Current hello.html</a>'
|
||||
Then I should see '<a href="/hello.html" title="Other hello.html">Other hello.html</a>'
|
||||
Then I should see '<a href="/es/hola.html" class="current"><span>Current Block</span></a>'
|
||||
Then I should see '<a href="/hello.html" title="Other hello.html"><span>Other Block</span></a>'
|
||||
|
||||
Scenario: link_to is i18n aware and supports relative_links
|
||||
Given a fixture app "empty-app"
|
||||
|
@ -124,30 +124,30 @@ Feature: i18n Paths
|
|||
Then I should see "assets/css/main.css"
|
||||
When I go to "/hello.html"
|
||||
Then I should see "Page: Hello"
|
||||
Then I should see '<a class="current" href="index.html">Current Home</a>'
|
||||
Then I should see '<a title="Other Home" href="es/index.html">Other Home</a>'
|
||||
Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a title="Other Home" href="es/index.html"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a class="current" href="hello.html">Current hello.html</a>'
|
||||
Then I should see '<a title="Other hello.html" href="es/hola.html">Other hello.html</a>'
|
||||
Then I should see '<a class="current" href="hello.html"><span>Current Block</span></a>'
|
||||
Then I should see '<a title="Other hello.html" href="es/hola.html"><span>Other Block</span></a>'
|
||||
Then I should see '<a href="index.html" class="current">Current Home</a>'
|
||||
Then I should see '<a href="es/index.html" title="Other Home">Other Home</a>'
|
||||
Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a href="es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a href="hello.html" class="current">Current hello.html</a>'
|
||||
Then I should see '<a href="es/hola.html" title="Other hello.html">Other hello.html</a>'
|
||||
Then I should see '<a href="hello.html" class="current"><span>Current Block</span></a>'
|
||||
Then I should see '<a href="es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
|
||||
When I go to "/es/hola.html"
|
||||
Then I should see "Page: Hola"
|
||||
Then I should see '<a class="current" href="index.html">Current Home</a>'
|
||||
Then I should see '<a title="Other Home" href="../index.html">Other Home</a>'
|
||||
Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a title="Other Home" href="../index.html"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a class="current" href="hola.html">Current hello.html</a>'
|
||||
Then I should see '<a title="Other hello.html" href="../hello.html">Other hello.html</a>'
|
||||
Then I should see '<a class="current" href="hola.html"><span>Current Block</span></a>'
|
||||
Then I should see '<a title="Other hello.html" href="../hello.html"><span>Other Block</span></a>'
|
||||
Then I should see '<a href="index.html" class="current">Current Home</a>'
|
||||
Then I should see '<a href="../index.html" title="Other Home">Other Home</a>'
|
||||
Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
|
||||
Then I should see '<a href="../index.html" title="Other Home"><span>Home: Other Block</span></a>'
|
||||
Then I should see '<a href="hola.html" class="current">Current hello.html</a>'
|
||||
Then I should see '<a href="../hello.html" title="Other hello.html">Other hello.html</a>'
|
||||
Then I should see '<a href="hola.html" class="current"><span>Current Block</span></a>'
|
||||
Then I should see '<a href="../hello.html" title="Other hello.html"><span>Other Block</span></a>'
|
||||
|
||||
Scenario: url_for is i18n aware
|
||||
Given a fixture app "empty-app"
|
||||
And a file named "data/pages.yml" with:
|
||||
"""
|
||||
- hello.html
|
||||
- hello.html
|
||||
- article.html
|
||||
"""
|
||||
And a file named "locales/en.yml" with:
|
||||
|
|
|
@ -13,5 +13,3 @@ Feature: Import files
|
|||
Then I should see 'jQuery'
|
||||
When I go to "/bower_components2/jquery/dist/jquery.js"
|
||||
Then I should see 'jQuery'
|
||||
|
||||
|
||||
|
|
|
@ -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</h1>"
|
||||
Then I should see "<p>paragraph</p>"
|
||||
|
||||
|
||||
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"'
|
|
@ -5,37 +5,37 @@ Feature: Allow nesting of layouts
|
|||
When I go to "/index.html"
|
||||
Then I should see:
|
||||
"""
|
||||
Master
|
||||
Master Erb
|
||||
<h1>Index Title</h1>
|
||||
Outer
|
||||
Inner
|
||||
I am Outer
|
||||
I am Inner
|
||||
Template
|
||||
|
||||
|
||||
"""
|
||||
When I go to "/another.html"
|
||||
Then I should see:
|
||||
"""
|
||||
Master
|
||||
Master Erb
|
||||
<h1>New Article Title</h1>
|
||||
Outer
|
||||
Inner
|
||||
I am Outer
|
||||
I am Inner
|
||||
<p>The Article Content</p>
|
||||
"""
|
||||
|
||||
|
||||
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 "<h1>Master</h1><p>New Article Title</p><div><h2>Outer</h2><h3>Inner</h3><p>The Article Content</p>"
|
||||
|
||||
Then I should see "<h1>Master Slim</h1><p>New Article Title</p><div><h2>I am Outer</h2><h3>I am Inner</h3><p>The Article Content</p>"
|
||||
|
||||
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
|
||||
<h1>New Article Title</h1>
|
||||
Outer
|
||||
Inner
|
||||
I am Outer
|
||||
I am Inner
|
||||
<p>The Article Content</p>
|
||||
"""
|
||||
|
||||
|
@ -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"
|
||||
|
|
|
@ -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: <a href="/3.html">Hi</a>'
|
||||
And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
|
||||
And I should see 'URL5: <a href="/implicit.html">Imp</a>'
|
||||
And I should see 'URL6: <a href="/folder/foldern.html">Foldern</a>'
|
||||
And I should see 'URL7: <a href="/feed.xml">Feed</a>'
|
||||
|
||||
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: <a href="/3.html">Hi</a>'
|
||||
And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
|
||||
And I should see 'URL8: <a href="/implicit.html">Imp</a>'
|
||||
And I should see 'URL9: <a href="/folder/foldern.html">Foldern</a>'
|
||||
And I should see 'URL10: <a href="/feed.xml">Feed</a>'
|
||||
|
||||
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"
|
|
@ -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"
|
||||
|
|
|
@ -120,7 +120,7 @@ Feature: Relative Assets
|
|||
"""
|
||||
And the Server is running at "relative-assets-app"
|
||||
When I go to "/sub/image_tag.html"
|
||||
Then I should see '<img src="../img/blank.gif" />'
|
||||
Then I should see '<img src="../img/blank.gif"'
|
||||
|
||||
Scenario: Relative assets should not break data URIs in image_tag
|
||||
Given a fixture app "relative-assets-app"
|
||||
|
|
|
@ -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 '<img src="../img/blank.gif"'
|
||||
|
||||
Scenario: Relative assets should not break data URIs in 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 "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" %>
|
||||
"""
|
||||
And the Server is running at "relative-assets-app"
|
||||
When I go to "/sub/image_tag.html"
|
||||
Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
|
||||
|
||||
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'
|
|
@ -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"
|
|
@ -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
|
|
@ -1,4 +0,0 @@
|
|||
|
||||
activate :asset_hash
|
||||
activate :directory_indexes
|
||||
activate :asset_host, host: 'http://middlemanapp.com'
|
|
@ -3,7 +3,7 @@
|
|||
<% end %>
|
||||
|
||||
<h2>Image url:</h2>
|
||||
<%= image_tag('100px.jpg') %>
|
||||
<img src="/images/100px.jpg">
|
||||
<%= image_tag('100px.jpg?test') %>
|
||||
<%= image_tag('100px.jpg?#test') %>
|
||||
<%= image_tag('100px.jpg#test') %>
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 334 B |
|
@ -0,0 +1,3 @@
|
|||
.no-bug{background-image:url(/images/100px.jpg)}
|
||||
.bug{content:"";background-image:url(/images/100px.jpg)}
|
||||
.no-bug{content:""; background-image:url(/images/100px.jpg)}
|
|
@ -0,0 +1,7 @@
|
|||
|
||||
activate :asset_hash,
|
||||
prefix: "myprefix-"
|
||||
|
||||
activate :relative_assets
|
||||
|
||||
activate :directory_indexes
|
|
@ -0,0 +1,16 @@
|
|||
class Middleware
|
||||
def initialize(app)
|
||||
@app = app
|
||||
end
|
||||
|
||||
def call(env)
|
||||
status, headers, response = @app.call(env)
|
||||
body = ''
|
||||
response.each {|part| body += part }
|
||||
if (env["PATH_INFO"] =~ /css$/)
|
||||
body += "\n/* Added by Rack filter */"
|
||||
status, headers, response = Rack::Response.new(body, status, headers).finish
|
||||
end
|
||||
[status, headers, response]
|
||||
end
|
||||
end
|
|
@ -0,0 +1,6 @@
|
|||
<% content_for :head do %>
|
||||
<title>The Middleman!</title>
|
||||
<% end %>
|
||||
|
||||
<h1>Testing the sitemap hashing</h1>
|
||||
<br /><br /><br />
|
|
@ -0,0 +1,2 @@
|
|||
function foo(){var message="HEY THERE FRIEND!";var para=document.createElement("p");para.innerHTML=message;var body=document.getElementsByTagName("body")[0];body.insertBefore(para,body.firstChild)}window.onload=foo;
|
||||
//# sourceMappingURL=application.js.map
|
|
@ -0,0 +1 @@
|
|||
{"version":3,"sources":["source/javascripts/application.js"],"names":["foo","message","para","document","createElement","innerHTML","body","getElementsByTagName","insertBefore","firstChild","window","onload"],"mappings":"AAAA,QAASA,OACP,GAAIC,SAAU,mBACd,IAAIC,MAAOC,SAASC,cAAc,IAClCF,MAAKG,UAAYJ,OACb,IAAIK,MAAOH,SAASI,qBAAqB,QAAQ,EAC/CD,MAAKE,aAAaN,KAAMI,KAAKG,YAGpCC,OAAOC,OAASX"}
|
|
@ -0,0 +1,17 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= yield_content :head %>
|
||||
</head>
|
||||
|
||||
<body class="<%= page_classes %>">
|
||||
|
||||
<div id="main" role="main">
|
||||
<%= yield %>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
|
@ -0,0 +1,6 @@
|
|||
|
||||
activate :asset_hash
|
||||
|
||||
activate :relative_assets
|
||||
|
||||
activate :directory_indexes
|
|
@ -0,0 +1,16 @@
|
|||
class Middleware
|
||||
def initialize(app)
|
||||
@app = app
|
||||
end
|
||||
|
||||
def call(env)
|
||||
status, headers, response = @app.call(env)
|
||||
body = ''
|
||||
response.each {|part| body += part }
|
||||
if (env["PATH_INFO"] =~ /css$/)
|
||||
body += "\n/* Added by Rack filter */"
|
||||
status, headers, response = Rack::Response.new(body, status, headers).finish
|
||||
end
|
||||
[status, headers, response]
|
||||
end
|
||||
end
|
|
@ -0,0 +1,6 @@
|
|||
<% content_for :head do %>
|
||||
<title>The Middleman!</title>
|
||||
<% end %>
|
||||
|
||||
<h1>Testing the sitemap hashing</h1>
|
||||
<br /><br /><br />
|
|
@ -0,0 +1,2 @@
|
|||
function foo(){var message="HEY THERE FRIEND!";var para=document.createElement("p");para.innerHTML=message;var body=document.getElementsByTagName("body")[0];body.insertBefore(para,body.firstChild)}window.onload=foo;
|
||||
//# sourceMappingURL=application.js.map
|
|
@ -0,0 +1 @@
|
|||
{"version":3,"sources":["source/javascripts/application.js"],"names":["foo","message","para","document","createElement","innerHTML","body","getElementsByTagName","insertBefore","firstChild","window","onload"],"mappings":"AAAA,QAASA,OACP,GAAIC,SAAU,mBACd,IAAIC,MAAOC,SAASC,cAAc,IAClCF,MAAKG,UAAYJ,OACb,IAAIK,MAAOH,SAASI,qBAAqB,QAAQ,EAC/CD,MAAKE,aAAaN,KAAMI,KAAKG,YAGpCC,OAAOC,OAASX"}
|
|
@ -0,0 +1,17 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= yield_content :head %>
|
||||
</head>
|
||||
|
||||
<body class="<%= page_classes %>">
|
||||
|
||||
<div id="main" role="main">
|
||||
<%= yield %>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
|
@ -0,0 +1 @@
|
|||
activate :asset_host, host: "http://assets1.example.com"
|
|
@ -44,3 +44,12 @@
|
|||
<a href="https://github.com/angular/angular.js">Angular.js</a>
|
||||
|
||||
<script>(function(a,b,c,d){})(window,document,'script','//www.example.com/script.js');</script>
|
||||
|
||||
<script>
|
||||
(function() {
|
||||
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
|
||||
'.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue