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

803 commits

Author SHA1 Message Date
Andrew Kvalheim
429e7d64bd Accept list of paths to exclude from gzipping. 2014-06-24 14:49:51 -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
fe5247d9d9 Add <head> to 404 so Livereload can add its script to the page 2014-06-16 08:58:16 -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
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
Thomas Reynolds
610716ee80 Work around possible mutable data issue #501 2014-05-22 19:20:43 +09: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
bootstraponline
3f0373adf2 Fix after_render 
Example usage from config.rb:

after_render do |content, path, locs, template_class|
  # restore character entities such as &amp;#96;
  content ||= ''
  content.gsub! '&amp;', '&'
  content
end
 2014-05-11 14:06:04 -04: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
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
8f75f6516d back out IP detection 2014-04-14 10:34:53 -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
a5c2386853 match masters new logger ref 2014-04-07 16:47:06 -07: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
638e2e64b7 Unvendor padrino 2014-04-04 10:22:34 -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
97e7427641 Ignore .cache by default in .gitignore 2014-03-25 22:39:52 -07:00
Ben Hollis
bb5b4054ff Don't bother processing asset hash on ignored resources. On a large project with a lot of Sprockets dependencies that were mostly ignored, this brought the build down from 30 minutes to 1 minute 2014-03-23 23:35:12 -07:00
Ben Hollis
0a6c80d223 Don't attempt to load local templates if HOME is not set 2014-03-23 16:49:22 -07:00
Thomas Reynolds
fde93ffed4 add node_modules to filewatcher ignore 2014-03-20 10:02:18 -07:00
Thomas Reynolds
ae1edd482f upgrade to newest activesupport 2014-03-20 09:53:01 -07:00
Thomas Reynolds
515c91e826 Merge pull request #1219 from bhollis/windows 
Add tzinfo-data for Windows users
 2014-03-19 15:40:33 -07:00
Ben Hollis
f71a0951ef Add tzinfo-data for Windows users 2014-03-18 22:42:31 -07:00
Ben Hollis
67689e60d2 Prevent the file watcher from recursively enumerating into paths that it should ignore. This should fix the issue in #1197 as well as provide a performance boost when starting 'middleman server'. 2014-03-18 21:17:50 -07:00
Ben Hollis
a88f12a262 Apply fix from 32716f3729 - avoid loading middleman-core unless needed. Fixes #1203 2014-03-13 20:32:25 -07:00
Thomas Reynolds
250c87ef61 move livereload init into dev block 2014-03-09 17:50:34 -07:00
Ben Hollis
0533bc4209 Be quiet about missing extras when middleman-core is used alone 2014-02-25 22:28:06 -08:00
Ben Hollis
4e545eef27 Break Middleman::Extension into its own file, mirroring the change on master 2014-02-22 18:43:47 -08:00
Ben Hollis
477f87e98a Prefer loading layouts from layouts_dir over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176. 2014-02-20 08:50:07 -08:00
Ben Hollis
ca50f21fac "middleman init" will create a project in the current directory. Fixes #1181. 2014-02-19 23:13:59 -08:00
Thomas Reynolds
3995ad850c update padrino. 2014-02-18 18:30:29 -08:00
Jonathan Soeder
8d346e74a5 Adding before build hook 2014-02-04 23:03:24 -06:00
Nico Hagenburger
0c3000c799 as there are no more local changes in the hooks’ source, it can be unvendored and used as gem 2014-02-03 23:39:23 +01:00
Nico Hagenburger
e5d95944c4 use instance hooks provided by hooks instead of changing the gem’s source 
Conflicts:
	middleman-core/lib/middleman-core/core_extensions/extensions.rb
 2014-02-03 23:37:55 +01:00
Nico Hagenburger
732532b72e upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0 
Conflicts:
	middleman-core/lib/middleman-core/application.rb
 2014-02-03 23:34:31 +01:00
