middleman

deac/middleman

Fork 0

Commit graph

59e112a022 Merge pull request #328 from bhollis/master Thomas Reynolds 2012-03-27 02:46:35 -07:00
3c4578b239 Document Middleman::Extensions.register Ben Hollis 2012-03-26 21:39:43 -07:00
b2f6d0db09 Get rid of some unused stuff in sitemap and complete documentation Ben Hollis 2012-03-25 17:38:38 -07:00
189833c61f Merge pull request #325 from bhollis/master Thomas Reynolds 2012-03-26 03:19:15 -07:00
92713dfe92 Make frontmatter always return a hash, and freeze it. This reduces the need for nil checks and prevents users from accidentally trying to modify frontmatter data which may be cached elsewhere. Ben Hollis 2012-03-25 12:43:11 -07:00
c69fac9028 Merge pull request #322 from bhollis/master Thomas Reynolds 2012-03-25 11:17:27 -07:00
086f05989b Fix ignore with a regex (with a test) and consolidate ignores into a single list of callbacks. Ben Hollis 2012-03-24 20:27:55 -07:00
d51056cb26 Fix CLI tests now that we generate a Gemfile by default Ben Hollis 2012-03-24 20:37:03 -07:00
53db5689c7 Merge pull request #318 from bhollis/bundler Thomas Reynolds 2012-03-20 10:49:38 -07:00
a07df582c3 Add bundler as a dependency and default to generating a Gemfile. Ben Hollis 2012-03-18 19:04:22 -06:00
276e6562dd Merge pull request #316 from bhollis/templates Thomas Reynolds 2012-03-19 08:37:16 -07:00
40380aaeeb Merge pull request #317 from bhollis/master Thomas Reynolds 2012-03-19 08:36:51 -07:00
0d80678e48 Include middleman-core's template path in the list of source_paths so that inherited templates in other gems can still use the Gemfile and config.ru from the main middleman gem. Ben Hollis 2012-03-18 18:58:15 -06:00
1b0fe80873 Fix watcher to be more selective about what it ignores Ben Hollis 2012-03-18 18:55:02 -06:00
bacffeea02 Tell Thor to return the right exit code on failure Ben Hollis 2012-03-18 17:30:25 -06:00
85d2ace5ce Merge pull request #315 from bhollis/master Thomas Reynolds 2012-03-18 12:34:43 -07:00
6f4e863091 Expose errors to users during build rather than burying them in output files. Ben Hollis 2012-03-17 16:41:27 -07:00
d36077f47b Merge pull request #313 from bhollis/sitemap_globs Thomas Reynolds 2012-03-15 11:32:03 -07:00
4a5fededf7 Make with_layout work with globs/regexes Ben Hollis 2012-03-15 00:31:50 -07:00
5db1a9453a Make directory_indexes use provides_metadata_for_path instead of its own list of ignored paths, allowing it to support regexes/globs Ben Hollis 2012-03-15 00:29:50 -07:00
73350d6d05 Don't let people (or messed up code) accidentally create sitemap pages through the page method Ben Hollis 2012-03-14 22:26:33 -07:00
111d021630 Fix frontmatter ignore to not create phantom pages and to generally be simpler. Ben Hollis 2012-03-14 00:01:45 -07:00
07828d8aa0 derp only allow compass 0.12 Thomas Reynolds 2012-03-14 20:05:49 -07:00
a13db4f16e derp only allow compass 0.12 Thomas Reynolds 2012-03-14 20:04:29 -07:00
7d2821a472 travis update Thomas Reynolds 2012-03-14 20:02:49 -07:00
e99d9afe4d Use http_generated_images_path with Compass 0.12.x. Closes #312 v2.0.15.1 Thomas Reynolds 2012-03-14 19:35:43 -07:00
199e418d01 Use http_generated_images_path with Compass 0.12.x Thomas Reynolds 2012-03-14 19:34:47 -07:00
f76883b53a bump compass Thomas Reynolds 2012-03-14 10:54:59 -07:00
1a25582d6f Merge pull request #310 from bhollis/master Thomas Reynolds 2012-03-14 10:46:09 -07:00
f1051d8c59 Load extensions even when only using middleman-core. Also, use Bundler.require when available rather than scanning gems for extensions. Ben Hollis 2012-03-13 23:00:02 -07:00
baa7d42d74 Forgot to rename gzip extension in one place Ben Hollis 2012-03-13 22:42:18 -07:00
13ea070c98 bump for compass update v2.0.15 Thomas Reynolds 2012-03-13 09:24:42 -07:00
892d2e7800 loosen sass dep Thomas Reynolds 2012-03-13 09:18:42 -07:00
af6145f2f7 compass is out Thomas Reynolds 2012-03-12 10:21:43 -07:00
40a5c619a4 Merge pull request #309 from bhollis/gzip Thomas Reynolds 2012-03-13 08:52:47 -07:00
317dfb318a Rename gzip_assets to just gzip since it does HTML too Ben Hollis 2012-03-12 21:31:05 -07:00
bba2584c81 Merge pull request #308 from bhollis/master Thomas Reynolds 2012-03-12 10:14:00 -07:00
780daa7053 Fix test instructions Ben Hollis 2012-03-11 23:41:11 -07:00
de92015085 Fix usage of a 1.9-only method in Sitemap::Page Ben Hollis 2012-03-11 23:40:50 -07:00
c6c3021593 Fix issue #302 Ben Hollis 2012-03-11 23:33:46 -07:00
6edefe3c68 Further tweaks that expose another bug - ignore with proxies leads to Not Found errors. Same issue as #302. Ben Hollis 2012-03-11 23:09:43 -07:00
9555266ac1 Variables not passed to proxies when they are built. Possibly related to issue #302. Ben Hollis 2012-03-11 22:49:21 -07:00
54b5304264 Ignore pidfiles Ben Hollis 2012-03-11 22:40:54 -07:00
3fde255610 Change gzip_assets output to print size difference in human terms Ben Hollis 2012-03-11 11:06:48 -07:00
89bd4f1eaf correct a relative_assets issue Thomas Reynolds 2012-03-10 19:51:47 -08:00
7d7f9a20ef i18n not ready for primetime yet Thomas Reynolds 2012-03-10 19:40:04 -08:00
08f5e64858 bump listen dep Thomas Reynolds 2012-03-10 18:57:47 -08:00
d9a82beb8a merge i18n extension Thomas Reynolds 2012-03-10 18:57:00 -08:00
8d22fee8d8 Merge pull request #298 from bhollis/i18n-helpers Thomas Reynolds 2012-03-09 10:19:15 -08:00
e7df250c4d Include "i18n" gem in middleman-core gemspec Ben Hollis 2012-03-08 23:05:59 -08:00
dc5bbe8522 Merge pull request #305 from bhollis/sitemap Thomas Reynolds 2012-03-08 09:12:00 -08:00
4830f51664 Fix current_page Ben Hollis 2012-03-04 22:56:07 -08:00
efe1d45af7 Rewrite sitemap_traversal tests to better reflect what should actually happen, and to expose a bug in current_page. Ben Hollis 2012-03-07 21:21:49 -08:00
739a8633ae Rename sitemap_traversal.features to sitemap_traversal.feature so it will actually be run. Also rename ignore_already_minified.features for the same reason. Ben Hollis 2012-03-07 21:30:34 -08:00
38d1059be2 Merge pull request #300 from bhollis/url Thomas Reynolds 2012-03-05 08:36:14 -08:00
0470fa3083 Remove nonsense comment Ben Hollis 2012-03-04 22:55:17 -08:00
627b6c1462 A url helper that strips directory indexes Ben Hollis 2012-03-04 23:17:30 -08:00
b093bb9f51 fix asset_hash tests from what I assume are random hash key ordering issues across rubies Thomas Reynolds 2012-03-04 23:03:21 -08:00
b9475bbccc Merge asset_hash extension Thomas Reynolds 2012-03-04 22:53:43 -08:00
49ae07bab8 Merge pull request #299 from bhollis/decruft Thomas Reynolds 2012-03-04 22:49:41 -08:00
b6415909dc Merge pull request #266 from bhollis/master Thomas Reynolds 2012-03-04 22:44:31 -08:00
481467a5ac Name the server class so it isn't so confusing when debugging Ben Hollis 2012-03-04 17:43:12 -08:00
dc0249b8b9 Remove --relative CLI option in favor of just turning on relative_assets in config.rb Ben Hollis 2012-03-04 17:30:09 -08:00
ac9ae8fcee Rename tilt_template to render_to_file Ben Hollis 2012-03-04 17:26:44 -08:00
617f73c8db Fix Padrino helpers that require an i18n locale to be present Ben Hollis 2012-03-04 17:20:57 -08:00
af605a909b Rewrite gzip_assets to work as a post-build step and to leave uncompressed versions around. Ben Hollis 2012-03-04 16:42:14 -08:00
cf9e59db83 Merge remote-tracking branch 'origin/master' into gzip Ben Hollis 2012-03-04 15:36:36 -08:00
073086b79c Extension to add hash values to asset filenames. This extension causes asset file types (images, scripts, stylesheets, etc) to have a unique identifier appended to their filename that consists of a hash of their contents. This extension also includes a Rack middleware that rewrites references to these assets in HTML, JavaScript, and CSS files, eliminating the need to use special helper functions to include modified filenames in references. Ben Hollis 2012-03-04 15:24:38 -08:00
c2f498e26e load template.rb files from local templates Thomas Reynolds 2012-03-03 16:52:49 -08:00
70dc453c25 Readd Middleman::Features namespace for backwards compatibility. Closes #280 Thomas Reynolds 2012-03-03 16:49:51 -08:00
410b6b37d1 make sure html5 template has correct paths setup. Fixes #291 Thomas Reynolds 2012-03-03 16:40:03 -08:00
a6d099c4a0 massage some deps Thomas Reynolds 2012-03-03 16:23:06 -08:00
b191cb8b7e temporarily disable config.rb reloading Thomas Reynolds 2012-03-03 15:58:17 -08:00
06ad7a5c88 update redcarpet dep Thomas Reynolds 2012-03-03 15:56:50 -08:00
332a503460 Always pretend we no nothing about the build folder. Fixes #283 Thomas Reynolds 2012-03-03 15:49:49 -08:00
e285045fc5 Merge branch 'master' of github.com:middleman/middleman Thomas Reynolds 2012-03-03 15:32:25 -08:00
ca28c7e55d Merge pull request #295 from bhollis/sass-partials Thomas Reynolds 2012-03-01 13:44:21 -08:00
445b66bed7 test backwards compatible request.params template values. closes #294 Thomas Reynolds 2012-03-01 13:43:47 -08:00
576463f361 fix merge Thomas Reynolds 2012-03-01 13:24:56 -08:00
fc2f761e2f New scenario showing Sass partials don't work in build Ben Hollis 2012-02-29 21:58:01 -08:00
1ee1a06291 switch to guard/listen Thomas Reynolds 2012-02-25 15:53:23 -08:00
81c83fafa6 Merge remote-tracking branch 'origin/master' Ben Hollis 2012-02-23 21:33:05 -08:00
3c78d9f171 Merge pull request #271 from Vasfed/master Thomas Reynolds 2012-02-19 16:24:44 -08:00
d69ae55fa8 new forum Thomas Reynolds 2012-02-18 21:51:02 -08:00
5b2381f6eb sorry jruby Thomas Reynolds 2012-02-18 10:04:28 -08:00
4e4e835bf5 basic pid file Thomas Reynolds 2012-02-18 10:00:54 -08:00
3cabbcf5a4 test jruby Thomas Reynolds 2012-02-18 09:02:16 -08:00
7458acae4d add test for vendored js Vasily Fedoseyev 2012-02-17 03:22:48 +04:00
c9b4edcc0a Add project vendored css and js into sprockets paths Vasily Fedoseyev 2012-02-14 00:17:32 +04:00
740d4a913f change compass sprites messaging exit Thomas Reynolds 2012-02-12 11:51:29 -08:00
5842bf8e5b allow extensionless files to be previewed and built. fixes #270, but requires alternative layouts be placed in a layouts/ directory now. Thomas Reynolds 2012-02-12 11:45:42 -08:00
baaa3fd148 change little piece of frontmatter logic Thomas Reynolds 2012-02-12 10:10:59 -08:00
8094af43d4 Merge pull request #268 from pusewicz/fix-cli-bundler Thomas Reynolds 2012-02-11 09:42:09 -08:00
cf991bfb89 Fix middleman init --bundler Piotr Usewicz 2012-02-11 09:39:45 +00:00
f5edfa75df Fix whitespace Piotr Usewicz 2012-02-11 09:35:49 +00:00
e4aa3da80a Make the list of file extensions that get gzipped configurable as an option to the gzip_assets extension Ben Hollis 2012-02-11 00:22:10 -08:00
a20570bd28 Merge pull request #267 from bhollis/sitemap Thomas Reynolds 2012-02-11 00:05:06 -08:00
39046ce029 Remove unused methods from Sitemap::Store. If these end up being needed again it'd be better to just filter the #pages list. Ben Hollis 2012-02-10 23:36:06 -08:00
c9b7bf4b59 Extension that will pre-Gzip JS and CSS files. Gzipped assets can be served directly by Apache or Nginx with the proper configuration, and pre-zipping means that we can use a more agressive compression level at no CPU cost per request. Ben Hollis 2012-02-10 20:09:39 -08:00
6799606324 Merge pull request #263 from bhollis/master Thomas Reynolds 2012-02-10 14:37:37 -08:00