deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch over to new config methods

Browse source
This commit is contained in:
Ben Hollis 2012-10-13 19:54:55 -07:00
parent 781fa1c65f
commit a50ca56fbc
22 changed files with 119 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

10
middleman-core/lib/middleman-core/core_extensions/data.rb
View file

@ -13,7 +13,7 @@ module Middleman
require "yaml"
require "active_support/json"
app.set :data_dir, "data"
app.config.define_setting :data_dir, "data", "The directory data files are stored in"
app.send :include, InstanceMethods
end
alias :included :registered
@ -24,12 +24,12 @@ module Middleman
# Setup data files before anything else so they are available when
# parsing config.rb
def initialize
self.files.changed DataStore.matcher do |file|
self.data.touch_file(file) if file.match(%r{^#{self.data_dir}\/})
files.changed DataStore.matcher do |file|
data.touch_file(file) if file.match(%r{^#{config[:data_dir]}\/})
end
self.files.deleted DataStore.matcher do |file|
self.data.remove_file(file) if file.match(%r{^#{self.data_dir}\/})
files.deleted DataStore.matcher do |file|
data.remove_file(file) if file.match(%r{^#{config[data_dir]}\/})
end
super