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

rubocop 2: the reckoning

Browse source
This commit is contained in:
Thomas Reynolds 2014-04-29 10:44:24 -07:00
parent 04dc48f13d
commit 8eabe4d354
62 changed files with 328 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,9 +143,6 @@ module Middleman
def data_for_path(path)
response = nil
@@local_sources ||= {}
@@callback_sources ||= {}
if store.key?(path.to_s)
response = store[path.to_s]
elsif callbacks.key?(path.to_s)
@ -164,10 +161,7 @@ module Middleman
return @local_data[path.to_s]
else
result = data_for_path(path)
if result
return ::Middleman::Util.recursively_enhance(result)
end
return ::Middleman::Util.recursively_enhance(result) if result
end
super
@ -187,11 +181,11 @@ module Middleman
__send__(key) if key?(key)
end
def has_key?(key)
@local_data.key?(key.to_s) || !!(data_for_path(key))
def key?(key)
@local_data.key?(key.to_s) || data_for_path(key)
end
alias_method :key?, :has_key?
alias_method :has_key?, :key?
# Convert all the data into a static hash
#