deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2284 commits 11 branches 271 tags 23 MiB
Commit graph

813 commits

Author SHA1 Message Date
Thomas Reynolds 614d69dc18 move current_path in to the template context, one less piece of global state 2014-01-03 14:56:16 -08:00
Thomas Reynolds f40903e663 move rendering into specialized File and Template rendering classes. 2014-01-03 13:40:37 -08:00
Thomas Reynolds c06fbcfc93 rely directly on rack-mock 2014-01-02 21:45:42 -08:00
Thomas Reynolds bea2515a41 Move CLI into middleman-cli 2014-01-02 16:39:06 -08:00
Thomas Reynolds 305d2f99ed Put template rendering in a jail 2014-01-02 16:05:39 -08:00
Thomas Reynolds 9798f152ca silence slim warnings 2014-01-02 14:59:14 -08:00
Thomas Reynolds 5afa66f194 bump deps 1 2014-01-02 14:48:40 -08:00
Thomas Reynolds d77ef04774 upgrade to newest activesupport 2014-01-02 14:38:18 -08:00
Thomas Reynolds 95eaeba960 Start cleaning up Rack internals 2014-01-01 19:09:47 -08:00
Thomas Reynolds 42fb8c229a bump version 2014-01-01 18:08:30 -08:00
Thomas Reynolds a610608785 remove old style extension support 2014-01-01 15:10:49 -08:00
Thomas Reynolds c95c924d53 build a config file jail 2013-12-31 18:21:30 -08:00
Thomas Reynolds 2e2415612a spring cleaning util and discovery of nasty variable mutating in url_for 2013-12-31 14:41:17 -08:00
Karl Freeman dcf527008e StringLiterals 'cop' fix [ci skip] 2013-12-29 23:04:30 +00:00
Matt Simpson 21f575af3a Specify the full path to the NEWLINE constant 2013-12-28 19:43:59 -06:00
Karl Freeman a31aa5d8be TrailingWhitespace 'cop' fix 2013-12-28 18:14:15 +00:00
Karl Freeman 03d6e6c990 Implemented Rubocop 
- just took a stab at running the StringLiterals cop to get a taste.
 2013-12-28 00:47:39 +00:00
Thomas Reynolds e996868033 Depend on new i18n gem, silence deprecation warning 2013-12-25 16:52:29 -08:00
Thomas Reynolds b6361c23f7 prep new release 2013-12-18 14:56:21 -08:00
Thomas Reynolds a1090f912c fix issue with UTF-8-MAC paths not matching UTF-8 paths in build clean 2013-12-18 14:54:07 -08:00
Ben Hollis f9728108cc Fix Mac filenames patch 2013-12-15 16:06:55 -08:00
Thomas Reynolds 70744aa63f fix typo 2013-12-13 08:30:19 -08:00
TMaYaD 8b87670024 Allow path to be passed to page_classes 
This allows tagging navigation links etc. in other pages with page classes
 2013-12-13 13:07:00 +05:30
Thomas Reynolds 0a264fd3c2 Merge pull request #1116 from bhollis/gzip 
Parallelize gzip extension using threads
 2013-12-11 10:40:29 -08:00
Ben Hollis 39a9331232 Commit 8e99d39570 introduced a serious regression by encoding filenames within a "delete_if" block, meaning that every path in the list of all previously built files was re-encoded every time a file was built. For large projects this causes serious slowdowns - for a 4000 file test, it went from 14s to build to around 8 minutes to build. This change fixes the builder to only encode files when the file list is initially build, removing the bottleneck. 2013-12-10 22:11:59 -08:00
Ben Hollis 54bc3e44f7 Parallelize gzip extension using four threads 2013-12-10 22:06:41 -08:00
Ben Hollis 1f6904c0fc Set locale to :en around gzip extension while it works. It was originally only set for one message, not the whole extension. 2013-11-30 22:59:19 -08:00
Thomas Reynolds c500039197 Add build-mode test cases to see if #1068 occurs 2013-11-29 14:57:35 -08:00
Ben Hollis 9e8a16cd6d Switch back to single-variable storage for Sitemap::Resource#destination_path 2013-11-27 00:19:59 -08:00
Ben Hollis fd9f726b9a Remove 1.8 notice message 2013-11-25 22:51:34 -08:00
Ben Hollis 63b53077ff Oops had not meant to commit this yet. Anyway, it makes the "helpers" method on Extension able to take a module directly instead of just a block. 2013-11-25 01:10:10 -08:00
Ben Hollis 34d399f580 Fix yard options 2013-11-25 00:12:39 -08:00
Ben Hollis 7ad5b2bdef Ignore this new .cache folder that's shown up 2013-11-24 23:31:51 -08:00
Ben Hollis fc20a761de Fix extension configs meta page to correctly handle multiple instance extensions like blog 2013-11-24 22:13:33 -08:00
fukayatsu 8e99d39570 Handle UTF-8-MAC filename on MacOS 2013-11-24 02:10:46 +09:00
Thomas Reynolds 6b6e9b143d actually add new padrino 2013-11-22 08:47:07 -08:00
Thomas Reynolds 48db12429a upgrade padrino. closes #1078 2013-11-19 18:10:39 -08:00
Ben Hollis 3347403d3a Fix typo 2013-11-19 00:17:50 -08:00
Ben Hollis 7f1285a773 Move to flat_map now that we don't use 1.8 2013-11-18 22:22:18 -08:00
Ben Hollis ac64b17ef0 Require Ruby 1.9.3+ 2013-11-18 20:19:57 -08:00
Paul C Pederson 56343c84ed localization by filename extension 2013-11-18 10:20:42 -08:00
Thomas Reynolds f136af2aad TODO 2013-11-15 11:26:27 +00:00
Thomas Reynolds 8a18da4e3d Merge pull request #1071 from stevenosloan/fix_paths_for_meta_pages 
use absolute paths for meta_page assets/links
 2013-11-14 08:47:09 -08:00
