FileSystemUnified data source: added configurable dirs

[gpakosz]

I added configurable prefixes to FileSystemUnified data source:

data_sources:
  - type:           filesystem_unified
    items_prefix:   items
    layouts_prefix: layouts

[denisdefreyne]

For consistency with Filesystem in nanoc 4.0, I’d change the names slightly:

• content_dir for items
• layouts_dir for layouts

I’d also like to have methods content_dir_name and layouts_dir_name that do @config.fetch(:content_dir, 'content') and @config.fetch(:layouts_dir, 'layouts'), respectively.

(The Filesystem data source in nanoc 4.0 is not that nice yet. It doesn’t have content_dir_name and layouts_dir_name, for instance. I also noticed it uses %w( content layouts ) which is not parameterised, oops.)

[denisdefreyne]

Thanks for spotting this :)

[gpakosz]

I'm about to replace this pull request with a commit that does what you asked for.

But some tests fail because @config returns nil. Should it be @config.fetch(:content_dir, 'content') rescue 'content' and @config.fetch(:layouts_dir, 'layouts') rescue 'layouts'?

[denisdefreyne]

Hmm, @config should ideally never be nil… can you fix the code so that it is never nil?

Alternative, you could have def config ; @config || [] ; end.

[gpakosz]

I started modifying the tests so that @config isn't nil. Which is kinda convoluted because lots of tests just assume it's ok to pass nil for config.

Somehow, it seems to me it's quite acceptable to change https://github.com/nanoc/nanoc/blob/master/lib/nanoc/base/source_data/data_source.rb#L61 to@config = config || {}.

What do you think?

PS: @config or config? FilesystemUnified uses the former while Static (which is more recent) uses the later.

[denisdefreyne]

I’m OK with @config = config || {}.

I’d like to only use @config in the initializer, and config elsewhere in the file.

[gpakosz]

I used config.fetch but left those untouched:

• https://github.com/nanoc/nanoc/blob/master/lib/nanoc/data_sources/filesystem.rb#L84
• https://github.com/nanoc/nanoc/blob/master/lib/nanoc/data_sources/filesystem.rb#L218

[denisdefreyne]

Looks good, thanks!