deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3128 commits 11 branches 271 tags 23 MiB
Commit graph

323 commits

Author SHA1 Message Date
Thomas Reynolds
7f2048b865 Don't lookup resource for path if the path is absolute. Fixes #1195 2015-03-03 13:09:46 -08:00
Andrew Kvalheim
8817f4ab38 Move IRB initialization into an overridable method. 2015-02-25 17:11:29 -08:00
Andrew Kvalheim
049dabbf15 Use configurable content type for detection of minifiable content. 
Squashed changes:

  - Prevent side effects of content type testing.
  - Test for inline minification in PHP files.
 2015-02-25 16:08:26 -08:00
Thomas Reynolds
c94e5d0f4d Merge from stable 2015-02-24 11:16:16 -08:00
Thomas Reynolds
a3772428c1 Merge pull request #1456 from yterajima/feature/add-template-test 
Add test to `$ middleman init` using tmeplate
 2015-02-23 12:30:11 -08:00
Ilya Vassilevsky
4d75ba7749 Fix grammar in a scenario 2015-02-23 01:53:14 +03:00
yterajima
ceb4769325 Add test to $ middleman init using tmeplate 
* using Middleman directory
* using github
    * user/repository
    * user/repository#branch
* using full path
    * contains "://"
 2015-02-19 01:02:21 +09:00
Thomas Reynolds
2f558ec571 Fix test 2015-02-13 14:39:08 -08:00
Thomas Reynolds
39c7c9df54 fix leftover flag 2015-01-04 15:28:13 -06:00
Thomas Reynolds
857c99fab5 attempt to fix interactive cli timeout 2015-01-04 15:23:37 -06:00
Thomas Reynolds
8e743aea94 fix interactive init test 2015-01-04 15:06:14 -06:00
Thomas Reynolds
f16510d034 Update CLI 2015-01-04 14:23:35 -06:00
Thomas Reynolds
302a891bbb Update some deps 2015-01-03 14:32:21 -06:00
Steven Sloan
85fa3fac02 add support for “sidecar” frontmatter at the destination url of proxied resources 
a “cheap” way to support adding data to pages created through `proxy` or `page` by adding frontmatter at the expected destination url.

for example proxying a page to `/proxied.html`, by adding a sidecar frontmatter file at `source/proxied.html.frontmatter` (or source/proxied.frontmatter if directory indexes is activated) the frontmatter will be merged with the proxy source and available to `current_resource` at the destination.
 2014-12-22 13:59:27 -05:00
Thomas Reynolds
29693e4533 More URI encoding and decoding. Addresses #1406 2014-11-19 10:39:48 -08:00
Thomas Reynolds
d8e8b06cb6 merge v3 2014-11-19 09:04:56 -08:00
Dennis Reimann
e28ed20c63 Asset hashing for image references in srcset 
Fixes #1287
 2014-11-16 21:25:28 +01:00
Max Meyer
f4ce1ff99d Switch to current working directory during testing 2014-11-03 09:17:43 +01:00
Thomas Reynolds
7c37d4ba51 Merge pull request #1338 from dg-ratiodata/feature/chained_templates_partials 
Chained template parsing failed if parent is "html.erb" and child is "html.md.erb"
 2014-10-23 15:25:10 -07:00
Thomas Reynolds
a95dbb6367 Collections 2014-10-15 14:34:53 -05:00
minusfive
17cddce675 Parse asset-hashes on JSON files 2014-09-28 16:39:46 -04:00
Andrew Kvalheim
00b4ac6867 Add a basic feature test for the console. 2014-09-10 16:12:04 -07:00
Dennis Günnewig
55e3c93278 Feature tests for force-option 2014-09-09 09:19:31 +02:00
Thomas Reynolds
84acb50b02 Optimize globbed file lookups, fixes nasty performance regression 2014-08-24 17:10:25 -07:00
Thomas Reynolds
07ac578a31 merge 2014-08-24 11:36:42 -07:00
Thomas Reynolds
a1979f11b1 Update sass dep and test new error message 2014-08-20 09:48:03 -07:00
Thomas Reynolds
51d57afc73 require new compass, fix tests 2014-08-17 13:20:29 -07:00
Christian Höltje
6895f30ff3 Accept pandoc-style YAML frontmatter 
Pandoc (and some other tools) have decided to end their YAML frontmatter
with `...` instead of `---`.  In the name of flexibility, this patch
allows either to mark the end of YAML frontmatter.

Example:

