Thomas Reynolds
70dd18e8f1
Attempt fix for #1506
2015-05-07 09:01: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
Eliott Appleford
27684e2ef3
Encode hostnames to fix #1510
2015-05-05 23:56:08 +01:00
Thomas Reynolds
486d34a2c1
prep beta.2
2015-05-04 11:05:00 -07:00
Thomas Reynolds
4626193f97
Fix show_exceptions
2015-05-04 10:50:35 -07:00
Thomas Reynolds
9d3c30ee53
Fix subscriber contract failure
2015-05-04 10:45:03 -07:00
Thomas Reynolds
cee53d0f2d
Fix bad merge from v3-stable
2015-05-04 10:02:32 -07:00
Thomas Reynolds
ee0f9f00f5
Tweak callback delegation
2015-05-04 09:58:29 -07:00
Thomas Reynolds
de5234818d
Prep
2015-05-04 09:40:33 -07:00
Ben Hollis
9f5080edf9
Don't crash when running the preview server and not connected to any network (no public IP)
2015-05-03 18:48:31 -07:00
Ben Hollis
08dee580aa
Address shortcomings in #1508 by removing the "host" parameter, always binding on all interfaces, and printing the preview URL with both the local hostname and the local public IP address.
2015-05-03 17:54:00 -07:00
Thomas Reynolds
69e66b04df
Some immutability tweaks
2015-05-03 17:11:49 -07:00
Thomas Reynolds
e64954fbff
Finish porting to new callbacks manager
2015-05-03 15:38:23 -07:00
Ben Hollis
126888272c
The preview server URL will once again use the machine's hostname if available.
2015-05-03 15:11:46 -07:00
Ben Hollis
cf58acda30
Clean up commit f366325b3b a bit
2015-05-03 15:11:21 -07:00
Karl Freeman
f366325b3b
return localhost when host is 0.0.0.0 #1011
2015-05-03 14:56:07 -07:00
Ben Hollis
f8e4f6f059
The preview server can now serve over HTTPS using the --https flag. It will use an automatic self-signed cert which can be overridden using --ssl_certificate and --ssl_private_key. These settings can also be set in config.rb.
2015-05-03 14:52:25 -07:00
Thomas Reynolds
d1211cc089
Subtle tweaks
2015-05-02 22:44:38 -07:00
Ben Hollis
572f86985b
The preview server can now serve over HTTPS using the --https flag. It will use an automatic self-signed cert which can be overridden using --ssl_certificate and --ssl_private_key. These settings can also be set in config.rb.
2015-05-02 20:54:58 -07:00
Thomas Reynolds
b9f0330869
Play around with a custom, immutable callback library to replace Hooks
2015-05-02 18:47:16 -07: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
9454536b12
Here we go
2015-05-02 14:23:16 -07:00
Thomas Reynolds
a9056d0e25
Fix webrick reloading on new ruby
2015-05-02 13:48:47 -07:00
Thomas Reynolds
c97c65d655
Add shorthand resources to extensions
2015-05-02 13:22:36 -07:00
Thomas Reynolds
82b84668b0
Standardize exposing methods inside extensions to the outside world
2015-05-02 11:48:21 -07:00
Thomas Reynolds
33cb9b3ba9
Expand collection laziness to data
2015-04-26 13:22:58 -07:00
Thomas Reynolds
b127283040
Fix up inline url confusion
2015-04-26 13:01:19 -07:00
Thomas Reynolds
2403fa2d81
Merge stable
2015-04-26 11:32:47 -07:00
Thomas Reynolds
c87e2e026e
Rubocop tweaks
2015-04-26 11:13:29 -07:00
Thomas Reynolds
56c7ef7905
Merge pull request #1504 from cllns/fix-whitespace
...
Remove spaces on empty lines in default layout.erb
2015-04-26 09:44:31 -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
Sean Collins
c1ce3ffd61
Remove spaces on empty lines
2015-04-26 12:16:55 -04:00
Thomas Reynolds
c30976ccf5
Fix Rack support. Closes #1501
2015-04-24 10:32:05 -07:00
Thomas Reynolds
4be3fcfd31
Fix recursive enhance on nil values
2015-04-24 10:28:03 -07:00
Thomas Reynolds
c25229065a
Better indiff logic
2015-04-24 10:28:03 -07:00
Thomas Reynolds
22ce56492f
Experiment with Hamster
2015-04-24 10:28:03 -07:00
Thomas Reynolds
55c5a46440
Update contracts gem. #1494
2015-04-24 10:26:42 -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
60b3bfcee2
Attempt to address #1497
2015-04-16 12:11:52 -07:00
Thomas Reynolds
30721436c0
Allow extensions to activate extensions
2015-03-27 10:56:09 -07:00
Thomas Reynolds
af486d7d2a
prep
2015-03-24 09:14:33 -07:00
Thomas Reynolds
d845503f50
Add jruby to the list of envs requiring tzinfo-data. Addresses comments in #1458
2015-03-21 11:21:03 -07:00
Simon-Pierre LeBel
4e88a66083
Added support for complete path localization
2015-03-19 16:20:19 -04:00
Thomas Reynolds
6fef5b3a93
Require forwardable. Closes #1479
2015-03-05 09:46:38 -08: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
Thomas Reynolds
a71589becd
Make preview host and port configurable in config.rb and also expose those variables to extensions which are curious. Closes #1477
2015-03-01 18:17:22 -08:00
Thomas Reynolds
26c6f453f3
Add file watcher :only option
2015-02-26 17:08:40 -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
Martin Schurig
10ed3c2447
append assets hash also to .woff2 files
2015-02-25 20:43:46 +01:00
Thomas Reynolds
c94e5d0f4d
Merge from stable
2015-02-24 11:16:16 -08:00
Thomas Reynolds
ce2d5028b2
Merge pull request #1445 from alex88/patch-1
...
Add Woff2 to asset hash extensions
2015-02-24 09:50:51 -07:00
Thomas Reynolds
fbe71f51e4
Merge pull request #1465 from thomasritz/fix-wrong-parent
...
Fixes computation of `parent`.
2015-02-23 14:18:31 -07: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
Thomas Reynolds
a3519bdf37
Bump
2015-02-23 12:28:30 -08:00
Thomas Reynolds
cac0484de8
Fixes #1469
2015-02-23 12:26:37 -08:00
Ilya Vassilevsky
4d75ba7749
Fix grammar in a scenario
2015-02-23 01:53:14 +03:00
Henrik Nyh
55673480dc
Fix proxy pages link in config template
...
Old link is broken.
2015-02-22 20:31:28 +01:00
Thomas Ritz
262e976790
Fixes computation of parent.
...
If there is a file without a basename in root, e.g. `.htaccess`,
`#parent` of another file in root finds `.htaccess` instead of
`index.html`.
Adding the `.htaccess` to the traversal-app fixture exposes this error.
The fix is to no longer scan for possible files if we know the parent
must be root.
2015-02-21 19:07:17 +01:00
Eliott Appleford
a977f8bf20
Merge pull request #1416 from dg-ratiodata/feature/fix_offenses
...
Fix rubocop offenses
2015-02-19 00:50:46 +00: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
Eliott Appleford
0230e26a8c
Fix slim >= 3.0.0 deprecation warning
2015-02-18 14:22:50 +00:00
Thomas Reynolds
1cce64d463
Bump
2015-02-17 16:08:58 -08:00
Thomas Reynolds
14104aad70
Try to avoid *nix double load issue again
2015-02-17 09:39:59 -08:00
Thomas Reynolds
fd3d9b206f
Attempt to avoid double-load issue
2015-02-16 15:53:21 -08:00
Thomas Reynolds
2f558ec571
Fix test
2015-02-13 14:39:08 -08:00
Thomas Reynolds
4d7b21185f
fix strange change to how file contents are checked in aruba
2015-02-13 14:34:15 -08:00
Thomas Reynolds
85c8143d49
bump
2015-02-13 14:31:53 -08:00
Thomas Reynolds
5b39a33ab6
Serve sourcemaps as JSON so extensions which rely on mime-type function correctly
2015-02-13 14:28:12 -08:00
Alessandro Tagliapietra
3c5c677a07
Add Woff2 to relative assets extension
2015-02-11 00:09:40 +01:00
Alessandro Tagliapietra
d97e380db8
Add Woff2 to builder asset order
2015-02-10 23:58:29 +01:00
Alessandro Tagliapietra
19db9f3be1
Add Woff2 to asset hash extensions
2015-02-10 23:30:20 +01:00
Joost Hietbrink
28199950e9
Add :overwrite option to gzip
...
Useful for deployment to S3 together with gzip content-encoding.
2015-02-10 21:49:15 +01:00
Nico Hagenburger
98b06878a5
fixed space
2015-02-10 09:28:31 +01:00
Nico Hagenburger
a5c65bac53
don’t override :custom if already set
...
Sometimes Sprockets needs to access
`options[:custom][:sprockets_context]`. If this is set, it should not be
overridden. This happens when building a LivingStyleGuide file when the
Sass source uses `asset-path`, `image-url` or similar functions.
2015-02-09 23:16:20 +01:00
Thomas Reynolds
e4b7d4fff0
begin prepping beta.1
2015-02-07 13:38:29 -08:00
Joost Hietbrink
7bec48c688
Fix 404 for sub-mounted apps
...
404 now shows full path (similar to url).
2015-01-26 14:33:22 +01:00
Steven Sloan
9ba1dc040f
reorganize all Middleman::Util specs to a single spec file, add specs for PR #1426
2015-01-15 13:29:37 -05:00
Thomas Reynolds
f02713788d
fix strange change to how file contents are checked in aruba
2015-01-15 09:56:28 +00:00
Steven Sloan
14e1cb1cd6
move all HashWithIndifferentAccess recursive enhancement over to the Util class
...
TODO: moving this two a class method on HashWithIndifferentAccess would really make the most sense, but there are two blockers:
- historically the method has operated out of Util. While totally ok, simply dedeferring to HashWithIndifferentAccess feels a bit awkward
- the contracts gem doesn’t support class method at this time. the assurance of frozen output is important considering the uses of the recursively_enhance method
2015-01-15 03:30:26 -05:00
Steven Sloan
a771b15700
rewrite CoreExtension::Data#key? to prevent potential SystemStackError
...
since data_for_path can trigger respond_to?, and respond_to? uses key? — a SystemStackError could trigger if data_for_path was called.
2015-01-15 02:46:59 -05:00
Dennis Günnewig
0f95d74827
Use guard clause
2015-01-08 14:58:00 +01:00
Dennis Günnewig
79dbfa0238
Rubcop found some new offenses
2015-01-08 14:55:03 +01:00
Dennis Günnewig
747ca86212
Fixed offense
2015-01-08 14:53:20 +01:00
Jared Norman
a4406e7d9c
Fix line ending format in all.js
...
Resolves #1302
2015-01-06 09:06:36 -08:00
Thomas Reynolds
69f8245f7b
bump
2015-01-04 15:42:22 -06: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
Max Meyer
67125a3f91
Supress warning because of method name offense
2014-12-28 10:50:12 +01:00
Max Meyer
e69704b540
Fixed whitespace offenses
2014-12-28 10:49:46 +01:00
Max Meyer
488a4b74ab
Update version of i18n
2014-12-28 10:36:33 +01:00
Thomas Reynolds
eb1a658b25
over calling change callbacks which are unnecessary.
2014-12-26 14:11:58 -08:00
Thomas Reynolds
ef0b996004
blog compat
2014-12-24 11:38:54 -08:00
Thomas Reynolds
ee4c68b03c
prep alpha, backwards compat
2014-12-23 14:54:21 -08: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
Thomas Reynolds
17eb54b9dc
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
2014-11-16 12:42:58 -08:00
Thomas Reynolds
3eafb4fcf4
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
2014-11-16 12:35:45 -08:00
Dennis Reimann
e28ed20c63
Asset hashing for image references in srcset
...
Fixes #1287
2014-11-16 21:25:28 +01:00
justin blecher
dcca8968c8
exclude .git folder when init'ing a local template
...
freshly init'd middleman projects from a local template should not
include the git files from that template because that's confusing.
this is to help users who clone git repos into `~/.middleman/`.
2014-11-12 19:12:52 -05:00
Thomas Reynolds
be98103e05
An attempt to fix #1402
2014-11-09 11:30:11 -08:00
Thomas Reynolds
c231e00f00
bump
2014-11-08 21:06:17 -08:00
claudiob
9d49b08426
Import patch to bugfix from Padrino Helpers
...
Padrino had an issue https://github.com/padrino/padrino-framework/issues/1582
which was solved at 72769fe39a (diff-526024418d0d573e08d46ba3d55c02bcR36)
2014-11-08 13:01:13 -08: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
65d3a0c84f
Be a bit safer about checking source_file in Sitemap Preview. Working towards fixing #1166
2014-10-20 11:24:52 -07:00
Thomas Reynolds
91d0d39569
stylistic change
2014-10-20 11:19:30 -07:00
Thomas Reynolds
c7922c4a35
move actual type detection to sprockets
2014-10-18 12:56:52 -05:00
Thomas Reynolds
6a3d2e7e4e
slightly better types debug message
2014-10-18 12:50:18 -05:00
Thomas Reynolds
d0a9f01b2f
Treat source file types more like tags, allow a set of them
2014-10-18 12:45:49 -05:00
Thomas Reynolds
54e10cf472
yield self along with options in extension activation
2014-10-18 12:11:18 -05:00
Thomas Reynolds
a95dbb6367
Collections
2014-10-15 14:34:53 -05:00
Thomas Reynolds
445443cffc
Add a bit of laziness
2014-10-15 14:25:06 -05:00
Thomas Reynolds
ddfa37faee
Use HTTPS by default in new project Gemfiles. Closes #1372
2014-10-12 09:38:14 -05:00
minusfive
17cddce675
Parse asset-hashes on JSON files
2014-09-28 16:39:46 -04:00
Thomas Reynolds
1b0b666130
bump
2014-09-15 15:36:57 -07:00
Thomas Reynolds
e326e10e98
listen gem started using full paths instead of relative. Fixes #1374
2014-09-15 15:36:41 -07:00
Thomas Reynolds
f73e89370d
execute modes as configure blocks
2014-09-11 09:40:10 -07:00
Andrew Kvalheim
00b4ac6867
Add a basic feature test for the console.
2014-09-10 16:12:04 -07:00
Dennis Günnewig
d45911f7b8
Add force-option to init
2014-09-09 09:19:41 +02:00
Dennis Günnewig
55e3c93278
Feature tests for force-option
2014-09-09 09:19:31 +02:00
Dennis Günnewig
b78515ce91
Fixed rubocop offense
2014-09-09 09:02:50 +02:00
Thomas Reynolds
313a2398d4
attempt to get compass 1 working
2014-09-02 12:43:20 -07:00
Thomas Reynolds
5a85d177c2
Catch File read exceptions in frontmatter
2014-08-29 10:24:45 -07:00
Thomas Reynolds
df22160173
apparently nums are freezable
2014-08-24 18:30:14 -07:00
Thomas Reynolds
5c18b85a8e
more freeze fixin
2014-08-24 18:11:56 -07:00
Thomas Reynolds
1d5ae59db9
Lazy isn't in 1.9.3 :(
2014-08-24 17:35:02 -07:00
Thomas Reynolds
84acb50b02
Optimize globbed file lookups, fixes nasty performance regression
2014-08-24 17:10:25 -07:00
Thomas Reynolds
6ef96cc15a
more instrumenting
2014-08-24 15:49:53 -07:00
Thomas Reynolds
c3492b1f7b
Fix partial lookup
2014-08-24 14:38:06 -07:00
Thomas Reynolds
07ac578a31
merge
2014-08-24 11:36:42 -07:00
Thomas Reynolds
18825e7ced
no reason for image sizes to touch the alt attr
2014-08-22 09:36:07 -07:00
Thomas Reynolds
0d2bcbabe9
Remove duplicate attr_accessor. Closes #1352
2014-08-20 09:48:55 -07:00
Thomas Reynolds
a1979f11b1
Update sass dep and test new error message
2014-08-20 09:48:03 -07:00
Thomas Reynolds
9b88906784
bump ver
2014-08-18 15:32:56 -07:00
Thomas Reynolds
ad93f3d8ae
fix some uncaught regressions
2014-08-18 14:53:15 -07:00
Thomas Reynolds
d4010c9dc4
prep for realz
2014-08-18 14:00:28 -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
96c4416246
ver bump
2014-08-15 09:41:19 -07:00
Thomas Reynolds
e886eeaa3e
add middleman.rb option
2014-08-14 20:34:31 -07:00
Thomas Reynolds
0f785a448a
updated from stable
2014-08-14 10:14:26 -07:00
Thomas Reynolds
fae0e00f42
Add webp to our image type lists
2014-08-14 09:04:26 -07:00
Thomas Reynolds
2b928a326c
Handle breaking padrino change. Closes #1349
2014-08-13 20:24:20 -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
1c977a83e2
prep
2014-08-03 08:37:46 -07:00
Thomas Reynolds
724eab3ac9
fix alt tags and add test. Closes #1341
2014-08-03 08:29:29 -07:00
Dennis Günnewig
fee6a8b617
Make rubocop happy
2014-07-31 13:13:07 +02: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
Dennis Günnewig
0add2e6676
Added a step to create templates on the fly
2014-07-31 08:46:22 +02:00
Thomas Reynolds
b39b913cfb
Merge pull request #1337 from dg-vrnetze/feature/new_server_steps
...
Added some new steps to test middleman applications
2014-07-29 07:22:38 -07:00
Max Meyer
398a038523
Support check for status code
2014-07-29 09:04:10 +02:00
Max Meyer
6dc7eb6353
Support should not see block
2014-07-29 09:03:56 +02:00
Thomas Reynolds
2f545cefbe
Attempt to allow i18n to override partial lookup. #1333
2014-07-24 11:11:27 -07:00
Thomas Reynolds
767db6ff26
Frozen works strangely on nils
2014-07-23 22:09:46 -07:00
Thomas Reynolds
ff11be93a0
fix source type typo
2014-07-23 22:03:54 -07:00
Thomas Reynolds
bfd4e5d7fa
make asset hash option required
2014-07-23 21:09:25 -07:00
Thomas Reynolds
5e20fca73e
Required options for extensions
2014-07-23 21:08:20 -07:00
Thomas Reynolds
feef2bf71c
Add external command support
2014-07-22 18:38:57 -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
Thomas Reynolds
debf3c704b
Remove template lookup cache in build mode. Fixes #1301
2014-07-20 13:37:16 -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
Thomas Reynolds
1f3e2043cb
Deep freeze IndifferentAccess.
2014-07-14 13:19:34 -07:00
Thomas Reynolds
332ce2bebc
slight util reorg
2014-07-14 09:50:44 -07:00
Thomas Reynolds
3ae16111ef
Separate Build from Thor
2014-07-11 09:22:53 -07:00
Thomas Reynolds
886fe40922
Merge pull request #1228 from middleman/file_watcher_refactor
...
FileWatcher Refactor
2014-07-11 09:19:45 -07:00
Thomas Reynolds
840c927ac0
Fix some bugs in the Slim renderer when converting to Extensions
2014-07-10 13:30:16 -07:00
Thomas Reynolds
215ddad660
actually, just depend on it
2014-07-10 13:11:14 -07:00
Thomas Reynolds
7e068cc77d
move contracts from gemfile to gemspec
2014-07-10 13:07:27 -07:00
Thomas Reynolds
9ae8a3128b
Refactor FileWatcher
2014-07-10 12:38:38 -07:00
Thomas Reynolds
6ccab8e071
Name things :)
2014-07-10 12:35:47 -07:00
Thomas Reynolds
08b75f06ef
more generic duck-typed rack extractor
2014-07-09 10:59:00 -07:00
Thomas Reynolds
fafeea0857
Handle Rack responses from Sprockets
2014-07-09 10:46:03 -07:00
Thomas Reynolds
c9d0dc7fb0
remove autoload sprockets, it'll use our new auto_activation code
2014-07-09 09:50:51 -07:00
Eliott Appleford
bf03c14518
merge spec fixes onto master
2014-07-09 14:10:49 +01:00
Thomas Reynolds
0185d37473
Experiment with Contracts
2014-07-08 18:18:17 -07:00
Thomas Reynolds
928eb82d65
Convert Sitemap::Extensions into actual Middleman::Extension
2014-07-08 17:02:02 -07:00
Thomas Reynolds
52dcf37f24
Merge pull request #1318 from bhollis/partials_dir
...
Remove partials_dir functionality
2014-07-08 09:19:36 -07:00
Ben Hollis
004ba36741
Remove partials_dir functionality
2014-07-07 23:48:49 -07:00
Ben Hollis
50c6b3f4b9
Merge pull request #1313 from bhollis/remove_neighbor
...
Remove neighbor frontmatter support & move resource methods into Resource
2014-07-07 22:49:23 -07:00
Ben Hollis
a1fe810a50
Fixup after rebase
2014-07-07 22:12:44 -07:00
Thomas Reynolds
f47a586332
no longer need warning
2014-07-07 09:51:23 -07:00
Thomas Reynolds
b02c9e5724
Merge pull request #1314 from middleman/rack-out
...
Untangle Rack from Application
2014-07-06 23:11:56 -07:00
Ben Hollis
bf4310697d
Move proxy/ignore/content_type Resource methods into the Resource class
2014-07-06 16:19:33 -07:00
Ben Hollis
0cbc232dac
Remove neighbor frontmatter support
2014-07-06 16:15:43 -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
Thomas Reynolds
13acee8fd5
Reload MM on environment and helpers_dir changes. Closes #1274 . Closes #1105
2014-07-05 18:26:51 -07:00
Thomas Reynolds
6752a86b83
Make our Rack pipeline a simple class abstracted from the App.
2014-07-05 17:38:29 -07:00
Thomas Reynolds
c94470d33f
get i18n's hands out of app too
2014-07-05 16:50:19 -07:00
Thomas Reynolds
0ca6c37e5d
Remove App include in File Watcher
2014-07-05 16:44:04 -07:00
Thomas Reynolds
60bbe44e0e
Data ext doesn't need to touch the app obj
2014-07-05 16:05:00 -07:00
Thomas Reynolds
300ef8d8fe
Convert renderers into first-class extensions
2014-07-05 13:41:59 -07:00
Thomas Reynolds
c0a6d8ac4c
Pull mixin for extension activation into a real class
2014-07-05 12:51:41 -07:00
Thomas Reynolds
336b80cbbd
Switch from ActiveSupports delegate method to Ruby 1.9+ def_delegator
2014-07-05 11:17:41 -07:00
Thomas Reynolds
3a19cc668d
move Sitemap into application, it's core to the entire system
2014-07-05 10:42:03 -07:00
Eliott Appleford
5897c4c4a4
update gemfile
2014-07-05 04:27:51 +01:00
Thomas Reynolds
3a2cab4775
Whoops, leftover include
2014-07-04 10:41:25 -07:00
Thomas Reynolds
1bd7dab1a3
Make a ProxyResource which extends Resource, rather than injecting methods into Resource
2014-07-04 10:38:25 -07:00
Eliott Appleford
e2e3c1e3fb
fix specs on windows
2014-07-03 21:09:32 +01:00
Thomas Reynolds
6bb9673630
final copping
2014-07-02 11:05:57 -07:00
Thomas Reynolds
5a936d315d
Merge remote-tracking branch 'origin/v3-stable'
2014-07-02 10:40:04 -07:00
Thomas Reynolds
52c8109ca3
rubocoping2
2014-07-02 10:39:43 -07:00
Eliott Appleford
d8f84fa97b
Update listen code
2014-07-02 18:26:18 +01:00
Thomas Reynolds
7b85a44afb
rubocoping
2014-07-02 10:11:52 -07:00
Thomas Reynolds
a2f67a4f37
listen gem conflict
2014-07-02 09:30:58 -07:00
Eliott Appleford
6678decd29
Update listen gem
2014-07-02 12:57:01 +01:00
Ben Hollis
dfecfebc69
Remove options to proxy or ignore through page, and use Middleman::Util#path_match for matchers to allow a wider set of matchers.
2014-06-28 21:01:26 -07:00
Ben Hollis
838e25085a
Munge build path so that path_match works against it in gzip extension
2014-06-28 21:00:59 -07: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
Andrew Kvalheim
429e7d64bd
Accept list of paths to exclude from gzipping.
2014-06-24 14:49:51 -07:00
Andrew Kvalheim
b819d38358
Test gzip extensions option.
2014-06-24 14:49:10 -07:00
Andrew Kvalheim
13ba9dae62
Make option documentation consistent.
2014-06-24 14:47:10 -07:00
Ben Hollis
5c991ba4dc
Add a protective require
2014-06-22 20:46:39 -07:00
Thomas Reynolds
434d55b1ae
See if code climate hooks work
2014-06-20 14:09:51 -07:00
Ben Hollis
ad4b441dc3
Fixed implementation of Middleman::Util#path_match, added tests for it
2014-06-16 21:44:19 -07:00
Thomas Reynolds
8989e27769
Rubocop auto fix
2014-06-16 09:05:24 -07:00
Thomas Reynolds
fe5247d9d9
Add <head> to 404 so Livereload can add its script to the page
2014-06-16 08:58:16 -07:00
Thomas Reynolds
c6543b7c27
Add <head> to 404 so Livereload can add its script to the page
2014-06-16 08:57:56 -07:00
Ben Hollis
2ef842a730
Fix references to store in traversal
2014-06-14 13:08:03 -07:00
Ben Hollis
f63feaf017
Do not use ShowExceptions during tests, it confuses things
2014-06-14 13:05:32 -07:00
Ben Hollis
f07bed4ecf
Fix custom layouts tests
2014-06-14 12:38:44 -07:00
Ben Hollis
416428444c
Let users add metadata via #page
2014-06-14 11:31:53 -07:00
Ben Hollis
e6ec5f31de
Fix meta pages
2014-06-14 11:31:53 -07:00
Ben Hollis
85cebdb7e9
rubocop
2014-06-14 11:31:53 -07:00
Ben Hollis
cb2b13778e
Fix i18n
2014-06-14 11:31:53 -07:00
Ben Hollis
2beb774eb9
Put back request_path, I get it now
2014-06-14 11:31:53 -07:00
Ben Hollis
b0ea4e7608
Tweak resource manipulator order
2014-06-14 11:31:53 -07:00
Ben Hollis
5760d64ef9
More ignores
2014-06-14 11:31:53 -07:00
Ben Hollis
0309753561
Change when file listeners are registered in order to make cache invalidation work
2014-06-14 11:31:53 -07:00
Ben Hollis
096f5ee356
Use source file, not path, to look up frontmatter data
2014-06-14 11:31:53 -07:00
Ben Hollis
bf8f02d563
Turn routing into an extension
2014-06-14 11:31:52 -07:00
Ben Hollis
213c672969
Fix a lot of breakage caused by removing/hiding accessors
2014-06-14 11:31:52 -07:00
Ben Hollis
78b7bbb92a
TODO metadata for path extension
2014-06-14 11:31:52 -07:00
Ben Hollis
d687677e38
Mess around with liquid
2014-06-14 11:31:52 -07:00
Ben Hollis
adfad92f8f
Get rid of raw_data
2014-06-14 11:31:52 -07:00
Ben Hollis
5c04c2f42b
More trimming
2014-06-14 11:31:52 -07:00
Ben Hollis
d83d6e077c
Extensionize liquid, bring back provides_metadata_for_path
2014-06-14 11:31:52 -07:00
Ben Hollis
c285848866
Clean up i18n a bit, stake out some territory around routing and resource
2014-06-14 11:31:52 -07:00
Ben Hollis
69396d34c1
Start gutting the provides_metadata methods and move some of frontmatter over
2014-06-14 11:31:52 -07:00
Thomas Reynolds
c59cefdafc
Merge pull request #1293 from middleman/environments
...
Environments
2014-06-13 11:12:04 -07:00
Thomas Reynolds
449d38bcd2
Update to rspec 3
2014-06-11 13:39:40 -07:00
Thomas Reynolds
a21dca025e
Separate Environments from Modes
2014-06-11 10:28:30 -07:00
Thomas Reynolds
c3b22fe325
sass renderer shouldn't explode if haml isn't available
2014-06-11 10:19:10 -07:00
Thomas Reynolds
7840ebf98a
move compass ext out of the main repo
2014-06-11 09:25:59 -07:00
Thomas Reynolds
ee1d89fe55
fix whitespace
2014-06-11 09:19:00 -07:00
Thomas Reynolds
29bf25ace6
Extract compass support into extension, rewrite all features that rely on it to be pure Ruby
2014-06-03 09:01:46 -07:00
Thomas Reynolds
3879be0f23
Add proc as a means of defining a rewriter ignore. Closes #1289
2014-06-02 15:56:07 -07:00
Thomas Reynolds
927a1758ba
Rack-based HTML rewriter
2014-05-30 14:48:34 -07:00
Thomas Reynolds
1006739e98
merge PR
2014-05-30 14:23:44 -07:00
Thomas Reynolds
ca0573d92a
Merge pull request #1266 from 747/working
...
A quick fix for finding eponymous parents
2014-05-30 14:20:11 -07:00
Thomas Reynolds
be5fad55ca
Merge branch 'master' of github.com:middleman/middleman
2014-05-26 18:00:44 -07:00
Thomas Reynolds
00bbdfa254
unvendor fastimage
2014-05-26 18:00:39 -07:00
Thomas Reynolds
c2512e9093
update more files to non-hashrocket syntax
2014-05-26 17:58:35 -07:00
Ben Hollis
7a5865a407
gsub to sub
2014-05-26 17:13:16 -07:00
Ben Hollis
b48a767595
Use alias_method instead of defining an alias method for current_page
2014-05-26 17:13:10 -07:00
Ben Hollis
7108c29035
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/version.rb
2014-05-26 16:59:04 -07:00
Ben Hollis
ce914e508a
Make rubocop TrivialAccessors warnings less annoying
2014-05-26 16:53:23 -07:00
Ben Hollis
430521be83
Merge pull request #1281 from adamjonas/v3-stable
...
update rspec should syntax to expect
2014-05-25 21:13:34 -07:00
Ben Hollis
6561fea296
Change the auto activated extension feature to allow specifying different lifecycle events to activate at, allowing more extensions to auto activate.
2014-05-25 21:12:40 -07:00
Ben Hollis
70b3b87905
Move ExternalHelpers into a real extension
2014-05-25 21:06:37 -07:00
Ben Hollis
fed95f9c5e
Convert external data to a real extension
2014-05-25 21:06:37 -07:00
Ben Hollis
e649bc2809
Convert FileWatcher to a real extension
2014-05-25 21:06:37 -07:00
Ben Hollis
67bb394852
Move some explicitly activated extensions to be auto activate
2014-05-25 21:06:36 -07:00
Ben Hollis
5d4cae2a06
Allow extensions to optionally register to be automatically activated before configuration.
2014-05-25 21:06:36 -07:00
Thomas Reynolds
f89a76747e
Removed wrap_layout
2014-05-25 12:23:00 +09:00
Thomas Reynolds
4ab88e6577
Document and cleanup TemplateContext class.
2014-05-25 11:59:21 +09:00
Thomas Reynolds
1a461154b6
prep
2014-05-24 19:27:56 +09:00
Thomas Reynolds
72b945682a
Fix threadsafety issue with assignment. Fixes #501 . Also, WTF?
2014-05-24 19:18:12 +09:00
Ben Hollis
9a3f9fe488
Clean up some Rubocop warnings that were previously suppressed.
2014-05-24 00:37:46 -07:00
Ben Hollis
dd7f06968a
Clean up extension activation, helper registration, and sprockets autoload
2014-05-22 23:05:15 -07:00
Ben Hollis
18da7bb692
Improve documentation and mildly clean up core_extensions/extensions.rb
2014-05-22 22:36:56 -07:00
Ben Hollis
f60a49d2ce
Improve documentation and variable naming for Middleman::Extensions
2014-05-22 21:48:37 -07:00
Thomas Reynolds
610716ee80
Work around possible mutable data issue #501
2014-05-22 19:20:43 +09:00
Ben Hollis
1a7da200d1
Fix before_render after change to hooks-0.4.0. Related to #1278 .
2014-05-15 23:58:50 -07:00
Ben Hollis
dc33f6b3fa
Fix before_render after change to hooks-0.4.0. Related to #1278 .
2014-05-15 23:55:39 -07:00
Ben Hollis
5f9dec3dc8
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman/middleman.gemspec
2014-05-15 23:41:04 -07:00
Ben Hollis
f29994e25a
Fix tests after Padrino 0.12.2 release
2014-05-15 23:35:09 -07:00
Ben Hollis
82636e3596
Fixes to deal with Padrino 0.12.2 release
2014-05-15 23:30:49 -07:00
adamjonas
9887fe510c
update rspec should syntax to expect
2014-05-15 11:51:42 -04:00
Thomas Reynolds
6238bb0716
Merge pull request #1279 from bhollis/extensions
...
Resource list manipulator priority
2014-05-12 09:25:24 -07:00
Ben Hollis
6b10d9d428
Add the ability to set a priority order for sitemap resource list manipulators.
...
This allows us to do things like forcing :directory_indexes to always run last, alleviating the problem of the sitemap output differing depending on when you activate your extensions.
2014-05-12 00:09:35 -07:00
Ben Hollis
2312f875e6
Revert "Add :format and :keep_original options to :asset_hash. Closes #1257 "
...
This reverts commit 1f98d0f4f0
2014-05-12 00:05:22 -07:00
bootstraponline
3f0373adf2
Fix after_render
...
Example usage from config.rb:
after_render do |content, path, locs, template_class|
# restore character entities such as &#96;
content ||= ''
content.gsub! '&', '&'
content
end
2014-05-11 14:06:04 -04:00
Ben Hollis
b79a74b35b
Improve documentation for Middleman::Extension
2014-05-11 00:35:15 -07:00
Ben Hollis
6515f01800
Extension setup methods should be private, not protected
2014-05-11 00:27:12 -07:00
Ben Hollis
ef9da685de
Do away with InstanceMethods for CoreExtensions::Extensions
2014-05-11 00:27:12 -07:00
Ben Hollis
d179343ce7
Remove unused "activate" class method from Extension
2014-05-11 00:27:12 -07:00
Ben Hollis
5fc5e15975
Move methods for handling automatic extension discovery and rubygems enumeration into their own file.
2014-05-11 00:27:12 -07:00
747
038d2a64f7
Merge branch 'add_tests' into working
2014-05-05 06:01:07 +09:00
747
d1d3e8dba6
add tests on eponymous parent traversal
2014-05-02 06:06:55 +09:00
Thomas Reynolds
2dd87bab74
Fix combo of compass-import-once and sass-globs. Closes middleman/middleman-sprockets#56
2014-05-01 10:01:45 -07:00
Thomas Reynolds
f513ab77b3
Rubocop'd
2014-04-29 11:43:05 -07:00
Thomas Reynolds
6760d855bc
hashrocket killa
2014-04-29 10:50:21 -07:00
Thomas Reynolds
8eabe4d354
rubocop 2: the reckoning
2014-04-29 10:44:24 -07:00
747
348417601b
quick fix for finding eponymous parents
2014-04-29 22:43:33 +09:00
Thomas Reynolds
04dc48f13d
Great rubocop-ing
2014-04-28 16:02:18 -07:00
Thomas Reynolds
1e43784cc2
remove queryable api
2014-04-28 10:28:16 -07:00
Thomas Reynolds
ffe9226aac
Remove root config options for minification
2014-04-28 10:21:14 -07:00
Thomas Reynolds
8f75f6516d
back out IP detection
2014-04-14 10:34:53 -07:00
Thomas Reynolds
1f98d0f4f0
Add :format and :keep_original options to :asset_hash. Closes #1257
2014-04-14 10:05:00 -07:00
Thomas Reynolds
9d0eb72e73
Merge pull request #1254 from Arcovion/patch-1
...
Change default IP for CLI server
2014-04-11 09:39:54 -07:00
Eliott Appleford
a50ca3a49d
Change default IP
...
Enables #1248 by default.
2014-04-11 14:48:12 +01:00
Thomas Reynolds
07aa2113b9
merge activesupport update
2014-04-09 16:14:10 -07:00
Thomas Reynolds
dc3d4f9fd5
bump activesupport
2014-04-09 16:12:57 -07:00
Thomas Reynolds
4b53549ae4
Merge in recent changes from v3-stable
2014-04-08 09:27:18 -07:00
Thomas Reynolds
a5c2386853
match masters new logger ref
2014-04-07 16:47:06 -07:00
Adam Luikart
d4d1391bbb
Don't hang on to the first Logger instance you see
...
If the main app instance hangs on to the logger that ::Middleman::Logger.singleton returns, then subsequent calls to re-init the logger won't have any effect (for instance, when setting up the preview server's logger based on CLI params).
Redefining logger to be a pass-through to ::Middleman::Logger.singleton instead of an ivar seems more in keeping with the sprit of a singleton, anyways.
This fixes an issue where running `middleman server --verbose` doesn't output any debug info.
2014-04-07 17:34:26 -05:00
Thomas Reynolds
69c6e87b31
bump
2014-04-07 09:56:15 -07:00
Thomas Reynolds
1b3b785c2b
Merge pull request #1248 from Arcovion/patch-1
...
Mobile friendly host & windows fix
2014-04-07 09:49:36 -07:00
Thomas Reynolds
4c9af0e07d
Merge pull request #1251 from railsbros-dirk/fix-middleman-init-command
...
CLI: Always require 'middleman-core/version'
2014-04-07 09:48:48 -07:00
Thomas Reynolds
fcbf9f1568
avoid running Sass compilation twice
2014-04-07 09:38:00 -07:00
Dirk Breuer
ae451608b3
CLI: Always require 'middleman-core/version'
...
The `init` command will fail if the `VERSION` was not required because
it is needed for the Gemfile generation. Unfortunately this was not
catched by the specs because the specs require the version and the child
process is not correctly reset.
I was not able to change this easily :-(
2014-04-07 16:15:50 +02:00
Eliott Appleford
e3946a06d9
Print correct IP and mobile testing support
...
Address `0.0.0.0` wasn't valid on windows, use localhost instead
Finds a local IP that will also allow the development server to run on mobiles
2014-04-05 21:55:01 +01:00
Thomas Reynolds
a40ef1a734
bump to include sass fix
2014-04-05 13:38:45 -07:00
Thomas Reynolds
7ae4c4d14e
use compass-import-once
2014-04-04 17:02:22 -07:00
Thomas Reynolds
f95da2a1da
arbua jruby support
2014-04-04 10:56:47 -07:00
Thomas Reynolds
f3edabfb7e
bump execjs dep
2014-04-04 10:48:08 -07:00
Thomas Reynolds
80256ec3c5
revert back to sass 3.2 and stable compass
2014-04-04 10:38:50 -07:00
Thomas Reynolds
638e2e64b7
Unvendor padrino
2014-04-04 10:22:34 -07:00
Thomas Reynolds
fac4928d50
Update haml and sass deps
...
Conflicts:
Gemfile
middleman/middleman.gemspec
2014-04-03 10:01:18 -07:00
Thomas Reynolds
f800a51fb2
Update haml and sass deps
2014-04-03 09:53:33 -07:00
Thomas Reynolds
6d2f8cd50c
Add options hash to asset methods to allow special options to be passed through from extensions
2014-03-31 14:15:46 -07:00
Thomas Reynolds
1c37cc6a34
Merge pull request #1238 from bhollis/asciidoc
...
Remove Asciidoc support in favor of a middleman-asciidoc extension
2014-03-30 10:52:40 -07:00
Ben Hollis
5ce8549f03
Remove Asciidoc support in favor of a middleman-asciidoc extension.
2014-03-29 19:24:51 -07:00
Ben Hollis
c1f7299cfd
Fix some references to extensions[:frontmatter]
2014-03-29 17:21:49 -07:00
Ben Hollis
abeee38126
Remove yet another way to register extensions and register/activate FrontMatter like a normal extension.
2014-03-29 17:17:00 -07:00
Ben Hollis
a6c37f3dd3
Clean up extensions a bit. Removes newest form of registering extensions, more consistently sets and uses an extension's ext_name, and makes a lot of things errors instead of just log messages in hopes that people can't get too far with a messed-up config.
2014-03-29 14:29:42 -07:00
Kale Worsley
6f38416c15
Include the destination_path in the instrumentation payload.
2014-03-28 09:10:33 -07:00
Andrey 'lolmaus' Mikhaylov
db59447e82
Webrick should not do reverse DNS lookups
...
This prevents Middleman server from being terribly slow over network. Closes #1118 .
2014-03-27 11:58:31 +03:00
Ben Hollis
4605ffc398
Improvements to the /__middleman/ metadata pages.
...
Includes formatting/styling changes to clarify the data being presented as well as align styling with middlemanapp.com. Also adds features and fixes to the sitemap view to show ignored files differently, hide redundant information, print data/options as a hash instead of as array pairs, and to list out available locals defined on a page.
2014-03-26 00:12:10 -07:00
Ben Hollis
10eca91311
Fix docs for HashWithIndifferentAccess
2014-03-25 22:43:43 -07:00
Ben Hollis
97e7427641
Ignore .cache by default in .gitignore
2014-03-25 22:39:52 -07:00
Ben Hollis
60f712e6ba
Merge branch 'v3-stable'
...
Conflicts:
.travis.yml
Gemfile
middleman-cli/lib/middleman-cli/build.rb
middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
middleman-core/lib/middleman-core/templates.rb
middleman-core/lib/middleman-core/util.rb
middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
