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
978b981e11
Merge remote-tracking branch 'origin/3.0-stable'
2013-02-10 17:05:18 -08:00
Ben Hollis
5a585dd3ab
Copy/paste error
2013-02-10 17:04:53 -08:00
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
42320ade8d
Force svgz to be binary
2013-02-10 15:23:39 -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
700b844e67
Add a spec for testing Middleman::Util#binary?
2013-02-09 15:49:10 -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
1af96fe305
Fix gemspecs
2013-02-09 10:28:55 -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
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
Leon Bogaert
cc988ee302
Added before_render & after_render hook
...
Can be used for pre-processing content
2013-01-31 23:04:49 +01: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
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
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
Thomas Reynolds
1af216240a
prep
2013-01-22 23:14:35 -08:00
Thomas Reynolds
2d28272396
Merge pull request #736 from bhollis/master
...
Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type.
2013-01-22 23:14:15 -08:00
Ben Hollis
da39484767
Mitigate major perf regression caused by the Middleman::Util#binary? method
2013-01-22 23:13:31 -08:00
Thomas Reynolds
c34b425f45
prep
2013-01-21 11:42:34 -08:00
Steven Sloan
17ad2caf11
also "build" .htpasswd files
2013-01-21 11:21:48 -08:00
Steven Sloan
c121c407df
also "build" .htpasswd files
2013-01-18 20:13:49 -05:00
Ben Hollis
16b3a729cd
Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type.
2013-01-17 19:40:39 -08:00
Thomas Reynolds
80fb3ff06f
merge
2013-01-13 15:25:35 -08:00
Thomas Reynolds
c7e35b95ba
use .sass-cache everywhere
2013-01-13 15:22:36 -08:00
Daniel Bayerlein
e3bb956649
Update installation command for susy-gem.
2013-01-13 11:59:41 -08:00
Thomas Reynolds
1b1a5c086e
Add --force-polling flag to server. Closes #730 . Closes #644
2013-01-13 11:57:18 -08:00
Thomas Reynolds
d4f5e4db29
Add --force-polling flag to server. Closes #730 . Closes #644
2013-01-13 11:56:53 -08:00
Daniel Bayerlein
2dca9e5787
Update installation command for susy-gem.
2013-01-12 16:40:00 +01:00
Thomas Reynolds
a76b02a55b
Don't look for frontmatter on binary files. Fixes #728
2013-01-11 17:25:45 -08:00
Thomas Reynolds
2e2516b95a
Don't look for frontmatter on binary files. Fixes #728
2013-01-11 16:58:02 -08:00
Thomas Reynolds
aa633a1cd3
make windows rack generic again
2013-01-09 10:28:47 -08:00
Thomas Reynolds
e82aa6cc61
make blksize work on windows.
2013-01-09 09:49:23 -08:00
Ben Hollis
3d00e91605
Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3)
2013-01-08 22:52:40 -08:00
Ben Hollis
e3b9a41d3b
Fix Middleman::Util.extract_response_text to follow the Rack spec (and thus work with rack 1.4.3)
2013-01-08 20:35:57 -08:00
Thomas Reynolds
d6c2cf305b
prep 3.0.9
2013-01-08 10:33:19 -08:00
