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

1244 commits

Author SHA1 Message Date
Jim Dalton f3296815c8 Add explicit option to prevent external option from running in background 2015-12-13 22:12:11 -08:00
Thomas Reynolds 4122bd7351 Add back compass sprite prerender step 2015-12-13 14:30:10 -08:00
Thomas Reynolds 01f899f529 Print a failing build so I can debug on travis 2015-12-13 13:59:44 -08:00
Thomas Reynolds b6befd3fc3 Rubocop and disable an annoying test 2015-12-13 13:29:33 -08:00
Thomas Reynolds 28a0071be7 Rename langs to locales in i18n. Provide backwards compat. Closes #1652 2015-12-13 13:20:48 -08:00
Thomas Reynolds 76f591788e Change inline URL matcher to only match strings, not newlines. Fixes #1689 2015-12-13 13:06:05 -08:00
Thomas Reynolds d3a5494062 Handle invalid URLs in rewriter. Fixed #1638 2015-12-13 12:32:21 -08:00
Thomas Reynolds 2674981d0b Fix yesterday's bone-headed commit. again 2015-12-09 17:08:58 -08:00
Thomas Reynolds 9b0b82c00b Fix yesterday's bone-headed commit 2015-12-09 17:03:55 -08:00
Thomas Reynolds cb6e8bcd95 Fix first-run issue with pipeline 2015-12-08 14:46:03 -08:00
Thomas Reynolds 2178a755e2 Minor SassC load_paths fix 2015-11-30 17:40:14 -08:00
Thomas Reynolds 7b3f5384e9 Add SassC message 2015-11-30 17:29:46 -08:00
Thomas Reynolds 07a216d5ca Remove sprockets/compass references 2015-11-30 17:14:02 -08:00
Thomas Reynolds ae15d203a8 Fix some tests 2015-11-28 19:32:45 -08:00
Thomas Reynolds e47b0ae29a import_file and import_path APIs. Addresses #1632 2015-11-28 18:03:05 -08:00
Thomas Reynolds 16b997498b Generic related files check 2015-11-28 16:48:08 -08:00
Thomas Reynolds 6de88a832e Make Ruby Sass the default, but use SassC if available. Addresses #1648 2015-11-27 15:41:42 -08:00
Thomas Reynolds dd0ee24ca3 Work around Listen :only weirdness. Addresses #1637 2015-11-27 15:26:46 -08:00
Thomas Reynolds 822a9f0ecc Fix layout detection on non-html files 2015-11-27 14:26:34 -08:00
Thomas Reynolds 4594f46fb8 Minor tweak to #1695 2015-11-27 14:16:55 -08:00
Johnny Shields 13a14d43d4 In SourceWatcher, add a subroutine to find files which should be considered "also dirty" when a given file is touched. 2015-11-27 15:20:20 +09:00
Steven Sloan 6ab6669456 fix(Util::asset_url): allow use without passing a current_resource 
Most cases the current_resource isn’t actually needed, so calls could be made
from extensions and still get the correct path back.

An exception will be raised with a descriptive message if the current_resource
is needed but not given. (for example, if relative is true — it needs a resource
to base the url on)
 2015-11-13 16:48:52 -05:00
Thomas Reynolds 37d96a9b14 Adapt to style changes and removal of on 2015-11-11 15:30:40 -08:00
Dennis Günnewig 8c7e156bd4 Make middleman's preview server a daemon 2015-11-11 23:28:38 +01: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
Dennis Günnewig a61b2e3b87 Move HTTPS to server_information 2015-11-07 18:50:55 +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
Thomas Reynolds e9abfe1134 rubocop 2015-10-01 13:54:54 -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 fd6a2376bd Fix frontmatter on 2.0 2015-10-01 10:25:53 -07:00
Thomas Reynolds d828067189 Fix sass helpers in SassC context 2015-09-30 11:16:57 -07:00
Eliott Appleford b389c26b4e Fix frontmatter regex 2015-09-30 04:58:59 +00:00
Eliott Appleford 9df1a45301 Strip newline after frontmatter 
Closes #1610
 2015-09-30 05:00:57 +01:00