```
---
title: No place like home
...
```
 2014-08-15 13:21:30 -04:00
Thomas Reynolds
0f785a448a updated from stable 2014-08-14 10:14:26 -07:00
Thomas Reynolds
625391953a Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327 2014-08-04 15:07:55 -07:00
Thomas Reynolds
05aa396399 more slim tests. Targets #1327 2014-08-04 14:41:22 -07:00
Thomas Reynolds
724eab3ac9 fix alt tags and add test. Closes #1341 2014-08-03 08:29:29 -07:00
Dennis Günnewig
98a36d68f0 Merge branch 'v3-stable' into feature/chained_templates_partials 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
 2014-07-31 13:00:19 +02:00
Dennis Günnewig
856f05709c Support template chaining for partials 2014-07-31 11:39:02 +02:00
Thomas Reynolds
2f545cefbe Attempt to allow i18n to override partial lookup. #1333 2014-07-24 11:11:27 -07:00
Thomas Reynolds
bedf235ff6 Multiple Source watchers 2014-07-20 18:57:22 -07:00
Thomas Reynolds
525e700bfa Move all templates over to Github. Remove need for auto-loaded extensions in CLI 2014-07-20 14:25:47 -07:00
Thomas Reynolds
9087da05d5 Merge branch 'v3-stable' 2014-07-20 13:54:45 -07:00
Thomas Reynolds
15d6210df8 Use the resource instead of the request path for auto asset helpers. Fixes #1326 2014-07-20 13:53:05 -07:00
Ben Hollis
22dace72df Upgrade url_for to search for resources relative to their destination paths as well as their source paths. This would fix #818. 2014-07-19 16:40:53 -07:00
Thomas Reynolds
6678ea1ae3 merge static partial change 2014-07-18 12:54:27 -07:00
Thomas Reynolds
f0603ddf2f work with static partials. Closes #1206 2014-07-18 10:54:48 -07:00
Eliott Appleford
bf03c14518 merge spec fixes onto master 2014-07-09 14:10:49 +01:00
Ben Hollis
004ba36741 Remove partials_dir functionality 2014-07-07 23:48:49 -07:00
Eliott Appleford
a47b58c58d fix gemfile conflict 2014-07-06 05:48:21 +01:00
Eliott Appleford
21c2b737f5 fix gzip spec 2014-07-06 04:02:43 +01:00
Eliott Appleford
e2e3c1e3fb fix specs on windows 2014-07-03 21:09:32 +01:00
Ben Hollis
d7fd48ef7d Merge branch 'v3-stable' 
Conflicts:
	middleman-core/lib/middleman-more/extensions/asset_hash.rb
 2014-06-28 18:48:49 -07:00
Andrew Kvalheim
429e7d64bd Accept list of paths to exclude from gzipping. 2014-06-24 14:49:51 -07:00
Andrew Kvalheim
b819d38358 Test gzip extensions option. 2014-06-24 14:49:10 -07:00
Thomas Reynolds
434d55b1ae See if code climate hooks work 2014-06-20 14:09:51 -07:00
Ben Hollis
f07bed4ecf Fix custom layouts tests 2014-06-14 12:38:44 -07:00
Thomas Reynolds
a21dca025e Separate Environments from Modes 2014-06-11 10:28:30 -07:00
Thomas Reynolds
7840ebf98a move compass ext out of the main repo 2014-06-11 09:25:59 -07:00
Thomas Reynolds
ee1d89fe55 fix whitespace 2014-06-11 09:19:00 -07:00
Thomas Reynolds
29bf25ace6 Extract compass support into extension, rewrite all features that rely on it to be pure Ruby 2014-06-03 09:01:46 -07:00
Thomas Reynolds
3879be0f23 Add proc as a means of defining a rewriter ignore. Closes #1289 2014-06-02 15:56:07 -07:00
Thomas Reynolds
927a1758ba Rack-based HTML rewriter 2014-05-30 14:48:34 -07:00
Thomas Reynolds
1006739e98 merge PR 2014-05-30 14:23:44 -07:00
Thomas Reynolds
ca0573d92a Merge pull request #1266 from 747/working 
A quick fix for finding eponymous parents
 2014-05-30 14:20:11 -07:00
