Commit graph

246 commits

Author SHA1 Message Date
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
Ben Hollis fb9a322b6e Fold assets.rb into default_helpers.rb 2013-04-09 23:06:10 -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
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 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 3e75a10056 Switch default markdown engine to Kramdown 2013-04-06 18:26:41 -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 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
Steven Sloan 6043392e1a add feature tests for markdown support in haml 2013-04-04 15:16:01 -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
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
Ryunosuke SATO afd8f0e775 Modify copyright year in smacss template
2012 -> 2013
2013-03-26 03:19:01 +09:00
Thomas Reynolds 63a13e1e66 coffee test 2013-03-20 09:52:31 -07:00
Thomas Reynolds 0a1751fff0 change i18n dep again 2013-03-20 08:57:32 -07:00
Thomas Reynolds f83bcad312 loosen dep 2013-03-20 08:54:28 -07:00
Thomas Reynolds c4cf672640 Remove Rainpress pure ruby CSS compressor and simply use SCSS :) 2013-03-19 16:23:10 -07:00
Ben Hollis 9a72036655 Merge branch '3.0-stable' 2013-03-03 12:57:48 -08:00
Ben Hollis 9fb54fcf5a Force locale to english for number_to_human_size in the gzip extension. Fixes #804. 2013-03-03 12:57:21 -08:00
Ben Hollis cda8bd759d Allow Haml 4 on master too 2013-03-02 23:34:57 -08:00
Ben Hollis 4745418200 Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
	.travis.yml
	Gemfile
	middleman-core/lib/middleman-core/version.rb
	middleman-core/middleman-core-x86-mingw32.gemspec
	middleman-core/middleman-core.gemspec
2013-03-02 22:32:03 -08:00
Thomas Reynolds de955aa0c3 try again 2013-02-27 13:20:26 -08:00
Thomas Reynolds a24397d45b avoid broken version of i18n gem 2013-02-27 13:02:57 -08:00
Ben Hollis 9057b7a85e Support Haml 4. Tests only run with Haml 4 now. Fixes #783 2013-02-17 19:40:17 -08:00
Ben Hollis f791733cc6 Constrain HAML 2013-02-15 22:26:46 -08:00
Ben Hollis 51a494b343 Merge remote-tracking branch 'origin/3.0-stable' 2013-02-10 18:05:24 -08:00
Ben Hollis d553c6a88e Protect against unset current_path 2013-02-10 17:51:47 -08:00
Ben Hollis 52c4677391 Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/data.rb
	middleman-core/lib/middleman-core/core_extensions/front_matter.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core-x86-mingw32.gemspec
	middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-more/lib/middleman-more/core_extensions/i18n.rb
2013-02-10 15:41:36 -08:00
Ben Hollis e4b5202238 Provide some helpful error messages when link_to is used improperly 2013-02-10 15:28:03 -08:00
Ben Hollis 3a3d5bbe3b Override form_tag to use url_for. Fixes #739 2013-02-10 15:20:51 -08:00
Ben Hollis ba035882fe Test for url_for 2013-02-10 15:20:51 -08:00
Ben Hollis 6fa6c021c0 Refactor out a url_for method 2013-02-10 15:20:51 -08:00
Ben Hollis f3750c7c01 Merge pull request #772 from bhollis/binary
Add a spec for testing Middleman::Util#binary?
2013-02-09 17:31:12 -08:00
Thomas Reynolds ae7f75e5cc Relative Assets shouldn't return a Pathname sometimes, the rest of the code expects Strings 2013-02-09 15:53:21 -08:00
Thomas Reynolds 9d54010656 Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable 2013-02-09 15:49:03 -08:00
Thomas Reynolds 76d09a4964 Pathname issues when combining relative assets and cache buster 2013-02-09 15:37:08 -08:00
Thomas Reynolds 559265140d Stub out rspec tests for public APIs: Rack and Sitemap for now 2013-02-09 15:32:32 -08:00
Ben Hollis 923697b517 Micro-optimizations around string comparisons 2013-02-09 15:21:52 -08:00
Ben Hollis ed119bed7b Support .yaml files for i18n 2013-02-09 15:15:52 -08:00
Thomas Reynolds 7f7ce07910 Merge pull request #756 from bhollis/yaml
l18n: Should load both locales/*.yml and locales/*.yaml files
2013-02-09 14:40:10 -08:00
Ben Hollis fbc4d7e9c7 Handle non-english default languages. Fixes #584 2013-02-09 12:49:11 -08:00
Ben Hollis afc62d5a26 i18n tweaks 2013-02-09 12:49:11 -08:00
Ben Hollis 7020bdce1a Failing test for #584 "i18n fails when default locale is not english" 2013-02-09 12:49:06 -08:00
Ben Hollis 7e0ae0e59c Support .yaml files for i18n 2013-02-09 10:15:25 -08:00
Ben Hollis 5cedd4c37c Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
	middleman-core/middleman-core-x86-mingw32.gemspec
2013-01-26 01:01:01 -08:00
Ben Hollis 6dbe7f7a5a Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs. 2013-01-25 22:31:40 -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