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

541 commits

Author SHA1 Message Date
Thomas Reynolds
e4bbed33c5 add some build cleaning tests 2011-10-15 11:21:56 -07:00
Thomas Reynolds
1d21cc4c5b Merge pull request #133 from arronmabrey/feature/cli-clean-option 
Adding: CLI -C --clean build option. closes #132
 2011-10-15 10:59:37 -07:00
Thomas Reynolds
18018bd248 add flag to disable guard 2011-10-14 13:13:21 -07:00
Arron Mabrey
2d41468ad4 Adding: CLI -C --clean build option. 2011-10-14 14:36:46 -04:00
Thomas Reynolds
62e27a7a08 Merge branch 'master' of github.com:tdreyno/middleman 2011-10-13 13:57:16 -07:00
Thomas Reynolds
df3f28b53a prep release 2011-10-13 13:56:56 -07:00
Arron Mabrey
81188aed7f Skip partials prefixed with an underscore while still handling files prefixed with 2 consecutive underscores 2011-10-12 23:12:13 -03:00
Thomas Reynolds
9bcf8f8ec6 bump sinatra supporting version 2011-10-05 08:30:45 -07:00
Thomas Reynolds
06d96d8497 prep pre 2011-10-04 11:24:43 -07:00
Thomas Reynolds
54953d14bf sinatra 1.3.0 2011-10-03 17:09:27 -07:00
Thomas Reynolds
c814677f44 fix front_matter load order. fixes #122 2011-09-27 12:10:37 -07:00
Thomas Reynolds
3c0cddc936 html5boilerplate mobile 2 2011-09-23 13:06:44 -07:00
Thomas Reynolds
21cb23ff0c prep release 2011-09-22 21:56:54 -07:00
Thomas Reynolds
553eb3a402 prep hopefully final pre 2011-09-20 18:29:18 -07:00
Thomas Reynolds
91e00e5289 return octet stream for unmatched extensions, instead of nil 2011-09-20 09:58:53 -07:00
Thomas Reynolds
a630b97201 remove debugging messages 2011-09-20 09:58:35 -07:00
Thomas Reynolds
4f09feeb2c html5 mobile boilerplate template. closes #119 2011-09-20 09:17:46 -07:00
Thomas Reynolds
80a3a9c82f think about async sinatra 2011-09-18 16:10:47 -07:00
Thomas Reynolds
dc30ea27b3 fix builder error 2011-09-17 16:49:14 -07:00
Thomas Reynolds
4fe75da020 font directory fixes 2011-09-17 12:52:40 -07:00
Thomas Reynolds
e125fc67b3 moar fixes 2011-09-16 10:16:23 -07:00
Thomas Reynolds
61d7e8abed allow build to use glob 2011-09-12 16:15:51 -07:00
Thomas Reynolds
bc7ee29486 make json a valid data format 2011-09-12 10:20:34 -07:00
Thomas Reynolds
dbaae67d1a accept both .yaml and .yml data sources 2011-09-12 10:13:13 -07:00
Thomas Reynolds
4f86fcd89f try the windows gem again 2011-09-11 10:46:35 -07:00
Thomas Reynolds
5611976d29 try multi platform builds 2011-09-09 11:14:34 -07:00
Thomas Reynolds
68f2527923 rearchitect some callbacks, add liquid partial support. closes #115 2011-09-08 23:06:22 -07:00
Thomas Reynolds
6eadb0e888 inject yaml data into liquid templates. closes #111 2011-09-06 11:13:56 -07:00
Thomas Reynolds
8fb0f4ad39 update to padrino 0.10.2, activesupport 3.1 2011-09-04 16:20:29 -07:00
Thomas Reynolds
a5cc87d247 add liquid to front matter aware templates 2011-09-03 10:23:04 -07:00
Thomas Reynolds
d83f2b72dc bump version 2011-08-31 13:39:39 -07:00
Thomas Reynolds
d7f39350d5 sprockets ignores extensions after .js in build mode. closes #110 2011-08-31 13:27:29 -07:00
Thomas Reynolds
cc577c0c73 give sprockets access to middleman environment scope (variables, data, etc) 2011-08-31 13:15:59 -07:00
Thomas Reynolds
af9e4989e3 allow setting of markdown engine with symbol 2011-08-31 12:22:45 -07:00
Thomas Reynolds
0df1a7cc28 closes #109 2011-08-30 14:09:13 -07:00
Thomas Reynolds
aace290cea remove ignored ext 2011-08-29 15:01:44 -07:00
Thomas Reynolds
aa2095094f search for init in lib 2011-08-29 12:35:08 -07:00
Thomas Reynolds
cfb440e902 rearrange some requires 2011-08-29 12:06:50 -07:00
Thomas Reynolds
deb68c29a7 try to make extension loading generic 2011-08-29 11:53:11 -07:00
Thomas Reynolds
97e8744847 change autorequire form to only search the newest gems by version 2011-08-29 11:31:27 -07:00
Thomas Reynolds
538d2e0ebc Require json explicitly to .to_json works everywhere 2011-08-29 11:30:55 -07:00
Thomas Reynolds
670fef2c52 use div, for main tag 2011-08-29 11:29:52 -07:00
Jeff Jewiss
a0a431213f Updated HTML5 template to use HTML5 Boilerplate v2.0. 2011-08-22 01:15:55 -07:00
Thomas Reynolds
6c52ce9037 whoops, left debugging string in 2011-08-21 11:05:42 -07:00
Thomas Reynolds
b2153db79f extract livereload into gem 2011-08-20 17:52:05 -07:00
Thomas Reynolds
feca0a0a2b vendor padrino 2011-08-20 17:10:15 -07:00
Thomas Reynolds
8de3d2b35d abstract data api so extensions can use it 2011-08-20 16:38:45 -07:00
Thomas Reynolds
d3bcd9287e prep 2011-08-19 18:14:14 -07:00
Thomas Reynolds
b39798a781 pulling blog feature into extension 2011-08-19 17:45:10 -07:00
Thomas Reynolds
79b10b88ad prep release 2011-08-19 16:45:24 -07:00
Thomas Reynolds
f48c648d64 fix sprockets circular error 2011-08-19 16:42:28 -07:00
Thomas Reynolds
38c46cc89a autoload extensions 2011-08-18 17:33:45 -07:00
Thomas Reynolds
c84830b30f wrong number of args in callback 2011-08-14 13:38:03 -07:00
Thomas Reynolds
5c94e57060 add more windows deps, require latest slim and sass 2011-08-11 22:42:43 -07:00
Thomas Reynolds
3a7906a07f Add kramdown to frontmatter 2011-08-11 22:42:16 -07:00
Thomas Reynolds
2eb48ea72a fix namespace issue 2011-08-09 15:54:07 -07:00
Thomas Reynolds
9fdcc82abe prep patch 2011-08-09 15:28:07 -07:00
Thomas Reynolds
3c2e9293f6 rollback padrino version, fixes huge speed regression 2011-08-09 15:23:53 -07:00
Thomas Reynolds
d19a1a26bc try win32-process gem 2011-08-09 14:55:48 -07:00
Thomas Reynolds
0fb9900ddb try win32-process gem 2011-08-09 14:49:03 -07:00
Thomas Reynolds
9e3830cf7b fix livereload regex 2011-08-09 14:38:08 -07:00
Thomas Reynolds
d2cbfc432f avoid guard on Windows for now 2011-08-09 14:37:55 -07:00
Thomas Reynolds
6ea2ffda5c tiny release for sprockets config error 2011-08-09 11:12:51 -07:00
Thomas Reynolds
da4ead8cf2 test sprockets with custom js_dir 2011-08-09 11:12:20 -07:00
Thomas Reynolds
6a3a480d13 Merge branch 'master' of github.com:tdreyno/middleman 2011-08-09 11:08:54 -07:00
Thomas Reynolds
14efce4b71 setup sprockets after config parse 2011-08-09 11:08:46 -07:00
Jason Harwig
1570293c0c fix templates_path on windows 2011-08-08 16:01:04 -05:00
Thomas Reynolds
8d7de527cd allow the generating and installation of a Gemfile 2011-08-06 14:56:05 -07:00
Thomas Reynolds
d441b9122c fix files named layout again 2011-08-05 21:37:33 -07:00
Thomas Reynolds
51de430a56 prep release 2011-08-05 11:00:50 -07:00
Thomas Reynolds
f5550d6fbb add --rack flag 2011-08-05 10:44:41 -07:00
Thomas Reynolds
ee06e01b54 switch to Maruku, avoid compiled extensions 2011-08-05 10:32:53 -07:00
Thomas Reynolds
9a3f09986f simplify 2011-08-04 19:52:23 -07:00
Thomas Reynolds
0303ed6442 alias the builder callbacks more easily 2011-08-04 19:43:42 -07:00
Thomas Reynolds
8c07dd3f97 rename after_config_init to after_configuration 2011-08-04 19:30:58 -07:00
Thomas Reynolds
c635c0ce6a ignore favicons 2011-08-04 19:24:55 -07:00
Thomas Reynolds
d1250e5053 prep for httparty ruby 1.9.2 fix 2011-08-04 10:54:38 -07:00
Thomas Reynolds
1110d434bb try to plug into Bundler if gemfile exists 2011-08-03 17:10:16 -07:00
Thomas Reynolds
c9f02e22ba prep fix for sass 3.1.6 2011-08-03 15:25:08 -07:00
Thomas Reynolds
73b9f4c9f0 add version command 2011-08-03 14:43:02 -07:00
Thomas Reynolds
7eadbdb7d5 fix migrate command 2011-08-02 22:27:16 -07:00
Thomas Reynolds
3e42d16187 prep release 2011-08-02 22:22:25 -07:00
Thomas Reynolds
723a0a62ae update some deps 2011-08-02 21:58:20 -07:00
Thomas Reynolds
77848ba549 remove susy from default css. fixes #90 2011-08-02 13:12:19 -07:00
Thomas Reynolds
bb2005388a remove proxy feature into its own extension 2011-08-02 10:38:25 -07:00
Thomas Reynolds
12a00e3811 directory index auto-ignores files already named index 2011-08-02 09:32:03 -07:00
Thomas Reynolds
d7e519dc85 new rc 2011-07-31 19:51:49 -07:00
Thomas Reynolds
6f8715360c actually use the handy dandy :index_file param we have 2011-07-27 20:04:35 -07:00
Thomas Reynolds
5602e35c88 directory_indexes feature, some builder rename middleware and a bunch of test case cleanup. closes #63 2011-07-27 19:59:38 -07:00
Thomas Reynolds
c35a6fc369 add ignorable paths 2011-07-27 14:14:22 -07:00
Thomas Reynolds
10af5caad9 fix accidently throwing of server in production mode 2011-07-27 12:37:09 -07:00
Thomas Reynolds
fcf9764512 use fullname for new bin, add bash cmds for old names 2011-07-27 01:45:57 -07:00
Thomas Reynolds
2634c4156f get all the tests working with the new binary 2011-07-26 23:19:43 -07:00
Andre Arko
4e0c7a0142 enable --help option for all subcommands 2011-07-26 21:26:25 -07:00
Andre Arko
5b8da9d8b8 unknown options should raise an error 2011-07-26 21:26:10 -07:00
Andre Arko
40b3444e71 standardize on string-named options 2011-07-26 21:25:48 -07:00
Andre Arko
b0dbb13f1e create CLI class that pulls in mm-* binary commands 2011-07-26 21:06:10 -07:00
Andre Arko
319871995f stop requiring rubygems where we don't need to 2011-07-26 21:05:29 -07:00
Andre Arko
d60ff13952 fix typo 2011-07-26 21:05:13 -07:00
Thomas Reynolds
53cd0909c2 prevent init from gettin run twice on build. closes #84 2011-07-26 16:54:11 -07:00
Thomas Reynolds
7d5bfaec2e switch back to thin 2011-07-26 16:23:09 -07:00
Thomas Reynolds
ff36d1ff6a fix some idiotic compass bugs 2011-07-26 13:40:59 -07:00
Thomas Reynolds
08cf376eac fix some compass config 2011-07-26 13:29:41 -07:00
Thomas Reynolds
43c118bdaa try try again 2011-07-26 12:15:51 -07:00
Thomas Reynolds
d5a2dedc6c attempt to get rc sorting correct 2011-07-26 12:10:50 -07:00
Thomas Reynolds
ba8071905e prep 1.8.7 compiled release 2011-07-26 11:49:06 -07:00
Thomas Reynolds
bb4ac6d88f prep new release. somehow the last gem got compiled strangely 2011-07-26 10:53:46 -07:00
Thomas Reynolds
a50ab8504b cleanup templates, add blog template 2011-07-25 20:48:49 -07:00
Thomas Reynolds
2c3523b94a Simplify compass config with extra file or new callback 2011-07-25 20:10:07 -07:00
Thomas Reynolds
7c266d9e85 prep rc release 2011-07-23 22:53:17 -07:00
Thomas Reynolds
527fa3160f allow dynamic file generation. closes #68 2011-07-23 22:21:52 -07:00
Thomas Reynolds
506148ae8a hide webrick logs, disable livereload by default 2011-07-23 21:28:01 -07:00
Thomas Reynolds
7b333140a1 be aware of spaces in paths. fixed #79 2011-07-22 19:29:38 -07:00
Thomas Reynolds
cdebfa4587 prep release 2011-07-21 16:55:30 -07:00
Thomas Reynolds
d53bac226e allow page blocks to add instance vars 2011-07-21 16:55:18 -07:00
Thomas Reynolds
e97af242bc also watch lib rb files 2011-07-21 13:50:33 -07:00
Thomas Reynolds
a151a2d3e6 prep release for higher rack requirement 2011-07-16 15:44:48 -07:00
Thomas Reynolds
5a47f87854 prep rc 2011-07-14 21:11:09 -07:00
Thomas Reynolds
20c8f81cbe fix blog load order 2011-07-14 21:08:22 -07:00
Thomas Reynolds
64b8c70d26 ignore dotfiles in watcher 2011-07-14 21:07:56 -07:00
Thomas Reynolds
292ec97bd8 use private before filters, leave sinatra alone. fixes #76 2011-07-14 12:32:39 -07:00
Thomas Reynolds
be506c60cc fancy release 2011-07-13 18:58:34 -07:00
Thomas Reynolds
81a7557459 Use Thor for mm-server 2011-07-13 18:58:22 -07:00
Thomas Reynolds
e81ba33b0d livereload 2011-07-13 18:45:15 -07:00
Thomas Reynolds
9659268a03 Implement Guard on config.rb 2011-07-13 18:30:18 -07:00
Thomas Reynolds
6c2a6f3082 blog should use chosen markdown engine 2011-07-13 17:56:50 -07:00
Thomas Reynolds
7a71dfacd3 prep rc4 2011-07-13 17:48:44 -07:00
Thomas Reynolds
dc231e42fb fix frontmatter test 2011-07-13 17:48:31 -07:00
Thomas Reynolds
ef89be163d fix sprockets test 2011-07-13 17:34:41 -07:00
Thomas Reynolds
199db07dc1 fix compass paths 2011-07-13 11:41:59 -07:00
Thomas Reynolds
17be87bafd refactor Server into a dynamically loadable class 2011-07-13 00:38:04 -07:00
Thomas Reynolds
61ef9ee3da prep custom 404 2011-07-12 22:14:02 -07:00
Thomas Reynolds
700eb7913c disabling sass-cache was a bad idea 2011-07-11 22:20:39 -07:00
Thomas Reynolds
cf08b14ba3 fix truly stupid markdown error 2011-07-11 18:37:01 -07:00
Thomas Reynolds
55c80d3bf6 Prep new rc 2011-07-11 16:04:43 -07:00
Thomas Reynolds
cf574800c8 Sprockets v2 support for JS 2011-07-10 16:02:52 -07:00
Thomas Reynolds
142e6b9f24 use build? helper 2011-07-10 15:13:00 -07:00
Thomas Reynolds
01eccafde2 extract compass into core_ext, allow other features to execute after its init, add map support to sinatra, prep Sprockets feature 2011-07-10 15:10:49 -07:00
Thomas Reynolds
7828b07dad rename default exts 2011-07-10 13:57:31 -07:00
Thomas Reynolds
f99b9fb2ca make some deps dynamically loaded 2011-07-10 13:55:40 -07:00
Thomas Reynolds
22f3f0bc8c Add pref to choose prefered markdown lib 2011-07-10 13:41:53 -07:00
Thomas Reynolds
8fa78ce8c9 further simplify coffee renderer 2011-07-10 13:36:56 -07:00
Thomas Reynolds
ac9b1bc3ef further simplify slim renderer 2011-07-10 13:36:31 -07:00
Thomas Reynolds
8cf36ffb64 simplify haml renderer 2011-07-10 13:36:08 -07:00
Thomas Reynolds
6cefa401f9 remove old haml table helper 2011-07-10 13:34:53 -07:00
Thomas Reynolds
859b7f6d97 Disable sass cache 2011-07-10 13:22:57 -07:00
Thomas Reynolds
e0effcf32f Disable sass cache 2011-07-10 13:20:27 -07:00
Thomas Reynolds
0b9ea13364 Allow layouts to be disabled entirely 2011-07-08 15:01:57 -07:00
Thomas Reynolds
daf217567f Add Redcarpet YAML support 2011-07-08 13:23:06 -07:00
Thomas Reynolds
81abcbc15b bump to rc 2011-07-07 16:31:00 -07:00
Thomas Reynolds
ef51434146 frontmatter test 2011-07-07 16:30:30 -07:00
Thomas Reynolds
edb60cd83a front matter test case and further support 2011-07-06 22:57:46 -07:00
Thomas Reynolds
ca5921a72e use before hooks to simplify server and move other code into features and extensions 2011-07-06 22:42:17 -07:00
Thomas Reynolds
7ffd5ccea9 use before hooks to simplify server and move other code into features and extensions 2011-07-06 22:41:12 -07:00
Thomas Reynolds
efe7332617 page routing is a core ext 2011-07-06 10:46:06 -07:00
Thomas Reynolds
118d23be41 make assets a core ext 2011-07-06 10:40:17 -07:00
Thomas Reynolds
59a07d4cc0 make data dir configurable 2011-07-06 10:30:24 -07:00
Thomas Reynolds
6a3de0768c Data API test 2011-07-06 10:29:07 -07:00
Thomas Reynolds
c9e4d41533 default extensions 2011-07-06 10:18:02 -07:00
Thomas Reynolds
1a285ae36e feature api, front matter and padrino rendering are core 2011-07-06 10:16:19 -07:00
Thomas Reynolds
397cd0e30b feature api, front matter and padrino rendering are core 2011-07-06 10:15:31 -07:00
Thomas Reynolds
7a35c1f48e split out core extensions from features 2011-07-06 09:50:34 -07:00
Thomas Reynolds
a6ad06f3e6 prep beta 2011-07-01 10:44:19 -07:00
Thomas Reynolds
cbdceb26cc Fix #72 2011-07-01 10:07:50 -07:00
Thomas Reynolds
77353b5adf Finish removing extra libs from front matter 2011-06-28 15:51:25 -07:00
Thomas Reynolds
78e31382e9 Merge branch 'master' of github.com:tdreyno/middleman 2011-06-27 13:11:55 -07:00
Thomas Reynolds
89849b2625 Rely directly on rdiscount, clean up Tilt load errors 2011-06-27 13:10:09 -07:00
Thomas Reynolds
22efdcfa44 re-raise missing template exception in dev 2011-06-27 12:33:21 -07:00
Matthias Döring
44894f9b74 Merge pull request #67 from matt-hh/master 
Tags for blog feature
 2011-06-27 00:09:36 -07:00
