cytoplasm 0.2.4 → 0.2.5

data/lib/cytoplasm.rb

@@ -212,13 +212,7 @@ module Cytoplasm
 		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()
@@ -276,15 +270,15 @@ module Cytoplasm
 	
 	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"

data/lib/cytoplasm/version.rb

@@ -1,3 +1,3 @@
 module Cytoplasm
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cytoplasm
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,7 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2129490078280573108
+      hash: -3713911084599963434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -403,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2129490078280573108
+      hash: -3713911084599963434
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24