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

325 commits

Author SHA1 Message Date
Thomas Reynolds 916a5a508b fix some tests 2015-11-11 13:46:09 -08:00
Thomas Reynolds b4457c98d2 Merge pull request #1647 from middleman/frontmatter_delims 
Frontmatter delims
 2015-11-11 13:20:15 -08:00
Thomas Reynolds 684a80c906 Change no-layout to the default, except for .html 2015-11-11 12:58:07 -08:00
Dennis Günnewig 0f8ea86119 Add hook for before_server 2015-11-08 11:03:25 +01:00
Dan Allen c48c81cbba resolves #1656 don't mangle URL inside tag 2015-10-26 15:30:44 -06:00
Dan Allen 4995bd23d7 resolves #1653 don't rewrite paths that start with // 2015-10-26 00:39:48 -06:00
Eliott Appleford 19d21d2295 make frontmatter delims configurable 2015-10-23 09:40:24 +00:00
Thomas Reynolds 3cd84eb4d1 move_file as a replacement for import_asset 2015-10-22 20:23:39 -07:00
Thomas Reynolds 6357f4f5b8 Add back app.set, but mark as deprecated 2015-10-12 12:37:07 -07:00
inoue_sachiro 67fc3d0c05 Fix: Can't clean files when the project is under a hidden directory. 2015-10-01 13:54:45 -07:00
Thomas Reynolds 0698d7f5aa Revert "Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression" 
This reverts commit 5e3ddbf988.
 2015-09-30 10:24:12 -07:00
Thomas Reynolds 5e3ddbf988 Frontmatter parseing changes broke some whitespace in tests, but shouldn't be a regression 2015-09-29 10:27:53 -07:00
Thomas Reynolds 04c133c90f Fix minify css tests 2015-09-28 13:58:49 -07:00
Thomas Reynolds 32891dc6fe SassC, woot 2015-09-28 11:24:37 -07:00
Thomas Reynolds fe66beacc3 Test fix WIP 2015-09-23 16:20:16 -07:00
Thomas Reynolds d3d32731e1 more test fixes 2015-09-19 16:00:38 -07:00
Thomas Reynolds 765de5ab11 Remove ancient twitter bootstrap test. Use npm or bower, y'all 2015-09-19 14:39:55 -07:00
Thomas Reynolds 3e1fc0aa1f Change test to respect global relative assets change 2015-09-19 14:26:30 -07:00
Thomas Reynolds fdabd87957 merge in fixes from stable 2015-09-17 13:53:43 -07:00
Thomas Reynolds 409a892da7 Forward port some stable changes 2015-09-17 09:41:17 -07:00
Thomas Reynolds a251c82562 Add test for #1568 2015-09-17 09:25:04 -07:00
Thomas Reynolds 441dc2faa6 Revert breaking resource source_file api. For #1595 2015-09-09 11:55:56 -07:00
Thomas Reynolds c69099c451 Really fix #1568 2015-07-24 13:46:33 -07:00
Thomas Reynolds 0a8ceb24b0 Add test for #1568 2015-07-20 12:13:10 -07:00
Max Meyer 6aa7ce741a Refactor preview server to support server_name and bind_address 2015-07-01 20:56:56 +02:00
Thomas Reynolds 3fca2c6961 Add relative argument to stylesheet and javascript helpers. Closes #1539 2015-06-22 10:37:17 -07:00
Thomas Reynolds 1efe6a27c5 Add tests for Slim inline filters. Refactor similar feature in Haml filters. Closes #1542 2015-06-16 16:47:42 -07:00
Thomas Reynolds 7383f67874 Implement yaml data postscript 2015-06-16 15:30:37 -07:00
Thomas Reynolds 915b059e4a Merge pull request #1535 from maxmeyer/feature/capybara 
Use capybara to make javascript testing possible
 2015-06-09 09:39:01 -07:00
Max Meyer 3935a7cf5f Use capybara to make javascript testing possible 2015-06-09 06:57:15 +02:00
Thomas Reynolds b2cb90c20f Allow live collections based on generic data. Helps with #1527 2015-06-02 16:16:07 -07:00
Thomas Reynolds 5630395b40 allow bad paths in i18n links. for #850 2015-06-02 13:48:23 -07:00
Thomas Reynolds ca8655744a Support relative urls in i18n links. For #850 2015-06-01 13:53:39 -07:00
Thomas Reynolds 5e30ef98a1 Fix new link_to i18n w.r.t. index pages. For #850 2015-06-01 11:51:27 -07:00
François Vantomme d7d37e4ae0 fix #1496 : Asset hashes on WOFF vs WOFF2 fonts get confused 
reverse sorting the extensions regex solves this issue
 2015-05-28 16:21:50 +02:00
Ryan McGeary 2875dbec2a Add rel=canonical URL to default RedirectResource template 
See https://support.google.com/webmasters/answer/139066
 2015-05-24 14:36:44 -06:00
