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

2005 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Hollis ee11ccb184 Reorganize Request a bit 2013-04-12 23:32:18 -07:00
Ben Hollis 8001dab258 Save information about extensions in a discoverable way. 
This allows us to display extension config information at /__middleman/config/, and also allows users to modify extension
settings after they're activated in config.rb with a statement like "extensions[:asset_hash].options.exts += ['.js']".
 2013-04-12 23:32:18 -07:00
Ben Hollis b9b17e3ac5 In general, no need for bundle exec since we call bundle/setup 2013-04-12 23:32:17 -07:00
Ben Hollis 6bf4059f4a Rewrite asset hash extension with new extension class 2013-04-12 23:32:17 -07:00
Ben Hollis b4c2bf3098 Requiring sinatra messes stuff up 2013-04-12 23:32:17 -07:00
Ben Hollis f7cd0e231e Update the extension template for the new Extension class. 2013-04-12 23:32:17 -07:00
Ben Hollis 13f8426da4 Fix location of meta pages in CHANGELOG 2013-04-12 23:32:17 -07:00
Ben Hollis b607d70a52 Simplify configuration a bit, and make extensions raise an error if the user tries to set an invalid extension option. 2013-04-12 23:32:17 -07:00
Ben Hollis 81d9ed118b Add Sprockets changes to CHANGELOG 2013-04-12 23:32:16 -07:00
Thomas Reynolds 3f94df1eef prep 3.1 beta 2013-04-12 16:19:47 -07:00
Thomas Reynolds 0574cc3d28 Support sideloading from .frontmatter files. Closes #855 2013-04-12 16:14:16 -07:00
Thomas Reynolds a0445e405a Allow frontmatter renderer_options key to overwrite renderer options on a per-file basis. closes #859 2013-04-11 10:13:36 -07:00
Thomas Reynolds 9fc06035b1 unrequire osx file watcher 2013-04-11 09:53:38 -07:00
Ben Hollis f0449229a9 Unregister .csv from Tilt as well. Fixes #822. 2013-04-09 23:15:05 -07:00
Ben Hollis 283576af1a Refactor some trivial extensions back into application. 2013-04-09 23:06:10 -07:00
Ben Hollis fdd52cd640 Remove global access to the rack env and response 2013-04-09 23:06:10 -07:00
Ben Hollis 16ca3d5c17 Make some common shared state, and logging, threadsafe 2013-04-09 23:06:10 -07:00
Ben Hollis fb9a322b6e Fold assets.rb into default_helpers.rb 2013-04-09 23:06:10 -07:00
Artem Baguinski fe6a18fbe6 Merge pull request #854 from artm/partials_dir 
A setting for custom partials dir
 2013-04-08 23:47:58 -07:00
Artem Baguinski cf1f6a0957 test nested partials_dir 2013-04-09 08:46:18 +02:00
Artem Baguinski fe20d92b28 feature for partials_dir setting 2013-04-09 08:46:18 +02:00
Artem Baguinski 91e7033d54 a first stab at partials_dir setting 
re #252
 2013-04-09 08:46:18 +02:00
Ben Hollis 023ea9f34e Process resources for asset_hash extension in a specific order. This makes sure static assets (images, fonts) get their paths modified before assets that include them (css, js). 2013-04-08 00:50:58 -07:00
Ben Hollis 1617875934 Activate Sprockets before user config 2013-04-07 23:33:40 -07:00
Ben Hollis b159946a6e Upgrade fivemat 2013-04-06 23:53:51 -07:00
Ben Hollis de1bfc440c Support fonts with asset_path 2013-04-06 23:39:45 -07:00
Ben Hollis c602df30dd Fix some 1.8.7 issues 2013-04-06 22:55:49 -07:00
Ben Hollis d6fa92d70e Add i18n changes to CHANGELOG 2013-04-06 18:30:10 -07:00
Ben Hollis 3e75a10056 Switch default markdown engine to Kramdown 2013-04-06 18:26:41 -07:00
Thomas Reynolds 53bddf8304 Merge pull request #853 from bhollis/i18n 
Include I18n::Fallbacks and set the default I18n locale to our default locale.
 2013-04-06 18:25:23 -07:00
