Buildable version of Ninjascript

Author: nyarly

Diff for: Rakefile

@@ -112,7 +112,7 @@ namespace :build do
     erb = ERB.new(File::read('src/header-comment.js.erb'))
     File::open(file.to_s, "w") do |file|
       build_date = PACKAGE_CONFIG["BUILD_DATE"]
-      copyright_year = COPYRIGHT_YEAR["COPYRIGHT_YEAR"]
+      copyright_year = PACKAGE_CONFIG["COPYRIGHT_YEAR"]
       version = PACKAGE_CONFIG["VERSION"]
       file.write( erb.result binding)
     end
@@ -131,15 +131,23 @@ namespace :build do
   end
 
   file "generated/javascript/ninjascript.js" => %w{tmp/header-comments.js generated/javascript} + sourcefiles do |file|
+    puts sourcefiles
     tmpfile = File::join("tmp", file.to_s.gsub(File::Separator, "_"))
-    sh "libs/requirejs/build/buildj.sh name=main out=#{tmpfile} baseUrl=src/javascript includeRequire=true optimize=none"
+    sh "java -jar #{BUILDTOOLS_DIR}/compiler.jar \
+    --closure_entry_point 'ninjascript.loaded' \
+    --create_source_map 'generated/javascript/ninjascript-sourcemap-js' \
+    --formatting PRETTY_PRINT \
+    --manage_closure_dependencies \
+    #{sourcefiles.map{|file| "--js #{file} "}} \
+    --js_output_file #{tmpfile}"
+
     sh "cat tmp/header-comments.js #{tmpfile} > #{file}"
   end
 
   file "generated/javascript/ns.min.js" =>
   %w{generated/javascript/ninjascript.js tmp/header-comments.js} do |file|
     tmpfile = File::join("tmp", file.to_s.gsub(File::Separator, "_"))
-    sh "java -jar libs/compiler.jar --js generated/javascript/ninjascript.js --js_output_file #{tmpfile}"
+    sh "java -jar #{BUILDTOOLS_DIR}/compiler.jar --js generated/javascript/ninjascript.js --js_output_file #{tmpfile}"
     sh "cat tmp/header-comments.js #{tmpfile} > #{file}"
   end
 

Diff for: cycle-finder.rb

@@ -1,5 +1,3 @@
-
-
 dir = ARGV[0]
 
 provides = {}
