ninjs 0.13.4 → 0.13.5

data/repository/ninjs/core/application.js

@@ -8,11 +8,7 @@
       <NinjsModule>
 */
 
-var NinjsApplication = function(base_url, tests_path) {
-	if (is_undefined(window.app)) {
-		window.app = this;
-	}
-	
+var NinjsApplication = function(base_url, tests_path) {	
 	if(is_defined(tests_path)) {
 		this.tests_path = tests_path;
 	}
@@ -35,22 +31,17 @@ var NinjsApplication = function(base_url, tests_path) {
    > myapp.add_module('my_module');
 */
 NinjsApplication.method('add_module', function(name) {
-	try {
-		if (is_undefined(name)) {
-			throw new SyntaxError("NinjsApplication.add_module(name): name is undefined");
-		}
+	if (is_undefined(name)) {
+		throw new SyntaxError("NinjsApplication.add_module(name): name is undefined");
+	}
 
-		if (is_defined(this[name])) {
-			throw new SyntaxError("NinjsApplication.add_module(name): '" + name + "' already declared");
-		}
-		
-		if (this.name === name) {
-			throw new SyntaxError("NinjsApplication.add_module(name): a module cannot have the same name as the application");
-		}
-		
-		return this[name] = new NinjsModule(name);
+	if (is_defined(this[name])) {
+		throw new SyntaxError("NinjsApplication.add_module(name): '" + name + "' already declared");
 	}
-	catch(error) {
-		alert(error.message);
+	
+	if (this.name === name) {
+		throw new SyntaxError("NinjsApplication.add_module(name): a module cannot have the same name as the application");
 	}
+	
+	return this[name] = new NinjsModule(name);
 });

data/repository/ninjs/core/existence.js

@@ -61,19 +61,14 @@ if (is_undefined(is_typeof)) {
          <is_regex>
    */
 	var is_typeof = function(type, suspect) {
-		try {
-			if (is_undefined(type)) {
-				throw new SyntaxError("is_typeof(Type, suspect): type is undefined");
-			}
-			if (is_undefined(suspect)) {
-				throw new SyntaxError("is_typeof(Type, suspect): suspect is undefined");
-			}
-
-			return (suspect.constructor == type) ? true : false;
+		if (is_undefined(type)) {
+			throw new SyntaxError("is_typeof(Type, suspect): type is undefined");
 		}
-		catch(error) {
-			alert(error.message);
+		if (is_undefined(suspect)) {
+			throw new SyntaxError("is_typeof(Type, suspect): suspect is undefined");
 		}
+
+		return (suspect.constructor == type) ? true : false;
 	};
 }
 
@@ -249,3 +244,34 @@ if (is_undefined(is_regex)) {
     return is_typeof(RegExp, suspect);
   };
 }
+
+
+if (is_undefined(is_empty)) {
+	/*
+		Function: is_empty
+			Determined if the suspect's length is less than one.
+			
+		Parameters:
+			suspect - suspect variable to test
+			
+		Returns: bool
+	*/
+	var is_empty = function(suspect) {
+		return suspect.length === 0;
+	};
+}
+
+if (is_undefined(is_not_empty)) {
+	/*
+		Function: is_not_empty
+			Determined if the suspect's length is greater than one.
+			
+		Parameters:
+			suspect - suspect variable to test
+			
+		Returns: bool
+	*/
+	var is_not_empty = function(suspect) {
+		return suspect.length >= 1;
+	};
+}

data/repository/ninjs/core/extend.js

@@ -20,21 +20,17 @@ if (is_undefined(Function.prototype['method'])) {
       > "hello".custom_method();
    */
 	Function.prototype.method = function(name, func) {
-		try {
-			if (is_undefined(name)) {
-				throw new SyntaxError("Object.method(name, func): name is undefined");
-			}
-			if (is_undefined(func)) {
-				throw new SyntaxError("Object.method(name, func): func is undefined");
-			}
-
-			if (is_undefined(this.prototype[name])) {
-				this.prototype[name] = func;
-				return this;
-			}
+		if (is_undefined(name)) {
+			throw new SyntaxError("Object.method(name, func): name is undefined");
+		}
+		
+		if (is_undefined(func)) {
+			throw new SyntaxError("Object.method(name, func): func is undefined");
 		}
-		catch(error) {
-			alert(error.message);
+
+		if (is_undefined(this.prototype[name])) {
+			this.prototype[name] = func;
+			return this;
 		}
 	};
 }
@@ -62,25 +58,20 @@ if (is_undefined(unless)) {
       > );
    */
    var unless = function(expression, callback, fallback) {
-      try {
-         if (is_undefined(expression)) {
-            throw new SyntaxError("unless(expression, callback[, fallback]): expression is undefined");
-         }
-         
-         if (is_undefined(callback)) {
-            throw new SyntaxError("unless(expression, callback[, fallback]): callback is undefined");
-         }
-         
-         // This kind of expression is exactly why we NEED unless
-         if (!expression) {
-            callback.call(this);
-         }
-         else if (is_defined(fallback)) {
-            fallback.call(this);
-         }
-      }
-      catch(error) {
-         alert(error.message);
-      }
+		if (is_undefined(expression)) {
+			throw new SyntaxError("unless(expression, callback[, fallback]): expression is undefined");
+		}
+
+		if (is_undefined(callback)) {
+			throw new SyntaxError("unless(expression, callback[, fallback]): callback is undefined");
+		}
+
+		// This kind of expression is exactly why we NEED unless
+		if (!expression) {
+			callback.call(this);
+		}
+		else if (is_defined(fallback)) {
+			fallback.call(this);
+		}
    };
 }

data/repository/ninjs/core/module.js

@@ -40,63 +40,52 @@ NinjsModule.method('execute', function() {
 });
 
 NinjsModule.method('elements', function(elements) {
-	try {
-		if (is_undefined(elements)) {
-		   if (is_typeof(Object, elements)) {
-		      throw new SyntaxError("NinjsModule.elements(elements): elements is undefined");
-		   }
-		   else if (is_string(elements)) {
-		      throw new SyntaxError("NinjsModule.elements(name): name is undefined");
-		   }
-		}
-		
-		// If first argument is a string, retrieve the element
-		if (is_string(elements)) {
-			var name = elements;
-			return is_defined(this.dom[name]) ? this.dom[name] : undefined;
-		}
-		// Set elements
-		else {
-			this.call_on_ready(function() {
-				for(var key in elements) {
-					if (elements.hasOwnProperty(key)) {
-						this.dom[key] = elements[key];
-					}
-				}
-			});
-		}
-	}
-	catch(error) {
-		alert(error.message);
+	if (is_undefined(elements)) {
+	   if (is_typeof(Object, elements)) {
+	      throw new SyntaxError("NinjsModule.elements(elements): elements is undefined");
+	   }
+	   else if (is_string(elements)) {
+	      throw new SyntaxError("NinjsModule.elements(name): name is undefined");
+	   }
 	}
 	
+	// If first argument is a string, retrieve the element
+	if (is_string(elements)) {
+		var name = elements;
+		return is_defined(this.dom[name]) ? this.dom[name] : undefined;
+	}
+	// Set elements
+	else {
+		this.call_on_ready(function() {
+			for(var key in elements) {
+				if (elements.hasOwnProperty(key)) {
+					this.dom[key] = elements[key];
+				}
+			}
+		});
+	}
 });
 
 NinjsModule.method('set_data', function(key, value) {
-	try {
-		if (is_undefined(key)) {
-			throw new SyntaxError('NinjsModule.set_data(key, value): key is undefined');
-		}
-		
-		if (is_typeof(String, key) && is_undefined(value)) {
-			throw new SyntaxError('NinjsModule.set_data(key, value): value is undefined');
-		}
-
-		if (is_typeof(String, key)) {
-			this.data[key] = value;
-		}
-		else if (is_typeof(Object, key)) {
-			var data = key;
-			for(var property in data) {
-				this.data[property] = data[property];
-			}
-		}
+	if (is_undefined(key)) {
+		throw new SyntaxError('NinjsModule.set_data(key, value): key is undefined');
+	}
+	
+	if (is_typeof(String, key) && is_undefined(value)) {
+		throw new SyntaxError('NinjsModule.set_data(key, value): value is undefined');
+	}
 
-		return this;
+	if (is_typeof(String, key)) {
+		this.data[key] = value;
 	}
-	catch(error) {
-		alert(error.message);
+	else if (is_typeof(Object, key)) {
+		var data = key;
+		for(var property in data) {
+			this.data[property] = data[property];
+		}
 	}
+
+	return this;
 });
 
 NinjsModule.method('add_test', function(test_file) {

data/repository/ninjs/extensions/jquery.elements.js

@@ -0,0 +1,60 @@
+(function($) { 
+	NinjsModule.prototype.elements = function(elements, force) {
+		var self = this;
+
+		unless(is_defined(force), function() {
+			force = false;
+		});
+
+		if (is_string(elements)) {
+			var key = elements;
+			if (is_undefined(self.dom[key])) {
+				throw new SyntaxError("NinjsModule.elements('" + key + "'): " + self.name + ".dom." + key + " is undefined");
+			}
+
+			if (is_string(self.dom[key])) {
+				var selection = $(self.dom[key]);
+
+				unless(selection.length === 0, function() {
+					return self.dom[key] = selection;
+				}, function() {
+					return self.dom[key];
+				});
+			}
+			else {
+				if (self.dom[key].length === 0 || force) {
+
+					var return_obj = undefined;
+
+					if (is_string(force)) {
+						var selector = self.dom[key].selector;
+						self.dom[key] = $(force).find(selector);
+						self.dom[key].selector = selector;
+
+						return_obj = self.dom[key];
+					}
+
+					var selection = $(self.dom[key].selector);
+				
+					unless(selection.length === 0, function() {
+						return_obj = selection;
+					});
+
+					return return_obj;
+				}
+				else {
+					return self.dom[key];
+				}
+			}
+		}
+		else if (is_typeof(Object, elements)) {
+			self.call_on_ready(function() {
+				for(var key in elements) {
+					if (elements.hasOwnProperty(key)) {
+						self.dom[key] = elements[key];
+					}
+				}
+			});
+		}
+	};
+})(jQuery);

data/repository/ninjs/utilities/array.js

@@ -1,24 +1,19 @@
 Array.method('is_empty', function() {
-	return (this.length < 1) ? true : false;
+	return is_empty(this);
 });
 
 Array.method('not_empty', function() {
-	return (this.length > 0) ? true : false;
+	return is_not_empty(this);
 });
 
 Array.method('each', function(callback) {
-	try {
-		if(is_undefined(callback)) {
-			throw new SyntaxError("Array.each(callback): callback is undefined");
-		}
-
-		for (var i = 0; i < this.length; i++) {
-			var args = [this[i], i];
-			callback.apply(this, args);
-		}
+	if(is_undefined(callback)) {
+		throw new SyntaxError("Array.each(callback): callback is undefined");
 	}
-	catch(error) {
-		alert(error.message);
+
+	for (var i = 0; i < this.length; i++) {
+		var args = [this[i], i];
+		callback.apply(this, args);
 	}
 });
 

data/repository/ninjs/utilities/string.js

@@ -24,18 +24,13 @@ String.method('rtrim', function() {
 });
 
 String.method('each', function(callback) {
-	try {
-		if(is_undefined(callback)) {
-			throw new SyntaxError("String.each(callback): callback is undefined");
-		}
-
-		for (var i = 0; i < this.length; i++) {
-			var args = [this.charAt(i), i];
-			callback.apply(this, args);
-		}
+	if(is_undefined(callback)) {
+		throw new SyntaxError("String.each(callback): callback is undefined");
 	}
-	catch(error) {
-		alert(error.message);
+
+	for (var i = 0; i < this.length; i++) {
+		var args = [this.charAt(i), i];
+		callback.apply(this, args);
 	}
 });
 

data/spec/helpers_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Ninjs::Helpers do
+  it 'should create a module filename from a POSIX path' do
+    Ninjs::Helpers.create_module_filename('/some/path/some.module.js').should === 'some'
+  end
+  
+  it 'should create a module filename from a Windows path' do
+    Ninjs::Helpers.create_module_filename('D:\\\\some\path\some.module.js').should === 'some'
+  end
+end

data/spec/integration_spec.rb

@@ -0,0 +1,257 @@
+require "spec_helper"
+
+describe Ninjs do
+  context 'When instantiating a new project' do
+    before :each do
+      @spec_dir = File.expand_path(File.join(File.dirname(__FILE__))) + '/'
+      @project_path = @spec_dir + 'js/'
+      @new_project = Ninjs::Project.new 'spec/js', 'MyApplication'
+    end
+
+    it 'should have the correct app_filename' do
+      @new_project.config.app_filename.should === 'myapplication'
+    end
+
+    it 'should have the correct project_path' do
+      @new_project.project_path.should === @project_path
+    end
+
+    it 'should have a @config property' do
+      @new_project.config.should_not be_nil
+    end
+
+    it 'should have the correct @config.name' do
+      @new_project.config.name.should === 'MyApplication'
+    end
+
+    it 'should have the correct @config.output' do
+      @new_project.config.output.should === 'expanded'
+    end
+
+    it 'should have the correct @config.dependencies' do
+      @new_project.config.dependencies.should == ["<jquery/latest>"]
+    end
+
+    it 'should have the correct @config.autoload' do
+      @new_project.config.autoload.should == ["<ninjs/utilities/all>"]
+    end
+
+    it 'should have the corect @config.base_url' do
+      @new_project.config.base_url.should == 'http://www.example.com/'
+    end
+
+    it 'should have the correct @config.test_path' do
+      @new_project.config.test_path.should == 'tests/'
+    end
+    
+    it 'should respond to create' do
+      @new_project.should respond_to :create
+    end
+    
+    it 'should create the project directory' do
+      @new_project.create
+      File.exists?('/Volumes/Storage/Development/ninjs/spec/js').should be_true
+    end
+  
+    it 'should have created the Ninjs::Manifest directories' do
+      Ninjs::Manifest.directories.each do |folder|
+        File.exists?("#{@project_path}#{folder}").should be_true
+      end
+    end
+    
+    it 'should have created a config file' do
+      File.exists?("#{@project_path}ninjs.conf").should be_true
+    end
+    
+    it 'should have created the application file' do
+      File.exists?("#{@project_path}application/myapplication.js").should be_true
+    end
+    
+    it 'should have created the /lib/nin.js file' do
+      File.exists?("#{@project_path}lib/nin.js")
+    end
+    
+    it 'should have created the /lib/utilities.js file' do
+      File.exists?("#{@project_path}lib/utilities.js").should be_true
+    end
+    
+    it 'should have created the /tests/index.html file' do
+      File.exists?("#{@project_path}tests/index.html").should be_true
+    end
+    
+    it 'should have created the /tests/ninjs.test.js file' do
+      File.exists?("#{@project_path}tests/ninjs.test.js").should be_true
+    end
+    
+    it 'should have created the /tests/ninjs.utilties.test.js file' do
+      File.exists?("#{@project_path}tests/ninjs.utilities.test.js").should be_true
+    end
+    
+    it 'should have the correct config file content' do
+      expected_conf_file = File.open('/Volumes/Storage/Development/ninjs/spec/fixtures/ninjs.conf', 'r')
+      expected_conf_content = expected_conf_file.readlines
+      expected_conf_file.close
+      
+      ninjs_conf_file = File.open("#{@project_path}ninjs.conf", 'r')
+      ninjs_conf_content = ninjs_conf_file.readlines
+      ninjs_conf_file.close
+      
+      ninjs_conf_content.should === expected_conf_content
+    end
+    
+    it 'should have the correct application file content' do
+      expected_file = File.open('/Volumes/Storage/Development/ninjs/spec/fixtures/myapplication.js', 'r')
+      expected_content = expected_file.readlines
+      
+      # .shift is to remove the generated comment which should never match
+      expected_content.shift
+      expected_file.close
+      
+      actual_file = File.open("#{@project_path}application/myapplication.js", 'r')
+      actual_content = actual_file.readlines
+      actual_content.shift
+      actual_file.close
+      
+      actual_content.should === expected_content
+    end
+    
+    it 'should have the correct /lib/nin.js content' do
+      expected_ninjs_lib_file = File.open('/Volumes/Storage/Development/ninjs/spec/fixtures/nin.js', "r")
+      expected_ninjs_lib_content= expected_ninjs_lib_file.readlines
+      expected_ninjs_lib_file.close
+      
+      ninjs_lib_file = File.open("#{@project_path}lib/nin.js", "r")
+      ninjs_lib_content = ninjs_lib_file.readlines
+      ninjs_lib_file.close
+      
+      ninjs_lib_content.should === expected_ninjs_lib_content      
+    end
+    
+    it 'should have the correct /lib/utilities.js' do
+      expected_utility_lib_file = File.open("/Volumes/Storage/Development/ninjs/spec/fixtures/utilities.js", "r")
+      expected_utility_lib_content = expected_utility_lib_file.readlines
+      expected_utility_lib_file.close
+      
+      utility_lib_file = File.open("#{@project_path}lib/utilities.js", "r")
+      utility_lib_content = utility_lib_file.readlines
+      utility_lib_file.close
+      
+      utility_lib_content.should === expected_utility_lib_content
+    end
+    
+    context 'and a project is updated' do
+      
+      before :each do
+        @path = Dir.getwd
+        @project = Ninjs::Project.new 'spec/js/'
+        
+        FileUtils.cp("#{@path}/spec/fixtures/global.module.js", "#{@path}/spec/js/modules") unless File.exists?("#{@path}/spec/js/modules/global.module.js")
+        FileUtils.cp("#{@path}/spec/fixtures/test.module.js", "#{@path}/spec/js/modules") unless File.exists?("#{@path}/spec/js/modules/test.module.js")
+        FileUtils.cp("#{@path}/spec/fixtures/test.elements.js", "#{@path}/spec/js/elements") unless File.exists?("#{@path}/spec/js/elements/test.elements.js")
+        FileUtils.cp("#{@path}/spec/fixtures/test.model.js", "#{@path}/spec/js/models") unless File.exists?("#{@path}/spec/js/models/test.model.js")
+        @project.update
+      end
+      
+      it 'should have created the /application/global.js module' do
+        File.exists?("#{@path}/spec/js/application/global.js").should be_true
+      end
+      
+      it 'should have created the /application/test.js module' do
+        File.exists?("#{@path}/spec/js/application/test.js").should be_true
+      end
+      
+      it 'should have the correct /application/global.js content' do
+        expected_global_file = File.open("#{@path}/spec/fixtures/global.js", "r")
+        expected_global_content = expected_global_file.readlines
+        expected_global_file.close
+        
+        actual_global_file = File.open("#{@path}/spec/js/application/global.js", "r")
+        actual_global_content = actual_global_file.readlines
+        actual_global_file.close
+        
+        actual_global_content.should == expected_global_content
+      end
+      
+      it 'should have the correct /application/test.js content' do
+        expected_test_file = File.open("#{@path}/spec/fixtures/test.js", "r")
+        expected_test_content = expected_test_file.readlines
+        expected_test_file.close
+        
+        actual_test_file = File.open("#{@path}/spec/js/application/test.js", "r")
+        actual_test_content = actual_test_file.readlines
+        actual_test_file.close
+        
+        actual_test_content.should == expected_test_content
+      end
+    end
+    
+  end# context When instantiating a new project
+  
+  context 'When instantiating a project from a config file' do
+    before :each do
+      @spec_dir = File.expand_path(File.join(File.dirname(__FILE__))) + '/'
+      @project_path = @spec_dir + 'js/'
+      @existing_project = Ninjs::Project.new 'spec/js'
+    end
+    
+    it 'should have the correct app_filename' do
+      @existing_project.config.app_filename.should === 'myapplication'
+    end
+    
+    it 'should have the correct project_path' do
+      @existing_project.project_path.should === @project_path
+    end
+    
+    it 'should have the correct @config.name' do
+      @existing_project.config.name.should === 'MyApplication'
+    end
+    
+    it 'should have the correct @config.output' do
+      @existing_project.config.output === 'expanded'
+    end
+    
+    it 'should have the correct @config.dependencies' do
+      @existing_project.config.dependencies.should == ["<jquery/latest>"]
+    end
+
+    it 'should have the correct @config.autoload' do
+      @existing_project.config.autoload.should == ["<ninjs/utilities/all>"]
+    end
+
+    it 'should have the corect @config.base_url' do
+      @existing_project.config.base_url == 'http://www.example.com/'
+    end
+
+    it 'should have the correct @config.test_path' do
+      @existing_project.config.test_path == 'tests/'
+    end
+    
+    it 'should not need a hack to delete all the files' do
+      File.delete("#{@project_path}ninjs.conf") if File.exists?("#{@project_path}ninjs.conf")
+      File.delete("#{@project_path}application/myapplication.js") if File.exists?("#{@project_path}application/myapplication.js")
+      File.delete("#{@project_path}application/global.js") if File.exists?("#{@project_path}application/global.js")
+      File.delete("#{@project_path}application/test.js") if File.exists?("#{@project_path}application/test.js")
+      File.delete("#{@project_path}elements/test.elements.js") if File.exists?("#{@project_path}elements/test.elements.js")
+      File.delete("#{@project_path}models/test.model.js") if File.exists?("#{@project_path}models/test.model.js")    
+      File.delete("#{@project_path}lib/nin.js") if File.exists?("#{@project_path}lib/nin.js")
+      File.delete("#{@project_path}lib/utilities.js") if File.exists?("#{@project_path}lib/utilities.js")
+      File.delete("#{@project_path}tests/index.html") if File.exists?("#{@project_path}tests/index.html")
+      File.delete("#{@project_path}tests/ninjs.test.js") if File.exists?("#{@project_path}tests/ninjs.test.js")      
+      File.delete("#{@project_path}tests/ninjs.utilities.test.js") if File.exists?("#{@project_path}tests/ninjs.utilities.test.js")
+      File.delete("#{@project_path}tests/qunit/qunit.css") if File.exists?("#{@project_path}tests/qunit/qunit.css")
+      File.delete("#{@project_path}tests/qunit/qunit.js") if File.exists?("#{@project_path}tests/qunit/qunit.js")
+      Dir.delete("#{@project_path}tests/qunit") if File.exists?("#{@project_path}tests/qunit")
+      File.delete("#{@project_path}modules/global.module.js") if File.exists?("#{@project_path}modules/global.module.js")
+      File.delete("#{@project_path}modules/test.module.js") if File.exists?("#{@project_path}modules/test.module.js")
+
+      Ninjs::Manifest.directories.each do |folder|
+        Dir.delete("#{@project_path}#{folder}") if File.exists? "#{@project_path}#{folder}"
+      end
+
+      Dir.delete('/Volumes/Storage/Development/ninjs/spec/js') if File.exists?('/Volumes/Storage/Development/ninjs/spec/js')
+      true.should be_true
+    end
+    
+  end
+
+end