Ben Hollis 17b3e3e628 Include I18n::Fallbacks and set the default I18n locale to our default locale. 
Thus, when a translation is missing in the current locale, fall back to the default locale. See https://github.com/svenfuchs/i18n/wiki/Fallbacks for more info and configuration settings available to users.

Also, this change adds a "t" helper that proxies to I18n.t, just like Rails, for more concise translating.
 2013-04-06 18:07:09 -07:00
Ben Hollis ee10d207a1 Update changelog with changes on master since 3.0.13 2013-04-06 16:58:47 -07:00
Ben Hollis 37ef6a31da Merge remote-tracking branch 'origin/3.0-stable' 2013-04-06 16:09:41 -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
Ben Hollis 397ccd2c1e Fix a bunch of Ruby warnings, including a bug in the not_found method 2013-04-06 14:56:08 -07:00
Ben Hollis 1d869b0c08 Simplify frontmatter by removing its resource_list_manipulator 2013-04-06 14:56:08 -07:00
Ben Hollis 14a39e5e87 Minor performance fix to not double-compute metadata in directory_indexes. 2013-04-06 14:56:04 -07:00
Ben Hollis 044b49d83b Fixes for alpha Sass versions 2013-04-04 23:28:28 -07:00
Ben Hollis c2ffa538ad Undo my previous change, apparently it is no good 2013-04-04 23:28:28 -07:00
Ben Hollis f7d1471edb Handle empty frontmatter without logging an exception 2013-04-04 22:59:05 -07:00
Ben Hollis f89c815868 More agressively set the context for our custom Markdown renderer, and fall back if we still don't manage to get it right. Fixes #662. 2013-04-04 22:48:09 -07:00
Ben Hollis fca4c0330e Merge pull request #849 from stevenosloan/markdown_filter_in_haml 
Markdown filter support for Haml 4
 2013-04-04 22:43:16 -07:00
Steven Sloan 6043392e1a add feature tests for markdown support in haml 2013-04-04 15:16:01 -04:00
Ben Hollis 70643dcc32 Merge pull request #846 from argent-smith/master 
Added .idea to .gitignore
 2013-04-03 22:06:14 -07:00
Thomas Reynolds 087872d286 Merge pull request #845 from bhollis/i18n 
Fix several issues around i18n and resource metadata.
 2013-04-03 11:25:18 -07:00
Pavel Argentov 6f76ae31a9 Added .idea dir to .gitignore 
… just in case if somebody uses RubyMine to dev it.
 2013-04-03 12:35:33 +04:00
Ben Hollis 4d5c509688 Fix several issues around i18n and resource metadata. 
There are a few things changing here. One is that we always dup metadata before using it - this prevents a class of nasty bugs where after the first resource list build, blocks had been deleted from metadata hashes, meaning they would no longer be applied. Now they will always stick around. Then, I made sure that whenever we render a file, we save the previous I18n.locale and restore it afterwards, in case people change locale from blocks. This should help in some weird cases where files are rendered recursively. Finally, I've added a :lang option that can be used from "page" or "proxy" to allow people to specify the language for one or more files without having to pass a block that sets I18n.locale directly, which should make that pattern much cleaner. This fixes #809 and may also fix middleman/middleman-blog#106.
 2013-04-03 00:07:31 -07:00
Ben Hollis cc418c7a2d Ruby 2.0 switches to using #inspect instead of #to_s when printing out objects, which brings back the infinite-hang-on-NoMethodError bug from http://bugs.ruby-lang.org/issues/4521. Aliasing #inspect to #to_s for Middleman::Application fixes it again. This fixes #833. 2013-04-02 22:20:37 -07:00
Ben Hollis 7c1c93562a Merge pull request #842 from tricknotes/fix-method-comments 
Fix method comments
 2013-03-29 08:51:10 -07:00
Ryunosuke SATO 3de491981a Fix method comments 
`rake doc` shows some warnings.
I fixed method comments to suppress it.
 2013-03-29 03:15:33 +09:00