cytoplasm 0.1.4 → 0.1.5

data/app/assets/javascripts/cytoplasm/cytoplasm.js.erb

@@ -17,9 +17,9 @@ var Cytoplasm;
 			var $this = $('#'+v+'_message');
 			if (!$this.is('*')) {
 				$this = $('<p />').addClass('callback_message').attr("id",v+"_message");
-				if (header.children(':first-child').is('h1')) $this.insertAfter(header.children(':first-child'));
-				else $this.prependTo(header);
-				$this.hide();
+				//if (header.children(':first-child').is('h1')) $this.insertAfter(header.children(':first-child'));
+				//else $this.prependTo(header);
+				$this.hide().appendTo(header);
 			}
 		});
 	});
@@ -35,6 +35,7 @@ var Cytoplasm;
 	var vars = {};
 	var ready = false;
 	
+	// Gradient manipulation library
 	var parseGradient = function(grad,reverse){
 		// Return untouched if not gradient
 		if (grad.indexOf("gradient")==-1) return grad;
@@ -114,6 +115,7 @@ var Cytoplasm;
 		if ($.inArray(nstr,['aqua','black','blue','fuchsia','gray','grey','green','lime','maroon','navy','olive','purple','red','silver','teal','white','yellow'])>-1) return true;
 		return (nstr.match(/^#([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})/) || nstr.match(/^#([\da-fA-F])([\da-fA-F])([\da-fA-F])/) || nstr.match(/^rgba\(([\d]+),([\d]+),([\d]+),([\d]+|[\d]*.[\d]+)\)/) || nstr.match(/^rgb\(([\d]+),([\d]+),([\d]+)\)/));
 	};
+	
 	var compileStyles = function(element,styles){
 		output = "";
 		output += element+" { ";
@@ -131,13 +133,14 @@ var Cytoplasm;
 	var methods = {
 		init:function(options){
 			var settings = $.extend(true,{},defaults,options);
+			$('body').css("overflow","hidden").children(':not(header)').css("opacity",0);
 			
 			// Fetch latest settings via AJAX
 			$.cytoAjax("/cytoplasm/settings/fetch",{},function(data){
 				conf = data.conf;
 				vars = data.vars;
-				methods.setStyles.apply(this);
 				$('body').data('cytoplasm',settings);
+				methods.setStyles.apply(this);
 				ready = true;
 			});
 		},
@@ -286,8 +289,12 @@ var Cytoplasm;
 		ready:function(callback){
 			var interval = setInterval(function(){
 				if (ready) {
-					callback.apply();
-					clearInterval(interval)
+					clearInterval(interval);
+					var allexceptheader = $('body').children(':not(header)').animate({opacity:1},250,function(){
+						$('body').css('overflow-y','scroll');
+						$(window).bind('beforeunload',function(){allexceptheader.animate({opacity:0},100);});
+						callback.apply();
+					});
 				}
 			},10);
 		}

data/app/controllers/cytoplasm/fonts_controller.rb

@@ -1,117 +1,342 @@
 require 'net/http'
 require 'open-uri'
 require 'yaml'
+require 'zip/zipfilesystem'
+require 'fileutils'
 
 module Cytoplasm
 	class FontsController < ApplicationController
 		
-		@@fonts = {
-			"fontsquirrel" => false,
-			"googlewebfonts" => false,
-			"imported" => false
-		}
+		@@cache = false
 		@@fontsdir = "public/fonts"
 		@@gwf_file = @@fontsdir + "/googlewebfonts.yml"
+		@@enabled_file = @@fontsdir + "/enabled.yml"
 		
-		def fetch_imported
-			return @@fonts["imported"] unless @@fonts["imported"] == false
+		class << self
+			#attr_accessor :fonts
 			
-			imported = {"fontsquirrel" => {}, "googlewebfonts" => {}}
-			
-			# Create @@fontsdir if it doesn't exist	
-			unless File.exists?(@@fontsdir)
-				Dir.chdir("public")
-				@@fontsdir = Dir.mkdir("fonts")
-				Dir.chdir("../")
+			def fonts
+				@@cache = fetch_fonts() if @@cache == false
+				return @fonts
+			end
+			def fetch_fonts
+				@fonts = {"fontsquirrel" => fetch_fs_all(), "googlewebfonts" => fetch_gwf_all(),"imported" => fetch_imported(),"enabled" => fetch_enabled()}
+				return @fonts
+			end
+			def fetch_fs_all
+				fs = {}
+				fetch_json("http://www.fontsquirrel.com/api/fontlist/all").each do |f|
+					fs[f["family_urlname"]] = f
+				end
+				return fs
+			end
+			def fetch_gwf_all
+				gwf = {}
+				fetch_json("https://www.googleapis.com/webfonts/v1/webfonts?key="+Cytoplasm.conf("fontloader.googlewebfonts_apikey"))["items"].each {|f| gwf[f["family"]] = f}
+				return gwf
+			end
+			def fetch_family(dir,fam)
+				return fetch_fs_family(fam) if dir=="fontsquirrel"
+				return fetch_gwf_family(fam) if dir=="googlewebfonts"
+			end
+			def fetch_fs_family(family)
+				fs = (@@cache==false or @@cache["fontsquirrel"]==false) ? fetch_fs_all() : @@cache["fontsquirrel"]
+				return fs[family] unless fs[family].nil?
 			end
+			def fetch_fs_familyinfo(family)
+				fetch_json("http://www.fontsquirrel.com/api/familyinfo/"+family)
+			end
+			def fetch_gwf_family(family)
+				gwf = (@@cache==false) ? fetch_gwf_all() : @@cache["googlewebfonts"]
+				return gwf[family] unless gwf[family].nil?
+			end
+			def fetch_imported
+				imported = {"fontsquirrel" => {}, "googlewebfonts" => {}}
 			
-			# Create @@gwf_file if it doesn't exist
-			File.open(@@gwf_file,'w') {|f| f.write("")} unless File.exists?(@@gwf_file)
+				# Create @@fontsdir if it doesn't exist	
+				unless File.exists?(@@fontsdir)
+					count = 0
+					@@fontsdir.split("/").each do |dir|
+						Dir.mkdir(dir) unless File.exists?(dir)
+						Dir.chdir(dir)
+						count += 1
+					end
+					while count > 0 do
+						Dir.chdir("../")
+						count -= 1
+					end
+				end
+				
+				# Create @@gwf_file and @@enabled_file if it doesn't exist
+				File.open(@@gwf_file,'w') {|f| f.write("")} unless File.exists?(@@gwf_file)
+				File.open(@@enabled_file,'w') {|f| f.write("")} unless File.exists?(@@enabled_file)
+				
+				# Fetch imported FontSquirrel fonts
+				Dir.open(@@fontsdir).each do |f|
+					if File.directory?(@@fontsdir+"/"+f) and f!="." and f!=".."
+						imported["fontsquirrel"][f] = fetch_fs_family(f)
+						imported["fontsquirrel"][f]["familyinfo"] = fetch_fs_familyinfo(f)
+					end
+				end
+				
+				# Fetch imported GoogleWebFonts fonts
+				yaml = fetch_yaml(@@gwf_file)
+				yaml["imported"].each {|f| imported["googlewebfonts"][f] = fetch_gwf_family(f)} unless yaml["imported"].nil?
+				
+				return imported
+			end
+			def fetch_enabled
+				enabled = {"fontsquirrel" => {}, "googlewebfonts" => {}}
 			
-			# Fetch imported FontSquirrel fonts
-			Dir.open(@@fontsdir).each {|file| imported["fontsquirrel"][file] = fetch_fs_family(file) if File.directory?(file) and file!="." and file!=".."}
+				# Attempt to load YAML from @@enabled_file
+				yaml = fetch_yaml(@@enabled_file)
+				
+				# 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
+					end
+				end
+				if notfound>0
+					open(@@enabled_file,"w+") {|f| f.write(yaml.to_yaml)}
+					return fetch_enabled()
+				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
+				
+				return enabled
+			end
+			def is_enabled?(dir,fam)
+				enabled = (@@cache==false) ? fetch_enabled() : @@cache["enabled"]
+				return !enabled[dir][fam].nil?
+			end
 			
-			# Attempt to load YAML from @@gwf_file
-			begin
-				c = YAML::load_file(@@gwf_file)
-			rescue
-				puts "Failed to parse YAML in #{@@gwf_file}!"
+			def import(dir,fam)
+				output = {}
+				@@cache = fetch_fonts() if @@cache == false
+				if dir == "fontsquirrel"
+					output["dir"] = @@fontsdir+"/"+fam
+					output["url"] = "http://www.fontsquirrel.com/fontfacekit/"+fam
+					open(output["url"]) do |f|
+						Zip::ZipFile.open(f) do |zipfile|
+							zipfile.each do |entry|
+								fpath = File.join(output["dir"],entry.to_s)
+								FileUtils.mkdir_p(File.dirname(fpath))
+								zipfile.extract(entry,fpath){true}
+							end
+						end
+					end
+					fix_fs_stylesheet_family_names(fam)
+				end
+				@@cache["imported"][dir][fam] = fetch_family(dir,fam)
+				write_gwf_file() if dir=="googlewebfonts"
+				@@cache = fetch_fonts()
+				return output;
+			end
+			def remove(dir,fam)
+				output = {}
+				@@cache = fetch_fonts() if @@cache == false
+				disable(dir,fam) if is_enabled?(dir,fam)
+				case dir
+					when "fontsquirrel"
+						output["dir"] = @@fontsdir+"/"+fam
+						FileUtils.rm_rf(output["dir"]) if File.exists?(output["dir"])
+					when "googlewebfonts"
+						@@cache["imported"]["googlewebfonts"].delete(fam)
+						write_gwf_file()
+				end
+				@@cache = fetch_fonts()
+				return output
+			end
+			def enable(dir,fam)
+				output = {}
+				@@cache = fetch_fonts() if @@cache == false
+				@@cache["enabled"][dir][fam] = fetch_family(dir,fam)
+				write_enabled_file()
+				@@cache = fetch_fonts()
+				return output
+			end
+			def disable(dir,fam)
+				output = {}
+				@@cache = fetch_fonts() if @@cache == false
+				@@cache["enabled"][dir].delete(fam)
+				write_enabled_file()
+				@@cache = fetch_fonts()
+				return output
 			end
 			
-			# Fetch imported GoogleWebFonts fonts
-			c["imported"].each {|f| imported["googlewebfonts"][f] = fetch_gwf_family(f)} unless c["imported"].nil?
+			private
+				def fetch_json(url)
+					return ActiveSupport::JSON.decode(open(url).read)
+				end
+				def fetch_yaml(file)
+					begin
+						c = YAML::load_file(file)
+					rescue
+						puts "Failed to parse YAML in #{file}!"
+					end
+					return c
+				end
+				def write_gwf_file
+					imported = (@@cache==false) ? fetch_imported()["googlewebfonts"] : @@cache["imported"]["googlewebfonts"]
+					open(@@gwf_file,"w+") {|f| f.write({"imported" => imported.keys}.to_yaml)}
+				end
+				def write_enabled_file
+					enabled = (@@cache==false) ? fetch_enabled() : @@cache["enabled"]
+					e = {}
+					["fontsquirrel","googlewebfonts"].each do |dir|
+						e[dir] = {}
+						enabled[dir].keys.each do |fam|
+							# Make list of variants to enable
+							e[dir][fam] = []
+						end
+					end
+					open(@@enabled_file,"w+") {|f| f.write(e.to_yaml)}
+				end
+				def fix_fs_stylesheet_family_names(fam)
+					sheet = @@fontsdir+"/"+fam+"/stylesheet.css"
+					finfo = fetch_fs_familyinfo(fam)
+					
+					# Fetch contents
+					lines = File.readlines(sheet)
+					lines.each_with_index do |line,index|
+						if line.include?("font-family")
+							# Parse name
+							halves = line.split(":")
+							name = halves[1]
+							[';','"',"'"].each{|char| name = name.gsub(char,'') if name.include?(char)}
+							name = name.strip()
+							
+							# Parse filename
+							filename = false
+							for i in (index+1)..lines.length
+								l = lines[i]
+								if l.include?("src: url(")
+									filename = l.split("(")[1].split(")")[0]
+									['"',"'"].each{|char| filename = filename.gsub(char,'') if filename.include?(char)}
+									filename = filename.split(".")
+									ext = filename.pop()
+									filename = filename.join(".").strip()
+									break
+								end
+							end
+							filename = filename.chomp("-webfont") if filename.include?("-webfont")
+							
+							unless filename == false
+								
+								# Determine corresponding fontface_name from familyinfo
+								cname = false
+								cindex = false
+								if finfo.length == 1 # If there is only one variant, we choose that one
+									cindex = 0
+								else
+									# Search for exact matches among the variants
+									finfo.each_with_index do |face,index|
+										ffname = face["filename"].split(".")
+										ext = ffname.pop()
+										ffname = ffname.join(".").strip()
+										if ffname == filename
+											cindex = index
+											break
+										end
+									end
+									# Otherwise, use the Levenshtein algorithm to select the closest match
+									if cindex == false
+										best = false
+										finfo.each_with_index do |face,index|
+											ffname = face["filename"].split(".")
+											ext = ffname.pop()
+											ffname = ffname.join(".").strip()
+											lscore = levenshtein(filename,ffname)
+											if best==false or lscore <= best
+												best = lscore
+												cindex = index
+											end
+										end
+									end
+								end
+								
+								# Fetch fontface_name from cindex and remove the variant from rotation
+								puts "CINDEX: "+cindex.to_s
+								cname = finfo[cindex]["fontface_name"]
+								finfo.delete(cindex)
+								puts "CNAME: " + cname.to_s
+								
+								# Replace if necessary
+								lines[index] = halves[0]+": '"+cname+"';\n" if cname != false and name != cname
+							
+							end
+						end
+					end
+					
+					# Write fixed contents to file
+					open(sheet,"w+") {|f| f.write(lines.join())}
+				end
+
+				@@damerau = true
+				def levenshtein(s1, s2)
+				  d = {}
+				  (0..s1.size).each do |row|
+				    d[[row, 0]] = row
+				  end
+				  (0..s2.size).each do |col|
+				    d[[0, col]] = col
+				    end
+				  (1..s1.size).each do |i|
+				    (1..s2.size).each do |j|
+				      cost = 0
+				      if (s1[i-1] != s2[j-1])
+				        cost = 1
+				      end
+				      d[[i, j]] = [d[[i - 1, j]] + 1,
+				                   d[[i, j - 1]] + 1,
+				                   d[[i - 1, j - 1]] + cost
+				                  ].min
+				      next unless @@damerau
+				      if (i > 1 and j > 1 and s1[i-1] == s2[j-2] and s1[i-2] == s2[j-1])
+				        d[[i, j]] = [d[[i,j]],
+				                     d[[i-2, j-2]] + cost
+				                    ].min
+				      end
+				    end
+				  end
+				  return d[[s1.size, s2.size]]
+				end
 			
-			@@fonts["imported"] = imported
-			return @@fonts["imported"]
 		end
 		
-		def fetch_fs_all
-			return @@fonts["fontsquirrel"] unless @@fonts["fontsquirrel"] == false
-			fonts = {}
-			fetch_json("http://www.fontsquirrel.com/api/fontlist/all").each {|f| fonts[f["family_name"]] = f}
-			@@fonts["fontsquirrel"] = fonts
-			return @@fonts["fontsquirrel"]
-		end
-		def fetch_gwf_all
-			return @@fonts["googlewebfonts"] unless @@fonts["googlewebfonts"] == false
-			gwf = {}
-			fetch_json("https://www.googleapis.com/webfonts/v1/webfonts?key="+Cytoplasm.conf("fontloader.googlewebfonts_apikey"))["items"].each {|f| gwf[f["family"]] = f}
-			@@fonts["googlewebfonts"] = gwf
-			return @@fonts["googlewebfonts"]
-		end
-		def fetch_fs_family(family)
-			fetch_json("http://www.fontsquirrel.com/api/familyinfo/"+family)
-		end
-		def fetch_gwf_family(family)
-			gwf = fetch_gwf_all()
-			return (!gwf[family].nil?) ? gwf[family] : false;
+		def fetch_all
+			@@cache = Cytoplasm::FontsController.fetch_fonts() if @@cache == false
+			render :text => Cytoplasm::Ajax.success(@@cache)
 		end
 		
-		def fetch_all
-			success = {"fontsquirrel" => {}, "googlewebfonts" => {},"imported" => {"fontsquirrel" => {}, "googlewebfonts" => {}}}
-			
-			success["fontsquirrel"] = fetch_fs_all()
-			success["googlewebfonts"] = fetch_gwf_all()
-			success["imported"] = fetch_imported()
-			
-			render :text => Cytoplasm::Ajax.success(success)
+		def index
+			@@cache = Cytoplasm::FontsController.fetch_fonts() if @@cache == false
+			@installed = Cytoplasm::FontsController.fetch_imported()
+			@enabled = Cytoplasm::FontsController.fetch_enabled()
 		end
 		
 		def import
-			puts params
-			success = {}
-			case params[:directory]
-				when "fontsquirrel"
-					open(@@fontsdir+"/"+params[:family]['family_urlname']+".zip","wb") do |file|
-						success["url"] = "http://www.fontsquirrel.com/fontfacekit/"+params[:family]['family_urlname']
-						file << open(success["url"]).read
-					end
-					
-					
-				when "googlewebfonts"
-					
-			end
-			render :text => Cytoplasm::Ajax.success(success)
+			render :text => Cytoplasm::Ajax.success(Cytoplasm::FontsController.import(params[:directory],params[:family]))
 		end
-		
 		def remove
-			case params[:directory]
-				when "fontsquirrel"
-					
-				when "googlewebfonts"
-					
-			end
-			render :text => Cytoplasm::Ajax.success()
+			render :text => Cytoplasm::Ajax.success(Cytoplasm::FontsController.remove(params[:directory],params[:family]))
 		end
-		
-		def index
-			@installed = fetch_imported()
+		def enable
+			render :text => Cytoplasm::Ajax.success(Cytoplasm::FontsController.enable(params[:directory],params[:family]))
+		end
+		def disable
+			render :text => Cytoplasm::Ajax.success(Cytoplasm::FontsController.disable(params[:directory],params[:family]))
 		end
-		
-		private
-			def fetch_json(url)
-				return ActiveSupport::JSON.decode(open(url).read)
-			end
 		
 	end
 end