Thomas Reynolds
de6d7980ac
Use centralized Logger and add instrument methods
2012-07-18 09:30:39 -07:00
kematzy
3ea2241155
Added :sass_assets_path for external SASS repositories
...
Compass is great, but sometimes we need to have common framework code in one (global) location with local overrides in the app.
This addition adds built-in support for loading SASS/SCSS files from multiple locations external to the "source" directory and even the Middleman app root.
Example usage:
# in config.rb
set :sass_assets_path, [ "#{root}/assets/sass/", "~/.sass-repo/"]
Using symlinks or copying files to the Middleman project can get messy quickly. This fix reduces some of those issues.
2012-07-17 09:21:46 -07:00
Thomas Reynolds
6f0f9b00a2
Merge pull request #536 from kematzy/fix-sass-cache-location
...
Fix sass cache location
2012-07-16 22:14:05 -07:00
kematzy
c00f9d5782
Tests for :sass_cache_path custom config
...
First time working with Cucumber, so perhaps not the best way to do things.
* Tests for default setting which stores the .sass_cache directory in Middleman app root.
* Tests for custom setting which stores the .sass_cache directory in /tmp directory.
Please Note! Unable to test the output of the default .sass_cache location since the directory is stored outside of the app root during testing, but inside app root in "production"
2012-07-16 14:39:26 +08:00
kematzy
1de1d3d25e
Added :sass_cache_path custom config of SASS cache directory
...
The default output of SASS .sass_cache directory is in the Middleman app root directory, which to my mind adds clutter to the directory.
Secondly, when storing Middleman apps in a Dropbox subfolder, the .sass_cache directory gets synced unnecessarily.
This fix enables moving the .sass_cache directory to any path on the system, such as the "/tmp" directory for automatic discarding of files when restarting the system.
Suggested usage:
#in config.rb
set :sass_cache_path, File.join('/tmp', "middleman-#{File.basename(Dir.pwd)}", "sass_cache")
which could return something like:
`/tmp/middleman-example.com/sass_cache`
This keeps multiple projects separated and easily identifiable.
2012-07-16 14:34:36 +08:00
Tim Bates
2117cbac79
Make directory_indexes check the destination_path
...
If the destination_path matches the index_file but the original path
does not (as can happen with proxied resources) then directory_indexes
will add the index file a second time, e.g. resource.path = "myres.html"
and resource.destination_path = "myres/index.html" then
directory_indexes will convert this to resource.destination_path =
"myres/index/index.html". This patch fixes that by making
directory_indexes check the destination_path when determining whether to
reroute.
2012-07-12 15:02:48 +09:30
Ben Hollis
4c5b614fe2
Make :automatic_image_sizes work for absolute image paths
2012-07-09 00:22:07 -07:00
Ben Hollis
6dad42bc77
Fix gzip extension
2012-07-07 20:50:43 -07:00
Thomas Reynolds
5cff7cd9c1
Update execjs dep, hopefully fixing therubyrhino on JRuby
2012-07-07 16:30:50 -07:00
Thomas Reynolds
4b03c5e2df
Add Middleman::Util.all_files_under to get a recursive listing of files beneath a path, follows symlinks. Fixes #515
2012-07-06 19:32:05 -07:00
Thomas Reynolds
d4259315e7
version bump [ci skip]
2012-07-04 16:47:01 -07:00
Thomas Reynolds
63224639d9
Add tests for more implied extensions
2012-07-04 16:45:27 -07:00
Thomas Reynolds
1c9a97990e
Update some gem requirements, lock Padrino
2012-07-02 16:35:53 -07:00
Ben Hollis
4faa98e874
Simplify and fix relative_assets extension to work more consistently. Also, fix a bug in relative link_to inspired by fixing this bug. This fixes #507 .
2012-06-30 22:02:23 -07:00
Ben Hollis
6ac263619a
Make :http_prefix work in link_to and asset helpers as long as the linked item is a sitemap resource. Fixes #484 .
2012-06-23 17:19:24 -07:00
Thomas Reynolds
8912d3627d
Update Padrino to 0.10.7 and Thor to 0.15.3. Closes #495
2012-06-20 17:53:14 -07:00
Ben Hollis
57f5701e72
Add a Middleman::Util.path_match function that handles matching on regexes, globs, and procs, and use it from asset_hash, minify_javascript, and minify_css. Fixes #480 .
2012-06-16 20:26:42 -07:00
Ben Hollis
8a01b28369
Improve link_to so that it can handle a Resource in place of a url. Fixes #474 .
2012-06-16 17:48:41 -07:00
Daniel Bayerlein
8fefbe350b
Remove double whitespace.
2012-06-10 00:13:04 +03:00
Daniel Bayerlein
cc1a741eb7
Move "set :fonts_dir" from "middleman-more" to "middleman-core".
2012-06-09 20:30:22 +02:00
Ben Hollis
0d0d572c3a
Rename internationalization module to avoid conflict with regular I18n module. Fixes #458 .
2012-06-05 22:00:16 -07:00
Thomas Reynolds
aa0d848ba5
Don't test Less on JRuby
2012-06-05 10:28:09 -07:00
Thomas Reynolds
286c7352b6
Fix Less load paths, simplify builder error output. Fixes #461
2012-06-05 10:24:00 -07:00
Thomas Reynolds
02871f5fcc
Avoid JRuby whitespace issue
2012-06-02 15:32:04 -07:00
Thomas Reynolds
e26b68635f
Haml wrap_layout passes again
2012-06-02 14:19:45 -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
f287e0a2bc
Don't asset_hash ico and manifest. Now with tests to prevent another regression.
2012-06-01 23:54:57 -07:00
Thomas Reynolds
2ab294c602
Fix wrap_layout for all know templating engines. Fixes #417
2012-06-01 20:08:28 -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
67e78f20c7
Move renderers into core, but don't require gems and only register templates if gems present
2012-05-28 13:19:40 -07:00
Thomas Reynolds
c3c662cf44
adapt minify_css test to compass line_comments change
2012-05-26 15:15:53 -07:00
Thomas Reynolds
98fc81beef
Implement and test asset_hash ignore option
2012-05-26 15:08:59 -07:00
Thomas Reynolds
3b847696ff
Load from root bundler when running from git
2012-05-26 14:15:36 -07:00
Thomas Reynolds
8d483f882c
Move Sprockets into an extension
2012-05-26 13:43:27 -07:00
Thomas Reynolds
f8c64f25ec
Put test ENV in the right place so cucumber/rake both work
2012-05-25 18:19:11 -07:00
Thomas Reynolds
d79acc7a78
Make i18n a normal extension with options
2012-05-24 16:51:36 -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
220bb5edb2
add some sprockets update tests
2012-05-24 10:24:36 -07:00
Thomas Reynolds
4b818ea230
Fix Sass Syntax error module path. Fixes #444
2012-05-23 14:37:57 -07:00
Thomas Reynolds
fd80027af6
idiot-proof maruku smarty pants test
2012-05-22 19:40:31 -07:00
Thomas Reynolds
2c058ee3de
Couple of fixes, specifically an issue with frontmatter layout setting
2012-05-22 19:11:54 -07:00
Thomas Reynolds
f0d781cce3
Implement our own Redcarpet Template to support renderer-level options. Closes #442
2012-05-22 14:50:37 -07:00
Ben Hollis
045f25fa4e
Ignore apple-touch-icon files from asset_hash
2012-05-20 21:01:35 -07:00
Ben Hollis
340922659a
Don't include ico and manifest in asset_hash by default
2012-05-19 23:47:26 -07:00
Ben Hollis
9b93bf2498
Add an option to asset_hash to allow excluding files that would otherwise get hashes appended to their filenames.
2012-05-19 15:35:27 -07:00
Thomas Reynolds
f0b4e56b80
Require latest execjs to avoid MultiJson warnings
2012-05-10 11:31:35 -07:00
Thomas Reynolds
5d8fd93981
loosen compass deps
2012-05-07 13:32:40 -07:00
Thomas Reynolds
527c987281
Attempt to avoid redcarpet tests on jruby
2012-05-02 16:28:04 -07:00
Thomas Reynolds
a7adc20b47
still support and test redcarpet
2012-05-02 15:27:47 -07:00
Thomas Reynolds
7fb16a4b1b
Merge pull request #413 from bhollis/maruku
...
Switch back to maruku
2012-05-02 15:10:00 -07:00
Ben Hollis
1c67871d44
Fix gemspecs for filenames with unicode paths
2012-05-01 22:57:56 -07:00
Ben Hollis
49bbc9feaa
Switch back to maruku
2012-05-01 22:46:38 -07:00
Ben Hollis
778626c6ec
Make Middleman somewhat more threadsafe and switch back to webrick.
2012-04-30 22:38:57 -07:00
Thomas Reynolds
7694ef6e07
Merge pull request #399 from bhollis/gzip
...
Synchronize gzipped file mtimes with their source file's mtime
2012-04-28 09:43:56 -07:00
Ben Hollis
9b9c95bd36
Synchronize gzipped file mtimes with their source file's mtime
2012-04-27 22:25:45 -07:00
Ben Hollis
9d811e0cf7
Prevent Sprockets from generating different hashes based on Sprockets' version number
2012-04-27 18:15:42 -07:00
Ben Hollis
593cdb27aa
I'm bad at Ruby
2012-04-27 09:20:38 -07:00
Ben Hollis
a65e1619b9
Move extract_response_text into Middleman::Util
2012-04-26 21:55:07 -07:00
Thomas Reynolds
a4b68335d4
Coffeescript module
2012-04-26 16:39:53 -07:00
Thomas Reynolds
b1d6b94302
Fixture-less slim
2012-04-26 16:21:53 -07:00
Thomas Reynolds
2e68e09200
Fixture-less ignored_already_minified
2012-04-26 16:20:03 -07:00
Thomas Reynolds
874ebc13c9
Cleanup renderers
2012-04-26 16:15:35 -07:00
Thomas Reynolds
2297100d9e
Minor cache_buster cleanup
2012-04-26 16:02:06 -07:00
Thomas Reynolds
4a49388d64
Minor relative_assets cleanup
2012-04-26 15:59:28 -07:00
Thomas Reynolds
8bf0124241
Minor minify_javascript cleanup
2012-04-26 15:57:37 -07:00
Thomas Reynolds
2292c32773
Minor minify_css cleanup
2012-04-26 15:56:27 -07:00
Thomas Reynolds
072880d79c
Cleanup Compass extension
2012-04-26 15:53:45 -07:00
Thomas Reynolds
d6f75afb3d
Cleanup middleman-more loading, remove autoload
2012-04-26 15:37:44 -07:00
Thomas Reynolds
cc3aebf5cc
Allow compressor to be passed to minify extensions as an activate option
2012-04-26 14:15:35 -07:00
Thomas Reynolds
240f67410d
Use config.rb file contents in minify test cases instead of fixtures
2012-04-26 14:07:10 -07:00
Thomas Reynolds
6987043a5f
Fix minify_css inline test
2012-04-26 13:54:38 -07:00
Ben Hollis
ce9b99ce44
Disable inline minification by default, allow it to be turned on with an option
2012-04-25 23:41:09 -07:00
Ben Hollis
82cc836ed9
Only warn on JS minification errors, and allow for custom minification ignores
2012-04-23 22:26:20 -07:00
Thomas Reynolds
1f93ec9b94
Bump deps
2012-04-22 11:02:23 -07:00
Thomas Reynolds
d95c0e6a3f
Ducks in row
2012-04-21 14:48:26 -07:00
Steel Fu
a85678f040
Add lib/asset to sprocket load path
2012-04-18 13:58:20 -07:00
Ben Hollis
50b797e0be
Get asset_hash working after the sitemap refactor. Part of this required changing the behavior of the OnDisk Sitemap extension to rebuild the sitemap every time a file is touched, instead of just when files are added (even if the file being touched is ignored by the sitemap, like a partial!). This is because asset_hash needs to recalculate hashes whenever any file changes, since partials can affect the output of other files.
2012-04-17 01:05:28 -07:00
Thomas Reynolds
dc784edc66
test directory_index and relative_assets combo
2012-04-16 16:52:21 -07:00
Thomas Reynolds
d2d40079cc
Rename Middleman::Base to Middleman::Application
2012-04-14 14:04:10 -07:00
Thomas Reynolds
d935aedd59
Sitemap refactor
2012-04-14 13:17:42 -07:00
Thomas Reynolds
baac8a31f4
fix CS test
2012-04-12 11:16:24 -07:00
Ben Hollis
7c78b20f65
Slightly improve the minify regexes
2012-04-09 19:53:01 -07:00
Ben Hollis
192047d242
Minify all JS and CSS via middleware. This means JS or CSS anywhere in the site is minified, not just in the Sprockets-controlled directories. I've also added inline CSS compression, and handling of several common "guards" that get wrapped around JS. Also, leave alone non-JS script tags (which may contain something like jQuery templates). Sprockets no longer has anything to do with minification after this.
2012-04-09 00:05:22 -07:00
Ben Hollis
fc79459e61
Fix the asset_hash extension to operate on the hash of the rendered output rather than just the source file. This prevents generating the same hash for a file when partials it uses change, or if a helper it uses produces different output. As part of this change I removed the caching from Sitemap::Page#destination_path and asset_hash since they were preventing recalculation of path/hash when partials changed, and I rewrote the Sprockets extension to expose the Sprockets environment to other extension, which included consolidating the JS and CSS Sprockets environments into one.
2012-04-04 00:00:33 -07:00
Ben Hollis
30c41df909
Merge pull request #335 from bhollis/cache
...
Introduce a cache tied to individual sitemap pages
2012-04-03 09:28:37 -07:00
Ben Hollis
4a4454fcab
Introduce a cache tied to individual sitemap pages. This helps individual extensions avoid having to implement methods to clear the cache whenever a page changes.
2012-04-01 20:37:24 -07:00
Ben Hollis
0a97aa7ec3
Fix undefined variable error in cache_buster, and make its tests more explicit.
2012-04-01 18:25:57 -07:00
Ben Hollis
c27a288f1a
Tests for using asset_host with asset_hash
2012-04-01 18:05:20 -07:00
Thomas Reynolds
183e9d68f3
Implied extensions. Closes #304
2012-03-29 18:34:25 +01:00
Trevor Wennblom
9d1be8f393
typo? engine undefined
2012-03-27 18:17:59 -05:00
Ben Hollis
b2f6d0db09
Get rid of some unused stuff in sitemap and complete documentation
2012-03-26 21:40:30 -07:00
Thomas Reynolds
7d2821a472
travis update
2012-03-14 20:02:49 -07:00
Thomas Reynolds
f76883b53a
bump compass
2012-03-14 10:54:59 -07:00
Ben Hollis
baa7d42d74
Forgot to rename gzip extension in one place
2012-03-13 22:42:18 -07:00
Thomas Reynolds
892d2e7800
loosen sass dep
2012-03-13 09:18:49 -07:00
Thomas Reynolds
af6145f2f7
compass is out
2012-03-13 09:18:49 -07:00
Ben Hollis
317dfb318a
Rename gzip_assets to just gzip since it does HTML too
2012-03-12 21:31:05 -07:00
Ben Hollis
3fde255610
Change gzip_assets output to print size difference in human terms
2012-03-11 11:06:48 -07:00
