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
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
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
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
.
Conflicts:
middleman-core/lib/middleman-core/extensions/asset_hash.rb
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
Thomas Reynolds
04dc48f13d
Great rubocop-ing
2014-04-28 16:02:18 -07:00
Thomas Reynolds
1e43784cc2
remove queryable api
2014-04-28 10:28:16 -07:00
Thomas Reynolds
ffe9226aac
Remove root config options for minification
2014-04-28 10:21:14 -07:00
Thomas Reynolds
8f75f6516d
back out IP detection
2014-04-14 10:34:53 -07:00
Thomas Reynolds
419a81fffb
Merge pull request #1256 from fabianrbz/fix_rubocop_config
...
Fix rubocop config.
2014-04-14 10:15:13 -07:00
Thomas Reynolds
1840176340
Merge pull request #1255 from binaryphile/h5bp
...
update to html5-boilerplate 4.3.0
2014-04-14 10:14:47 -07:00
Thomas Reynolds
1f98d0f4f0
Add :format and :keep_original options to :asset_hash. Closes #1257
2014-04-14 10:05:00 -07:00
Fabian Rodriguez
0656cd6a31
Fix rubocop config.
...
Since rubycop v0.20.0 'AllCops/Excludes' and 'AllCops/Includes' where renamed to
'AllCops/Exclude' and 'AllCops/Include'
2014-04-12 18:28:13 -03:00
Ted Lilley
e57318f7c6
update to html5-boilerplate 4.3.0
2014-04-12 15:17:38 -04:00
Thomas Reynolds
9d0eb72e73
Merge pull request #1254 from Arcovion/patch-1
...
Change default IP for CLI server
2014-04-11 09:39:54 -07:00
Eliott Appleford
a50ca3a49d
Change default IP
...
Enables #1248 by default.
2014-04-11 14:48:12 +01:00
Thomas Reynolds
07aa2113b9
merge activesupport update
2014-04-09 16:14:10 -07:00
Thomas Reynolds
dc3d4f9fd5
bump activesupport
2014-04-09 16:12:57 -07:00
Thomas Reynolds
4b53549ae4
Merge in recent changes from v3-stable
2014-04-08 09:27:18 -07:00
Thomas Reynolds
a5c2386853
match masters new logger ref
2014-04-07 16:47:06 -07:00
Thomas Reynolds
6a34bf544a
Merge pull request #1253 from adamesque/patch-1
...
Don't hang on to the first Logger instance you see
2014-04-07 16:44:12 -07:00
Adam Luikart
d4d1391bbb
Don't hang on to the first Logger instance you see
...
If the main app instance hangs on to the logger that ::Middleman::Logger.singleton returns, then subsequent calls to re-init the logger won't have any effect (for instance, when setting up the preview server's logger based on CLI params).
Redefining logger to be a pass-through to ::Middleman::Logger.singleton instead of an ivar seems more in keeping with the sprit of a singleton, anyways.
This fixes an issue where running `middleman server --verbose` doesn't output any debug info.
2014-04-07 17:34:26 -05:00
Thomas Reynolds
bbd9913372
Update changelog [ci skip]
2014-04-07 11:03:13 -07:00
Thomas Reynolds
69c6e87b31
bump
2014-04-07 09:56:15 -07:00
Thomas Reynolds
1b3b785c2b
Merge pull request #1248 from Arcovion/patch-1
...
Mobile friendly host & windows fix
2014-04-07 09:49:36 -07:00
Thomas Reynolds
4c9af0e07d
Merge pull request #1251 from railsbros-dirk/fix-middleman-init-command
...
CLI: Always require 'middleman-core/version'
2014-04-07 09:48:48 -07:00
Thomas Reynolds
fcbf9f1568
avoid running Sass compilation twice
2014-04-07 09:38:00 -07:00
Dirk Breuer
ae451608b3
CLI: Always require 'middleman-core/version'
...
The `init` command will fail if the `VERSION` was not required because
it is needed for the Gemfile generation. Unfortunately this was not
catched by the specs because the specs require the version and the child
process is not correctly reset.
I was not able to change this easily :-(
2014-04-07 16:15:50 +02:00