cytoplasm 0.2.0 → 0.2.1

data/app/controllers/cytoplasm/fonts_controller.rb

@@ -88,7 +88,7 @@ module Cytoplasm
 				
 				# Fetch imported GoogleWebFonts fonts
 				yaml = fetch_yaml(@@gwf_file)
-				yaml["imported"].each {|f| imported["googlewebfonts"][f] = fetch_gwf_family(f)} unless yaml["imported"].nil?
+				yaml["imported"].each {|f| imported["googlewebfonts"][f] = fetch_gwf_family(f)} unless yaml["imported"].nil? or !yaml["imported"].any?
 				
 				return imported
 			end

data/lib/cytoplasm.rb

@@ -325,14 +325,18 @@ module Cytoplasm
 			puts "Failed to parse YAML in public/fonts/enabled.yml!"
 			enabled = {}
 		end
-		enabled.each do |dir,fonts|
-			fonts.each do |fam,variants|
-				if dir == "fontsquirrel"
-					sheets << "/fonts/"+fam+"/stylesheet.css"
-				elsif dir == "googlewebfonts"
-					sheet = "http://fonts.googleapis.com/css?family="+fam
-					sheet += ":" + variants.join(",") if variants.any?
-					sheets << sheet
+		if enabled.any?
+			enabled.each do |dir,fonts|
+				if 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
+							sheet += ":" + variants.join(",") if variants.any?
+							sheets << sheet
+						end
+					end
 				end
 			end
 		end

data/lib/cytoplasm/version.rb

@@ -1,3 +1,3 @@
 module Cytoplasm
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/dummy/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+ruby "1.9.3"
 
 gem 'rails', '3.2.9'
 

data/test/dummy/Gemfile.lock

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

data/test/dummy/log/development.log

@@ -617026,3 +617026,129 @@ Processing by Cytoplasm::SettingsController#fetch as */*
 WARNING: Can't verify CSRF token authenticity
   Rendered text template (0.0ms)
 Completed 200 OK in 6ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2013-01-24 13:13:40 -0500
+Connecting to database specified by database.yml
+Processing by HomeController#index as HTML
+  Rendered home/index.html.erb within layouts/application (2.5ms)
+Completed 200 OK in 80ms (Views: 79.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /application.css - 304 Not Modified (16ms)
+
+
+Started GET "/assets/about.css?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /about.css - 304 Not Modified (1ms)
+
+
+Started GET "/assets/docs.css?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /docs.css - 304 Not Modified (2ms)
+
+
+Started GET "/assets/demos.css?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /demos.css - 304 Not Modified (3ms)
+
+
+Started GET "/assets/downloads.css?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /downloads.css - 304 Not Modified (1ms)
+
+
+Started GET "/assets/home.css?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /home.css - 304 Not Modified (1ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /jquery.js - 304 Not Modified (6ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /jquery_ujs.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/demos.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /demos.js - 304 Not Modified (3ms)
+
+
+Started GET "/assets/about.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /about.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/docs.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /docs.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/downloads.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /downloads.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/home.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /home.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /application.js - 304 Not Modified (12ms)
+
+
+Started GET "/assets/cytoplasm/less-1.3.1.min.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/less-1.3.1.min.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/cytoplasm/cytoplasm.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoplasm.js - 304 Not Modified (16ms)
+
+
+Started GET "/assets/cytoplasm/jquery.ba-throttle-debounce.min.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/jquery.ba-throttle-debounce.min.js - 304 Not Modified (3ms)
+
+
+Started GET "/assets/cytoplasm/jquery.color.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/jquery.color.js - 304 Not Modified (25ms)
+
+
+Started GET "/assets/cytoplasm/cytoAjax.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoAjax.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/cytoplasm/cytoSelect.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoSelect.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/cytoplasm/cytoRadio.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoRadio.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/cytoplasm/cytoSlider.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoSlider.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/cytoplasm/cytoUpload.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoUpload.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/cytoplasm/cytoColorPicker.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoColorPicker.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/cytoplasm/cytoField.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoField.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/cytoplasm/cytoTable.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoTable.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/cytoplasm/cytoLogo.js?body=1" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /cytoplasm/cytoLogo.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/jquery-ui.js?_=1359051221549" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Served asset /jquery-ui.js - 200 OK (4ms)
+
+
+Started POST "/cytoplasm/settings/fetch" for 127.0.0.1 at 2013-01-24 13:13:41 -0500
+Processing by Cytoplasm::SettingsController#fetch as */*
+WARNING: Can't verify CSRF token authenticity
+  Rendered text template (0.0ms)
+Completed 200 OK in 7ms (Views: 1.8ms | ActiveRecord: 0.0ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cytoplasm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -389,7 +389,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -932365779184013727
+      hash: 152095801228446096
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -398,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -932365779184013727
+      hash: 152095801228446096
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24