Thomas Reynolds d29f387245 Merge pull request #1073 from stevenosloan/fix_markdown_syntax_in_kramdown_test 
Add link contents in maito in kramdown test
 2013-11-14 08:46:39 -08:00
Thomas Reynolds 95c0fe60ac whoops, bad rename 2013-11-14 16:44:37 +00:00
Steven Sloan 955467f648 add link contents for mailto: link in kramdown markdown test 2013-11-13 22:46:06 -05:00
Steven Sloan d183858091 make meta page asset paths absolute to fix the issue of trailing/non-trailing slashes causing path problems on meta pages 2013-11-13 22:23:03 -05:00
Thomas Reynolds 4da2b02d70 Merge branch 'master' of github.com:middleman/middleman 2013-11-12 11:12:02 +00:00
Thomas Reynolds b813db397f actually wire up auto alt tags. Finally fixes #782 2013-11-12 11:11:33 +00:00
Takehiro SUGITA 19908ca81a Add -B option as an alias to --skip-bundle 2013-11-08 19:45:49 +09:00
Thomas Reynolds 238f992551 post install message 2013-11-02 18:01:23 -07:00
Thomas Reynolds e0a4b8f17d dont route kramdown mailto links through link_to. Closes #1058 2013-10-30 09:18:25 -07:00
Thomas Reynolds 22c977d426 Merge branch 'master' of github.com:middleman/middleman 2013-10-29 09:44:22 -07:00
Thomas Reynolds 2cd5edf114 bump to 3.2.0 2013-10-29 09:44:19 -07:00
Thomas Reynolds ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds 19c155349d Merge pull request #1044 from mojavelinux/asciidoc-renderer 
resolves #1043 added a renderer for AsciiDoc files
 2013-10-29 09:37:36 -07:00
Thomas Reynolds 9a2c1533e3 make page_classes prefix configurable 2013-10-29 09:33:27 -07:00
Thomas Reynolds 1e57eb5c1b Merge pull request #1049 from bhollis/classes 
Clean page classes of invalid CSS characters
 2013-10-29 09:23:05 -07:00
Andrew e8de5907fa Actually fix the issue, rather than pretending to 2013-10-25 18:09:36 +11:00
Andrew 2e70cc5d99 Update queryable interface so that it doesn't mutate 2013-10-25 14:48:23 +11:00
Thomas Reynolds 87aa288f1e Merge pull request #1054 from bhollis/reload 
Gracefully handle syntax (and other) errors when reloading config.rb.
 2013-10-21 10:37:36 -07:00
Thomas Reynolds 764efe65cd Merge pull request #1053 from bhollis/logging 
Allow logging to be sent to a file
 2013-10-21 10:37:02 -07:00
Thomas Reynolds 13511f9323 Merge pull request #1052 from bhollis/builder 
Refactor the Build CLI code to be easier to read
 2013-10-21 10:36:44 -07:00
Ben Hollis 12de88e8d7 Allow logging to be sent to a file 
In config.rb, you can write:

logger 'middleman.log'
 2013-10-19 20:20:07 -07:00
Ben Hollis 441ec95065 Gracefully handle syntax (and other) errors when reloading config.rb. 
With this change, config.rb modifications that result in an error will print the error to the logs but will not kill the server - the previous version of the application will still be running just fine, so that you can try and fix your config.rb without having to restart. The server no longer simply hangs with no message, which was the previous behavior. This fixes #702.
 2013-10-19 19:39:10 -07:00
Ben Hollis e773e8c1a9 Fix tests under 1.8 by coercing Kramdown's OrderedHash into a real Hash. 2013-10-19 19:02:34 -07:00
Ben Hollis d3e4882b93 Refactor the Build CLI code to be easier to read and use Pathname throughout. 
This also throws an error if :build_dir is set to a parent directory of :source_dir, which resolves #991.
 2013-10-19 18:11:29 -07:00