Thomas Reynolds
c2512e9093 update more files to non-hashrocket syntax 2014-05-26 17:58:35 -07:00
Thomas Reynolds
f89a76747e Removed wrap_layout 2014-05-25 12:23:00 +09:00
Ben Hollis
f29994e25a Fix tests after Padrino 0.12.2 release 2014-05-15 23:35:09 -07:00
Ben Hollis
82636e3596 Fixes to deal with Padrino 0.12.2 release 2014-05-15 23:30:49 -07:00
Ben Hollis
2312f875e6 Revert "Add :format and :keep_original options to :asset_hash. Closes #1257" 
This reverts commit 1f98d0f4f0.

Conflicts:
	middleman-core/lib/middleman-core/extensions/asset_hash.rb
 2014-05-12 00:05:22 -07:00
747
d1d3e8dba6 add tests on eponymous parent traversal 2014-05-02 06:06:55 +09:00
Thomas Reynolds
1e43784cc2 remove queryable api 2014-04-28 10:28:16 -07:00
Thomas Reynolds
ffe9226aac Remove root config options for minification 2014-04-28 10:21:14 -07:00
Thomas Reynolds
1f98d0f4f0 Add :format and :keep_original options to :asset_hash. Closes #1257 2014-04-14 10:05:00 -07:00
Thomas Reynolds
4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds
80256ec3c5 revert back to sass 3.2 and stable compass 2014-04-04 10:38:50 -07:00
Thomas Reynolds
638e2e64b7 Unvendor padrino 2014-04-04 10:22:34 -07:00
Thomas Reynolds
fac4928d50 Update haml and sass deps 
Conflicts:
	Gemfile
	middleman/middleman.gemspec
 2014-04-03 10:01:18 -07:00
Thomas Reynolds
f800a51fb2 Update haml and sass deps 2014-04-03 09:53:33 -07:00
Ben Hollis
5ce8549f03 Remove Asciidoc support in favor of a middleman-asciidoc extension. 2014-03-29 19:24:51 -07:00
Thomas Reynolds
8bc2fddb9d Remove static serving of non-Middleman folders 2014-03-25 16:57:57 -07:00
Thomas Reynolds
ce7636ad18 remove Implied Extensions feature. Closes #1211 2014-03-20 17:12:41 -07:00
Ben Hollis
7b46fd6524 Merge remote-tracking branch 'origin/v3-stable' 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec
 2014-02-22 18:11:37 -08:00
Ben Hollis
477f87e98a Prefer loading layouts from layouts_dir over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176. 2014-02-20 08:50:07 -08:00
Ben Hollis
ca50f21fac "middleman init" will create a project in the current directory. Fixes #1181. 2014-02-19 23:13:59 -08:00
Thomas Reynolds
3995ad850c update padrino. 2014-02-18 18:30:29 -08:00
Thomas Reynolds
98e3c8aa79 remove instance variable and page block support 2014-01-03 15:49:54 -08:00
Thomas Reynolds
95eaeba960 Start cleaning up Rack internals 2014-01-01 19:09:47 -08:00
Thomas Reynolds
a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Matt Simpson
21f575af3a Specify the full path to the NEWLINE constant 2013-12-28 19:43:59 -06:00
Thomas Reynolds
c500039197 Add build-mode test cases to see if #1068 occurs 2013-11-29 14:57:35 -08:00
Paul C Pederson
56343c84ed localization by filename extension 2013-11-18 10:20:42 -08:00
Steven Sloan
955467f648 add link contents for mailto: link in kramdown markdown test 2013-11-13 22:46:06 -05:00
Thomas Reynolds
e0a4b8f17d dont route kramdown mailto links through link_to. Closes #1058 2013-10-30 09:18:25 -07:00
Thomas Reynolds
22c977d426 Merge branch 'master' of github.com:middleman/middleman 2013-10-29 09:44:22 -07:00
Thomas Reynolds
ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds
19c155349d Merge pull request #1044 from mojavelinux/asciidoc-renderer 
resolves #1043 added a renderer for AsciiDoc files
 2013-10-29 09:37:36 -07:00