Jeremy Green
b056f4f1d1 Update the console to the new logger syntax. 2014-01-30 23:26:17 -06:00
Thomas Reynolds
f0fcebe169 disable sass cache since it cant marshal the path to the MM instance 2014-01-28 10:46:39 -08:00
Thomas Reynolds
c2d85c35f2 prep release 2014-01-27 09:56:48 -08:00
Ivan Zarea
3993034883 Fix dynamic pages link in the config template 2014-01-27 09:35:30 +02:00
Thomas Reynolds
2e2415612a spring cleaning util and discovery of nasty variable mutating in url_for 2013-12-31 14:41:17 -08:00
Karl Freeman
dcf527008e StringLiterals 'cop' fix [ci skip] 2013-12-29 23:04:30 +00:00
Matt Simpson
21f575af3a Specify the full path to the NEWLINE constant 2013-12-28 19:43:59 -06:00
Karl Freeman
a31aa5d8be TrailingWhitespace 'cop' fix 2013-12-28 18:14:15 +00:00
Karl Freeman
03d6e6c990 Implemented Rubocop 
- just took a stab at running the StringLiterals cop to get a taste.
 2013-12-28 00:47:39 +00:00
Thomas Reynolds
e996868033 Depend on new i18n gem, silence deprecation warning 2013-12-25 16:52:29 -08:00
Thomas Reynolds
b6361c23f7 prep new release 2013-12-18 14:56:21 -08:00
Thomas Reynolds
a1090f912c fix issue with UTF-8-MAC paths not matching UTF-8 paths in build clean 2013-12-18 14:54:07 -08:00
Ben Hollis
f9728108cc Fix Mac filenames patch 2013-12-15 16:06:55 -08:00
Thomas Reynolds
70744aa63f fix typo 2013-12-13 08:30:19 -08:00
TMaYaD
8b87670024 Allow path to be passed to page_classes 
This allows tagging navigation links etc. in other pages with page classes
 2013-12-13 13:07:00 +05:30
Thomas Reynolds
0a264fd3c2 Merge pull request #1116 from bhollis/gzip 
Parallelize gzip extension using threads
 2013-12-11 10:40:29 -08:00
Ben Hollis
39a9331232 Commit 8e99d39570 introduced a serious regression by encoding filenames within a "delete_if" block, meaning that every path in the list of all previously built files was re-encoded every time a file was built. For large projects this causes serious slowdowns - for a 4000 file test, it went from 14s to build to around 8 minutes to build. This change fixes the builder to only encode files when the file list is initially build, removing the bottleneck. 2013-12-10 22:11:59 -08:00
Ben Hollis
54bc3e44f7 Parallelize gzip extension using four threads 2013-12-10 22:06:41 -08:00
Ben Hollis
1f6904c0fc Set locale to :en around gzip extension while it works. It was originally only set for one message, not the whole extension. 2013-11-30 22:59:19 -08:00
Ben Hollis
9e8a16cd6d Switch back to single-variable storage for Sitemap::Resource#destination_path 2013-11-27 00:19:59 -08:00
Ben Hollis
63b53077ff Oops had not meant to commit this yet. Anyway, it makes the "helpers" method on Extension able to take a module directly instead of just a block. 2013-11-25 01:10:10 -08:00
Ben Hollis
34d399f580 Fix yard options 2013-11-25 00:12:39 -08:00
Ben Hollis
7ad5b2bdef Ignore this new .cache folder that's shown up 2013-11-24 23:31:51 -08:00
Ben Hollis
fc20a761de Fix extension configs meta page to correctly handle multiple instance extensions like blog 2013-11-24 22:13:33 -08:00
fukayatsu
8e99d39570 Handle UTF-8-MAC filename on MacOS 2013-11-24 02:10:46 +09:00
Thomas Reynolds
6b6e9b143d actually add new padrino 2013-11-22 08:47:07 -08:00
Thomas Reynolds
48db12429a upgrade padrino. closes #1078 2013-11-19 18:10:39 -08:00
Ben Hollis
3347403d3a Fix typo 2013-11-19 00:17:50 -08:00
Ben Hollis
7f1285a773 Move to flat_map now that we don't use 1.8 2013-11-18 22:22:18 -08:00
Paul C Pederson
56343c84ed localization by filename extension 2013-11-18 10:20:42 -08:00
Thomas Reynolds
f136af2aad TODO 2013-11-15 11:26:27 +00:00
Thomas Reynolds
8a18da4e3d Merge pull request #1071 from stevenosloan/fix_paths_for_meta_pages 
use absolute paths for meta_page assets/links
 2013-11-14 08:47:09 -08:00