Thomas Reynolds f7ba4ada20 More i18n tests and make sure templates with locale in file name take precedence over the default. 2015-05-16 13:53:09 -07:00
Thomas Reynolds d3c7436647 Tweak locale links 2015-05-16 13:21:12 -07:00
Thomas Reynolds 6502b37934 Use locale for link_to flag 2015-05-16 12:50:39 -07:00
Thomas Reynolds ed5236ef37 Fix bone-headed link_to change 2015-05-15 16:20:47 -07:00
Thomas Reynolds 9de1f16f3b Empower link_to in a i18n context 2015-05-11 09:13:04 -07:00
yterajima 013b4a8394 fixed: Builded text file(html, css, xml, txt...)'s permission is 0600 
In v3-stable branch, builded text file's permission are 0644.
But in master(v4) branch, file's permission are 0600.

When I deploy(drug-and-drop with sftp), the website isn't displayed. So
I fixed this problem.
 2015-05-07 21:43:53 +09:00
yterajima c444b3f232 fixed 'after_render' hook is not work. 
- 'before_render' hook is called twice.
- add simple cucumber test about some hooks.
 2015-05-06 16:28:01 +09:00
Thomas Reynolds 2b1a4ed1b8 Merge pull request #1393 from AndrewKvalheim/minify-proxied 
CSS/JS isn't minified when a proxy has removed the file extension.
 2015-05-02 14:28:00 -07:00