Thomas Reynolds
9a2c1533e3 make page_classes prefix configurable 2013-10-29 09:33:27 -07:00
Andrew
e8de5907fa Actually fix the issue, rather than pretending to 2013-10-25 18:09:36 +11:00
Andrew
2e70cc5d99 Update queryable interface so that it doesn't mutate 2013-10-25 14:48:23 +11:00
Ben Hollis
e773e8c1a9 Fix tests under 1.8 by coercing Kramdown's OrderedHash into a real Hash. 2013-10-19 19:02:34 -07:00
Dan Allen
5439139b76 added cucumber tests for #1043, AsciiDoc support 2013-10-19 14:41:52 -06:00
Thomas Reynolds
1260188069 attempt to address asset host and hash combo, give up. 2013-10-15 14:33:25 -07:00
Thomas Reynolds
c69909910d adjust some markdown tests 2013-09-28 00:23:13 -07:00
Ali Bosworth
2738e8ea69 Add test against URL fragments for asset hashes 2013-09-26 14:33:56 -07:00
Ben Hollis
a746be1342 Use our magic linking functions from Kramdown, just like we do with Redcarpet. Fixes #999 2013-09-16 23:46:59 -07:00
Ben Hollis
268538f926 Make an effort to handle spaces in filenames in a way that url_for can handle. 2013-09-16 21:07:57 -07:00
Nicholas Hutchinson
dcd760d4f8 Demonstrate issue with directory indexes and spaces in paths 
References #961
 2013-09-16 21:07:56 -07:00
Steven Sloan
ee7c9e6a6e Add support/tests for Redcarpet 3.0.0 features 
- :underline
- :highlight
- :disable_indented_code_blocks

Fix support for
- :link_attributes
- :filter_html

separate Redcarpet extensions from renderer options, add specs for missing renderer options

add specs for the missing/new redcarpet extensions, [ :lax_spacing, :underline, :highlight, :quote, :disable_indented_code_blocks, :footnotes ]

fix link_attributes option for Redcarpet

patch Tilt's reverse option aliases (they were there for RC1)

adjust test data for Redcarpet toc_data to match the current way it renders in 3.0

revert tests that aren't in redcarpet 3.0.0

add a cucumber exempt tag for mri-1.8.x

move redcarpet 3 specific extensions to a separate scenario filtered by the no18 tag
 2013-08-27 11:37:37 -04:00
Thomas Reynolds
ec060e0b6e change tests since coffee changed their output 2013-07-16 15:10:43 -07:00
Thomas Reynolds
8b970f9d92 support redcarpet's no_ flags which need to be re-implemented in our overrides. Fixes #951 2013-07-08 14:21:36 -07:00
Arron Mabrey
00d6a78872 Add expectation that .nojekyll file should exist to directory_index feature 2013-06-30 18:45:49 -04:00
Thomas Reynolds
c7d3e7d601 Fix regex which was allowing i18n to file yaml files in the data folder 2013-06-24 13:56:32 -07:00
Thomas Reynolds
37752dc291 fix layouts with implied extensions 2013-06-24 13:39:14 -07:00
Thomas Reynolds
d86dffa7c6 implement redirect support 2013-06-19 11:13:23 -07:00
Thomas Reynolds
0415b76d4f tests for content_tag escaping 2013-06-18 11:12:41 -07:00
Thomas Reynolds
efe52f7cca Check if set is redefining a param at the class level. Fixes #939 2013-06-17 00:47:10 +00:00
Thomas Reynolds
f0707c0968 Prevent relative asset helper from munging data URIs. Closes #938. 2013-06-15 16:22:14 -07:00
Thomas Reynolds
913d2b7049 Implement generic which is a simple way to build a file from Rack 2013-06-13 09:05:13 -07:00
Thomas Reynolds
7d7d5e683e Set current_engine on the context, not self, since we dup self and use that for each render loop. Closes #860 2013-06-12 15:21:31 -07:00
Moritz Breit
b234deb540 Add cucumber scenarios for markdown pages with erb layout 
These are tests for middleman/middleman#860.
 2013-06-12 11:23:00 -07:00
Thomas Reynolds
a52effc119 continue forcing Padrino to html_safe everything 2013-06-12 11:19:02 -07:00
Thomas Reynolds
d71af3f5a1 Force padrino to skip safebuffer on erb 2013-06-08 15:36:14 -07:00
Thomas Reynolds
efc0f9961b Merge pull request #927 from middleman/content_for_escaping 
content_for is escaping .erb
 2013-06-07 10:08:37 -07:00
