ninjs 0.13.1 → 0.13.2

data/lib/ninjs/generator.rb

@@ -1,36 +1,47 @@
 module Ninjs
   class Generator
     
+    attr_writer :alias, :app_name
+    
     def initialize(project, name)
       @project = project
       @name = name
+      @alias = false
+      @app_name = @use_alias ? 'app' : @project.config.name
     end
     
-    def generate_module_file(with = { :elements => false, :model => false })      
+    def generate_module_file(with = { :elements => false, :model => false })
+          
       File.open "#{@project.project_path}modules/#{@name.downcase}.module.js", "w" do |file|
-        file << "(function(){\n"
-        file << "\tvar self = " + @project.config.name + ".add_module('" + @name + "');\n\n"
-        file << "\t" + '//= require "../elements/' + @name.downcase + '.elements.js"' + "\n\n" if with[:elements]
-        file << "\t" + '//= require "../models/' + @name.downcase + '.model.js"' + "\n\n" if with[:model]
-        file << "\t#{@project.config.name}." + @name + ".actions = function() {\n\n\t};\n\n"
-        file << "\t#{@project.config.name}." + @name + ".run();\n"
-        file << "})();"
+        file << "(function(#{@app_name if @alias}){\n"
+        file << "\tvar self = #{@app_name}.add_module('#{@name}');\n\n"
+        file << "\t" + '//= require "../elements/' + @name.downcase + '.elements"' + "\n\n" if with[:elements]
+        file << "\t" + '//= require "../models/' + @name.downcase + '.model"' + "\n\n" if with[:model]
+        file << "\t #{@app_name}.#{@name}.actions = function() {\n\n\t};\n\n"
+        file << "\t #{@app_name}.#{@name}.run();\n"
+        file << "})(#{@project.config.name if @alias});"
         Ninjs::Notification.added "created #{@name.downcase}.module.js"
       end unless File.exists? "#{@project.project_path}modules/#{@name.downcase}.module.js"
+      
+      self
     end
     
-    def generate_elements_file      
+    def generate_elements_file
       File.open("#{@project.project_path}elements/#{@name.downcase}" + ".elements.js", "w") do |file|
-        file << @project.config.name + "." + @name + ".elements(function({\n\n}));"
+        file << "#{@app_name}.#{@name}.elements({\n\n});"
         Ninjs::Notification.added "created #{@name.downcase}.elements.js"
       end unless File.exists? "#{@project.project_path}elements/#{@name.downcase}.elements.js"
+      
+      self
     end
     
-    def generate_model_file      
+    def generate_model_file
       File.open "#{@project.project_path}models/#{@name.downcase}.model.js", "w" do |file|
-        file << @project.config.name + "." + @name + ".set_data({\n\t\n});"
+        file << "#{@app_name}.#{@name}.set_data({\n\t\n});"
         Ninjs::Notification.added "created #{@name.downcase}.model.js"
       end unless File.exists? "#{@project.project_path}models/#{@name.downcase}.model.js"
+      
+      self
     end
     
   end

data/lib/ninjs/project.rb

@@ -12,6 +12,7 @@ module Ninjs
       @project_path = Dir.getwd + path
       @modules = Array.new
       @config = Ninjs::Configuration.new @project_path, name
+      @app_filename = @config.name.downcase
     end
     
     def add_slashes(dir)
@@ -64,12 +65,12 @@ module Ninjs
     end
     
     def create_ninjs_application_file
-      filename = "#{@project_path}application/#{@config.app_filename}.js"
+      filename = "#{@project_path}application/#{@app_filename}.js"
       
       File.open(filename, "w+") do |file|
         file << "//-- Ninjs #{Time.now.to_s}  --//\n"
         file << File.open("#{@project_path}lib/nin.js", 'r').readlines.join('')
-        file << "\nvar #{@config.name} = new NinjsApplication('#{@config.base_url}', '#{@config.test_path}');"
+        file << "\nvar #{@config.name} = new NinjsApplication();"
       end
     end
     
@@ -127,7 +128,7 @@ module Ninjs
 
         ninjs_lib_secretary = Sprockets::Secretary.new(
           :root         => "#{Ninjs::BASE_DIR}",
-          :asset_root   => @config.asset_root || @project_path.gsub(/[a-zA-z0-9\.\-\_\s]+\/$/, ''),
+          :asset_root   => @config.asset_root,
           :load_path    => ["repository"],
           :source_files => ["#{module_src}"]
         )
@@ -144,7 +145,7 @@ module Ninjs
     end
     
     def update_application_file
-      application_file = "#{@project_path}application/#{@config.app_filename}.js"
+      application_file = "#{@project_path}application/#{@app_filename}.js"
       
       File.open(application_file, "w+") do |file|
         write_dependencies(file)
