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

1738 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Hollis fede3449b6 Merge branch '3.0-stable' 2013-02-10 16:54:02 -08:00
Ben Hollis cf51fe6a20 Fix binary_spec test for svgz - it's binary 2013-02-10 16:53:38 -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 42320ade8d Force svgz to be binary 2013-02-10 15:23:39 -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 3bdbc11db2 Change the behavior of before_render and after_render hooks from #761. 
This changes the before_render and after_render hooks so that the callbacks
given to them each get to modify the template source / the rendered output
in turn, instead of having to modify them in-place. It also changes the arguments
provided to the callbacks - now, they are given the source/output, the template path,
the locals hash, and the Tilt template *class*, wheras previously they were given the source/output
and the Tilt template *instance*. The locals hash is there in case pron case hooks want to
pay attention to the locals in some way. The before_render hook is also run before
compiling the template and caching it, which should prevent weird data mismatches
and save some template compilation effort.
 2013-02-10 15:18:57 -08:00
Ben Hollis 5e12c68f1b Merge pull request #773 from JonRowe/patch-1 
Removed outdated information.
 2013-02-10 10:58:10 -08:00
Jon Rowe b94be9ed93 Removed outdated information. 
It seems the wiki is no longer publicly accessible. Linking to it confuses people.
 2013-02-10 21:49:32 +11: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
Ben Hollis 700b844e67 Add a spec for testing Middleman::Util#binary? 2013-02-09 15:49:10 -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
Ben Hollis 0f2dc82138 Add vendor.yml to exclude our fixtures from GitHub language stats 2013-02-09 15:12: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
Thomas Reynolds 3db5d0ca6a Merge pull request #771 from bhollis/i18n 
Handle non-english default languages
 2013-02-09 14:39:28 -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 1af96fe305 Fix gemspecs 2013-02-09 10:28:55 -08:00
Ben Hollis 7e0ae0e59c Support .yaml files for i18n 2013-02-09 10:15:25 -08:00
Thomas Reynolds dd80d22b6a Merge pull request #767 from bhollis/deps 
Revert the more-flexible Thor dependency since it breaks bundle install
 2013-02-08 23:15:49 -08:00
Ben Hollis de7e621766 Revert the more-flexible Thor dependency since it breaks bundle install for JRuby and we will need to update Padrino when it gets upgraded anyway 2013-02-08 00:05:34 -08:00
Thomas Reynolds c9290c6b11 Allow frontmatter to be parsed on templates outside the project root 2013-02-06 13:19:09 -08:00
Ben Hollis 8d5dd8e8ce Merge pull request #763 from zuf/patch-1 
Fix huge files regression (for undetected mime)
 2013-02-06 00:28:37 -08:00
Egor Vakhromtsev 4e88414478 blksize was replaced with fixed value because windows issues 2013-02-06 12:14:24 +04:00
Ben Hollis 137ce94d23 Restore indifferent-access behavior to page data and fix broken caching 2013-02-05 23:34:18 -08:00
Ben Hollis bb2f40cc72 Merge branch '3.0-stable' 
Conflicts:
	README.md
 2013-02-05 22:07:05 -08:00
Thomas Reynolds 8996e65fd1 Merge pull request #761 from LeonB/3.0-stable 
Added before_render & after_render hook
 2013-02-02 14:08:10 -08:00
Egor 83c8f9a2ce Fix huge files regression (for undetected mime) 
Note that binary_bytes is an array of bytes that never never appears in text. Array taken from encoding.c source from 'file' utility (http://www.darwinsys.com/file/).
 2013-02-02 00:26:58 +04:00
Thomas Reynolds 81acdca5f9 Update README.md 2013-02-01 10:02:43 -08:00
Leon Bogaert cc988ee302 Added before_render & after_render hook 
Can be used for pre-processing content
 2013-01-31 23:04:49 +01:00
Thomas Reynolds ec94b3710b Merge pull request #760 from k33l0r/patch-1 
Fixes the Travis CI status image
 2013-01-31 10:50:01 -08:00
Matias Korhonen 80c464a96f Fixes the Travis CI status image 2013-01-31 15:57:19 +02:00
Ben Hollis aa6564f038 Don't catch Exception when parsing YAML frontmatter 2013-01-27 17:11:54 -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
Thomas Reynolds 5f84833fc5 loosening our thor dependency in advance of padrino updating to 0.16. Closes #751 2013-01-25 23:04:52 -08:00
Thomas Reynolds 49cf6c53c6 Merge pull request #752 from bhollis/gemfile 
Update Gemfile to allow bundler to ever complete.
 2013-01-25 22:58:09 -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
Ben Hollis 7c9c4d03db Make build error message code a bit more compact 2013-01-25 20:22:45 -08:00
Ben Hollis 8f0cc92f1b Merge pull request #750 from sethvargo/better_error_message 
Add quotes and bundle exec to error message
 2013-01-25 20:13:35 -08:00
Seth Vargo 95fa217cec Say middleman build instead of just middleman 2013-01-25 21:23:24 -05:00
Seth Vargo 12753c5759 add quotes and bundle exec to error message 2013-01-24 12:40:24 -05:00