Thomas Reynolds d9fc7a95e1 Fix a bad i18n regression 2015-09-28 14:52:16 -07:00
Thomas Reynolds 32891dc6fe SassC, woot 2015-09-28 11:24:37 -07:00
Eliott Appleford 97cd1c1411 Fix JSON frontmatter parsing 2015-09-24 20:27:36 +01:00
Thomas Reynolds fe66beacc3 Test fix WIP 2015-09-23 16:20:16 -07:00
Eliott Appleford ddc4a3cabc Update data.rb 2015-09-23 23:40:42 +01:00
Eliott Appleford 47bdcb2d9c Fix frontmatter parsing changes from #1608 
Only allow frontmatter at the top of the page:
  Now manually removing encoding lines as before

Fix handling of postscript data:
  If there is no frontmatter and the filetype is known,
  parse the whole file

Allow empty frontmatter

Update the documentation comments
 2015-09-23 21:45:52 +00:00
Eliott Appleford 11fc90f93c Merge pull request #1604 from middleman/frontmatter 
Refactor frontmatter parsing
 2015-09-21 13:33:43 +01:00
Eliott Appleford 91a06a1a35 Refactor util/data.rb further 2015-09-20 12:34:15 +00:00
Eliott Appleford 62f431b5ae Refactor frontmatter parsing 
Closes #1603
 2015-09-20 12:24:48 +00:00
Thomas Reynolds d3d32731e1 more test fixes 2015-09-19 16:00:38 -07:00
Thomas Reynolds 3ae28874bf Fix test breakage 2015-09-19 14:07:42 -07:00
Thomas Reynolds 2907761556 tweak logger ref 2015-09-17 14:46:27 -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 8c02eb2a26 Some tweaks to get blog working 2015-09-14 17:37:35 -07:00
Thomas Reynolds 40f023f01c Let's do this 2015-09-12 16:15:32 -07:00
Thomas Reynolds 441dc2faa6 Revert breaking resource source_file api. For #1595 2015-09-09 11:55:56 -07:00
Rafał Komorowski 0d4d82a01a Update middleman-livereload version to more current 
As discussed https://github.com/middleman/middleman-livereload/issues/69 but I forgot to apply the fix to source code inside MM. @tdreyno, should it be `~> 3.3.0` or `~> 3.4.0`? I looked into 3.4 changes and they seem to be MM v4 related?
 2015-09-03 18:25:43 +02:00
Thomas Reynolds d849930e51 Don't set mode AND environment with the same ENV 2015-09-01 09:58:13 -07:00
Thomas Reynolds 5cab7c46a9 Store intermediate resources in reducer so the array is not empty the first run. Addresses #1590 2015-08-31 11:18:45 -07:00
Brad Gessler 8bdeab50ee Fix typo in server CLI. 2015-08-28 13:08:56 -07:00
Thomas Reynolds f76561d101 Add logger require in rack. Addresses #1550 2015-08-28 09:58:10 -07:00
Thomas Reynolds 9ed0796b4a Move some extension setup to ready event 2015-08-20 17:45:18 -07:00
Thomas Reynolds 3485f49f74 Use Hashie Mash for recursive indifferent 2015-08-18 16:22:32 -07:00
Thomas Reynolds 0861fad2e1 Adding ignore 2015-08-17 15:59:48 -07:00
Thomas Reynolds 241fe69f7d Adding ignore 2015-08-17 14:33:19 -07:00
Thomas Reynolds 9886e04a95 Patch around seemingly invalid logic in Listen v3 2015-08-17 14:28:15 -07:00
Thomas Reynolds 50bf848ee8 Add config CLI command 2015-08-17 10:48:56 -07:00
Thomas Reynolds bb6b8c7f13 Replace Hamster hash for user-accessible data with Hashie Indifferent access 2015-08-12 15:29:06 -07:00
Thomas Reynolds fb6bca234f Update to newer cucumber and aruba 2015-08-10 16:58:36 -07:00
Jim Dalton 1a3f96b58f Fix misnamed config value which was causing --force-polling flag to be ignored by file_watcher extension 2015-08-10 15:04:47 -07:00
Thomas Reynolds 8cce9b8a8c Loudly announce external pipeline errors and exit with failure. 2015-08-10 10:00:23 -07:00
Thomas Reynolds dcbeb7dc76 Remove fivemat 2015-08-06 11:06:34 -07:00
Thomas Reynolds 0fba2ae2f6 Fix config meta page 2015-08-05 13:37:03 -07:00
Dennis Günnewig 63e9cd9b5f Substitue whitespace in name 2015-07-24 13:48:32 -07:00
Thomas Reynolds c69099c451 Really fix #1568 2015-07-24 13:46:33 -07:00
Mauro Otonelli dcc52d967c Applied Rubocop feedback. 2015-07-19 20:45:45 -03:00
Eliott Appleford 4364d754a5 Merge pull request #1564 from mauro-oto/remove_dir_related_deprec_warnings 
Removed most deprecation warnings from the build.
 2015-07-17 01:07:17 +01:00
