social_cheesecake 0.0.4 → 0.1.0

data/app/assets/javascripts/socialcheesecake/sector.js

@@ -1,10 +1,5 @@
-socialCheesecake.defineModule(
-    'SocialCheesecake#Sector'
-)
-.dependsOn(
-    'SocialCheesecake#Text'  
-)
-.withCode(function() {
+var socialCheesecake = socialCheesecake || {};
+(function() {
 	socialCheesecake.Sector = function(settings) {
 		var defaultSettings = {
 			center : { x : 0,  y : 0 },
@@ -16,11 +11,12 @@ socialCheesecake.defineModule(
 			color : "#eeffee",
 			mouseover : { color : "#aaffaa" },
 			mouseout : { color : "#eeffee" },
-			mouseup : {  color : "#77ff77" },
-			mousedown : {  color : "#aaffaa" }
+			mouseup : { color : "#77ff77" },
+			mousedown : { color : "#aaffaa" },
+			auxiliar : false
 		}
 		for(var property in defaultSettings) {
-			if(!( property in settings)) {
+			if(!(property in settings)) {
 				settings[property] = defaultSettings[property];
 			}
 		}
@@ -46,7 +42,8 @@ socialCheesecake.defineModule(
 		this.actors = [];
 		if(settings.parent != null) this.parent = settings.parent;
 		if(settings.simulate != null) this.simulate = settings.simulate;
-
+		this.auxiliar = settings.auxiliar;
+		
 		if(settings.subsectors != null) {
 			var rInSubsector = this.rIn;
 			var separation = (this.rOut - this.rIn) / settings.subsectors.length;
@@ -61,7 +58,32 @@ socialCheesecake.defineModule(
 					delta : this.delta,
 					rIn : rInSubsector,
 					rOut : rOutSubsector,
-					actors : settings.subsectors[i].actors
+					actors : settings.subsectors[i].actors,
+					mouseover : { color : "#aaffaa",
+						callback : function(subsector) {
+							/* FIX FOR EXECUTING MOUSEOUT BEFORE MOUSEOVER */					
+							for(var i in subsector.parent.subsectors){
+								subsector.parent.subsectors[i].getRegion().addEventListener("mouseout", undefined);
+								if(subsector.parent.subsectors[i]!= subsector){
+								 subsector.parent.subsectors[i].changeColor(subsector.parent.subsectors[i].mouseout.color);
+								}
+							}
+							subsector.getRegion().addEventListener("mouseout", function() {
+								subsector.eventHandler('mouseout');
+							});
+							
+							document.body.style.cursor = "pointer";
+							subsector.parent.parent.grid.hideAll();
+							subsector.parent.parent.grid.fadeIn(subsector.actors, 300, true);				
+						}
+					},
+					mouseout :{
+						color : "#eeffee",
+						callback : function(subsector) {
+							document.body.style.cursor = "default";
+							subsector.parent.parent.grid.fadeIn(subsector.parent.actors, 300, true);
+						}
+					} 
 				});
 				rInSubsector = rOutSubsector;
 				this.subsectors.push(layer);
@@ -81,7 +103,8 @@ socialCheesecake.defineModule(
 			mousedown : this.mousedown,
 			mouseup : this.mouseup,
 			simulate : this.simulate,
-			subsectors : this.subsectors
+			subsectors : this.subsectors,
+			auxiliar : this.auxiliar
 		};
 		this._region = null;
 	}
@@ -95,6 +118,7 @@ socialCheesecake.defineModule(
 		var rOut = this.rOut;
 		var color = this.color;
 		var label = this.label;
+		var actors = this.actors;
 		if(options != null) {
 			if(options.x != null) x = options.x;
 			if(options.y != null) y = options.y;
@@ -116,37 +140,18 @@ socialCheesecake.defineModule(
 		context.fill();
 		context.lineWidth = 4;
 		context.stroke();
-		socialCheesecake.text.writeCurvedText(label, context, x, y, (rOut + rIn) / 2, phi, delta);
+		socialCheesecake.text.writeCurvedText(label, context, x, y, 0.75*rOut, phi, delta);		
+		if(!this.auxiliar)
+		socialCheesecake.text.writeCurvedText("(" + actors.length + ")", context, x, y, 0.6*rOut, phi, delta);
 	}
 	
-	socialCheesecake.Sector.prototype.getRegion = function(regenerate) {
-		if((this._region == null) || (regenerate == true)) {
+	socialCheesecake.Sector.prototype.getRegion = function() {
+		if(this._region == null) {
 			var sector = this;
-			if(sector._region != null) {
-				/* TO-DO!!!
-				if(sector.parent != null){
-				var cheesecake=sector.parent;
-				var regions= cheesecake.stage.regions;
-				var regionIndex;
-				for(var j in regions){
-				if(regions[j]==sector._region){
-				regionIndex= j;
-				}
-				}
-				}
-				var canvas=sector.getRegion().getCanvas();
-				if((canvas!=null)&&(canvas.parentNode!=null)){
-				canvas.parentNode.removeChild(canvas);
-				}*/
-			}
 			sector._region = new Kinetic.Shape(function() {
 				var context = this.getContext();
 				sector._draw(context);
 			});
-			/*
-			if(regionIndex!=null){
-			regions[regionIndex]=this._region;
-			} */
 			sector._region.addEventListener('mouseover', function() {
 				sector.eventHandler('mouseover');
 			});
@@ -164,25 +169,30 @@ socialCheesecake.defineModule(
 	}
 	
 	socialCheesecake.Sector.prototype.eventHandler = function(eventName) {
-	  var sector = this;
-	  if(sector[eventName] != null){
-  	  if(sector[eventName].color != null) {
-        var color = sector[eventName].color;
-        sector.changeColor(color);
-      }
-      if(sector[eventName].callback != null) {
-        sector[eventName].callback(sector);
-      }
-    }
+		var sector = this;
+		if(sector[eventName] != null){
+			if(sector[eventName].color != null) {
+				var color = sector[eventName].color;
+				sector.changeColor(color);
+			}
+			if(sector[eventName].callback != null) {
+				sector[eventName].callback(sector);
+			}
+		}
+	}
+	
+	socialCheesecake.Sector.prototype.getCheesecake = function () {
+		var sector = this;
+		return sector.parent;
 	}
 	
 	socialCheesecake.Sector.prototype.splitUp = function() {
-		var cheesecake = this.parent;
+		var cheesecake = this.getCheesecake();
 		var phi = this.phi;
 		var delta = this.delta;
 		var rOut = this.rOut;
 		var rIn = this.rIn;
-		var sector; (this.simulate != null) ? sector = cheesecake.sectors[this.simulate] : sector = this;
+		var sector = (this.simulate != null) ? cheesecake.sectors[this.simulate] :  this;
 		var subsectors = sector.subsectors;
 
 		//Draw sector's subsectors over it
@@ -201,7 +211,7 @@ socialCheesecake.defineModule(
 	}
 	
 	socialCheesecake.Sector.prototype.putTogether = function() {
-		var cheesecake = this.parent;
+		var cheesecake = this.getCheesecake();
 		var sector; (this.simulate != null) ? sector = cheesecake.sectors[this.simulate] : sector = this;
 		var subsectors = sector.subsectors;
 		//Clear subsectors from stage
@@ -212,18 +222,14 @@ socialCheesecake.defineModule(
 	
 	socialCheesecake.Sector.prototype.changeColor = function(color) {
 		var sector = this;
-		if (sector._region){
-  		var context = sector._region.getContext();
-  		sector.color = color;
-  		context.fillStyle = color;
-  		context.fill();
-  		context.lineWidth = 4;
-  		context.stroke();
-  		sector._region.getContext().restore();
-  		sector._region.getContext().save();
-  		socialCheesecake.text.writeCurvedText(sector.label, sector._region.getContext(),
-  		  sector.x, sector.y, (sector.rOut + sector.rIn) / 2, sector.phi, sector.delta);
-    }
+		if (sector.getRegion().layer){
+			var context = sector.getRegion().layer.getContext();
+			var stage = sector.getCheesecake().stage;
+			sector.color = color;
+			context.restore();
+			context.save();
+			stage.draw();
+		}
 	}
 	
 	/**
@@ -240,10 +246,9 @@ socialCheesecake.defineModule(
 	socialCheesecake.Sector.prototype.resize = function(options) {
 		if(!options)
 			throw "No arguments passed to the function";
-		if(options.context == null)
-			throw "context must be defined"
-		var context = options.context;
 		var sector = this;
+		var context = sector.getRegion().layer.getContext();
+		var stage = sector.getCheesecake().stage;
 		var currentDelta = sector.delta;
 		var currentPhi = sector.phi;
 		var step = 0.05;
@@ -274,8 +279,9 @@ socialCheesecake.defineModule(
 		sector.delta = currentDelta;
 		sector.phi = currentPhi;
 
-		sector.clear();
-		sector._draw(context);
+		context.restore();
+		context.save();
+		stage.draw();
 		if(currentDelta != goalDelta) {
 			requestAnimFrame(function() {
 				sector.resize(options);
@@ -287,28 +293,22 @@ socialCheesecake.defineModule(
 	
 	socialCheesecake.Sector.prototype.focus = function() {
 		var sector = this;
-		var context = sector._region.getContext();
+		var context = sector.getRegion().layer.getContext();
+		var stage = sector.getCheesecake().stage;
 		sector.rOut *= 1.05;
-		sector.clear();
-		sector._draw(context);
+		context.restore();
+		context.save();
+		stage.draw();
 	}
 	
 	socialCheesecake.Sector.prototype.unfocus = function() {
 		var sector = this;
-		var context = sector._region.getContext();
+		var context = sector.getRegion().layer.getContext();
+		var stage = sector.getCheesecake().stage;
 		sector.rOut = sector.originalAttr.rOut;
-		sector.clear();
-		sector._draw(context);
-	}
-	
-	socialCheesecake.Sector.prototype.clear = function() {
-		var sector = this;
-		var context = sector.getRegion().getContext();
-		if(context != undefined) {
-			context.restore();
-			context.save();
-		}
-		sector.getRegion().clear();
+		context.restore();
+		context.save();
+		stage.draw();
 	}
 	
 	socialCheesecake.Sector.prototype.rotateTo = function(options) {
@@ -318,10 +318,12 @@ socialCheesecake.defineModule(
 		var delta = this.delta;
 		var step = 0.05;
 		var anchor = 0;
+		var stage = sector.getCheesecake().stage;
+		var context = sector.getRegion().layer.getContext();
 		if(!options) throw "No arguments passed to the function";
 		if(options.step) step = options.step;
-		if(options.context == null) throw "context must be defined";
-		var context = options.context;
+		/*if(options.context == null) throw "context must be defined";
+		var context = options.context;*/
 		if(options.destination == null) throw "destination must be defined";
 		if(options.anchor){
 			if((options.anchor.toLowerCase() == "b") || (options.anchor == "beginning"))
@@ -359,11 +361,10 @@ socialCheesecake.defineModule(
 		}
 		sector.phi = currentPhi;
 
-		// clear stage
-		sector.clear();
-
-		// draw stage
-		this._draw(context);
+		// redraw
+		context.restore();
+		context.save();
+		stage.draw();
 
 		// request new frame
 		if(Math.abs(currentPhi - phiDestination) > 0.001) {
@@ -424,8 +425,12 @@ socialCheesecake.defineModule(
 		this.phi = settings.phi;
 		this.delta = settings.delta;
 		this.actors = [];
+		if(settings.mousedown != null) this.mousedown = settings.mousedown;
+		if(settings.mouseup != null) this.mouseup = settings.mouseup; 
+		if(settings.mouseover != null) this.mouseover = settings.mouseover; 
+		if(settings.mouseout != null) this.mouseout = settings.mouseout;
 
-		var grid = this.parent.parent.grid;
+		var grid = this.getCheesecake().grid;
 		if (settings.actors){
 			for( var actor in settings.actors){
 				var actor_info = {
@@ -443,6 +448,16 @@ socialCheesecake.defineModule(
 		rIn : this.rIn,
 		rOut : this.rOut,
 		phi : this.phi,
-		delta : this.delta
+		delta : this.delta,
+		
+		mouseover : this.mouseover,
+		mouseout : this.mouseout,
+		mouseup : this.mouseup,
+		mousedown : this.mousedown
 	});
-});
+	
+	socialCheesecake.Subsector.prototype.getCheesecake = function () {
+		var subsector = this;
+		return subsector.parent.parent;
+	}
+})();

data/app/assets/javascripts/socialcheesecake/text.js

@@ -1,36 +1,39 @@
-socialCheesecake.defineModule(
-  'SocialCheesecake#Text'
-).dependsOn(
-  
-).withCode(function() {
-  socialCheesecake.text = {
-    writeCurvedText : function(text, context, x, y, r, phi, delta) {
-      context.font = "bold 14px sans-serif";
-      context.fillStyle = '#000';
-      context.textBaseline = "middle";
-      var medium_alpha = Math.tan(context.measureText(text).width / (text.length * r));
-      if(medium_alpha * text.length <= delta) {
-        context.translate(x, y);
-        var orientation = 0;
-        if((phi + delta / 2 >= Math.PI ) && (phi + delta / 2 < Math.PI * 2)) {
-          orientation = -1;
-          context.rotate(-(delta - (medium_alpha * text.length)) / 2 - phi - Math.PI / 2);
-        } else {
-          orientation = 1;
-          context.rotate((delta - (medium_alpha * text.length)) / 2 + Math.PI / 2 - delta - phi);
-        }
-        for(var i = 0; i < text.length; i++) {
-          context.fillText(text[i], 0, -(orientation * r));
-          var alpha = Math.tan(context.measureText(text[i]).width / r);
-          context.rotate(orientation * alpha);
-        }
-        return true;
-      } else {
-        return false;
-      }
-    },
-    writeCenterText : function(text, context, centerX, centerY) {
-      context.fillText(text, centerX - context.measureText(text).width / 2, centerY);
-    }
-  }
-});
+var socialCheesecake = socialCheesecake || {}; (function() {
+	socialCheesecake.text = {
+		writeCurvedText : function(text, context, x, y, r, phi, delta) {
+			context.font = "bold 14px sans-serif";
+			context.fillStyle = '#000';
+			context.textBaseline = "middle";
+			var medium_alpha = Math.tan(context.measureText(text).width / (text.length * r));
+			while(medium_alpha * (text.length + 4) > delta) {
+				words = text.split(" ");
+				if(words.length > 1){
+					words.splice(words.length - 1, 1);
+					text = words.join(" ") + "...";
+				}else{
+					text = words[0].substring(0, delta/medium_alpha - 7) + "...";
+				}
+				medium_alpha = Math.tan(context.measureText(text).width / (text.length * r));			
+			}
+			context.translate(x, y);
+			var orientation = 0;
+			if((phi + delta / 2 >= Math.PI ) && (phi + delta / 2 < Math.PI * 2)) {
+				orientation = -1;
+				context.rotate(-(delta - (medium_alpha * text.length)) / 2 - phi - Math.PI / 2);
+			} else {
+				orientation = 1;
+				context.rotate((delta - (medium_alpha * text.length)) / 2 + Math.PI / 2 - delta - phi);
+			}
+			for(var i = 0; i < text.length; i++) {
+				context.fillText(text[i], 0, -(orientation * r));
+				var alpha = Math.tan(context.measureText(text[i]).width / r);
+				context.rotate(orientation * alpha);
+			}
+			context.restore();
+			context.save();
+		},
+		writeCenterText : function(text, context, centerX, centerY) {
+			context.fillText(text, centerX - context.measureText(text).width / 2, centerY);
+		}
+	}
+})();

data/lib/generators/social_cheesecake/install_generator.rb

@@ -0,0 +1,10 @@
+class SocialCheesecake::InstallGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+  
+  source_root File.expand_path('../templates', __FILE__)
+  def require_javascripts
+    inject_into_file 'app/assets/javascripts/application.js',
+                     "//= require social_cheesecake\n",
+                     :before => '//= require_tree .'
+  end
+end

data/lib/social_cheesecake/version.rb

@@ -1,3 +1,3 @@
 module SocialCheesecake
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/social_cheesecake.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency('railties', '>= 3.1.3')
 end

data/test/dummy/.gitignore

@@ -0,0 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/test/dummy/Gemfile

@@ -0,0 +1,34 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.3'
+
+# Bundle edge Rails instead:
+# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+
+gem 'json'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.1.5'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+gem 'social_cheesecake', :path => '../../'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
+