Commit graph

2418 commits

Author SHA1 Message Date
Thomas Reynolds
a494d782e6 move some feature stuff into main mm file 2011-12-04 11:58:45 -08:00
Thomas Reynolds
833a229770 fix multi engine partials 2011-12-01 23:05:03 -08:00
Thomas Reynolds
6a03a60cf7 Merge pull request #178 from audionerd/master
Example of partial and layout using different engines
2011-12-01 22:25:31 -08:00
Thomas Reynolds
51a00c4174 add very basic lorem test 2011-12-01 08:43:26 -08:00
Eric Skogen
5c07fd0ea9 fix typos in test for partials with engine different than layout 2011-12-01 02:35:40 -06:00
Thomas Reynolds
6582a2f75a re-enable builder error catching 2011-12-01 00:01:16 -08:00
Eric Skogen
c6209b2869 Merge branch 'master' of git://github.com/tdreyno/middleman 2011-12-01 01:58:23 -06:00
Thomas Reynolds
f1074ed1e2 Merge pull request #179 from bhollis/master
Fix two bugs around "build --clean"
2011-11-30 23:57:16 -08:00
Ben Hollis
167b213a07 Fix build --clean when the build directory doesn't exist.
Before this fix, "build --clean" with no build directory would do
nothing. Now it behaves just like a normal build.
2011-11-30 23:07:09 -08:00
Ben Hollis
8648aaed7c Fix build --clean when paths are rerouted.
This was mostly apparent when using directory indexes - because the
rewrite of the destination path happened after the point where the
path was removed from the "to clean" list, directory indexes would
get removed on the next build --clean.
2011-11-30 23:07:09 -08:00
Eric Skogen
721c2112e1 clarify wording of test 2011-12-01 00:39:50 -06:00
Eric Skogen
ca68c7f944 add failing test for a partial with a different engine than the layout 2011-12-01 00:38:34 -06:00
Thomas Reynolds
46e6d37fff Merge pull request #177 from bhollis/master
Fix previous commit and a few other changes
2011-11-30 22:11:58 -08:00
Ben Hollis
c92ccbb613 Trim down frontmatter data storage by not storing the source of the template after stripping frontmatter in the local_data hash. 2011-11-30 22:08:46 -08:00
Ben Hollis
d08b825607 Fix typo desination -> destination 2011-11-30 22:08:46 -08:00
Ben Hollis
c730af108c Document "doc" task and use "sh" so it prints output 2011-11-30 22:08:46 -08:00
Ben Hollis
1b330e7a27 Oops - the change to the frontmatter regex broke it somehow. This reverts that change (but also reigns in the file_deleted hook). 2011-11-30 22:08:11 -08:00
Thomas Reynolds
562f9259b7 Merge pull request #176 from bhollis/master
A slight speedup in the sitemap extension by only scanning the source directory
2011-11-30 22:05:26 -08:00
Ben Hollis
17e3735d44 A slight speedup in the sitemap extension by only scanning the source directory.
This way sitemap will not scan through all the files in your project (including
.git files and such) when it doesn't ever need to know about those files. This
also includes a slight tightening of the regex for filtering paths for front_matter.
2011-11-30 20:04:23 -08:00
Thomas Reynolds
073a8dee74 add test for simple sinatra/rack app mounting 2011-11-30 10:17:23 -08:00
Thomas Reynolds
dd0836b9d5 maruku is abandonware, default to rdiscount 2011-11-30 10:11:08 -08:00
Thomas Reynolds
46ddfe747f Tweak docs 2011-11-29 23:43:01 -08:00
Thomas Reynolds
4b8beba7a3 initial tests for file change api 2011-11-29 22:26:01 -08:00
Thomas Reynolds
baa3c32b45 cleanup generator feature steps 2011-11-29 22:12:33 -08:00
Thomas Reynolds
e02173425b reorg cucumber steps so gem extensions can reuse them 2011-11-29 14:17:07 -08:00
Thomas Reynolds
f02dd8c90e add chained templates changelog 2011-11-29 11:52:51 -08:00
Thomas Reynolds
451b9e5f46 test chained templates build 2011-11-29 11:51:01 -08:00
Thomas Reynolds
2ed409b5e1 make sure chained templates work with data 2011-11-29 11:49:42 -08:00
Thomas Reynolds
0898ff6d42 Merge pull request #172 from bhollis/master
Build .htaccess files (and other things in the sitemap) directly even when directory-indexes are on
2011-11-28 08:52:01 -08:00
Ben Hollis
67fe8215e8 Build .htaccess files (and other things in the sitemap) directly even when directory-indexes are on 2011-11-28 00:18:13 -08:00
Thomas Reynolds
e405a233c6 Merge pull request #171 from bhollis/frontmatter
Frontmatter was not being removed from template source
2011-11-27 23:27:59 -08:00
Ben Hollis
db890f904b Test to make sure frontmatter doesn't get left behind in template source 2011-11-27 22:15:56 -08:00
Thomas Reynolds
223cf09c8f Merge pull request #170 from bhollis/partials
Fix partials with locals
2011-11-27 22:07:49 -08:00
Thomas Reynolds
41f4a30824 Merge branch 'master' of github.com:tdreyno/middleman 2011-11-27 22:04:29 -08:00
Thomas Reynolds
9ac114406f re-order some callbacks 2011-11-27 22:04:19 -08:00
Ben Hollis
7a4d8c7533 Fix partials with locals 2011-11-27 21:56:21 -08:00
Thomas Reynolds
a14853e2bf Merge pull request #169 from bhollis/master
Include .htaccess files when building a site
2011-11-27 21:16:17 -08:00
Thomas Reynolds
0ef8de6106 reorg build constants. Update docs 2011-11-27 20:49:46 -08:00
Ben Hollis
0cc00a74b4 Include .htaccess files when building a site. 2011-11-27 20:24:19 -08:00
Thomas Reynolds
d12b3a95d2 update RbConfig call. Fixes #164 2011-11-26 23:12:15 -08:00
Thomas Reynolds
7ab8f0cdd1 support for svgz gzip 2011-11-26 23:09:18 -08:00
Thomas Reynolds
4cfbd6e5d9 include svg when looking for image extensions 2011-11-26 20:53:05 -08:00
Thomas Reynolds
abbd489c91 implement new http-based messaging between guard and instance 2011-11-26 20:09:14 -08:00
Thomas Reynolds
e2fdd9a4d3 add more content_for helpers, disable caching for now 2011-11-26 18:12:15 -08:00
Thomas Reynolds
ddb15b2e35 add some more rdocs 2011-11-26 16:23:38 -08:00
Thomas Reynolds
fed3dd5a85 move rendering into rendering extension, instead of sitemap 2011-11-26 16:17:18 -08:00
Thomas Reynolds
7c50c9e4d5 tests for partials 2011-11-26 15:32:41 -08:00
Thomas Reynolds
2b545f8e35 fix double-run layout lookup 2011-11-25 16:25:02 -08:00
Thomas Reynolds
fee6fba15d Merge pull request #154 from arronmabrey/feature/fixed-port-typo
Fixing: port typo.
2011-11-25 16:11:04 -08:00
Thomas Reynolds
3ce5adac3c change how layouts work 2011-11-25 16:09:31 -08:00