lib/hx.rb in hx-0.11.0 vs lib/hx.rb in hx-0.12.0
- old
+ new
@@ -446,11 +446,10 @@
class Site
include Filter
attr_reader :options
attr_reader :sources
- attr_reader :outputs
class << self
private :new
def load_file(config_file)
@@ -514,36 +513,35 @@
sources[name] = Hx.build_source(options, NULL_INPUT, sources,
raw_source)
end
outputs = []
- for raw_output in raw_config.fetch('outputs', [])
+ for raw_output in raw_config.fetch('output', [])
outputs << Hx.build_source(options, NULL_INPUT, sources, raw_output)
end
new(options, sources, outputs)
end
end
def initialize(options, sources, outputs)
@options = options
@sources = sources
- @outputs = outputs
- @combined_output = Overlay.new(*@outputs)
+ @output = Overlay.new(*outputs)
end
def edit_entry(path, prototype=nil)
- @combined_output.edit_entry(path, prototype) { |text| yield text }
+ @output.edit_entry(path, prototype) { |text| yield text }
self
end
def each_entry_path(selector)
- @combined_output.each_entry_path(selector) { |path| yield path }
+ @output.each_entry_path(selector) { |path| yield path }
self
end
def get_entry(path)
- @combined_output.get_entry(path)
+ @output.get_entry(path)
end
end
def self.refresh_file(pathname, content, update_time, executable=false)
begin