cytoplasm 0.3.0 → 0.3.1

data/app/controllers/cytoplasm/fonts_controller.rb

@@ -100,10 +100,12 @@ module Cytoplasm
 				
 				# Check that FontSquirrel fonts actually exist in @@fontsdir
 				notfound = 0
-				yaml["fontsquirrel"].each do |fam,variants|
-					unless File.exists?(@@fontsdir+"/"+fam)
-						yaml["fontsquirrel"].delete(fam)
-						notfound += 1
+				if yaml.is_a? Hash and yaml["imported"]
+					yaml["fontsquirrel"].each do |fam,variants|
+						unless File.exists?(@@fontsdir+"/"+fam)
+							yaml["fontsquirrel"].delete(fam)
+							notfound += 1
+						end
 					end
 				end
 				if notfound>0
@@ -112,13 +114,7 @@ module Cytoplasm
 				end
 				
 				# Fetch enabled fonts lists
-				["fontsquirrel","googlewebfonts"].each do |dir|
-					unless yaml[dir].nil?
-						yaml[dir].each do |fam,variants|
-							enabled[dir][fam] = fetch_family(dir,fam)
-						end
-					end
-				end
+				["fontsquirrel","googlewebfonts"].each {|dir| yaml[dir].each {|fam,variants| enabled[dir][fam] = fetch_family(dir,fam)} if yaml.is_a? Hash and yaml[dir]}
 				
 				return enabled
 			end

data/lib/cytoplasm/version.rb

@@ -1,3 +1,3 @@
 module Cytoplasm
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/dummy/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    cytoplasm (0.2.9)
+    cytoplasm (0.3.0)
       jquery-rails
       jquery-ui-rails
       rails (~> 3.2.9)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cytoplasm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -386,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648559931027973802
+      hash: -3254516121215688554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648559931027973802
+      hash: -3254516121215688554
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24