Karl Freeman
ef46e4e6c3 add breaking test for escaped html using content_for 2013-06-07 09:59:59 +01:00
Karl Freeman
0b8c36cb8c capture_html helper tests 2013-06-07 09:58:37 +01:00
Thomas Reynolds
265f90e240 Add callback so v4 extensions can see when other extensions are activated 2013-06-04 15:51:03 -07:00
Thomas Reynolds
d0cd3e3cf9 layouts_dir is now configurable. Closes #899 2013-06-01 15:25:44 -07:00
Thomas Reynolds
149f6ffa5b fix builder not cleaning empty directories 2013-05-31 21:20:15 -04:00
Thomas Reynolds
fe2a7c4dd6 Merge branch 'master' of github.com:middleman/middleman 2013-05-31 00:11:54 -04:00
Ben Hollis
7bdf28a421 Fix ignoring layouts from the sitemap when the source directory has been set to something other than 'source'. Fixes #896. 2013-05-30 20:17:58 -07:00
Thomas Reynolds
403d6abd05 fix up simplecov, add coveralls 2013-05-30 13:38:52 -04:00
Jonathan Allard
56f16c2488 Fix #823-2 to allow only one extension on localized views 
Make Sitemap::Store#strip_away_locale actually do something
 2013-05-30 13:37:31 -04:00
Thomas Reynolds
31f238f881 Refactor some of i18n for better codeclimate scores. In the process, make nested i18n files work like rails 2013-05-29 14:00:37 -04:00
Thomas Reynolds
86cd626084 write some file change and deletion tests for better data coverage 2013-05-29 10:59:03 -04:00
Thomas Reynolds
b8b48afcbb how do i paren? 2013-05-29 10:35:00 -04:00
Thomas Reynolds
fef8b8417d Add more nested data tests, actually get simplecov to run 2013-05-29 09:59:15 -04:00
Manuel Meurer
ed59260367 Replace all occurrences of data.page with current_page.data 
see https://github.com/middleman/middleman/issues/912
 2013-05-29 11:25:57 +02:00
Ben Hollis
994bd651f8 Add Simplecov 2013-05-28 22:29:58 -07:00
Thomas Reynolds
407f1b67a3 fix test for updated uglifier 2013-05-18 13:47:15 -07:00
Thomas Reynolds
9ebddeed1d merge more into core, use gem availability to autoload 2013-05-09 14:41:26 -07:00
Thomas Reynolds
2679b7c506 Default build to cleaning 2013-04-13 13:52:22 -07:00
Thomas Reynolds
0574cc3d28 Support sideloading from .frontmatter files. Closes #855 2013-04-12 16:14:16 -07:00
Ben Hollis
7a4aa109a6 Overhaul content-type handling, making it configurable via page/proxy commands as well as frontmatter with the 'content_type' parameter. 
Now, users can set content type explicitly for their files in a number of ways, or rely on automatic file-extension content types. Proxied files default to automatic file-extension content types, but then fall back to the content type of the resource they proxy to. There is also a bug fixed around correctly setting content type inside send_file. Fixes #821.
 2013-04-06 15:11:25 -07:00
Ryunosuke SATO
1e64e8022e Support directory name as a data key 2013-03-23 17:17:34 +09:00
Ben Hollis
6672c1c324 Merge branch '3.0-stable' 2013-03-10 16:32:55 -07:00
Kevin McCarthy
7608275089 Fix dynamic multi-byte utf-8 files rebuilding. 
Thor compares the new contents with the existing file by using
File.binread(destination) == new_content.
File.binread returns a string with ASCII_8BIT encoding, which will not
match the new_content if new_content contains multi-byte utf-8.

This patch simply encodes the new_content to ASCII_8BIT before passing
it to Thor.
 2013-03-03 18:13:41 -08:00
Ben Hollis
c0c14f4eab Merge remote-tracking branch 'origin/3.0-stable' 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/preview_server.rb
	middleman-core/lib/middleman-core/renderers/sass.rb
	middleman-core/lib/middleman-core/sitemap/store.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-more/lib/middleman-more/core_extensions/compass.rb
	middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-more/lib/middleman-more/extensions/asset_hash.rb
 2013-01-25 21:43:30 -08:00
Steven Sloan
17ad2caf11 also "build" .htpasswd files 2013-01-21 11:21:48 -08:00
Steven Sloan
c121c407df also "build" .htpasswd files 2013-01-18 20:13:49 -05:00
Thomas Reynolds
eccda125e5 Remove Tilt mappings for missing libraries. Fixes #713 2013-01-08 10:24:07 -08:00
Thomas Reynolds
6253c91610 Allow non-templates to have frontmatter. Closes #698 2012-12-30 20:40:20 -08:00
Thomas Reynolds
e97d0ad0e4 Allow non-templates to have frontmatter. Closes #698 2012-12-30 20:29:39 -08:00
Thomas Reynolds
45ddc0c344 Make Sitemap metadata queryable with arel-style API 2012-12-25 16:05:54 -08:00
Thomas Reynolds
12a604d69e Fix html5bp test 2012-12-15 14:56:22 -08:00