Thomas Reynolds
a66a0bb5a8 another release 2011-06-24 12:06:45 -07:00
Thomas Reynolds
f977d284fc Use spork for forked cucumber tests, build images first to appease Compass 2011-06-24 12:06:28 -07:00
Matthias Döring
5a467d4258 Merge remote branch 'upstream/master' 2011-06-24 20:56:11 +02:00
Thomas Reynolds
b585e0775b prep new beta 2011-06-24 11:05:26 -07:00
Thomas Reynolds
02158cb96a Merge in pull 65 2011-06-24 11:04:16 -07:00
Matthias Döring
352f8ec816 tags for blog entries 2011-06-24 19:03:10 +02:00
Thomas Reynolds
5861a1bd7f Don't double list sass. Ignore leftover build folder in git 2011-06-23 18:05:25 -07:00
David Siegel
fe9a5ece32 Take a bit more care when checking if a view file exists. 2011-06-23 09:41:43 -07:00
David Siegel
bfa5332c98 Add auto_javascript_include_tag that behaves similarly to auto_stylesheet_link_tag. 
Includes new features/fixtures.
 2011-06-22 16:54:38 -07:00
Thomas Reynolds
38ed58070d new beta 2011-06-14 14:02:46 -07:00
Thomas Reynolds
d17fa7b71b fix esoteric image path bug 2011-06-14 13:54:59 -07:00
Thomas Reynolds
d2e7dde496 new release 2011-06-13 18:34:14 -07:00
Thomas Reynolds
f7a567d2d3 always rely on frontmatter 2011-06-13 18:33:50 -07:00
Thomas Reynolds
a4a9075e54 Use Susy instead of Blueprint 2011-06-12 11:45:11 -07:00
Thomas Reynolds
6c5d75aca9 working implementation, dogfooding on my own blog 2011-06-08 20:53:46 -07:00
Thomas Reynolds
746ddcc519 blog feature 2011-06-07 21:44:10 -07:00
Thomas Reynolds
9849e2aa2f more robust frontmatter impl, still need to tie into Tilt 2011-06-06 11:39:57 -07:00
Matthias Döring
80e120060b fix for #58 2011-06-07 01:35:01 +08:00
Thomas Reynolds
5ded17c775 Simple YAML front-matter implementation. Needs tests and to teach Tilt to ignore the YAML 2011-06-05 18:59:04 -07:00
Thomas Reynolds
56b3a176fb Fix preview mode status/mime issues for static files 2011-06-05 12:54:18 -07:00
Thomas Reynolds
3a7d30164d play with fixing live reload 2011-06-05 12:44:57 -07:00
Thomas Reynolds
f3bd7bd3d1 Add support for slim templating language (because I love it) 2011-06-02 10:48:56 -07:00
Matthias Döring
36698f1aba fix for static files 2011-06-02 12:05:09 +02:00
Matthias Döring
57c80f00e7 minifiy inline js 2011-06-02 11:37:58 +02:00
Matthias Döring
cc73d4c2c6 adding :coffeescript haml filter 2011-06-02 11:37:58 +02:00
Matthias Döring
bb0ced8741 public -> views 2011-06-01 01:09:00 +02:00
Thomas Reynolds
993be281c7 First pass at combining views and public folders 2011-05-30 22:33:11 -07:00
Thomas Reynolds
ba2cbb0ceb release fixes #52 2011-05-22 14:08:53 -07:00
Thomas Reynolds
739e668008 rely on sass/plugin like tilt 2011-05-22 14:08:33 -07:00
Thomas Reynolds
468c9561f0 Prep windows fix release. Fixes #49 2011-05-19 10:37:20 -07:00
Thomas Reynolds
397a545b8c Don't depend on therubyracer, let uglifier figure out it's own deps. Fixes #50 2011-05-18 15:22:19 -07:00