Artem Baguinski
e07bd036d1
just call needs_to_reload? once
2013-03-22 18:28:38 +01:00
Artem Baguinski
e169f88a5a
fix 'needs_to_reload?' regexps
...
- remove stray ^ that would cause regexp to never match
- remove '_helper' suffix as it isn't required for helpers
2013-03-22 18:22:16 +01:00
Thomas Reynolds
f2f3ad21b6
bump tilt requirement, unregister plaintext template. fixes #824
2013-03-18 14:12:49 -07:00
Michael Baudino
d8d34b6c74
Changed 'default' and 'html5' templates to use 'current_page.data.title' instead of 'data.page.title'
...
Related to middleman/middleman-blog#107
2013-03-17 18:18:59 +01:00
Ben Hollis
659f063076
Include file extension in template cache. May fix #798
2013-03-14 23:21:58 -07:00
Ben Hollis
6672c1c324
Merge branch '3.0-stable'
2013-03-10 16:32:55 -07:00
Ben Hollis
46f060ab12
Don't require securerandom - not sure what it was there for, but its not available in JRuby
2013-03-10 16:32:24 -07:00
Ben Hollis
3ce35149ec
Merge pull request #806 from kevin8t8/3.0-stable
...
Fix dynamic multi-byte utf-8 files rebuilding.
2013-03-03 19:07:55 -08:00
Kevin McCarthy
7608275089
Fix dynamic multi-byte utf-8 files rebuilding.
...
Thor compares the new contents with the existing file by using
File.binread(destination) == new_content.
File.binread returns a string with ASCII_8BIT encoding, which will not
match the new_content if new_content contains multi-byte utf-8.
This patch simply encodes the new_content to ASCII_8BIT before passing
it to Thor.
2013-03-03 18:13:41 -08:00
Ben Hollis
34fe18e56c
Don't use the logger from a trap context. Fixes #801 .
2013-03-03 12:33:30 -08:00
Ben Hollis
a10c8aa194
Don't use the logger from a trap context. Fixes #801 .
2013-03-03 12:31:42 -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
Ben Hollis
3928b209ef
Serve extensionless files or dotfiles with text/plain MIME type, and remove Sitemap::Resource#mime_type.
2013-03-02 22:28:27 -08:00
Thomas Reynolds
6cee2d74f5
adapt to bundler changes, add ruby 2.0 to tests, prep release
2013-02-24 13:44:24 -08:00
Thomas Reynolds
dd63ba164e
Merge branch '3.0-stable' of github.com:middleman/middleman into 3.0-stable
2013-02-24 13:37:30 -08:00
Thomas Reynolds
0f80965ae3
latest listen supports new wdm
2013-02-24 13:34:07 -08:00
Thomas Reynolds
8d5ac575f6
prep pre
2013-02-20 13:15:38 -08:00
Thomas Reynolds
aa2102cbb7
update listen dep
2013-02-19 17:14:10 -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
c48ac06526
Merge pull request #776 from bhollis/config_meta
...
Add a metadata page for inspecting configuration.
2013-02-14 08:52:07 -08:00
Ben Hollis
ff971dd327
Merge pull request #775 from bhollis/console
...
Add an experimental "console" CLI command.
2013-02-14 08:51:48 -08:00
Ben Hollis
b4aa33fe22
Typo in merge
2013-02-10 18:43:38 -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
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
d6110e2ff1
Add a metadata page for inspecting configuration.
...
This is another metadata page that uses the new configuration system to
show all the available options, their current values, and their defaults.
This is still unstyled, but the info is there. I still need to add on a
method for extensions to register their configuration with the global
config so they show up (stuff like blog) but this is a start.
2013-02-10 16:43:37 -08:00
Ben Hollis
2a5513dcc9
Add an experimental "console" CLI command.
...
The "console" command drops you into an IRB session in the context of the
Middleman application instance. You can look at configuration, poke around
at the sitemap and data, try out handlers (after calling self.current_path = "foo"), etc.
2013-02-10 16:12:32 -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
