Thomas Reynolds
a52effc119
continue forcing Padrino to html_safe everything
2013-06-12 11:19:02 -07:00
Thomas Reynolds
efc0f9961b
Merge pull request #927 from middleman/content_for_escaping
...
content_for is escaping .erb
2013-06-07 10:08:37 -07:00
Karl Freeman
ef46e4e6c3
add breaking test for escaped html using content_for
2013-06-07 09:59:59 +01:00
Karl Freeman
0b8c36cb8c
capture_html helper tests
2013-06-07 09:58:37 +01:00
Thomas Reynolds
265f90e240
Add callback so v4 extensions can see when other extensions are activated
2013-06-04 15:51:03 -07:00
Thomas Reynolds
d0cd3e3cf9
layouts_dir is now configurable. Closes #899
2013-06-01 15:25:44 -07:00
Thomas Reynolds
149f6ffa5b
fix builder not cleaning empty directories
2013-05-31 21:20:15 -04:00
Ben Hollis
7bdf28a421
Fix ignoring layouts from the sitemap when the source directory has been set to something other than 'source'. Fixes #896 .
2013-05-30 20:17:58 -07:00
Jonathan Allard
56f16c2488
Fix #823-2 to allow only one extension on localized views
...
Make Sitemap::Store#strip_away_locale actually do something
2013-05-30 13:37:31 -04:00
Thomas Reynolds
31f238f881
Refactor some of i18n for better codeclimate scores. In the process, make nested i18n files work like rails
2013-05-29 14:00:37 -04:00
Thomas Reynolds
86cd626084
write some file change and deletion tests for better data coverage
2013-05-29 10:59:03 -04:00
Thomas Reynolds
fef8b8417d
Add more nested data tests, actually get simplecov to run
2013-05-29 09:59:15 -04:00
Manuel Meurer
ed59260367
Replace all occurrences of data.page with current_page.data
...
see https://github.com/middleman/middleman/issues/912
2013-05-29 11:25:57 +02:00
Thomas Reynolds
9ebddeed1d
merge more into core, use gem availability to autoload
2013-05-09 14:41:26 -07:00
Jonathan Allard
0211114ecb
Change different-engine-layout from .str to Haml
2013-05-02 19:14:59 -07:00
Thomas Reynolds
0574cc3d28
Support sideloading from .frontmatter files. Closes #855
2013-04-12 16:14:16 -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
Ryunosuke SATO
1e64e8022e
Support directory name as a data key
2013-03-23 17:17:34 +09: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
Steven Sloan
c121c407df
also "build" .htpasswd files
2013-01-18 20:13:49 -05:00
Thomas Reynolds
eccda125e5
Remove Tilt mappings for missing libraries. Fixes #713
2013-01-08 10:24:07 -08:00
Thomas Reynolds
6253c91610
Allow non-templates to have frontmatter. Closes #698
2012-12-30 20:40:20 -08:00
Thomas Reynolds
e97d0ad0e4
Allow non-templates to have frontmatter. Closes #698
2012-12-30 20:29:39 -08:00
Thomas Reynolds
45ddc0c344
Make Sitemap metadata queryable with arel-style API
2012-12-25 16:05:54 -08:00
Ben Hollis
862551c523
Upgrade proxy to be able to take :locals and understand :ignore, and store proxy options and metadata with the proxy list.
...
This allows users to use proxy directly instead of page to create dynamic pages, and improves performance of dynamic pages for sites that create many proxies. It also allows people to use locals instead of instance variables, which are better for partials and reduce the risk of overwriting Middleman settings.
2012-10-13 14:03:32 -07:00
Ben Hollis
1ee89ac6bf
Upgrade proxy to be able to take :locals and understand :ignore, and store proxy options and metadata with the proxy list.
...
This allows users to use proxy directly instead of page to create dynamic pages, and improves performance of dynamic pages for sites that create many proxies. It also allows people to use locals instead of instance variables, which are better for partials and reduce the risk of overwriting Middleman settings.
2012-10-12 19:46:11 -07:00
Thomas Reynolds
446aa6a4ba
Clean up whitespace, play with cane for testing style quality and code complexity
2012-08-13 15:41:07 -07:00
cwebbdesign
d0a36f0879
Adding tests for using front matter to override layout set in config
2012-07-27 10:57:48 +02:00
cwebbdesign
a0c11df4cc
Adding tests for overriding layouts using frontmatter
2012-07-27 10:55:30 +02:00
Tim Bates
99a8723ea6
Fix instance variables in dynamic pages
2012-07-24 23:02:27 +09:30
Tim Bates
0fa1bfe675
Tests and a small bug fix to make them pass
2012-07-13 16:00:53 +09:30
Thomas Reynolds
df31f65522
Make automatic helpers smarter. Fixes #510
2012-07-04 11:29:00 -07:00
Thomas Reynolds
c3796a9161
:automatic_directory_matcher optionally converts a character sequence in file names into a subdirectory. Closes #491
2012-06-19 20:07:50 -07:00
Thomas Reynolds
518ae3f46d
Move encoding tests into a dynamic form so they aren't packaged with gemspecs on unsupported platforms.
2012-06-18 15:18:16 -07:00
Thomas Reynolds
5071a2c15d
Tests for #477
2012-06-17 12:03:36 -07:00
Ben Hollis
efa846341d
Update nested_layout tests to show that Haml still doesn't work right. Also updated Slim and ERb tests to verify ordering of output.
2012-06-02 00:35:03 -07:00
Ben Hollis
9b5d1f17d0
Test showing wrap_layout is still broken when used with haml
2012-06-01 19:05:55 -07:00
Ben Hollis
d8d4769702
Fix nested layouts for ERB
2012-06-01 19:05:55 -07:00
Thomas Reynolds
b5b6349220
Only allow frontmatter on first line, unless we have a ruby 1.9 encoding comment, then allow it on the second line. Fixes #446
2012-05-25 13:17:22 -07:00
Thomas Reynolds
dcdbf3e110
change json frontmatter delimeter to the ironic ;;; to avoid interfering with mustache {{{
2012-05-25 12:52:04 -07:00
Thomas Reynolds
64f84bacd2
asset urls, padrino helpers and i18n belong in more
2012-05-24 16:31:21 -07:00
Thomas Reynolds
1cad726c81
Move off-by-default extensions into middleman-more, make middleman-more itself an extension
2012-05-24 16:14:17 -07:00
Thomas Reynolds
8c87bbc757
Handle .htc files [no-ci]
2012-05-12 08:48:03 -07:00
Thomas Reynolds
162622c453
JSON frontmatter and allowing frontmatter to be located after a encoding value
2012-05-09 13:33:14 -07:00
Ben Hollis
dddd409336
Support Unicode characters in filenames, both in source filenames and in the names of proxied paths. Fixes #332 .
2012-04-29 21:42:45 -07:00
Thomas Reynolds
9024de85d8
Allow partial to find files without an underscore prefix. Closes #366
2012-04-20 10:34:22 -07:00
Thomas Reynolds
bd9814965e
Move 3rd party CLI out of fixtures
2012-04-16 15:38:26 -07:00
Thomas Reynolds
d08624dfe3
Port i18n to new sitemap api
2012-04-16 13:42:22 -07:00
Thomas Reynolds
d935aedd59
Sitemap refactor
2012-04-14 13:17:42 -07:00
Thomas Reynolds
e769477e93
Implied extensions. Closes #304
2012-03-29 18:22:43 +01:00
Ben Hollis
1b0fe80873
Fix watcher to be more selective about what it ignores
2012-03-18 18:55:02 -06:00
Ben Hollis
5db1a9453a
Make directory_indexes use provides_metadata_for_path instead of its own list of ignored paths, allowing it to support regexes/globs
2012-03-15 00:29:50 -07:00
Ben Hollis
6edefe3c68
Further tweaks that expose another bug - ignore with proxies leads to Not Found errors. Same issue as #302 .
2012-03-11 23:09:43 -07:00
Ben Hollis
54b5304264
Ignore pidfiles
2012-03-11 22:40:54 -07:00
Thomas Reynolds
7d7f9a20ef
i18n not ready for primetime yet
2012-03-10 19:40:04 -08:00
Thomas Reynolds
8d22fee8d8
Merge pull request #298 from bhollis/i18n-helpers
...
Fix Padrino helpers that require an i18n locale to be present
2012-03-09 10:19:15 -08:00
Ben Hollis
efe1d45af7
Rewrite sitemap_traversal tests to better reflect what should actually happen, and to expose a bug in current_page.
2012-03-07 22:08:41 -08:00
Ben Hollis
617f73c8db
Fix Padrino helpers that require an i18n locale to be present
2012-03-04 17:20:57 -08:00
Thomas Reynolds
e285045fc5
Merge branch 'master' of github.com:middleman/middleman
2012-03-03 15:32:25 -08:00
Thomas Reynolds
445b66bed7
test backwards compatible request.params template values. closes #294
2012-03-01 13:43:47 -08:00
Thomas Reynolds
1ee1a06291
switch to guard/listen
2012-02-25 15:53:23 -08:00
Thomas Reynolds
5842bf8e5b
allow extensionless files to be previewed and built. fixes #270 , but requires alternative layouts be placed in a layouts/ directory now.
2012-02-12 11:45:42 -08:00
Thomas Reynolds
d1f0e6f616
fix errant MM bootup during CLI. Make an autodiscoverable tasks/ directory
2012-01-16 14:55:08 -08:00
Thomas Reynolds
aeb9d10b25
automatically load helper modules from helpers/. closes #238
2012-01-15 13:44:00 -08:00
Thomas Reynolds
309f8dd966
Merge pull request #231 from bhollis/ignore
...
Scenarios to test proposed "ignore" behavior
2012-01-14 12:19:07 -08:00
Ben Hollis
b01f0f96e8
New (failing) feature describing what it would look like to set some page features through frontmatter.
...
This tests the ability to set layout, ignore, and diable directory_index. Pertains to issue #194 .
2012-01-06 23:08:38 -08:00
Ben Hollis
cebb15c9ca
Add a new (failing) feature test to show the behavior I think would be good for the "ignore" helper.
...
These scenarios show ignoring files by their source paths rather than their output paths,
ignoring globbed paths (including into subdirectories), and ignoring paths that will be transformed
by directory_indexes. These scenarios pertain to issues #229 and #225 .
2012-01-06 22:43:32 -08:00
Thomas Reynolds
92319ebffc
support glob page instance vars. fixes #230
2012-01-05 21:18:55 -08:00
Ben Hollis
c5063c1e35
Fix builder steps to properly copy configs, and add a new scenario that shows build --clean not working right when the build directory is set to a nested path. When a path is ignored, it doesn't get removed - in fact, no unused paths will get removed, this is just the easiest way to show it in a test.
2012-01-04 22:54:20 -08:00
Thomas Reynolds
ca10d108e3
fix remaining middleman-more tests
2011-12-29 19:28:49 -08:00
Thomas Reynolds
73913f0ace
Start getting middleman-more tests passing. About 50% done
2011-12-29 19:04:39 -08:00
Thomas Reynolds
c8a134a386
split into middleman-core and middleman-more
2011-12-29 15:09:51 -08:00
