Commit graph

160 commits

Author SHA1 Message Date
Thomas Reynolds 0eb906efac Stylus support and tests. Fixes #649 2012-10-28 12:19:47 -07:00
Thomas Reynolds 2ea35b3004 Stub out rspec tests for public APIs: Rack and Sitemap for now 2012-10-27 11:47:06 -07:00
Ben Hollis 0d806277f9 Don’t print a warning when FastImage doesn’t know about a file type 2012-10-20 21:18:42 -07:00
Rolf Timmermans da11eae106 Fix asset hash generation in combination with sprockets. 2012-10-16 16:57:00 -07:00
Ben Hollis a50ca56fbc Switch over to new config methods 2012-10-13 21:37:02 -07:00
Ben Hollis 52819cd239 Make sure to require rack/test from asset_hash 2012-09-30 19:25:15 -07:00
Thomas Reynolds 3a4c063535 Reload i18n files when they change, closes #616 2012-09-30 13:17:01 -07:00
Thomas Reynolds c53c46729a actually make ruby encoding setting work, fix gzip to read/write binary 2012-09-29 14:12:26 -07:00
Thomas Reynolds 061323a09f prep release 2012-09-23 18:43:42 -07:00
Thomas Reynolds 2aec04db69 Merge pull request #558 from bhollis/asset-hash-rack
Asset_hash doesn't play nice with Sprockets
2012-09-23 18:41:11 -07:00
Ben Hollis 6c241603ac Delay recalculating sitemap until absolutely necessary, avoiding redundant recalculations. 2012-09-16 19:36:47 -07:00
Ben Hollis d181ec5f4f Remove use of full_path and odd options from auto_tag 2012-09-16 01:57:37 -07:00
Ben Hollis 09ba0049d4 Fix asset_hashing assets affected by Rack middleware or mounted apps (like sprockets). Fixes #558 2012-09-11 00:08:58 -07:00
Adam Luikart 4076666c19 Add test for asset_hashing rack-filtered items. 2012-09-11 00:08:57 -07:00
Thomas Reynolds 05834ad386 Test relative_assets with i18n 2012-09-02 10:04:43 -07:00
Thomas Reynolds 1998668a87 Disable buggy color-compression in built-in Rainpress CSS minification. Fixes #576 2012-08-28 16:08:34 -07:00
Thomas Reynolds 54c055ea5e Hack a way to pass Middleman context into Slim filters 2012-08-16 13:48:34 -07:00
Thomas Reynolds 8e7041994f Wire-up and document smacss template 2012-08-14 13:52:07 -07:00
Thomas Reynolds b3fd8629d3 Merge pull request #562 from nsteiner/smacss
adding smacss submodule
2012-08-14 13:43:57 -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
Nate Steiner 7fb6766d4d adding smacss as files instead of a submodule 2012-08-10 14:19:20 -04:00
Nate Steiner 893b7baafd removing smacss submodule 2012-08-10 14:17:10 -04:00
Nate Steiner e29dfa4ab7 adding smacss submodule 2012-08-10 11:29:19 -04:00
Thomas Reynolds f1eae1e0c8 Correct path in sass-assets-path test 2012-07-25 12:05:43 -07:00
Thomas Reynolds 1c9810483b Ruby 1.8-friendly markdown image test 2012-07-25 11:39:17 -07:00
Thomas Reynolds 6ccf5e2db0 Don't catch CoffeeScript errors when in build mode. Fixes #551 2012-07-25 11:22:29 -07:00
Ben Hollis e6c7caaa83 Test for Redcarpet using our link_to and image_tag helpers 2012-07-18 22:57:52 -07:00
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