Commit graph

1271 commits

Author SHA1 Message Date
Thomas Reynolds
094de61e92 Merge pull request #347 from middleman/sitemap_refactor
Sitemap refactor (attempt 2)
2012-04-14 13:26:43 -07:00
Thomas Reynolds
d935aedd59 Sitemap refactor 2012-04-14 13:17:42 -07:00
Ben Hollis
db0febe2f0 Merge pull request #352 from bhollis/bundler
Friendlier bundle install step
2012-04-13 22:24:51 -07:00
Ben Hollis
6cebb15b27 Merge pull request #355 from trevor/patch-2
minor typos
2012-04-12 18:18:39 -07:00
Trevor Wennblom
4d80d99d36 minor typos 2012-04-12 18:58:03 -05:00
Thomas Reynolds
baac8a31f4 fix CS test 2012-04-12 11:16:24 -07:00
Thomas Reynolds
3d1f8e7624 Try Fivemat cucumber output 2012-04-12 11:04:23 -07:00
Ben Hollis
7c78b20f65 Slightly improve the minify regexes 2012-04-09 19:53:01 -07:00
Thomas Reynolds
313f6f8214 don't need ext, handled by listen gem 2012-04-09 19:06:54 -07:00
Thomas Reynolds
5d1961ba86 bump listen dep 2012-04-09 14:23:58 -07:00
Thomas Reynolds
cd89e5ffa4 Merge pull request #353 from bhollis/minify
Minify all JS and CSS via middleware
2012-04-09 11:10:36 -07:00
Thomas Reynolds
6d75bb3bf8 Merge pull request #351 from bhollis/stacktrace
Stacktraces for config.rb
2012-04-09 09:53:00 -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
24930b094d Friendlier bundle install step 2012-04-09 00:04:07 -07:00
Ben Hollis
8730a540b0 Add a filename and line number argument to instance_exec so config.rb gets to participate in stack traces. 2012-04-08 23:45:06 -07:00
Thomas Reynolds
b1ba94cf22 Merge pull request #346 from bhollis/master
Provide a stack trace for build errors
2012-04-08 08:39:40 -07:00
Ben Hollis
4c0c638892 Provide a stack trace for build errors 2012-04-07 20:00:56 -07:00
Thomas Reynolds
ea8951dbcd activesupport not going to happen 2012-04-04 18:26:07 +01:00
Thomas Reynolds
67a84c0c9b Merge pull request #341 from bhollis/asset_hash
asset_hash considers output file contents for hash
2012-04-04 02:03:48 -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
Thomas Reynolds
4fc9492aae Merge pull request #333 from bhollis/asset_hash
Make asset_hash work with asset_host
2012-04-02 13:42:46 -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
7e816c04c0 Make the asset_url helper use the sitemap page's destination_path if it's available, which means extensions that rewrite asset paths using reroute get rewritten paths output from all path helpers for free. This was necessary to make asset_hash work with asset_host. 2012-04-01 18:08:59 -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
Thomas Reynolds
e769477e93 Implied extensions. Closes #304 2012-03-29 18:22:43 +01:00
Thomas Reynolds
aab9644185 add todo 2012-03-29 11:14:03 +01:00
Ben Hollis
95b0f80d31 Merge pull request #329 from trevor/patch-1
typo? engine undefined
2012-03-27 21:36:16 -07:00
Trevor Wennblom
9d1be8f393 typo? engine undefined 2012-03-27 18:17:59 -05:00
Thomas Reynolds
59e112a022 Merge pull request #328 from bhollis/master
Documentation and dead code removal
2012-03-27 02:46:35 -07:00
Ben Hollis
3c4578b239 Document Middleman::Extensions.register 2012-03-26 21:40:30 -07: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
189833c61f Merge pull request #325 from bhollis/master
Make frontmatter always return a hash, and freeze it
2012-03-26 03:19:15 -07:00
Ben Hollis
92713dfe92 Make frontmatter always return a hash, and freeze it. This reduces the need for nil checks and prevents users from accidentally trying to modify frontmatter data which may be cached elsewhere. 2012-03-25 12:53:45 -07:00
Thomas Reynolds
c69fac9028 Merge pull request #322 from bhollis/master
Fix ignore with a regex
2012-03-25 11:17:27 -07:00
Ben Hollis
086f05989b Fix ignore with a regex (with a test) and consolidate ignores into a single list of callbacks. 2012-03-24 20:45:17 -07:00
Ben Hollis
d51056cb26 Fix CLI tests now that we generate a Gemfile by default 2012-03-24 20:37:15 -07:00
Thomas Reynolds
53db5689c7 Merge pull request #318 from bhollis/bundler
Add bundler as a dependency and default to generating a Gemfile
2012-03-20 10:49:38 -07:00
Ben Hollis
a07df582c3 Add bundler as a dependency and default to generating a Gemfile. 2012-03-19 16:50:51 -06:00
Thomas Reynolds
276e6562dd Merge pull request #316 from bhollis/templates
Include middleman-core's template path in the list of source_paths
2012-03-19 08:37:16 -07:00
Thomas Reynolds
40380aaeeb Merge pull request #317 from bhollis/master
Fix watcher to be more selective about what it ignores
2012-03-19 08:36:51 -07:00
Ben Hollis
0d80678e48 Include middleman-core's template path in the list of source_paths so that inherited templates in other gems can still use the Gemfile and config.ru from the main middleman gem. 2012-03-18 18:58:15 -06:00
Ben Hollis
1b0fe80873 Fix watcher to be more selective about what it ignores 2012-03-18 18:55:02 -06:00
Ben Hollis
bacffeea02 Tell Thor to return the right exit code on failure 2012-03-18 17:30:35 -06:00
Thomas Reynolds
85d2ace5ce Merge pull request #315 from bhollis/master
Expose errors to users during build
2012-03-18 12:34:43 -07:00
Ben Hollis
6f4e863091 Expose errors to users during build rather than burying them in output files. 2012-03-18 13:01:04 -06:00
Thomas Reynolds
d36077f47b Merge pull request #313 from bhollis/sitemap_globs
Sitemap/frontmatter/globbing fixes
2012-03-15 11:32:03 -07:00
Ben Hollis
4a5fededf7 Make with_layout work with globs/regexes 2012-03-15 00:31:50 -07:00