Ben Hollis ae2b6b34f1 Fix a nasty memory/proc leak pointed out by @Xanders. Fixes #1020. 2013-10-19 16:45:07 -07:00
Ben Hollis da34153e0c Support HEAD requests. Fixes #1021. 2013-10-19 16:18:11 -07:00
Ben Hollis 4055479ff3 Clean page classes of invalid CSS characters and make sure they don't start with a number 2013-10-19 15:31:49 -07:00
Dan Allen 5439139b76 added cucumber tests for #1043, AsciiDoc support 2013-10-19 14:41:52 -06:00
Dan Allen 55d844f667 resolves #1043 added a renderer for AsciiDoc files 2013-10-17 00:49:53 -06:00
Thomas Reynolds 7762abe461 prep 2013-10-15 14:40:01 -07:00
Thomas Reynolds 1260188069 attempt to address asset host and hash combo, give up. 2013-10-15 14:33:25 -07:00
Thomas Reynolds c69909910d adjust some markdown tests 2013-09-28 00:23:13 -07:00
Ali Bosworth 2738e8ea69 Add test against URL fragments for asset hashes 2013-09-26 14:33:56 -07:00
Thomas Reynolds 43653b70a4 Merge pull request #1019 from tavon/master 
Do not cache generated redirect index file.
 2013-09-24 23:39:34 -07:00
Thomas Reynolds d842db1772 Merge pull request #1017 from bhollis/url_for 
Look for assets using url_for before falling back to the "images" directory
 2013-09-24 23:33:53 -07:00
John Hwang 5b691fff10 Do not cache generated redirect index file. 
Returning visitors to site were being redirected to the old page because their browser was caching the index page which was pointing to the previously URL.
 2013-09-24 10:59:52 -04:00
Ben Hollis f2538f2e54 Look for assets using url_for before falling back to the "images" directory 2013-09-22 14:02:51 -07:00
Ben Hollis a746be1342 Use our magic linking functions from Kramdown, just like we do with Redcarpet. Fixes #999 2013-09-16 23:46:59 -07:00
Ben Hollis 8a928863f2 Normalize paths in the cleaning queue using realpath in order to avoid complicated symlink problems. 2013-09-16 22:13:39 -07:00
Ben Hollis 268538f926 Make an effort to handle spaces in filenames in a way that url_for can handle. 2013-09-16 21:07:57 -07:00
Nicholas Hutchinson dcd760d4f8 Demonstrate issue with directory indexes and spaces in paths 
References #961
 2013-09-16 21:07:56 -07:00
Thomas Reynolds cd9964edbe prep 2013-09-07 13:12:31 -07:00
Steven Sloan ee7c9e6a6e Add support/tests for Redcarpet 3.0.0 features 
- :underline
- :highlight
- :disable_indented_code_blocks

Fix support for
- :link_attributes
- :filter_html

separate Redcarpet extensions from renderer options, add specs for missing renderer options

add specs for the missing/new redcarpet extensions, [ :lax_spacing, :underline, :highlight, :quote, :disable_indented_code_blocks, :footnotes ]

fix link_attributes option for Redcarpet

patch Tilt's reverse option aliases (they were there for RC1)

adjust test data for Redcarpet toc_data to match the current way it renders in 3.0

revert tests that aren't in redcarpet 3.0.0

add a cucumber exempt tag for mri-1.8.x

move redcarpet 3 specific extensions to a separate scenario filtered by the no18 tag
 2013-08-27 11:37:37 -04:00
Thomas Reynolds abfe5e673f Merge pull request #992 from Mark-Simulacrum/master 
Add listener latency option.
 2013-08-21 16:01:27 -07:00
Mark Simulacrum 7606dfd494 Change latency option to :numeric type. 2013-08-21 05:33:29 -06:00
Mark-Simulacrum c12d98df4f add comma at end of line 74 2013-08-20 15:59:38 -06:00
Mark-Simulacrum 24ce8334ee Add latency option to listener object. 2013-08-20 06:36:51 -06:00
Mark-Simulacrum d37eca6a54 Add latency option. 
Aliased to -l.
 2013-08-20 06:32:49 -06:00
Mark-Simulacrum b1b3339597 Create automated alt tag addition, based on image name. 
Needs documentation.
 2013-08-18 20:06:39 -06:00
Linus Pettersson e77e615314 Fixed encoding for new buffer 2013-08-18 00:07:26 +02:00
Ben Hollis f92ae94728 Escape filenames in regexes. Fixes #942. 2013-08-15 22:04:18 -07:00
Jason Webster dd08ea2f6d Fix wrong http pathing/prefixing example in generated config 2013-08-15 15:24:44 -07:00
Thomas Reynolds 6d1effd2e7 bump 2013-07-21 23:32:28 -07:00
Thomas Reynolds ec060e0b6e change tests since coffee changed their output 2013-07-16 15:10:43 -07:00
Aggelos Orfanakos 2a8b22558a Don't set resp Content-Type for some status codes 
There must not be a Content-Type set when the Status is 1xx, 204, 205 or
304, otherwise Rack blows up with the following error: "Content-Type
header found in 304 response, not allowed"
 2013-07-13 05:01:32 +03:00
Aggelos Orfanakos 83d83c5c8c Fix double-escaping of config settings 2013-07-12 23:06:51 +03:00
Aggelos Orfanakos fffe36f42c Fix double-escaping of resource properties 2013-07-12 22:54:15 +03:00