Thomas Reynolds
be5fad55ca
Merge branch 'master' of github.com:middleman/middleman
2014-05-26 18:00:44 -07:00
Thomas Reynolds
00bbdfa254
unvendor fastimage
2014-05-26 18:00:39 -07:00
Thomas Reynolds
c2512e9093
update more files to non-hashrocket syntax
2014-05-26 17:58:35 -07:00
Ben Hollis
7a5865a407
gsub to sub
2014-05-26 17:13:16 -07:00
Ben Hollis
b48a767595
Use alias_method instead of defining an alias method for current_page
2014-05-26 17:13:10 -07:00
Ben Hollis
7108c29035
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/version.rb
2014-05-26 16:59:04 -07:00
Ben Hollis
ce914e508a
Make rubocop TrivialAccessors warnings less annoying
2014-05-26 16:53:23 -07:00
Thomas Reynolds
18884cac95
Merge pull request #1285 from bhollis/extensions
...
Auto activating extensions
2014-05-26 14:26:09 -07:00
Ben Hollis
430521be83
Merge pull request #1281 from adamjonas/v3-stable
...
update rspec should syntax to expect
2014-05-25 21:13:34 -07:00
Ben Hollis
6561fea296
Change the auto activated extension feature to allow specifying different lifecycle events to activate at, allowing more extensions to auto activate.
2014-05-25 21:12:40 -07:00
Ben Hollis
70b3b87905
Move ExternalHelpers into a real extension
2014-05-25 21:06:37 -07:00
Ben Hollis
fed95f9c5e
Convert external data to a real extension
2014-05-25 21:06:37 -07:00
Ben Hollis
e649bc2809
Convert FileWatcher to a real extension
2014-05-25 21:06:37 -07:00
Ben Hollis
67bb394852
Move some explicitly activated extensions to be auto activate
2014-05-25 21:06:36 -07:00
Ben Hollis
5d4cae2a06
Allow extensions to optionally register to be automatically activated before configuration.
2014-05-25 21:06:36 -07:00
Thomas Reynolds
f89a76747e
Removed wrap_layout
2014-05-25 12:23:00 +09:00
Thomas Reynolds
4ab88e6577
Document and cleanup TemplateContext class.
2014-05-25 11:59:21 +09:00
Thomas Reynolds
1a461154b6
prep
2014-05-24 19:27:56 +09:00
Thomas Reynolds
72b945682a
Fix threadsafety issue with assignment. Fixes #501 . Also, WTF?
2014-05-24 19:18:12 +09:00
Thomas Reynolds
dc15006340
We are semver
2014-05-24 18:51:18 +09:00
Ben Hollis
9a3f9fe488
Clean up some Rubocop warnings that were previously suppressed.
2014-05-24 00:37:46 -07:00
Ben Hollis
dd7f06968a
Clean up extension activation, helper registration, and sprockets autoload
2014-05-22 23:05:15 -07:00
Ben Hollis
18da7bb692
Improve documentation and mildly clean up core_extensions/extensions.rb
2014-05-22 22:36:56 -07:00
Ben Hollis
f60a49d2ce
Improve documentation and variable naming for Middleman::Extensions
2014-05-22 21:48:37 -07:00
Thomas Reynolds
610716ee80
Work around possible mutable data issue #501
2014-05-22 19:20:43 +09:00
Ben Hollis
1a7da200d1
Fix before_render after change to hooks-0.4.0. Related to #1278 .
2014-05-15 23:58:50 -07:00
Ben Hollis
dc33f6b3fa
Fix before_render after change to hooks-0.4.0. Related to #1278 .
2014-05-15 23:55:39 -07:00
Ben Hollis
5f9dec3dc8
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman/middleman.gemspec
2014-05-15 23:41:04 -07:00
Ben Hollis
f29994e25a
Fix tests after Padrino 0.12.2 release
2014-05-15 23:35:09 -07:00
Ben Hollis
82636e3596
Fixes to deal with Padrino 0.12.2 release
2014-05-15 23:30:49 -07:00
adamjonas
9887fe510c
update rspec should syntax to expect
2014-05-15 11:51:42 -04:00
Thomas Reynolds
6238bb0716
Merge pull request #1279 from bhollis/extensions
...
Resource list manipulator priority
2014-05-12 09:25:24 -07:00
Thomas Reynolds
b81ce2956b
Merge pull request #1280 from bhollis/revert-asset-hash
...
Revert 1f98d0f
2014-05-12 09:25:05 -07:00
Ben Hollis
6b10d9d428
Add the ability to set a priority order for sitemap resource list manipulators.
...
This allows us to do things like forcing :directory_indexes to always run last, alleviating the problem of the sitemap output differing depending on when you activate your extensions.
2014-05-12 00:09:35 -07:00
Ben Hollis
2312f875e6
Revert "Add :format and :keep_original options to :asset_hash. Closes #1257 "
...
This reverts commit 1f98d0f4f0
2014-05-12 00:05:22 -07:00
Ben Hollis
5c75d26c86
Merge pull request #1276 from bhollis/extensions
...
Extensions cleanup
2014-05-11 17:20:31 -07:00
Thomas Reynolds
1c6cd27171
Merge pull request #1278 from bootstraponline/fix_after_render
...
Fix after_render
2014-05-11 16:03:22 -07:00
bootstraponline
3f0373adf2
Fix after_render
...
Example usage from config.rb:
after_render do |content, path, locs, template_class|
# restore character entities such as `
content ||= ''
content.gsub! '&', '&'
content
end
2014-05-11 14:06:04 -04:00
Ben Hollis
b79a74b35b
Improve documentation for Middleman::Extension
2014-05-11 00:35:15 -07:00
Ben Hollis
6515f01800
Extension setup methods should be private, not protected
2014-05-11 00:27:12 -07:00
Ben Hollis
ef9da685de
Do away with InstanceMethods for CoreExtensions::Extensions
2014-05-11 00:27:12 -07:00
Ben Hollis
d179343ce7
Remove unused "activate" class method from Extension
2014-05-11 00:27:12 -07:00
Ben Hollis
5fc5e15975
Move methods for handling automatic extension discovery and rubygems enumeration into their own file.
2014-05-11 00:27:12 -07:00
Ben Hollis
ab238c32e5
Don't use data.page.title. This was a regression from 3.x
2014-05-10 19:37:48 -07:00
Thomas Reynolds
2dd87bab74
Fix combo of compass-import-once and sass-globs. Closes middleman/middleman-sprockets#56
2014-05-01 10:01:45 -07:00
Thomas Reynolds
113b352474
have travis install rubocop
2014-04-29 11:59:10 -07:00
Thomas Reynolds
f513ab77b3
Rubocop'd
2014-04-29 11:43:05 -07:00
Thomas Reynolds
6760d855bc
hashrocket killa
2014-04-29 10:50:21 -07:00
Thomas Reynolds
147b0a6626
rubocopening master
2014-04-29 10:48:40 -07:00
Thomas Reynolds
8eabe4d354
rubocop 2: the reckoning
2014-04-29 10:44:24 -07:00
