lib/compass/configuration/helpers.rb in compass-0.13.alpha.0 vs lib/compass/configuration/helpers.rb in compass-0.13.alpha.2

- old
+ new

@@ -31,9 +31,11 @@ def configuration_for(config, filename = nil, defaults = nil) if config.nil? nil elsif config.is_a?(Compass::Configuration::Data) config + elsif config.instance_of?(Hash) + Compass::Configuration::Data.new(filename, config) elsif config.respond_to?(:read) filename ||= config.to_s if config.is_a?(Pathname) Compass::Configuration::FileData.new_from_string(config.read, filename, defaults) elsif config.is_a?(Hash) Compass::Configuration::Data.new(filename, config)