Commit Graph

255 Commits

Author SHA1 Message Date
Parker Moore 64cce065e6 Require kramdown instead of maruku.
CRAP CRAP CRAP whoops.
2014-05-06 21:55:11 -04:00
Parker Moore 4de2be8c5f Add Jekyll::LiquidExtensions.lookup_variable
To use, just include `Jekyll::LiquidExtensions` as you please:

```ruby
class SayHi < Liquid::Tag
  include Jekyll::LiquidExtensions

  def initialize(tag_name, markup, tokens)
    @markup = markup.strip
  end

  def render(context)
    "hi #{lookup_variable(context, @markup)}"
  end
end
```

Fixes #2071.
2014-04-22 14:27:47 -04:00
Parker Moore 9db5a1a6ce Merge pull request #2205 from jekyll/maul-esel-frontmatter-defaults 2014-04-21 23:01:05 -04:00
Parker Moore 75f49a751e OMG COLLECTIONS ARE RENDERING CALL THE POLICE 2014-04-14 22:46:21 -04:00
Parker Moore 50b46d7bee OMG it's happening ~*Collections*~ 2014-04-14 22:44:29 -04:00
Parker Moore a77c92aebe Replace load-in of YAML data with Jekyll::Document logic.
COLLECTIONS IS COMING
2014-04-14 22:43:09 -04:00
maul.esel 26663a6cf9 add the Publisher class to handle publishing logic 2014-04-07 16:17:51 +02:00
Parker Moore 6bd07501e8 Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft

Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
Parker Moore 5d761a1c2b Require 'plugin_manager' in lib/jekyll.rb 2014-04-01 18:44:37 -04:00
Parker Moore 009e2c200d Only strip the drive name if it begins the string. 2014-03-27 18:19:35 -04:00
Matt Rogers 19dc855551 Properly strip drive name from clean path when sanitizing path. 2014-03-10 14:35:19 -04:00
Parker Moore 37c2da5062 Properly clean path for Windows machines which is *nix-compliant. 2014-03-09 21:12:34 -04:00
Parker Moore 7787d64bce Rename those Utils functions. 2014-03-04 15:52:05 -05:00
Parker Moore e2af1b547b Extract core extensions into a Utils module
Fixes #2111
2014-03-03 22:13:03 -05:00
Parker Moore 0633cbf8fa Bring in jekyll-sass-converter 2014-02-28 21:20:20 -05:00
Parker Moore 9ffb984f37 Sass support should be shipped outside core. 2014-02-28 21:12:00 -05:00
Parker Moore 8a0d036b87 Greatly simplify Jekyll's gemspec. 2014-02-24 16:15:51 -05:00
Parker Moore 57d07469d3 Sanitize paths uniformly, in a Windows-friendly way.
Fixes kinda a #1948 thing.
Related to #1946.
2014-02-23 20:05:23 -05:00
Parker Moore 88e35f0852 Release 2.0.0.alpha.1 2014-02-13 18:02:49 -05:00
Parker Moore 56a633ae95 Update Jekyll version to latest released.
Latest release can be found on the v1-stable branch.
2014-02-09 18:44:30 -05:00
Matt Rogers f581940c71 Create a LayoutReader class to read layouts 2014-02-06 22:22:06 -06:00
Matt Rogers 5edb4c6bfd Merge pull request #1982 from dtao/safe-yaml-no-clobber 2014-01-31 06:48:16 -08:00
Parker Moore fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
Dan Tao 4f0b1bdf6d switched from YAML.safe_load* to SafeYAML.load* 2014-01-23 17:25:17 -08:00
Parker Moore 824a84ef2a Add support for Sass and SCSS. 2014-01-12 21:30:29 -08:00
Matt Rogers 350c9b3ab5 bump the version number in the code 2013-12-07 17:59:16 -06:00
maul.esel f1869cda98 Merge branch 'master' into frontmatter-defaults 2013-12-05 19:29:57 +01:00
Parker Moore b8bbc6e08b require the TOML gem, idiot. 2013-11-29 23:33:38 -05:00
Matt Rogers 91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Matt Rogers 63713799cd Extract Site#filter_entries into its own class 2013-11-04 21:35:13 -06:00
Matt Rogers 65653fed84 Bump version to 1.3.0 2013-11-03 21:48:34 -06:00
Matt Rogers 9f63ddb4db Prepare for a 1.3.0.rc release 2013-10-28 20:26:36 -05:00
maul.esel 20ea0c8d56 Merge branch 'master' into frontmatter-defaults 2013-10-14 19:44:06 +02:00
Matt Rogers 454e038fad Require 'pathname' 2013-09-16 20:29:57 -05:00
Parker Moore 6f053fbc8c Update gemspec & version to v1.2.1 2013-09-14 20:59:06 -04:00
maul.esel b3fdaa9792 add a class `FrontmatterDefaults` for handling of frontmatter defaults 2013-09-11 00:55:28 +02:00
Parker Moore afe1291f0c Update Jekyll::VERSION 2013-09-06 22:23:31 -04:00
Parker Moore 0d890e4b70 Merge pull request #944 from x3ro/permalink-special-characters
WIP - Improve permalink generation for URLs with special characters
2013-08-28 15:02:20 -07:00
maul.esel 5da13d2b66 Refactor `Site#cleanup`
Move the cleanup logic out into a separate class,
`Jekyll::Cleaner`.
2013-08-17 17:14:08 +02:00
Lucas Jenss 41b2f0824e Merge branch 'master' of https://github.com/mojombo/jekyll into permalink-special-characters 2013-07-25 21:33:55 +02:00
Parker Moore 0db5dcf832 Release 1.1.2 2013-07-25 09:15:34 +02:00
Parker Moore fe10f21d8d Release 1.1.1 2013-07-24 22:42:03 +02:00
Lucas Jenss 2ac98a7358 Merge branch 'master' into permalink-special-characters
Conflicts:
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2013-07-14 23:58:22 +02:00
Parker Moore d572e588e8 Release 1.1.0 2013-07-14 19:52:44 +02:00
Parker Moore 015ace6773 Shuffle around rendering of extracted excerpt so it can be liquified. 2013-07-13 16:18:20 +02:00
Parker Moore 700d840a06 Release 1.0.3 2013-06-07 21:02:13 +02:00
Parker Moore 14a4e32bbe Use singleton instance variable instead of class variable 2013-05-29 12:04:50 +02:00
Parker Moore 1f59e9c757 Use Jekyll.logger instead of Jekyll::Stevenson to log things. 2013-05-29 11:58:35 +02:00
Parker Moore ef48cbefec Merge pull request #1057 from mojombo/refactor-related-posts
Move the building of related posts into their own class
2013-05-15 07:25:53 -07:00
Parker Moore 5258e3afa3 Logger ~> Stevenson and don't inherit from Ruby Logger. #1106. 2013-05-15 15:15:00 +02:00
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 8051df0f4c Release 1.0.2 2013-05-12 15:26:45 +02:00
Matt Rogers 64f8a7b228 Move the require for related_posts to jekyll.rb 2013-05-08 07:39:00 -05:00
Parker Moore c758f8d24f Release 1.0.1 2013-05-08 01:03:14 +02:00
Parker Moore 06beb4b72b Bump version for 1.0.0. 2013-05-05 23:02:45 +02:00
Parker Moore 3c218d2dcd Only require pygments where it's needed. 2013-05-04 15:04:57 +02:00
Parker Moore c0c0150bb5 Release 1.0.0.rc1 2013-04-16 00:47:31 +02:00
Parker Moore b4f68baafb Jekyll.set_timezone accepts just the timezone, not the config 2013-04-15 15:39:36 +02:00
Parker Moore b249289b9d Set the timezone for the process 2013-04-15 00:42:13 +02:00
Parker Moore 398cd633b6 Merge pull request #959 from mojombo/deprecator
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
Parker Moore 4ef107f3e8 Remove Logger methods from main Jekyll module. 2013-04-14 19:27:19 +02:00
Parker Moore 81e44bf5f4 Merge pull request #955 from mojombo/refactor-markdown
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
Parker Moore 7a7990fb9a Moved markdown converters into lib/jekyll/converters/markdown 2013-04-14 05:23:42 +02:00
Parker Moore b99baeae27 Colorize warns as yellow 2013-04-13 19:58:41 +02:00
Parker Moore c5f6e527b5 Bring Logger and Deprecator into the fold 2013-04-13 18:05:03 +02:00
Parker Moore 63cdd21353 Move initialization of parsers to separate classes 2013-04-13 01:47:40 +02:00
Parker Moore bd8d271ce3 Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr- 2013-04-12 23:11:38 +02:00
Parker Moore e2967c96cd Jekyll.configuration should use the new Jekyll::Configuration class 2013-04-12 21:20:30 +02:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Alex Kessinger 14a669530e Fixing tests, and making it more ruby friendly 2013-04-11 10:17:59 -07:00
Alex Kessinger 1e209c9bf3 Upgrade --config to accept an array of files 2013-04-10 11:38:49 -07:00
Alex Kessinger df1efeff25 Accept multiple config files from command line
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line

Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
Lucas Jenss cfcbe1f830 Refactor URL processing/generation into separate module
This is done to prepare for improved permalink generation
for URLs containing special characters, as proposed in
issue #782
2013-04-09 23:53:46 +02:00
Parker Moore 1319b823f8 Release 1.0.0.beta4 2013-04-09 21:31:23 +02:00
Parker Moore dbb3dd3a1a Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly. 2013-04-07 23:55:04 +02:00
Parker Moore 1526aa3b1d Fix cascade problem with site.baseurl. Fixes #931. 2013-04-07 22:47:55 +02:00
Parker Moore ae462afb76 Backwards-compatibility for 'auto'. Fixes #821. 2013-04-07 22:29:30 +02:00
Parker Moore 28097a9ebb Updated version to 1.0.0.beta3. 2013-04-04 16:14:54 +02:00
Parker Moore de8f0c986c Update version for 1.0.0.beta2. 2013-03-19 00:08:56 +01:00
Parker Moore ee697a6308 Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_ 2013-03-17 21:09:58 +01:00
Parker Moore 936ed1f849 Merge pull request #837 from ixti/feature-excerpt
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
Parker Moore 7e1100962c Load in config from --config switch 2013-03-16 14:44:49 +01:00
Parker Moore 5c35a84662 Updated version and gemspec to reflect 1.0.0.beta1 release 2013-03-14 21:26:06 +01:00
Parker Moore dbc356f9f4 Bump version to 1.0.0.pre. 2013-03-14 21:23:34 +01:00
Aleksey V Zapparov 22dcc4e20f Adds excerpt to posts 2013-03-04 17:13:25 +01:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore 5d8e012899 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:10:42 +01:00
Parker Moore bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:09:34 +01:00
Parker Moore 11eb1ecae1 Safe loading of files and YAML. 2013-02-10 19:07:38 +01:00
scribu 1ac46b17c4 Don't require date in draft filenames. 2013-02-09 21:35:41 +02:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Tom Bell 7f072ed578 Merge branch 'master' 2013-01-12 01:18:41 +00:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Matt Rogers f3f181484d Merge remote-tracking branch 'upstream/master' into issue-653 2013-01-10 20:41:32 -06:00
Tom Bell b70b57cb89 Merge branch 'master' into 'jekyll-command-redux' 2013-01-09 23:40:27 +00:00
Tom Preston-Werner d58a0c1088 Release 0.12.0 2012-12-22 16:46:30 -07:00
Tom Bell a151a16f09 Remove command options from default config
Removing command line options from the config is a path towards cleaning up the
configuration file and not including options which don't really belong there.
2012-12-19 18:23:34 +00:00
Tom Bell dc139e2ac9 Update the sym->str key conversion 2012-12-18 22:13:17 +00:00