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
Karl Freeman
87acf687d5
friendlier localhost print
2014-03-14 06:46:10 +00: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
Thomas Reynolds
8b20b39b31
Merge pull request #1194 from bhollis/gemfile
...
Require Bundler (a Gemfile) for all set up Middleman projects
2014-03-08 16:05:34 -08:00
Ben Hollis
10f8715bde
Whoops, properly implement findup
2014-03-04 22:43:10 -08:00
Ben Hollis
220d1e8948
Require Bundler (a Gemfile) for all set up Middleman projects. We still do extension auto-discovery for "init". Gemfile may now be in any parent directory of 'config.rb', in case the Middleman project is in a subdirectory of a larger project.
2014-03-03 23:47:24 -08:00
Ben Hollis
5de4e337c1
Merge middleman-more back into middleman-core
2014-03-03 22:32:12 -08:00
Ben Hollis
c9a640a3e2
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
middleman-core/lib/middleman-core/extension.rb
2014-03-03 22:10:50 -08: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
0f9b199bfa
Move some requires around
2014-02-22 22:44:28 -08:00
Ben Hollis
e662b6433f
Reapply changes from 477f87e98a
to TemplateRenderer/TemplateContext
2014-02-22 22:44:25 -08:00
Ben Hollis
c5b0ba17ea
Fix Padrino integration after merge
2014-02-22 20:11:54 -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
7b46fd6524
Merge remote-tracking branch 'origin/v3-stable'
...
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/extensions.rb
middleman-core/lib/middleman-core/version.rb
middleman-core/lib/middleman-more/core_extensions/compass.rb
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
middleman-core/middleman-core.gemspec
2014-02-22 18:11:37 -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
Nico Hagenburger
d6f9e8c640
as there are no more local changes in the hooks’ source, it can be unvendored and used as gem
2014-02-02 11:18:25 +01:00
Nico Hagenburger
2ad91339bb
use instance hooks provided by hooks instead of changing the gem’s source
2014-02-02 11:12:57 +01:00
Nico Hagenburger
247a152d39
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0
2014-02-01 23:45:46 +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
Sam Symons
df1236412b
Corrected a handful of documentation typos.
2014-01-09 19:49:41 -08:00
Thomas Reynolds
1dc9b97a5e
better ruby style on some changes
2014-01-04 12:44:20 -08:00
Thomas Reynolds
504a1c2eba
remove confusing and broken data.page variable
2014-01-03 16:18:16 -08:00
Thomas Reynolds
98e3c8aa79
remove instance variable and page block support
2014-01-03 15:49:54 -08:00
Thomas Reynolds
614d69dc18
move current_path in to the template context, one less piece of global state
2014-01-03 14:56:16 -08:00
Thomas Reynolds
f40903e663
move rendering into specialized File and Template rendering classes.
2014-01-03 13:40:37 -08:00
Thomas Reynolds
c06fbcfc93
rely directly on rack-mock
2014-01-02 21:45:42 -08:00
Thomas Reynolds
bea2515a41
Move CLI into middleman-cli
2014-01-02 16:39:06 -08:00
Thomas Reynolds
305d2f99ed
Put template rendering in a jail
2014-01-02 16:05:39 -08:00
Thomas Reynolds
9798f152ca
silence slim warnings
2014-01-02 14:59:14 -08:00
Thomas Reynolds
d77ef04774
upgrade to newest activesupport
2014-01-02 14:38:18 -08:00
Thomas Reynolds
95eaeba960
Start cleaning up Rack internals
2014-01-01 19:09:47 -08:00
Thomas Reynolds
42fb8c229a
bump version
2014-01-01 18:08:30 -08:00
Thomas Reynolds
a610608785
remove old style extension support
2014-01-01 15:10:49 -08:00
Thomas Reynolds
c95c924d53
build a config file jail
2013-12-31 18:21:30 -08: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