Thomas Reynolds
95c0fe60ac whoops, bad rename 2013-11-14 16:44:37 +00:00
Steven Sloan
d183858091 make meta page asset paths absolute to fix the issue of trailing/non-trailing slashes causing path problems on meta pages 2013-11-13 22:23:03 -05:00
Thomas Reynolds
4da2b02d70 Merge branch 'master' of github.com:middleman/middleman 2013-11-12 11:12:02 +00:00
Thomas Reynolds
b813db397f actually wire up auto alt tags. Finally fixes #782 2013-11-12 11:11:33 +00:00
Takehiro SUGITA
19908ca81a Add -B option as an alias to --skip-bundle 2013-11-08 19:45:49 +09:00
Thomas Reynolds
e0a4b8f17d dont route kramdown mailto links through link_to. Closes #1058 2013-10-30 09:18:25 -07:00
Thomas Reynolds
22c977d426 Merge branch 'master' of github.com:middleman/middleman 2013-10-29 09:44:22 -07:00
Thomas Reynolds
2cd5edf114 bump to 3.2.0 2013-10-29 09:44:19 -07:00
Thomas Reynolds
ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds
19c155349d Merge pull request #1044 from mojavelinux/asciidoc-renderer 
resolves #1043 added a renderer for AsciiDoc files
 2013-10-29 09:37:36 -07:00
Thomas Reynolds
9a2c1533e3 make page_classes prefix configurable 2013-10-29 09:33:27 -07:00
Thomas Reynolds
1e57eb5c1b Merge pull request #1049 from bhollis/classes 
Clean page classes of invalid CSS characters
 2013-10-29 09:23:05 -07:00
Andrew
e8de5907fa Actually fix the issue, rather than pretending to 2013-10-25 18:09:36 +11:00
Andrew
2e70cc5d99 Update queryable interface so that it doesn't mutate 2013-10-25 14:48:23 +11:00
Thomas Reynolds
87aa288f1e Merge pull request #1054 from bhollis/reload 
Gracefully handle syntax (and other) errors when reloading config.rb.
 2013-10-21 10:37:36 -07:00
Thomas Reynolds
764efe65cd Merge pull request #1053 from bhollis/logging 
Allow logging to be sent to a file
 2013-10-21 10:37:02 -07:00
Thomas Reynolds
13511f9323 Merge pull request #1052 from bhollis/builder 
Refactor the Build CLI code to be easier to read
 2013-10-21 10:36:44 -07:00
Ben Hollis
12de88e8d7 Allow logging to be sent to a file 
In config.rb, you can write:

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

Fix support for
- :link_attributes
- :filter_html

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

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

fix link_attributes option for Redcarpet

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

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

revert tests that aren't in redcarpet 3.0.0

add a cucumber exempt tag for mri-1.8.x

move redcarpet 3 specific extensions to a separate scenario filtered by the no18 tag
 2013-08-27 11:37:37 -04:00
Thomas Reynolds
abfe5e673f Merge pull request #992 from Mark-Simulacrum/master 
Add listener latency option.
 2013-08-21 16:01:27 -07:00