@@ -166,7 +167,7 @@ module Ninjs
     def write_core(file)      
       file << "/*---------- Ninjs core ../lib/nin.js ----------*/\n"
       file << "//= require \"../lib/nin.js\"\n\n"
-      file << "\nvar #{@config.name} = new NinjsApplication('#{@config.base_url}', '#{@config.test_path}');\n\n"
+      file << "\nvar #{@config.name} = new NinjsApplication();\n\n"
     end
     
     def write_autoload(file)
@@ -181,7 +182,7 @@ module Ninjs
       begin
         ninjs_lib_secretary = Sprockets::Secretary.new(
           :root         => "#{Ninjs::BASE_DIR}",
-          :asset_root   => @config.asset_root || @project_path.gsub(/[a-zA-z0-9\.\-\_\s]+\/$/, ''),
+          :asset_root   => @config.asset_root,
           :load_path    => ["repository"],
           :source_files => ["#{file}"]
         )

data/ninjs.gemspec

@@ -5,18 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ninjs}
-  s.version = "0.13.1"
+  s.version = "0.13.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = %q{2011-04-10}
+  s.date = %q{2011-05-04}
   s.default_executable = %q{ninjs}
   s.description = %q{Ninjs is a ruby application and small javascript framework that helps you build clean, modular javascript applications. Ninjs encourages "Good Parts" best practices and the Crockford school Module pattern (http://www.crockford.com/). The ninjs command line application is an automatic compiler, written in ruby, and based on the Sprockets library (http://getsprockets.org/).}
   s.email = %q{daytonn@gmail.com}
   s.executables = ["ninjs"]
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.textile"
+    "README.md"
   ]
   s.files = [
     ".bundle/config",
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README.textile",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/ninjs",
@@ -186,6 +186,7 @@ Gem::Specification.new do |s|
     "repository/ninjs/docs/search/VariablesR.html",
     "repository/ninjs/docs/search/VariablesT.html",
     "repository/ninjs/docs/styles/main.css",
+    "repository/ninjs/extensions/ninjs.jquery.js",
     "repository/ninjs/tests/index.html",
     "repository/ninjs/tests/ninjs.test.js",
     "repository/ninjs/tests/ninjs.utilities.test.js",
@@ -282,37 +283,19 @@ Gem::Specification.new do |s|
     "tmp/ff9e83aa019b712b90200b8d1b8fa0c7e14576af.json",
     "tmp/metric_fu/_data/20110305.yml",
     "tmp/metric_fu/output/bluff-min.js",
-    "tmp/metric_fu/output/churn.html",
     "tmp/metric_fu/output/excanvas.js",
-    "tmp/metric_fu/output/flay.html",
-    "tmp/metric_fu/output/flay.js",
-    "tmp/metric_fu/output/flog.html",
-    "tmp/metric_fu/output/flog.js",
-    "tmp/metric_fu/output/hotspots.html",
-    "tmp/metric_fu/output/index.html",
     "tmp/metric_fu/output/js-class.js",
-    "tmp/metric_fu/output/lib_ninjs.rb.html",
-    "tmp/metric_fu/output/lib_ninjs_command.rb.html",
-    "tmp/metric_fu/output/lib_ninjs_configuration.rb.html",
     "tmp/metric_fu/output/lib_ninjs_dependencies.rb.html",
     "tmp/metric_fu/output/lib_ninjs_helpers.rb.html",
     "tmp/metric_fu/output/lib_ninjs_manifest.rb.html",
-    "tmp/metric_fu/output/lib_ninjs_project.rb.html",
     "tmp/metric_fu/output/rails_best_practices.js",
-    "tmp/metric_fu/output/rcov.html",
-    "tmp/metric_fu/output/rcov.js",
-    "tmp/metric_fu/output/reek.html",
-    "tmp/metric_fu/output/reek.js",
-    "tmp/metric_fu/output/roodi.html",
-    "tmp/metric_fu/output/roodi.js",
-    "tmp/metric_fu/report.yml",
     "tmp/metric_fu/scratch/rcov/rcov.txt"
   ]
   s.homepage = %q{http://github.com/textnotspeech/ninjs}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{nowarning}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{ninjs is a command line application to help you write clean, modular javascript applications.}
   s.test_files = [
     "spec/ninjs_spec.rb",
@@ -320,15 +303,12 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubikon>, [">= 0"])
       s.add_runtime_dependency(%q<fssm>, [">= 0"])
       s.add_runtime_dependency(%q<jsmin>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_development_dependency(%q<metric_fu>, [">= 0"])
+      s.add_runtime_dependency(%q<sprockets>, ["= 1.0.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -340,11 +320,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sprockets>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<rubikon>, [">= 0"])
       s.add_dependency(%q<fssm>, [">= 0"])
       s.add_dependency(%q<jsmin>, [">= 0"])
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<metric_fu>, [">= 0"])
+      s.add_dependency(%q<sprockets>, ["= 1.0.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -357,11 +335,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rubikon>, [">= 0"])
     s.add_dependency(%q<fssm>, [">= 0"])
     s.add_dependency(%q<jsmin>, [">= 0"])
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<metric_fu>, [">= 0"])
+    s.add_dependency(%q<sprockets>, ["= 1.0.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/repository/ninjs/core/module.js

@@ -1,70 +1,17 @@
-/*
-   File: module.js
-   
-   Class: NinjsModule
-      A NinjsModule is an object which encapsulates a certain behavior or functionality.
-
-   Parameters:
-      name - the name of the module
-
-   See Also:
-      <NinjsApplication>
-*/
 var NinjsModule = function(name) {
-   /*
-      Variable: data
-         The module's data object
-   */
+	this.dom = {};
 	this.data = {};
-	/*
-      Variable: name
-         The module's name (string)
-   */
 	this.name = name;
-	/*
-      Variable: run_tests (beta)
-         Boolean to turn tests on/off
-   */
 	this.run_tests = false;
-	/*
-      Variable: tests (beta)
-         Array of test files to run 
-   */
 	this.tests = [];
 };
 
-/*
-   Method: actions
-      The actions method contains code to be executed when run is called. This method is a placeholder to be overwritten.
-      
-   > MyModule.actions = function() {
-   >  // define actions here
-   >};
-*/
 NinjsModule.method('actions', function() {});
 
-
-/*
-   Method: run
-      Waits for the DOM to load then calls execute.
-      
-   > MyModule.run();
-*/
 NinjsModule.method('run', function() {
 	this.call_on_ready(this.execute);
 });
 
-/*
-   Method: call_on_ready
-      Waits for the DOM to be ready and then executes a callback.
-   
-   Parameters:
-      callback - function to be called when the DOM is ready
-      
-   > MyModule.call_on_ready(function() {
-   >    // some code to execute when the DOM is ready
-   > });
-*/
 NinjsModule.method('call_on_ready', function(callback) {
 	var timer;
 	var module = this;
@@ -84,12 +31,6 @@ NinjsModule.method('call_on_ready', function(callback) {
 	check_ready();
 });
 
-/*
-   Method: execute
-      Wrapper method that set's up the environment and then calls actions.
-   
-   > MyModule.execute();
-*/
 NinjsModule.method('execute', function() {	
 	if (this.run_tests) {
 		this._run_tests();
@@ -98,40 +39,39 @@ NinjsModule.method('execute', function() {
 	this.actions();
 });
 
-/*
-   Method: elements
-      Method to define module elements.
-      
-   Parameters:
-      callback - function to define a module's elements
-      
-   > MyModule.elements(function() {
-   >    // element definitions go here
-   > });
-*/
-NinjsModule.method('elements', function(callback) {	
-	this.call_on_ready(callback);
+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);
+	}
+	
 });
 
-
-/*
-   Method: set_data
-      Adds properties to the module's data object.
-      
-   Parameters:
-      key - string or object (if string = key, if object sets multiple properties)
-      value - value of key if key is string
-      
-   > MyModule.set_data('some_key', 'some_value');
-   > MyModule.data.some_key === 'some_value'
-   
-   > MyModule.set_data({
-   >    'property_one': 'value_one',
-   >    'property_two': 'value_two'
-   > });
-   > MyModule.data.property_one === 'value_one'
-   > MyModule.data.property_two === 'value_two'
-*/
 NinjsModule.method('set_data', function(key, value) {
 	try {
 		if (is_undefined(key)) {
@@ -159,23 +99,10 @@ NinjsModule.method('set_data', function(key, value) {
 	}
 });
 
-/*
-   Method: add_test
-      Adds a test file to the tests array (beta).
-      
-   Parameters:
-      test_file - File to add to the tests array
-      
-   > MyModule.add_test('mytest.test.js');
-*/
 NinjsModule.method('add_test', function(test_file) {
 	this.tests.push(test_file);
 });
 
-/*
-   Method: _run_tests
-      Runs the test files in the test array. This method is automatically called by the execute method if run_tests === true
-*/
 NinjsModule.method('_run_tests', function() {
 	var test_template = [];
 	test_template.push('<div class="test-results" title="Test Results">');

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

@@ -0,0 +1,67 @@
+(function($) {
+   
+   NinjsModule.prototype.elements = function(elements, force) {
+      var self = this;
+
+      unless(is_defined(force), function() {
+         force = false;
+      });
+
+      if (is_string(elements)) {
+         var key = elements;
+
+         try {
+            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];
+               }
+            }
+         }
+         catch(error) {
+            alert(error.message);
+         }
+      }
+      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);