Thomas Reynolds
c741735446
update path to helpers for sitemap metapages
2013-06-03 10:07:09 -07:00
Karl Freeman
32b113dc93
include '/vendor' in ignored files / folders
2013-06-03 17:06:43 +01: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
Thomas Reynolds
9d50cad910
Merge branch 'master' of github.com:middleman/middleman
2013-05-31 21:01:34 -04:00
Thomas Reynolds
10f1d7ada2
break apart some methods to make code less complex
2013-05-31 20:46:12 -04:00
Ben Hollis
dbcb28dded
Add an "empty" template and let template classes override the "Gemfile" template.
...
Custom template classes can define "self.gemfile_template" to return the path to their own Gemfile template, without having to reimplement our generate_bundler! task.
2013-05-30 21:17:43 -07:00
Ben Hollis
7127401aa2
Micro-optimize some regexes
2013-05-30 21:17:42 -07: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
Ben Hollis
f611a7185b
Clean up frontmatter a bit
2013-05-28 22:29:58 -07:00
Ben Hollis
e03ef4226a
Cache the filtered resource list to avoid calling Resource#ignored? a ton
2013-05-26 16:38:28 -07:00
Thomas Reynolds
950aace674
Make Frontmatter a class-based extension to simplify file
2013-05-24 17:11:46 -07:00
Thomas Reynolds
5104579623
after_build support in class-based extension
2013-05-24 15:49:15 -07:00
Thomas Reynolds
7611f4ef4a
Listen bundles these gems again (le sigh)
2013-05-24 11:34:03 -07:00
Thomas Reynolds
3d804494f5
ignore tmp dir
2013-05-24 10:34:10 -07:00
Thomas Reynolds
117a9ab6f9
unneeded require
2013-05-23 16:27:37 -07:00
Thomas Reynolds
5b8c7a2494
move vendored gems into shared root
2013-05-23 16:06:20 -07:00
Thomas Reynolds
7a227b8bac
stub out blank middleman-more gem for backwards compat with extensions
2013-05-23 15:26:33 -07:00
Thomas Reynolds
ed9012ef5b
Ruby 1.8 can't regex on a symbol (or something)
2013-05-23 14:55:26 -07:00
Thomas Reynolds
bcdaad6443
Merge pull request #906 from adamesque/master
...
Make sure Frontmatter data is actually cached
2013-05-23 13:35:01 -07:00
Thomas Reynolds
424fee0722
Cache frontmatter repeated calling of recursively_enhance
2013-05-23 13:31:52 -07:00
Adam Luikart
c60cddc1ac
Make sure Frontmatter data is actually cached. Fixes #903
...
(Can't return a value to early out of a begin…end expression in Ruby)
2013-05-23 14:50:46 -05:00
Ben Hollis
dbbf84016f
Fix c9d151ba66
for when files are outside the project
2013-05-22 23:39:56 -07:00
Thomas Reynolds
c9d151ba66
The file watcher knows which files exist, so don't use slow File.exists?
...
Possible solution for #903
2013-05-22 17:38:01 -07:00
Thomas Reynolds
fc37ef9b99
vendor padrino
2013-05-19 13:53:37 -07:00
Thomas Reynolds
b19e8bc185
reorg some of the more stuff
2013-05-19 13:26:16 -07:00
Thomas Reynolds
15cfbd3b51
bump
2013-05-16 17:03:32 -07:00
Ben Hollis
0b017bbf3d
Require padrino helpers from sitemap meta page
2013-05-12 13:55:24 -07:00
Ben Hollis
2d17fd7480
Show a warning when default helpers or Compass are not installed.
2013-05-12 10:35:40 -07:00
Ben Hollis
ee05fa3d2c
Add total to the end of gzip output
2013-05-12 10:09:53 -07:00
Thomas Reynolds
9ebddeed1d
merge more into core, use gem availability to autoload
2013-05-09 14:41:26 -07:00
Ben Hollis
b4d75351a2
Make errors more obvious during build (with color) and run after_build hooks even if there's an error.
2013-05-04 10:57:17 -07:00
Ben Hollis
64878bfc23
Replace all_files_under with method that doesn't modify in-place
2013-05-04 10:56:38 -07:00
Thomas Reynolds
2ef3b7e4d9
fix listen deprecation
2013-05-03 11:40:30 -07:00
Thomas Reynolds
b230018692
quick release to work around i18n gem dep problem
2013-05-03 11:24:53 -07:00
Thomas Reynolds
4964022998
rollback some versions
2013-05-03 11:24:05 -07:00
Thomas Reynolds
fdc5154462
scope it, real good
2013-05-02 23:01:30 -07:00
Ben Hollis
1d88a52170
Make the list of regexes ignored by FileWatcher configurable
2013-05-02 22:09:54 -07:00
Ben Hollis
5970333ca2
Fixups for localizable files
2013-05-02 22:03:28 -07:00
Ben Hollis
d58acae939
Progress towards making localizable pages work
2013-05-02 21:17:50 -07:00
Jonathan Allard
23b6efbb06
Store#extensionless_path: Change implementation to make overrides easier
2013-05-02 19:14:59 -07:00
Ben Hollis
1362a1fc81
Update default config.rb to be a bit more modern
2013-05-02 18:59:39 -07:00
Ben Hollis
3080857316
Merge pull request #840 from barraponto/livereload_instructions
...
Document livereload usage in config file
2013-05-02 18:55:48 -07:00
Will Koehler
25d7544103
Add [] operator and has_key? to DataStore to make DataStore act like a hash.
...
The main benefit of this is to add the ability to gracefully handle the case when data is not present.
2013-05-02 16:39:28 -04:00
Thomas Reynolds
b4edf7cf16
update the extension template to new class system
2013-05-01 09:37:33 -07:00
Ben Hollis
fa17134c0a
Call the :initialized hook after the build configuration hook so extensions don't get activated but not initialized
2013-05-01 01:12:50 -07:00
Ben Hollis
513e6dc2ad
Attempt a fix for #837
2013-04-30 19:52:33 -07:00
Ben Hollis
53c4413cc3
Define respond_to? on DataStore. Fixes #872 .
2013-04-30 18:27:26 -07:00
zbo
fce9d17a81
bug fix: loading assets in pre-release gems (like :path=> :git=> in Gemfile)
2013-04-30 18:44:01 +08:00
Thomas Reynolds
ab2f37d2e6
make I18n optional in core
2013-04-22 22:09:33 -07:00
Thomas Reynolds
8a54645de5
bump padrino to 0.11.x
2013-04-22 22:07:35 -07:00
Thomas Reynolds
8b1bcb6246
move livereload dep to Gemfile
2013-04-22 20:30:25 -07:00
Ben Hollis
e54c854e10
Go back to calling the source file "Source File" in the metadata view.
2013-04-21 18:13:48 -07:00
Thomas Reynolds
bf4862860d
remove unbundled extensions from default config
2013-04-20 21:21:27 -07:00
Thomas Reynolds
2500e4d35d
convert i18n to new ext
2013-04-20 14:58:06 -07:00
Thomas Reynolds
65c8dda565
automatically wire up sitemap manipulators, let extensions control their name, add self-registration method
2013-04-20 13:54:32 -07:00
Thomas Reynolds
10e1fd92d6
add extension helpers block, convert cache buster
2013-04-20 13:32:39 -07:00
Thomas Reynolds
b12a7bff3d
Switch AssetHost to be a new-style extension. Setup extensions app scope earlier. Add supports_multiple_instances flag for extensions.
2013-04-20 12:59:14 -07:00
Thomas Reynolds
c2e2839b79
allow new sprockets
2013-04-14 16:21:36 -07:00
Thomas Reynolds
9af92fa7a3
Fix slim's complaints about extra render options (:layout)
2013-04-14 09:37:23 -07:00
Thomas Reynolds
ca333bb306
avoid warning with empty frontmatter
2013-04-14 09:29:34 -07:00
Thomas Reynolds
31651e4296
fix slim 2.0 deprecation warnings
2013-04-14 09:24:48 -07:00
Ben Hollis
a2822ce7f5
Fix --clean option to not be an error if it is passed (for backwards compatibility)
2013-04-13 18:58:54 -07:00
Ben Hollis
310eae255e
Nice styling for sitemap pages
2013-04-13 18:13:51 -07:00
Ben Hollis
b4f131d615
Styling for config meta page
2013-04-13 18:13:51 -07:00
Ben Hollis
a2f0cc263a
Merge pull request #861 from bhollis/extensions
...
A bunch of extensions and config meta pages work
2013-04-13 16:38:17 -07:00
Thomas Reynolds
2679b7c506
Default build to cleaning
2013-04-13 13:52:22 -07:00
Ben Hollis
6fcbac0368
Advertise meta pages on startup
2013-04-12 23:32:18 -07:00
Ben Hollis
774361bf89
Add extensions to meta config page
2013-04-12 23:32:18 -07:00
Ben Hollis
2d4668f524
Add in the metadata rack app early so it is there whenever middleware grabs the app
2013-04-12 23:32:18 -07:00
Ben Hollis
ee11ccb184
Reorganize Request a bit
2013-04-12 23:32:18 -07:00
Ben Hollis
8001dab258
Save information about extensions in a discoverable way.
...
This allows us to display extension config information at /__middleman/config/, and also allows users to modify extension
settings after they're activated in config.rb with a statement like "extensions[:asset_hash].options.exts += ['.js']".
2013-04-12 23:32:18 -07:00
Ben Hollis
b9b17e3ac5
In general, no need for bundle exec since we call bundle/setup
2013-04-12 23:32:17 -07:00
Ben Hollis
f7cd0e231e
Update the extension template for the new Extension class.
2013-04-12 23:32:17 -07:00
Ben Hollis
b607d70a52
Simplify configuration a bit, and make extensions raise an error if the user tries to set an invalid extension option.
2013-04-12 23:32:17 -07:00
Thomas Reynolds
3f94df1eef
prep 3.1 beta
2013-04-12 16:19:47 -07:00
Thomas Reynolds
0574cc3d28
Support sideloading from .frontmatter files. Closes #855
2013-04-12 16:14:16 -07:00
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
Thomas Reynolds
9fc06035b1
unrequire osx file watcher
2013-04-11 09:53:38 -07:00
Ben Hollis
f0449229a9
Unregister .csv from Tilt as well. Fixes #822 .
2013-04-09 23:15:05 -07:00
Ben Hollis
283576af1a
Refactor some trivial extensions back into application.
2013-04-09 23:06:10 -07:00
Ben Hollis
fdd52cd640
Remove global access to the rack env and response
2013-04-09 23:06:10 -07:00
Ben Hollis
16ca3d5c17
Make some common shared state, and logging, threadsafe
2013-04-09 23:06:10 -07:00
Artem Baguinski
91e7033d54
a first stab at partials_dir setting
...
re #252
2013-04-09 08:46:18 +02:00
Ben Hollis
1617875934
Activate Sprockets before user config
2013-04-07 23:33:40 -07:00
Ben Hollis
3e75a10056
Switch default markdown engine to Kramdown
2013-04-06 18:26:41 -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
Ben Hollis
397ccd2c1e
Fix a bunch of Ruby warnings, including a bug in the not_found method
2013-04-06 14:56:08 -07:00
Ben Hollis
1d869b0c08
Simplify frontmatter by removing its resource_list_manipulator
2013-04-06 14:56:08 -07:00
Ben Hollis
c2ffa538ad
Undo my previous change, apparently it is no good
2013-04-04 23:28:28 -07:00
Ben Hollis
f7d1471edb
Handle empty frontmatter without logging an exception
2013-04-04 22:59:05 -07:00
Ben Hollis
f89c815868
More agressively set the context for our custom Markdown renderer, and fall back if we still don't manage to get it right. Fixes #662 .
2013-04-04 22:48:09 -07: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
Ben Hollis
cc418c7a2d
Ruby 2.0 switches to using #inspect instead of #to_s when printing out objects, which brings back the infinite-hang-on-NoMethodError bug from http://bugs.ruby-lang.org/issues/4521 . Aliasing #inspect to #to_s for Middleman::Application fixes it again. This fixes #833 .
2013-04-02 22:20:37 -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
Capi Etheriel
c1c752aa32
Suggest adding middleman-livereload to bundle
2013-03-26 15:07:22 -03:00
Capi Etheriel
00ac776fc4
Document livereload usage in config file
2013-03-26 11:21:17 -03:00