@@ -12,7 +10,7 @@
     if match = /goog.require\(['"]([^)]*)['"]\)/.match(line)
       required << match[1]
     elsif match = /goog.provide\(['"]([^)]*)['"]\)/.match(line)
-      raise "Double provide!: #{provide}/#{match[0]}" unless provide.nil?
+      raise "Double provide in #{path}!: #{provide}/#{match[0]}" unless provide.nil?
       provide = match[1]
     end
   end
@@ -24,9 +22,6 @@
 reqs.uniq!
 
 require 'pp'
-pp provides
-
-pp reqs
 
 missing_reqs = reqs - provides.keys
 unless missing_reqs.empty?
@@ -50,14 +45,11 @@
     tree.last.filled << req
     need = provides[req] - tree.last.filled
 
-    if need.empty?
-      tree.pop
-      next
-    end
-
     if need.include? provided
       raise "Cycle detected: #{(tree.map(&:prov) + [req]).inspect} => #{provided}"
     end
     tree.push Step.new(req, need, tree.last.filled.dup + [req])
   end
 end
+
+puts "All looks well"

Diff for: src/javascript/behavior-binding.js

@@ -1,7 +1,6 @@
 goog.provide('ninjascript.BehaviorBinding')
 
 goog.require('ninjascript.utils')
-goog.require('ninjascript.Tools')
 
 ninjascript.BehaviorBinding = function(tools){
   var parentClass = function(){

Diff for: src/javascript/behavior-rule-builder.js

@@ -0,0 +1,59 @@
+goog.provide('ninjascript.BehaviorRuleBuilder');
+goog.require('ninjascript.utils');
+
+ninjascript.BehaviorRuleBuilder = function() {
+  this.ninja = null
+  this.rules = []
+  this.finder = null
+  this.behaviors = []
+}
+
+;(function(){
+    var prototype = ninjascript.BehaviorRuleBuilder.prototype;
+    var Utils = ninjascript.utils;
+
+    prototype.normalizeFinder = function(finder) {
+      if(typeof finder == "string") {
+        return function(root){
+          return ninjascript.sizzle( finder, root )
+        }
+      } else {
+        return finder
+      }
+    }
+
+    prototype.normalizeBehavior = function(behavior) {
+      if(behavior instanceof ninjascript.behaviors.Abstract) {
+        return behavior
+      } else if(typeof behavior == "function"){
+        return behavior.call(this.ninja)
+      } else {
+        return new ninjascript.behaviors.Basic(behavior)
+      }
+    }
+
+    prototype.buildRules = function(behavior) {
+      this.rules = []
+      this.finder = this.normalizeFinder(this.finder)
+
+      if(Utils.isArray(behavior)) {
+        this.behaviors = behavior
+      } else {
+        this.behaviors = [behavior]
+      }
+
+      var i, len = this.behaviors.length
+      while(this.behaviors.length > 0) {
+        var behavior = this.behaviors.shift();
+        behavior = this.normalizeBehavior(behavior);
+        if(Utils.isArray(behavior)){
+          this.behaviors = this.behaviors.concat(behavior)
+        } else {
+          var rule = new ninjascript.BehaviorRule
+          rule.finder = this.finder
+          rule.behavior = behavior
+          this.rules.push(rule)
+        }
+      }
+    }
+  })()

Diff for: src/javascript/behavior-rule.js

@@ -1,21 +1,13 @@
 goog.provide('ninjascript.BehaviorRule');
-goog.provide('ninjascript.BehaviorRuleBuilder');
+goog.require('ninjascript.BehaviorRuleBuilder');
 goog.require('ninjascript.behaviors.Basic');
 goog.require('ninjascript.sizzle');
-goog.require('ninjascript.utils');
 
 ninjascript.BehaviorRule = function() {
   this.finder = function(root){ return [] }
   this.behavior = null
 }
 
-ninjascript.BehaviorRuleBuilder = function() {
-  this.ninja = null
-  this.rules = []
-  this.finder = null
-  this.behaviors = []
-}
-
 ninjascript.BehaviorRule.build = function(ninja, finder, behavior) {
   builder = new ninjascript.BehaviorRuleBuilder
   builder.ninja = ninja
@@ -54,50 +46,3 @@ ninjascript.BehaviorRule.build = function(ninja, finder, behavior) {
       return antecedant
     }
   })()
-
-;(function(prototype, Utils){
-    prototype.normalizeFinder = function(finder) {
-      if(typeof finder == "string") {
-        return function(root){
-          return ninjascript.sizzle( finder, root )
-        }
-      } else {
-        return finder
-      }
-    }
-
-    prototype.normalizeBehavior = function(behavior) {
-      if(behavior instanceof ninjascript.behaviors.Abstract) {
-        return behavior
-      } else if(typeof behavior == "function"){
-        return behavior.call(this.ninja)
-      } else {
-        return new ninjascript.behaviors.Basic(behavior)
-      }
-    }
-
-    prototype.buildRules = function(behavior) {
-      this.rules = []
-      this.finder = this.normalizeFinder(this.finder)
-
-      if(Utils.isArray(behavior)) {
-        this.behaviors = behavior
-      } else {
-        this.behaviors = [behavior]
-      }
-
-      var i, len = this.behaviors.length
-      while(this.behaviors.length > 0) {
-        var behavior = this.behaviors.shift();
-        behavior = this.normalizeBehavior(behavior);
-        if(Utils.isArray(behavior)){
-          this.behaviors = this.behaviors.concat(behavior)
-        } else {
-          var rule = new ninjascript.BehaviorRule
-          rule.finder = this.finder
-          rule.behavior = behavior
-          this.rules.push(rule)
-        }
-      }
-    }
-  })(ninjascript.BehaviorRuleBuilder.prototype, ninjascript.utils)

Diff for: src/javascript/extensible.js

@@ -3,7 +3,15 @@ goog.provide('ninjascript.Extensible');
 ninjascript.Extensible = function(){
 };
 
-ninjascript.Extensible.package = function(targets, callback){
+/* This class-level function sets up access functions on a throwaway object and
+ * passes it into a callback method. Extensions to Ninjascript call
+ * ninjascript.plugin with a callback function that can then call
+ * hooks.behaviors or hooks.tools to add methods to those prototypes.
+ *
+ * c.f. the packaged-behaviors directory for examples of use
+ *
+ */
+ninjascript.Extensible.addPackage = function(targets, callback){
   var hooks = {}
   var buildHookingFunction = function(target){
     return function(extension){

Diff for: src/javascript/ninjascript.js

@@ -24,12 +24,13 @@ ninjascript.NinjaScript.prototype = new ninjascript.Extensible
 
     var log = ninjascript.Logger.log
 
-    prototype.package = function(callback) {
+    //XXX Needed here, or in package?
+    prototype.plugin = function(callback) {
       var targets = {
         Ninja: this,
-        tools: this.tools,
+        tools: this.tools
       }
-      return ninjascript.Extensible.package(targets, callback)
+      return ninjascript.Extensible.addPackage(targets, callback)
     }
 
     prototype.configure = function(opts) {

Diff for: src/javascript/packaged-behaviors/confirm.js

@@ -1,9 +1,9 @@
 goog.provide('ninjascript.packagedBehaviors.confirm');
 
-goog.require('ninjascript.package');
+goog.require('ninjascript.plugin');
 
 (function(){
-    ninjascript.package(function(hooks){
+    ninjascript.plugin(function(hooks){
         hooks.behaviors({
           confirms: function(configs) {
 

Diff for: src/javascript/packaged-behaviors/placeholder.js

@@ -1,6 +1,6 @@
 goog.provide('ninjascript.packagedBehaviors.placeholder');
 
-goog.require('ninjascript.package');
+goog.require('ninjascript.plugin');
 
 (function() {
     var behaviors = {}
@@ -197,7 +197,7 @@ goog.require('ninjascript.package');
       return behaviors
     }
 
-    ninjascript.package( function(hooks){
+    ninjascript.plugin( function(hooks){
         hooks.Ninja(behaviors)
       })
   })()

Diff for: src/javascript/packaged-behaviors/standard.js

@@ -1,14 +1,14 @@
 goog.provide('ninjascript.packagedBehaviors.standard');
 
-goog.require('ninjascript.package');
+goog.require('ninjascript.plugin');
 goog.require('ninjascript.utils');
 goog.require('ninjascript.Logger');
 
 (function() {
     var Utils = ninjascript.utils
     var log = ninjascript.Logger.log
 
-    ninjascript.package(function(hooks){
+    ninjascript.plugin(function(hooks){
         hooks.ninja({
             /**
              * Ninja.submitsAsAjax(configs) -> null

Diff for: src/javascript/packaged-behaviors/trigger-on.js

@@ -1,6 +1,6 @@
 goog.provide('ninjascript.packagedBehaviors.triggerOn');
 
-goog.require('ninjascript.package');
+goog.require('ninjascript.plugin');
 
 // There's several things happening here is ways that should be more configurable:
 // * A standard overlayAndSubmit
@@ -60,7 +60,7 @@ goog.require('ninjascript.package');
 // scope than what { "selector": behavior } allows for...
 //
 ;(function() {
-    ninjascript.package(function(hooks) { hooks.behaviors({
+    ninjascript.plugin(function(hooks) { hooks.behaviors({
             cascadeEvent: function(configs){
             },
             removed: function(){

Diff for: src/javascript/packaged-behaviors/utility.js

@@ -1,9 +1,9 @@
 goog.provide('ninjascript.packagedBehaviors.utility');
 
-goog.require('ninjascript.package');
+goog.require('ninjascript.plugin');
 
 (function() {
-    ninjascript.package(function(hooks){
+    ninjascript.plugin(function(hooks){
         hooks.behaviors({
           suppressChangeEvents: function() {
             return new this.types.does({

Diff for: src/javascript/package.js renamed to src/javascript/plugin.js

@@ -1,13 +1,13 @@
-goog.provide('ninjascript.package')
+goog.provide('ninjascript.plugin')
 
 goog.require('ninjascript.Extensible')
 goog.require('ninjascript.NinjaScript')
 goog.require('ninjascript.Tools')
 
-ninjascript.package = function(callback){
+ninjascript.plugin = function(callback){
   var targets = {
     Ninja: ninjascript.NinjaScript.prototype,
     tools: ninjascript.Tools.prototype
   }
-  ninjascript.Extensible.package(targets, callback)
+  ninjascript.Extensible.addPackage(targets, callback)
 }

Diff for: src/javascript/tools/ajax-submitter.js

@@ -5,7 +5,7 @@ goog.require('ninjascript.Logger')
 goog.require('ninjascript.tools.JSONDispatcher')
 goog.require('ninjascript.tools.Overlay')
 
-goog.require('ninjascript.package')
+goog.require('ninjascript.plugin')
 
 ninjascript.tools.AjaxSubmitter = function() {
   this.formData = []
@@ -68,7 +68,7 @@ ninjascript.tools.AjaxSubmitter = function() {
       Ninja.tools.message("Server prototype.error = " + xhr.statusText, "error")
     }
 
-    ninjascript.package(function(hooks){
+    ninjascript.plugin(function(hooks){
         hooks.tools({
             ajaxSubmitter: function() {
               return new ninjascript.tools.AjaxSubmitter()

Diff for: src/javascript/tools/overlay.js

@@ -1,7 +1,7 @@
 goog.provide('ninjascript.tools.Overlay')
 
 goog.require('ninjascript.utils')
-goog.require('ninjascript.package')
+goog.require('ninjascript.plugin')
 
 ninjascript.tools.Overlay = function(list) {
   var elements = this.convertToElementArray(list)
@@ -67,7 +67,7 @@ ninjascript.tools.Overlay = function(list) {
       this.set.remove()
     }
 
-    ninjascript.package(function(hooks){
+    ninjascript.plugin(function(hooks){
         hooks.tools({
         overlay: function() {
           return new ninjascript.tools.Overlay(jQuery.makeArray(arguments))