cytoplasm.rb in cytoplasm-0.2.5

- old
+ new

@@ -210,17 +210,11 @@
 		deps = []
 		valid_types = ["*","css","js"]
 		return false unless valid_types.include? type
 		case type
 			when "*"
-				valid_types.each do |t|
-					if t!="*"
-						dependencies(t).each do |d|
-							deps << d
-						end
-					end
-				end
+				valid_types.each {|t| dependencies(t).each {|d| deps << d} if t!="*"}
 			when "css"
 				deps << "http://ajax.googleapis.com/ajax/libs/jqueryui/"+vars("setup.jqueryui.version")+"/themes/"+vars("setup.jqueryui.theme")+"/jquery-ui.css"
 				deps += load_fonts()
 				@dependencies[:css].each {|stylesheet| deps << "cytoplasm/"+stylesheet}
 			when "js"
@@ -274,18 +268,18 @@
 		end
 	end
 	
 	def self.load_fonts
 		sheets = []
+		enabled = {}
 		begin
 			enabled = YAML::load_file("public/fonts/enabled.yml")
 		rescue
 			puts "Failed to parse YAML in public/fonts/enabled.yml!"
-			enabled = {}
 		end
-		if enabled.any?
+		if enabled.is_a? Hash and enabled.any?
 			enabled.each do |dir,fonts|
-				if fonts.any?
+				if fonts.is_a? Hash and fonts.any?
 					fonts.each do |fam,variants|
 						if dir == "fontsquirrel"
 							sheets << "/fonts/"+fam+"/stylesheet.css"
 						elsif dir == "googlewebfonts"
 							sheet = "http://fonts.googleapis.com/css?family="+fam
\ No newline at end of file