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
b20d855f2c
prep
2015-05-15 11:49:22 -07:00
Thomas Reynolds
651b5fc1c3
Merge old patch to address #1430
2015-05-11 09:24:22 -07:00
Ben Hollis
28498b2fbe
Minor cleanup of 1a23ab3938
2015-05-08 08:36:43 -07:00
Ben Hollis
6afda2a34c
Merge pull request #1516 from dg-ratiodata/feature/set_hostname
...
Set host name and iterate over some ports...
2015-05-08 08:27:42 -07:00
Dennis Günnewig
fd88e50db6
Output environment in verbose mode
2015-05-08 10:12:57 +02:00
Dennis Günnewig
1a23ab3938
Iterate over 4 ports before giving up and let the user choose a port to listen on
2015-05-08 09:26:00 +02:00
Dennis Günnewig
9741c68d34
Explicit set the hostname
2015-05-08 09:25:54 +02:00
Ben Hollis
38e5fde04e
Create our own self-signed certs, rather than letting Webrick do it for us.
...
We now use a modified copy of Webrick's create_self_signed_certificate that generates a different certificate serial number each time (based on the current time). This avoids an error in Firefox when we serve a certificate with different details but the same serial: it throws up a "sec_error_reused_issuer_and_serial" error and refuses to let you accept the certificate. Our modified version also avoids printing garbage to $stderr.
2015-05-07 22:09:09 -07:00
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
Sean Collins
c1ce3ffd61
Remove spaces on empty lines
2015-04-26 12:16:55 -04: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
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
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
fbe71f51e4
Merge pull request #1465 from thomasritz/fix-wrong-parent
...
Fixes computation of `parent`.
2015-02-23 14:18:31 -07: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
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
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
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
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
857c99fab5
attempt to fix interactive cli timeout
2015-01-04 15:23:37 -06:00
Thomas Reynolds
f16510d034
Update CLI
2015-01-04 14:23:35 -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
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
3eafb4fcf4
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
2014-11-16 12:35:45 -08: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
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
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
Dennis Günnewig
d45911f7b8
Add force-option to init
2014-09-09 09:19:41 +02:00
Dennis Günnewig
b78515ce91
Fixed rubocop offense
2014-09-09 09:02:50 +02: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
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
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
1c977a83e2
prep
2014-08-03 08:37:46 -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
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
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
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
Ben Hollis
5c991ba4dc
Add a protective require
2014-06-22 20:46:39 -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
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
ce914e508a
Make rubocop TrivialAccessors warnings less annoying
2014-05-26 16:53:23 -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