Thomas Reynolds d2f8dc9932 Merge pull request #1528 from maxmeyer/feature/listener 
Support Bind to address for middleman
 2015-07-16 15:12:09 -07:00
Thomas Reynolds df13c62a6b Revert "Attempt to help #1563" 
This reverts commit 55f909d9cf.
 2015-07-16 11:34:46 -07:00
Mauro Otonelli 68a6eacc33 Removed most deprecation warnings from the build. 2015-07-15 22:03:41 -03:00
Thomas Reynolds 55f909d9cf Attempt to help #1563 2015-07-15 14:08:51 -07:00
Mauro Otonelli 63d6a00ed9 Use native Ruby JSON implementation instead of ActiveSupport's. 2015-07-14 19:30:17 -03:00
Mauro Otonelli c14fd72d04 Remove unused integer/inflections extension. 2015-07-14 19:26:59 -03:00
Max Meyer 6aa7ce741a Refactor preview server to support server_name and bind_address 2015-07-01 20:56:56 +02:00
Thomas Reynolds 8bbda9ea7b Whoops again 2015-06-22 11:28:09 -07:00
Thomas Reynolds 709a0d1a6c Fix previous commit 2015-06-22 10:48:40 -07: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 e09f7fadb5 Add better error messaging for #1541 2015-06-15 09:58:29 -07:00
Eliott Appleford 70d4671d2c Allow extended globs with ignore 
This makes it match the default behaviour of Dir#glob
 2015-06-14 12:16:34 +01:00
Todd Fisher ae2d1487fa Update util.rb 
line 128, Float type is also not something that can be dup'ed, similar to Fixnum and friends
 2015-06-11 15:24:19 -04:00
Thomas Reynolds 6562716aa5 bone head move 2015-06-09 10:42:41 -07:00
Thomas Reynolds bb44e59e6e Blindly attempt to imrpove encoding situation 2015-06-09 10:15:55 -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
Thomas Reynolds 68adbfeb2a Add to localized content. For #850 2015-06-01 11:32:43 -07:00
Thomas Reynolds 81a77828bd Make rack request object available in template rendering. Closes #1532 2015-06-01 11:12:34 -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
Eliott Appleford 3b88496803 Merge pull request #1531 from middleman/backport-407a17b 
Backport "Fix port suggestion from unused ports"
 2015-05-28 09:38:13 +01:00
Thomas Reynolds f5fe46cb59 Merge pull request #1517 from splebel/i18n-localized-path 
Added support for complete path localization
 2015-05-27 12:51:39 -07:00
Shin'ya Ueoka 43211d1bc6 Fix port suggestion from unused ports 
Conflicts:
	middleman-core/lib/middleman-core/preview_server.rb
 2015-05-27 03:07:51 +01:00
Shin'ya Ueoka 407a17bc77 Fix port suggestion from unused ports 2015-05-25 10:49:21 +09: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
Luís Ferreira af2e90cb0a Allow minify to correctly throw warnings 
The `path` variable was being used but never defined in the context of the `minify` method. Thus, instead of a warning we would get an error. Using an instance variable fixes this.
 2015-05-19 15:41:07 +01:00
Thomas Reynolds a25e9c6382 Normalize file path string encoding on darwin. For #1506 2015-05-17 12:25:17 -07: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 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
Thomas Reynolds 9de1f16f3b Empower link_to in a i18n context 2015-05-11 09:13:04 -07:00
Paulo f2f8a42f00 Fix syntax bug on retina file matching 2015-05-09 11:15:16 +02:00
Paulo 647ec149ca Add retina files support on automatic_image_sizes 2015-05-08 23:18:11 +02: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