ninjs 0.10.1 → 0.10.2

data/bin/ninjs

@@ -42,11 +42,11 @@ class NinjsConsole < Rubikon::Application::Base
     Ninjs::Command.import
   end
   
-  option :directory, [:dir] do
+  option :directory, :dir do
     @directory = dir
   end
   option :p => :directory
-  command :create, [:app_name] do
+  command :create, :app_name do
     Ninjs::Command.create(app_name, @directory)
   end
 end

data/lib/ninjs.rb

@@ -3,7 +3,7 @@ end
 
 module Ninjs
   def version
-    '0.9.4'
+    '0.10.1'
   end
   
   def base_directory

data/lib/ninjs/configuration.rb

@@ -9,7 +9,9 @@ module Ninjs
                   :dependencies,
                   :autoload,
                   :config_path,
-                  :asset_root
+                  :asset_root,
+                  :base_url,
+                  :tests_path
                   
       def initialize(project_path, name = 'NinjsApplication')
         @defaults = {
@@ -18,7 +20,9 @@ module Ninjs
           :asset_root => project_path,
           :output => 'expanded',
           :dependencies => ['<jquery/latest>'],
-          :autoload => ['<ninjs/utilities/all>']
+          :autoload => ['<ninjs/utilities/all>'],
+          :base_url => 'http://www.example.com/',
+          :tests_path => 'tests/'
         }
 
         @defaults.each do |label, setting|
@@ -39,6 +43,8 @@ asset_root: #{options[:project_path]}
 output: #{options[:output]}
 dependencies: [#{options[:dependencies].join(', ')}]
 autoload: [#{options[:autoload].join(', ')}]
+base_url: #{options[:base_url]}
+tests_path: #{options[:tests_path]}
         CONF
       end
       
@@ -57,7 +63,9 @@ autoload: [#{options[:autoload].join(', ')}]
           :asset_root => @project_path,
           :output => @output,
           :dependencies => @dependencies,
-          :autoload => @autoload
+          :autoload => @autoload,
+          :base_url => @base_url,
+          :tests_path => @tests_path
         })
         create_conf_file content
       end
@@ -74,6 +82,8 @@ autoload: [#{options[:autoload].join(', ')}]
           @output = config['output']
           @dependencies = config['dependencies'] || Array.new
           @autoload = config['autoload'] || Array.new
+          @base_url = config['base_url'] || 'http://www.example.com/'
+          @tests_path = config['tests_path'] || 'tests/'
         rescue IOError => e
           puts e.message
           puts e.backtrace.inspect

data/lib/ninjs/project.rb

@@ -1,6 +1,5 @@
 module Ninjs
-  class Project
-    
+  class Project    
     attr_reader :app_filename,
                 :project_path,
                 :config
@@ -19,15 +18,13 @@ module Ninjs
       project
     end
     
-    def initialize(name = 'NinjsApplication', project_dir = '/')
-      name.gsub!(/\s|\-|\./)
+    def initialize(name = 'NinjsApplication', project_dir = '/')      
+      app_name = name.gsub(/\s|\-|\./, '')
       proj_dir = clean_project_path project_dir
       @modules = Array.new
-
       @color_start = "\e[32m"
       @color_end = "\e[0m"
-
-      @app_filename = name.downcase
+      @app_filename = app_name.downcase
       @project_path = "#{Ninjs.root_directory}#{proj_dir}"
       @config = Ninjs::Configuration.new @project_path, name
     end
@@ -89,16 +86,16 @@ module Ninjs
       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();"
+        file << "\nvar #{@config.name} = new NinjsApplication('#{@config.base_url}', '#{@config.tests_path}');"
       end
     end
     
     def import_test_files
-      Fileutils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/index.html", "#{@project_path}tests"
-      Fileutils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/ninjs.test.js", "#{@project_path}tests"
-      Fileutils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/ninjs.utilities.test.js", "#{@project_path}tests"
-      Fileutils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/qunit/qunit.js", "#{@project_path}tests/qunit"
-      Fileutils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/qunit/qunit.css", "#{@project_path}tests/qunit"
+      FileUtils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/index.html", "#{@project_path}tests"
+      FileUtils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/ninjs.test.js", "#{@project_path}tests"
+      FileUtils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/ninjs.utilities.test.js", "#{@project_path}tests"
+      FileUtils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/qunit/qunit.js", "#{@project_path}tests/qunit"
+      FileUtils.cp "#{Ninjs.base_directory}/repository/ninjs/tests/qunit/qunit.css", "#{@project_path}tests/qunit"
     end
     
     def update
@@ -187,7 +184,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();\n\n"
+      file << "\nvar #{@config.name} = new NinjsApplication('#{@config.base_url}', '#{@config.tests_path}');\n\n"
     end
     
     def write_autoload(file)

data/ninjs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ninjs}
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-29}
   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}

data/repository/ninjs/core/application.js

@@ -7,13 +7,20 @@
    See Also:
       <NinjsModule>
 */
-var NinjsApplication = function() {
+var NinjsApplication = function(base_url, tests_path) {
 	if (is_undefined(window._)) {
 		window._ = this;
 	}
-
-	if (is_undefined(window.app)) {
-		window.app = this;
+	
+	if(is_defined(tests_path)) {
+		this.tests_path = tests_path;
+	}
+	
+	if(is_defined(base_url)) {
+		this.site_url = function(path) {
+			var path = path || '';
+			return base_url + path;
+		}
 	}
 };
 

data/repository/ninjs/core/module.js

@@ -190,10 +190,10 @@ NinjsModule.method('add_test', function(test_file) {
 });
 
 /*
-   Method: run_tests
+   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() {
+NinjsModule.method('_run_tests', function() {
 	var test_template = [];
 	test_template.push('<div class="test-results" title="Test Results">');
 	test_template.push('<h1 id="qunit-header">' + this.name + ' module tests</h1>');
@@ -202,25 +202,31 @@ NinjsModule.method('run_tests', function() {
 	test_template.push('<ol id="qunit-tests"></ol>');
 	test_template.push('</div>');
 
+	var qunit_dependencies = '<script src="' + _.tests_path +'qunit/qunit.js"></script>';
+	$.getScript(_.tests_path + 'qunit/qunit.js');
+	var qunit_styles = '<link rel="stylesheet" href="' + _.tests_path + 'qunit/qunit.css">';
+	$('body').append(qunit_styles);
 	$('body').append(test_template.join("\n"));
 
 	this.tests.each(function(test) {
-		$.getScript('tests/' + some + '.test.js', function() {
+		$.getScript(_.tests_path + test + '.test.js', function() {
 			var test_results_dialog = $('.test-results');
-			var height = test_results_dialog.height() + 130;
+			var height = $(window).height() - 200;
 			var width = $(window).width() - 300;
-			var maxHeight = $(window).height() - 200;
 			try {
 				test_results_dialog.dialog({
 					width: width,
 					height: height,
-					maxHeight: maxHeight,
+					autoOpen: false,
 					buttons: {
 						"Thanks buddy": function() {
 							test_results_dialog.dialog('close');
 						}
 					}
 				});
+				var failed = $('.failed');
+				console.log(failed.html());
+				test_results_dialog.dialog('open');
 			}
 			catch(error) {
 				alert("Test harness requires jQueryUI");

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Dayton Nolan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -06:00
+date: 2011-01-29 00:00:00 -06:00
 default_executable: ninjs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -459,7 +459,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3748990397520062791
+      hash: 3572589723604572302
       segments: 
       - 0
       version: "0"