data_sources.rb in nanoc3-3.1.0a1

- old
+ new
@@ -1,20 +1,29 @@
 # encoding: utf-8
 
 module Nanoc3::DataSources
 
-  autoload 'Delicious',          'nanoc3/data_sources/delicious'
   autoload 'Filesystem',         'nanoc3/data_sources/filesystem'
-  autoload 'FilesystemCombined', 'nanoc3/data_sources/filesystem_combined'
-  autoload 'FilesystemCommon',   'nanoc3/data_sources/filesystem_common'
-  autoload 'FilesystemCompact',  'nanoc3/data_sources/filesystem_compact'
-  autoload 'LastFM',             'nanoc3/data_sources/last_fm'
-  autoload 'Twitter',            'nanoc3/data_sources/twitter'
+  autoload 'FilesystemUnified',  'nanoc3/data_sources/filesystem_unified'
+  autoload 'FilesystemVerbose',  'nanoc3/data_sources/filesystem_verbose'
 
+  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemVerbose',  :filesystem_verbose
+  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemUnified',  :filesystem_unified
+
+  # Deprecated; fetch data from online data sources manually instead
+  # TODO [in nanoc 4.0] remove me
+  autoload 'Delicious', 'nanoc3/data_sources/deprecated/delicious'
+  autoload 'LastFM',    'nanoc3/data_sources/deprecated/last_fm'
+  autoload 'Twitter',   'nanoc3/data_sources/deprecated/twitter'
   Nanoc3::DataSource.register '::Nanoc3::DataSources::Delicious',          :delicious
-  Nanoc3::DataSource.register '::Nanoc3::DataSources::Filesystem',         :filesystem
-  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemCombined', :filesystem_combined
-  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemCompact',  :filesystem_compact
   Nanoc3::DataSource.register '::Nanoc3::DataSources::LastFM',             :last_fm
   Nanoc3::DataSource.register '::Nanoc3::DataSources::Twitter',            :twitter
+
+  # Deprecated; use `filesystem_verbose` or `filesystem_unified` instead
+  # TODO [in nanoc 4.0] remove me
+  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemVerbose',  :filesystem
+  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemUnified',  :filesystem_combined
+  Nanoc3::DataSource.register '::Nanoc3::DataSources::FilesystemUnified',  :filesystem_compact
+  FilesystemCombined = FilesystemUnified
+  FilesystemCompact  = FilesystemUnified
 
 end