Thomas Reynolds 33cb9b3ba9 Expand collection laziness to data 2015-04-26 13:22:58 -07:00
Thomas Reynolds 2403fa2d81 Merge stable 2015-04-26 11:32:47 -07:00
Thomas Reynolds a43fa14f34 More tests WRT #1503 2015-04-26 09:43:20 -07:00
Thomas Reynolds 4bdf5a9005 Refactor srcset a little 2015-04-26 09:41:50 -07:00
Thomas Reynolds 45ba4bb0d4 Add slim test to asset_hash. WRT #1503 2015-04-26 09:31:39 -07:00
David Morrow 580431ca43 Resolves issue #1396 supporting srcset 
allows you to use image_tag helper and have it build the asset urls for
your srcset images, just like it does for your main src. Leaves absolute
urls alone, (having // in the path)

```
<%= image_tage 'pic_1980.jpg', srcset: 'pic_640.jpg 2x, pic_1024.jpg 3x' %>
=> <img src="/images/pic_1980.jpg" srcset="/images/pic_640.jpg 2x, /images/pic_1024.jpg 3x">
```
 2015-04-23 17:28:49 -07:00
Thomas Reynolds 4740159a3a Use Addressable to improve inline url detection and rewriting. Only rewrite relative paths. Closes #1499 2015-04-22 09:41:24 -07:00
Steven Sloan 3b1a00cf47 allow setting a destination_dir for SourceWatchers 
This change lets a source be defined with a destination directory. That way we can mount a source (say a gem’s ‘doc’ directory) in a namespace and worry less about name collisions with  files in other sources.
 2015-04-17 16:46:39 -04:00
Thomas Reynolds 7f2048b865 Don't lookup resource for path if the path is absolute. Fixes #1195 2015-03-03 13:09:46 -08:00
Andrew Kvalheim 8817f4ab38 Move IRB initialization into an overridable method. 2015-02-25 17:11:29 -08:00
Andrew Kvalheim 049dabbf15 Use configurable content type for detection of minifiable content. 
Squashed changes:

  - Prevent side effects of content type testing.
  - Test for inline minification in PHP files.
 2015-02-25 16:08:26 -08:00
Thomas Reynolds c94e5d0f4d Merge from stable 2015-02-24 11:16:16 -08:00
Thomas Reynolds a3772428c1 Merge pull request #1456 from yterajima/feature/add-template-test 
Add test to `$ middleman init` using tmeplate
 2015-02-23 12:30:11 -08:00
Ilya Vassilevsky 4d75ba7749 Fix grammar in a scenario 2015-02-23 01:53:14 +03:00
yterajima ceb4769325 Add test to $ middleman init using tmeplate 
* using Middleman directory
* using github
    * user/repository
    * user/repository#branch
* using full path
    * contains "://"
 2015-02-19 01:02:21 +09:00
Thomas Reynolds 2f558ec571 Fix test 2015-02-13 14:39:08 -08:00
Thomas Reynolds 39c7c9df54 fix leftover flag 2015-01-04 15:28:13 -06:00
Thomas Reynolds 857c99fab5 attempt to fix interactive cli timeout 2015-01-04 15:23:37 -06:00
Thomas Reynolds 8e743aea94 fix interactive init test 2015-01-04 15:06:14 -06:00
Thomas Reynolds f16510d034 Update CLI 2015-01-04 14:23:35 -06:00
Thomas Reynolds 302a891bbb Update some deps 2015-01-03 14:32:21 -06:00
Steven Sloan 85fa3fac02 add support for “sidecar” frontmatter at the destination url of proxied resources 
a “cheap” way to support adding data to pages created through `proxy` or `page` by adding frontmatter at the expected destination url.

for example proxying a page to `/proxied.html`, by adding a sidecar frontmatter file at `source/proxied.html.frontmatter` (or source/proxied.frontmatter if directory indexes is activated) the frontmatter will be merged with the proxy source and available to `current_resource` at the destination.
 2014-12-22 13:59:27 -05:00
Thomas Reynolds 29693e4533 More URI encoding and decoding. Addresses #1406 2014-11-19 10:39:48 -08:00
Thomas Reynolds d8e8b06cb6 merge v3 2014-11-19 09:04:56 -08:00
Dennis Reimann e28ed20c63 Asset hashing for image references in srcset 
Fixes #1287
 2014-11-16 21:25:28 +01:00
Max Meyer f4ce1ff99d Switch to current working directory during testing 2014-11-03 09:17:43 +01:00
Thomas Reynolds 7c37d4ba51 Merge pull request #1338 from dg-ratiodata/feature/chained_templates_partials 
Chained template parsing failed if parent is "html.erb" and child is "html.md.erb"
 2014-10-23 15:25:10 -07:00
Thomas Reynolds a95dbb6367 Collections 2014-10-15 14:34:53 -05:00
minusfive 17cddce675 Parse asset-hashes on JSON files 2014-09-28 16:39:46 -04:00
Andrew Kvalheim 00b4ac6867 Add a basic feature test for the console. 2014-09-10 16:12:04 -07:00
Dennis Günnewig 55e3c93278 Feature tests for force-option 2014-09-09 09:19:31 +02:00
Thomas Reynolds 84acb50b02 Optimize globbed file lookups, fixes nasty performance regression 2014-08-24 17:10:25 -07:00
Thomas Reynolds 07ac578a31 merge 2014-08-24 11:36:42 -07:00
Thomas Reynolds a1979f11b1 Update sass dep and test new error message 2014-08-20 09:48:03 -07:00
Thomas Reynolds 51d57afc73 require new compass, fix tests 2014-08-17 13:20:29 -07:00
Christian Höltje 6895f30ff3 Accept pandoc-style YAML frontmatter 
Pandoc (and some other tools) have decided to end their YAML frontmatter
with `...` instead of `---`.  In the name of flexibility, this patch
allows either to mark the end of YAML frontmatter.

Example:

```
---
title: No place like home
...
```
 2014-08-15 13:21:30 -04:00
Thomas Reynolds 0f785a448a updated from stable 2014-08-14 10:14:26 -07:00
Thomas Reynolds 625391953a Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327 2014-08-04 15:07:55 -07:00
Thomas Reynolds 05aa396399 more slim tests. Targets #1327 2014-08-04 14:41:22 -07:00
Thomas Reynolds 724eab3ac9 fix alt tags and add test. Closes #1341 2014-08-03 08:29:29 -07:00
Dennis Günnewig 98a36d68f0 Merge branch 'v3-stable' into feature/chained_templates_partials 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
 2014-07-31 13:00:19 +02:00
Dennis Günnewig 856f05709c Support template chaining for partials 2014-07-31 11:39:02 +02:00
Thomas Reynolds 2f545cefbe Attempt to allow i18n to override partial lookup. #1333 2014-07-24 11:11:27 -07:00
Thomas Reynolds bedf235ff6 Multiple Source watchers 2014-07-20 18:57:22 -07:00
Thomas Reynolds 525e700bfa Move all templates over to Github. Remove need for auto-loaded extensions in CLI 2014-07-20 14:25:47 -07:00
Thomas Reynolds 9087da05d5 Merge branch 'v3-stable' 2014-07-20 13:54:45 -07:00
Thomas Reynolds 15d6210df8 Use the resource instead of the request path for auto asset helpers. Fixes #1326 2014-07-20 13:53:05 -07:00
Ben Hollis 22dace72df Upgrade url_for to search for resources relative to their destination paths as well as their source paths. This would fix #818. 2014-07-19 16:40:53 -07:00
Thomas Reynolds 6678ea1ae3 merge static partial change 2014-07-18 12:54:27 -07:00
Thomas Reynolds f0603ddf2f work with static partials. Closes #1206 2014-07-18 10:54:48 -07:00
Eliott Appleford bf03c14518 merge spec fixes onto master 2014-07-09 14:10:49 +01:00
Ben Hollis 004ba36741 Remove partials_dir functionality 2014-07-07 23:48:49 -07:00
Eliott Appleford a47b58c58d fix gemfile conflict 2014-07-06 05:48:21 +01:00
Eliott Appleford 21c2b737f5 fix gzip spec 2014-07-06 04:02:43 +01:00
Eliott Appleford e2e3c1e3fb fix specs on windows 2014-07-03 21:09:32 +01:00
Ben Hollis d7fd48ef7d Merge branch 'v3-stable' 
Conflicts:
	middleman-core/lib/middleman-more/extensions/asset_hash.rb
 2014-06-28 18:48:49 -07:00