Mark Simulacrum
7606dfd494 Change latency option to :numeric type. 2013-08-21 05:33:29 -06:00
Mark-Simulacrum
c12d98df4f add comma at end of line 74 2013-08-20 15:59:38 -06:00
Mark-Simulacrum
24ce8334ee Add latency option to listener object. 2013-08-20 06:36:51 -06:00
Mark-Simulacrum
d37eca6a54 Add latency option. 
Aliased to -l.
 2013-08-20 06:32:49 -06:00
Mark-Simulacrum
b1b3339597 Create automated alt tag addition, based on image name. 
Needs documentation.
 2013-08-18 20:06:39 -06:00
Linus Pettersson
e77e615314 Fixed encoding for new buffer 2013-08-18 00:07:26 +02:00
Ben Hollis
f92ae94728 Escape filenames in regexes. Fixes #942. 2013-08-15 22:04:18 -07:00
Jason Webster
dd08ea2f6d Fix wrong http pathing/prefixing example in generated config 2013-08-15 15:24:44 -07:00
Thomas Reynolds
6d1effd2e7 bump 2013-07-21 23:32:28 -07:00
Aggelos Orfanakos
2a8b22558a Don't set resp Content-Type for some status codes 
There must not be a Content-Type set when the Status is 1xx, 204, 205 or
304, otherwise Rack blows up with the following error: "Content-Type
header found in 304 response, not allowed"
 2013-07-13 05:01:32 +03:00
Aggelos Orfanakos
83d83c5c8c Fix double-escaping of config settings 2013-07-12 23:06:51 +03:00
Aggelos Orfanakos
fffe36f42c Fix double-escaping of resource properties 2013-07-12 22:54:15 +03:00
Ben Hollis
bef6e13c5f I never meant to actually name this parameter blockm 2013-07-08 22:17:12 -07:00
Ben Hollis
8979fe9f18 Print file where YAML/JSON errors occur. Fixes #954. 2013-07-08 22:16:03 -07:00
Thomas Reynolds
8b970f9d92 support redcarpet's no_ flags which need to be re-implemented in our overrides. Fixes #951 2013-07-08 14:21:36 -07:00
Thomas Reynolds
5806f2cbf5 auto include wdm on windows platforms 2013-07-07 20:57:04 -07:00
Thomas Reynolds
dd2525c18e Merge branch 'master' of github.com:middleman/middleman 2013-07-02 14:42:54 -07:00
Thomas Reynolds
6403daccd3 prep 2013-07-02 14:42:44 -07:00
Arron Mabrey
44e5ff3f6c Update Sitemap source_dotfiles to support .nojekyll file 2013-06-30 18:46:39 -04:00
Alan Larkin
26b7f46978 Fixed typo in middleman-core/core-extensions/request.rb. 2013-06-25 14:55:12 +01:00
Thomas Reynolds
b2ecf5526b ignore all ds_store 2013-06-24 14:26:58 -07:00
Thomas Reynolds
b6a73ccfe5 prep 2013-06-24 14:15:27 -07:00
Thomas Reynolds
c7d3e7d601 Fix regex which was allowing i18n to file yaml files in the data folder 2013-06-24 13:56:32 -07:00
Thomas Reynolds
37752dc291 fix layouts with implied extensions 2013-06-24 13:39:14 -07:00
Thomas Reynolds
3399ee207e dont hardcode ignored build dir name 2013-06-23 15:15:43 -07:00
Steve Faulkner
f68f01a574 Update gitignore 2013-06-22 22:53:10 -05:00
Thomas Reynolds
d86dffa7c6 implement redirect support 2013-06-19 11:13:23 -07:00
Thomas Reynolds
0415b76d4f tests for content_tag escaping 2013-06-18 11:12:41 -07:00
Manuel Meurer
c75e31ae94 Fix content_tag helper, only try to mark content as safe if it is not a hash of options 2013-06-18 10:12:38 +02:00