spf13
dcfcbac589
Enabling Nitro ('--stepAnalysis') again. Fix #58
2013-10-03 09:44:45 -04:00
spf13
18f2b82658
Switching to the rjson library which is more friendly to human generated json.
2013-10-01 22:45:24 -04:00
spf13
92cff05582
go fmt so code
2013-09-29 02:10:29 -04:00
spf13
ff2b98c9dd
Better error message when no source content is found.
2013-09-29 02:10:29 -04:00
Noah Campbell
db50154e75
Support index.html indexes in content directory
...
If a file named index.html exists in a directory, or root, it will be
rendered as if ugly urls are turned on. This allows for top level
content to not need a supporting layout file and content in content.
This change should not affect anyone who is using the perscribed way.
I also cleaned up a bunch of one off functions in site.go.
2013-09-24 21:27:25 -07:00
Noah Campbell
4250bf8e30
Fixes #80 - Homepage now renders correctly
...
I mistakenly make RenderHomePage a NOP. Bad programmer.
2013-09-24 14:41:21 -07:00
Noah Campbell
bffe4baf42
Create a TargetPath() method that provides OutFile
...
Moved the generation of the target path to the page breaking all
dependecies on Site.
2013-09-20 17:24:25 -07:00
Noah Campbell
52e8c7a0ac
Section is determined by the source, not the url
...
This change allows for top level html content to exists.
2013-09-20 17:03:43 -07:00
Noah Campbell
784077da4d
Fix fragments being AbsUrlified in final html
...
Found that fragments were getting the BaseURL applied creating a proper
anchor url and redirecting off the page.
2013-09-18 15:48:36 -07:00
Noah Campbell
311e102223
Allow non-markdown content in content directory
...
Allow content that is not markdown and does not need to be rendered to
exists in the content directory. Currently any valid html or xml
document can exist. Templates are applied to these documents as well.
If you need to have content that doesn't have templates or AbsUrlify
like operations, then continue to put this content in static and it will
be copied over.
2013-09-18 14:21:27 -07:00
Noah Campbell
5374242ff7
More expressive --check output
2013-09-18 11:52:30 -07:00
Noah Campbell
c510140c0c
Add renderer information to --check
...
Now reports if the page will be rendered or not and by which render
engine.
2013-09-18 10:27:56 -07:00
Noah Campbell
67b2abaf09
Add IsRenderable to Page
...
As pages are read from the target, they will be assessed if they should
be rendered or not. The logic for IsRenderable is in the parser/page.go
and looks for anything exception '<'.
2013-09-18 10:17:43 -07:00
Noah Campbell
d8e1834910
Fix parsing edge case of frontmatter
...
When the frontmatter contains a - (or other delimiter) close to the
closing frontmatter delimiter, frontmatter detection would fail.
2013-09-18 09:15:46 -07:00
Noah Campbell
a82efe5bb1
Merge remote-tracking branch 'origin/parser' into mrg_praser
...
Also brought in parse for github.com/noahcampbell/akebia
Conflicts:
hugolib/page.go
hugolib/page_test.go
2013-09-17 15:52:40 -07:00
Noah Campbell
6b0752e8c0
Move AbUrlify to post content transformation
...
Currently the a@href and script@src elements will have BaseUrl applied
to their elements prior to being written to disk.
2013-09-17 14:16:06 -07:00
Noah Campbell
172ff5ea7a
Initialize HTMLRedirectAlias before ShowPlan()
...
Without it, no alias information is generated when running --check
2013-09-13 15:06:37 -07:00
Noah Campbell
d45fb72f67
Add /index.html to unadorned alias paths
...
Bring code to be better in line with documentation.
2013-09-13 14:51:28 -07:00
Noah Campbell
803a0fce1e
Remove RenderedContent from page.
...
The output is written directly to disk after being written. Not
entirely sure why it was split into two steps.
2013-09-13 10:30:27 -07:00
Noah Campbell
2ebfb33fe0
Move alias logic to target module
...
I want to move all logic to writing aliases to target so I can pave the
way for writing aliases specific to other runtimes (like .htaccess for
apache or a script for updating AWS or symlinking on a filesystem).
2013-09-12 21:20:00 -07:00
Noah Campbell
2f10da1570
Move alias rendering to target
2013-09-12 16:18:30 -07:00
Noah Campbell
74b55fc7c8
Normalize paths within hugo
...
filepath was used inconsistently throughout the hugolib. With the
introduction of source and target modules, all path are normalized to
"/". This simplifies the processing of paths. It does mean that
contributors need to be aware of using path/filepath in any module other
than source or target is not recommended. The current exception is
hugolib/config.go
2013-09-12 10:48:59 -07:00
Noah Campbell
6274aa0a64
Homepage "/" respects PublishDir
...
It wasn't taking the value of PublishDir into consideration for the
special case of the homepage "/".
Fixes #75
2013-09-05 09:57:25 -07:00
Noah Campbell
610c06e658
Introduce source.Filesystem
...
This provides an abstraction over how files are processed by Hugo. This
allows for alternatives like CMS systems or Dropbox, etc.
2013-09-04 22:42:52 -07:00
Noah Campbell
d4d9da9f3a
Remove page module dependence on opening files
...
The site is responsible for reading files, page only operates on
buffers.
2013-09-04 19:36:06 -07:00
Noah Campbell
cb00917af6
Expand the ShowPlan functionality
2013-09-03 20:52:50 -07:00
Noah Campbell
4004687fb2
Move to target.Filesystem
...
Moving the ugly urls logic to the target. There is still UglyUrl logic
in page for the permlink but this is dealing with the generate of urls.
2013-09-03 20:01:55 -07:00
Noah Campbell
7919603fb5
Add Translate to target
...
Translate handles Ugly Urls.
2013-09-03 20:00:22 -07:00
Noah Campbell
c6ad532b94
Add file reporting to planner
2013-09-03 20:00:22 -07:00
Noah Campbell
13d2c55206
Adding Planner
2013-09-03 20:00:21 -07:00
Noah Campbell
79d9f82e79
Code reorg, helpers.go has been decomposed.
...
It started with wanting to move templates in template bundles and the
rest followed. I did my best to start grouping related functions
together, but there are some that I missed. There is also the method
Urlize that seems to be a special function used in both worlds. I'll
need to revisit this method.
2013-09-03 16:16:07 -07:00
Noah Campbell
207d8fb7af
Date rendering unit tests in pages
...
Tests to ensure rendering dates in templates is working correctly.
Actually, I was running into invalid templates not giving warnings when
I was trying to render a date.
2013-09-03 14:51:06 -07:00
Noah Campbell
3ecc698f5e
Remove hugolib.HTML and hugolib.URL types
...
These types were not be rendered correctly by the html/template package.
Removing them gets the correct behavior.
Fixes #74
2013-09-03 12:43:56 -07:00
Noah Campbell
a591a10626
Include building hugo docs as part of test.
...
If the building of the doc fails, tarvis will fail. This will help with
pull requests.
2013-09-03 11:29:43 -07:00
Fabrizio (Misto) Milo
ba82a20321
Add support for amber files
...
If a layout file ends with .amber it will interpreted as a Amber file
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 19:51:32 -07:00
Fabrizio (Misto) Milo
ee5865f239
Abstract html/template dependency
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 19:51:27 -07:00
Fabrizio (Misto) Milo
0a9dc705f3
Use s everywhere for consistency
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 19:51:21 -07:00
Mark Sanborn
6c8e7edbb4
The <!--more--> (summary divider) now works even if it is on the same line as content
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 07:44:29 -07:00
Noah Campbell
4349216deb
Small code cleanup
2013-08-31 20:00:57 -07:00
Noah Campbell
0fdea0c2c2
Return an error with WritePublic
2013-08-30 21:24:25 -07:00
Noah Campbell
097b782a80
Removing site.Directories.
...
Please revert if this is used somewhere.
2013-08-30 21:13:50 -07:00
Noah Campbell
b14b61af37
Externalize the writing of content to a target
...
Introducing the target module in hugo. This provides the simple
interface for writing content given a label (filename) and a io.Reader
containing the content to be written.
If site.Target is not set, it defaults back to the original behavior of
writing to file system.
In hugolib/site_url_test.go I have an InMemoryTarget for testing
purposes and use it to see if the final output of a render matches.
2013-08-30 20:45:42 -07:00
Noah Campbell
bc3c229002
Ensure Section is set before returning Page object.
2013-08-30 20:13:22 -07:00
Noah Campbell
c32f401b15
Revert "Return errors when rendering"
...
This reverts commit e66ba5d2a7
.
Fixed #69
2013-08-30 20:08:13 -07:00
Noah Campbell
a792ec09ce
Cleanup formatting - go fmt ./...
...
Remember to run go fmt ./... before committing. Looks sternly in mirror
2013-08-30 14:39:12 -07:00
Mark Sanborn
4ed43e8076
Fixed bug where Url specified in front matter as pretty url wouldnt render
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-08-30 14:39:11 -07:00
Fabrizio (Misto) Milo
3ab5245049
clean up logic
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-08-28 20:39:58 -07:00
Ross Lawley
1bb00b8c19
Refactored added RenderThingOrDefault and tests
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
Conflicts:
hugolib/site.go
2013-08-27 12:40:53 -07:00
Noah Campbell
554375b2ad
Using new parser.
2013-08-25 20:27:03 -07:00
Hugo Duncan
1de1992664
Return any error reported by RenderHomePage
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-08-23 16:55:40 -07:00
Ross Lawley
9930011ea2
Wordpress summaries
...
Allow full control of summaries which can be rendered as html rather
than text. Using a `<!--more-->` html comment in your markdown / rst
you can indiciate where the summary should end and have the summary
converted to html.
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
Conflicts:
hugolib/page_test.go
2013-08-23 16:46:19 -07:00
Ross Lawley
7b1f0960e3
Add 404.html for gh-pages
...
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-08-23 16:38:35 -07:00
Noah Campbell
f28a8fa0c2
RenderThing test cases
...
Provide unit test support RenderThing.
One observation is that creating the site.Tmpl variable is a one time
event. site.Tmpl doesn't like additional templates with the same name.
This means that updating a template while in --watch mode requires
throwing away the entire Site object and creating a new one. Not that
this is a bad idea, but it is something I discovered while working on
these unit tests.
2013-08-23 16:21:28 -07:00
Noah Campbell
9d15262ee5
Test cases for ignoreDotFile
...
Meant to commit this earlier, but it's a basic unit test.
2013-08-23 14:57:21 -07:00
Noah Campbell
7461ed63ae
Fix benchmark so the buffer is read each time.
...
The bytes.Buffer was exhausted after the first read. Creating a new
reader each invocation catpures the correctly timing.
2013-08-23 14:16:37 -07:00
Noah Campbell
599e6672f7
Removing GetSection
...
Using GetXXX is not idiomatic to Go. Also added a bunch of unit testing
around this method.
2013-08-23 14:14:54 -07:00
Noah Campbell
ae7112977d
Skip "dot" files in layout
...
As a vim user, .filename.swp files pop up. This change prevents hugo
from reading those files.
2013-08-23 13:58:52 -07:00
Hugo Duncan
301d2bafcd
Print error if index value in a page is wrong type
...
This was causing a panic with no information displayed about the
page causing the error.
2013-08-20 16:39:26 -04:00
Steve Francia
c4bcdebc59
Merge pull request #44 from cactus/avoid-redirect-with-slugs
...
avoid possible redirects with non-ugly slug urls
2013-08-17 21:04:51 -07:00
Steve Francia
e2744d403c
Merge pull request #43 from hugoduncan/feature/allow-xhtml-aliases
...
Enable aliases from .xhtml paths
2013-08-17 21:04:14 -07:00
Steve Francia
2542836bbc
Merge pull request #41 from rozza/skipStatic
...
Skip Static directory if its in your content directory
2013-08-17 20:59:07 -07:00
Noah Campbell
c713beba4d
Formatting cleanup
2013-08-17 23:52:16 -04:00
Noah Campbell
ec821739bc
Removing the use of slash
...
An oversight on my behalf. The FromSlash method is used when writing
out the public file name. There is one place where the slashes are
required which is setting the output file. I replaced those instances
with filepath.Join which should do the right thing depending on the OS.
2013-08-17 23:46:57 -04:00
Noah Campbell
8eca8f8aa0
Detect missed index from front matter
2013-08-17 23:45:03 -04:00
Noah Campbell
e66ba5d2a7
Return errors when rendering
2013-08-17 23:45:03 -04:00
elij
b9e835b101
avoid handling a redirect from slug to slug/
...
because the url lacks a trailing /, many webservers will issue a
redirect to the canonical url with trailing slash for directory index
w/index.htm(l).
Append a slash to avoid this.
2013-08-16 13:14:20 -07:00
Hugo Duncan
23a98ad05c
Enable aliases from .xhtml paths
...
When redirecting an alias from a .xhtml path, served with default content type,
a redirect only works if the html element has a xmlns attribute. This adds the
attribute when the alias path ends in .xhtml
2013-08-16 00:29:46 -04:00
Ross Lawley
0f143dcf14
Skip Static directory if its in your content directory
...
Allows organisation where all source files are in one directory:
```
`config.yaml`:
contentdir: "source"
staticdir: "source/static"
...
.
└── source
├── post
| ├── firstpost.md // <- http://site.com/post/firstpost.html
| └── secondpost.md // <- http://site.com/post/secondpost.html
└── static
└── css
└── site.css // <- http://site.com/css/site.css
```
2013-08-15 20:05:46 +01:00
spf13
3c3fc45d3c
Merge branch 'master' of github.com:spf13/hugo
2013-08-14 10:19:59 -04:00
spf13
480e01eb15
Further work on path/section stuff. Tests passing now.
2013-08-14 08:57:14 -04:00
Steve Francia
7a51a8a5a3
Merge pull request #38 from noahcampbell/workflow_dotfile
...
Workflow dotfile
2013-08-13 20:03:18 -07:00
spf13
b4bcc591e4
Now support for nested paths. Better section detection.
2013-08-13 19:39:24 -04:00
spf13
6e27239485
Merge branch 'master' of github.com:spf13/hugo
2013-08-13 10:47:58 -04:00
Steve Francia
ca5a94a988
Merge pull request #37 from noahcampbell/master
...
Test GetParam and the various incarnations of frontmatter.
2013-08-13 07:44:43 -07:00
Steve Francia
c661d9803e
Merge pull request #31 from cactus/issue-31
...
sanitizeRegex chopping dots
2013-08-13 07:44:00 -07:00
spf13
ec02fa4bdd
Adding support for a default content type template
...
default template found at layouts/_default/single.html
2013-08-13 09:23:43 -04:00
spf13
8968524900
Adding support for recent content.
2013-08-13 08:43:42 -04:00
Noah Campbell
97eb9225a7
Ignore dotfiles in content directory
...
This supports my personal workflow of using vim which places a temporary file in the same directory as the file I'm editing.
2013-08-12 20:40:52 -07:00
Noah Campbell
5664780cca
gofmt pass
...
Clean up test files.
2013-08-12 20:40:34 -07:00
Noah Campbell
2d11d1bd67
Test GetParam and the various incarnations of frontmatter.
2013-08-12 20:25:32 -07:00
elij
31a1ade1b4
move "dot" in regex to avoid it being part of a range
2013-08-12 19:55:52 -07:00
elij
b13afc4178
fix sanitizeRegex to not strip "dots"
...
sanitizeRegex was stripping dots in permalinks when generating
RenderIndexes (noted during feed/rss generation).
permalink was being set to `.../indexxml` instead of `.../index.xml`.
Adding "dot" to the regex whitelist fixed the issue.
2013-08-12 19:02:43 -07:00
elij
023567b05e
fix bad tab/space due to paste
2013-08-12 19:01:23 -07:00
elij
2f9b582dbe
fix wrong renderlist feed permalink
...
when not using ugly urls, the feed permalink does not end up in the
expected location, and instead always behaves as if using ugly urls.
this fixes that behavior and inserts the feed xml file into the
directory as index.xml.
fixes #32
2013-08-12 19:00:29 -07:00
Noah Campbell
8c03141307
Use / for template names regardless of platform.
...
The path seperator was causing templates to not be loaded on windows.
Now all template names use / internally.
2013-08-12 15:03:06 -07:00
Noah Campbell
3fdcd0ba7c
Support for non-standard formats.
...
Forgot to include existing formats. Integration tests include new
format.
2013-08-12 14:35:39 -07:00
Noah Campbell
0305c82513
Move timezone tests to integration test.
...
Interacting with timezones will result in checks against the filesystem.
This access, by definition, is an integration test. Creating a
*integration_test.go file will signify this change.
When interacting with Travis-ci.org, the ubuntu boxes plus go 1.1 do not
seem to support shortcode timezones, think PST. In this case, the tests
are skipped. This is not ideal, but the IRC #go-nuts channel has
indicated timezone support is still lacking. We should advise users of
hugo that timezone support may be an issue and report any odd behavior.
The workaround is to use numeric timezones (-08:00 for PST, etc.)
2013-08-12 12:04:04 -07:00
Noah Campbell
f610d45cd8
Add additional details to date test cases.
2013-08-12 09:14:30 -07:00
Noah Campbell
dd19d0cc77
Provide better support for various date formats.
...
Fixes #30 as long as the date is well formatted.
2013-08-12 09:14:29 -07:00
VonC
17aafb39dd
Avoid error if no content.
...
The homepage should still be generated.
This is useful especially in the beginning, where you start just with
the homepage.
2013-08-12 14:31:39 +02:00
spf13
0233708907
Started new release notes, added nitro step for aliases
2013-08-10 15:44:22 +01:00
spf13
ac26de205e
Adding correct canonical link to alias pages
2013-08-10 15:41:10 +01:00
spf13
d5518c0966
Adding support for aliases (redirects)
2013-08-10 15:35:34 +01:00
spf13
45ce6e2b30
Merge branch 'redirect' of https://github.com/rozza/hugo into rozza-redirect
...
Conflicts:
hugolib/page.go
2013-08-10 14:08:38 +01:00
spf13
733c0207cb
Merge branch 'master' of github.com:spf13/hugo
...
Conflicts:
hugolib/site.go
2013-08-10 02:07:35 +01:00
Noah Campbell
2bbecc7bc8
Better reporting when the template is missing.
2013-08-09 17:36:32 -07:00
Noah Campbell
309db474c7
Nitro timer is encapsulated.
...
Remove the need for NewSite by relying on appropriate defaults. Renamed
site.c to site.Config to allow Sites to be created outside the package.
2013-08-09 17:36:32 -07:00
Noah Campbell
e26b43f6d9
Adding more test cases
2013-08-09 17:36:32 -07:00
Noah Campbell
e67db666c8
Adding benchmark for parsing pages using unicode.
...
The resulting comparsion is not equal because NewPage reads the file each time where ReadFrom just reads a buffer in memory.
2013-08-09 17:36:32 -07:00
Noah Campbell
085ce15f7c
Adding ability to read from io.Reader
...
This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-09 17:36:32 -07:00
Noah Campbell
274d324c8b
Introduce unit testing for page.go
2013-08-09 17:36:32 -07:00
Noah Campbell
fa55cd9857
Remove unreachable code path.
2013-08-09 17:36:32 -07:00
Noah Campbell
0595f27e6d
Using a composite literal to create a page.
...
Wonder why the need for composite structs. Not sure if my go knowledge is lacking or if this is cruft from other programming language doctrine.
2013-08-09 17:36:32 -07:00
Noah Campbell
19538a1bd6
Support pages without folders
2013-08-09 17:36:31 -07:00
Noah Campbell
fc5e92cc24
Provide better error handling
...
Change the method signatures to follow the check ok pattern.
2013-08-09 17:36:31 -07:00
Ross Lawley
e2a28114d1
Add redirect to page parameters and redirects example
2013-08-09 21:57:22 +01:00
spf13
a870f4d955
Fixing missing trailing slash in baseUrl
2013-08-08 12:30:01 +01:00
Nick Sabine
780e2f311b
Populated page Site metadata. Enables accessing Indexes from Page template.
2013-08-07 14:23:24 -04:00
spf13
783f0d6154
fixing badlink on homepage
2013-08-06 01:06:59 +02:00
spf13
6789b6c5ce
removing erroneous debugging output
2013-08-06 01:05:50 +02:00
spf13
dff86cb22c
Renaming indexes template to indexes.html
2013-08-03 03:29:24 -04:00
spf13
52c089ffbd
Added support for indexes of indexes & ordered indexes
2013-08-03 03:09:28 -04:00
spf13
ddad1e04ac
adding previous next capabilities
2013-08-02 16:30:26 -04:00
Noah Campbell
3e539c7126
Adding error message when no content pages exists.
2013-08-01 13:27:56 -07:00
Noah Campbell
c9a09418e7
Fixed section labels causing panic on windows.
...
The filename path was being split using a unix specific path seperator. This fix uses the os.PathSeperator to ensure proper evaluation regardless of platform.
2013-08-01 13:27:56 -07:00
spf13
736677a21d
Using MkdirAll instead of my own logic
2013-07-26 18:10:03 -04:00
spf13
7ab28c564f
Adding support for destination dir, split out static
2013-07-26 18:06:13 -04:00
spf13
92c31bbe10
permalink now respects pretty urls
2013-07-26 09:56:00 -04:00
spf13
d5f5543061
create content at any level of nesting
2013-07-26 09:28:26 -04:00
spf13
e08d14ad49
fixing issue with some urls missing '/'
2013-07-26 09:27:22 -04:00
spf13
b2385f062a
create missing directories recurisvely
2013-07-26 09:22:23 -04:00
spf13
8fae5f0dd6
Default is now pretty urls (without .html)
...
Adding --uglyurls option to retain previous behavior
2013-07-19 00:10:42 -07:00
spf13
c24112ce86
Render shortcodes before index and section rss feeds
2013-07-11 23:26:03 -04:00
spf13
649560fca2
proper BaseUrl handling (if has trailing slash or not)
2013-07-11 22:55:07 -04:00
spf13
7a521ad1a1
Fixing some RSS issues
2013-07-11 22:31:58 -04:00
spf13
b7b6f054a9
Accidentally left in debugging code
2013-07-11 22:16:29 -04:00
spf13
75a2e6d4e8
Now support for config files as yaml, json or toml
2013-07-11 22:04:57 -04:00
spf13
f857f4caba
adding helper to create absolute url
2013-07-10 17:57:28 -04:00
spf13
51e3098548
Writing relative links to absolute so they work in feeds
2013-07-10 00:14:02 -04:00
spf13
e76c3feb52
Fix bug with JSON front matter parsing.
2013-07-09 19:04:22 -04:00
spf13
a6914e9c4c
Better error handling for parsing front matter
2013-07-09 18:53:08 -04:00
tycho garen
4951ff998c
rst: fixing rst output processing
2013-07-09 08:16:29 -04:00
spf13
d2a6267ad7
Adding support for TOML, updating documentation
2013-07-08 22:23:54 -04:00
spf13
3c80cd323c
YAML support similar to jekyll (start and end with '---')
2013-07-08 17:57:01 -04:00
tycho garen
f851c4162b
fix: changing terminal yaml line, generalizing forematter splitting
2013-07-07 10:01:53 -04:00
tycho garen
b024454ea9
fixes: returning json parsing, error messages, yaml header offsets
2013-07-07 01:03:12 -04:00
tycho garen
67f4da30b1
revert: adding json support
2013-07-06 23:52:14 -04:00
tycho garen
6c42d3d490
fix: parsing of yaml forematter
2013-07-06 23:37:47 -04:00
tycho garen
431fa0e2d7
changing to suport yaml rather than json and adding optional restructuredtext support
2013-07-06 22:48:12 -04:00
tycho garen
a7f5f97bc2
sanity: move from json to yaml
2013-07-06 22:32:50 -04:00
spf13
f875577197
rendering shortcodes earlier for better performance
2013-07-05 12:03:47 -04:00
spf13
6e16449e5f
adding hugo
2013-07-04 11:32:55 -04:00