ninjs 0.14.1 → 0.16.0

data/Rakefile

@@ -1,5 +1,11 @@
 require 'rubygems'
 require 'bundler'
+require 'rake'
+require 'jeweler'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+require 'rdoc/task'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -7,9 +13,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "ninjs"
   gem.homepage = "http://github.com/textnotspeech/ninjs"
@@ -25,10 +29,9 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'sprockets'
   gem.add_development_dependency 'rspec', '>= 0'
 end
+
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
@@ -40,8 +43,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
@@ -58,4 +60,12 @@ namespace :ndoc do
     puts output
   end
   
-end
+end
+begin
+  require 'jasmine'
+  load 'jasmine/tasks/jasmine.rake'
+rescue LoadError
+  task :jasmine do
+    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.16.0

data/bin/ninjs

@@ -72,22 +72,22 @@ footer = <<-FOOTER
 FOOTER
 
 help = {
-  :create => create,
-  :generate => generate,
-  :compile => compile,
-  :watch => watch,
-  :update => upd,
-  :footer => footer
+  create: create,
+  generate: generate,
+  compile: compile,
+  watch: watch,
+  update: upd,
+  footer: footer
 }
 
 command = ARGV[0]
 
 options = {
-  :alias => nil,
-  :elements => false,
-  :model => false,
-  :help => false,
-  :compress => nil
+  alias: nil,
+  elements: false,
+  model: false,
+  help: false,
+  compress: nil
 }
 
 optparse = OptionParser.new do |opts|
@@ -141,7 +141,9 @@ case command
       exit
     end
     
-    Ninjs::Command.create({ :name => app_name, :directory => sub_dir })
+    config = { name: app_name }
+    config[:root] = sub_dir unless sub_dir.nil?
+    Ninjs::Command.create(config)
 # generate
   when "generate"
     if options[:help]
@@ -166,17 +168,17 @@ case command
     end
     
     dependencies = {
-        :model => options[:model],
-        :elements => options[:elements]
+        model: options[:model],
+        elements: options[:elements]
     }
     
     Ninjs::Command.generate({
-      :project => Ninjs::Project.new,
-      :type => type,
-      :name => name,
-      :alias => als,
-      :dest => dest,
-      :dependencies => dependencies
+      project: Ninjs::Project.new,
+      type: type,
+      name: name,
+      alias: als,
+      dest: dest,
+      dependencies: dependencies
     })
 # compile
   when "compile"
@@ -186,9 +188,9 @@ case command
     end
     
     unless options[:compress].nil?
-      Ninjs::Command.compile(options[:compress])
+      Ninjs::Command.compile({ force_compress: options[:compress] })
     else
-      Ninjs::Command.compile()
+      Ninjs::Command.compile
     end
 # watch
   when "watch"

data/lib/ninjs/command.rb

@@ -1,10 +1,10 @@
 module Ninjs
   module Command
-    def watch
+    def watch(path = nil)
       require "fssm"
       
-      project_path = File.expand_path Dir.getwd
-      raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}/ninjs.conf"
+      path ||= File.expand_path(Dir.getwd)
+      raise "ninjs.conf was not located in #{path}" unless File.exists? "#{path}/ninjs.conf"
       
       puts Ninjs::Notification.log "Ninjs are watching for changes. Press Ctrl-C to stop."
       project = Ninjs::Project.new
@@ -14,10 +14,10 @@ module Ninjs
 	    watch_hash = Hash.new
 	    
 	    watch_dirs.each do |dir|
-	     watch_hash["#{project_path}/#{dir}"] = "**/*.js"
+	     watch_hash["#{path}/#{dir}"] = "**/*.js"
 	    end
 	    
-	    watch_hash[project_path] = "**/*.conf"
+	    watch_hash[path] = "**/*.conf"
 	    watch_hash["#{Ninjs::BASE_DIR}/repository"] = "**/*.js"
 	    
 	    FSSM.monitor do
@@ -45,37 +45,48 @@ module Ninjs
 	           
     end
 
-    def create(config)
-      raise 'you must specify a project name: ninjs create ProjectName' if config[:name].nil?
+    def create(config = nil)
+      settings = {
+        name: nil,
+        root: File.expand_path(Dir.getwd)
+      }
       
-      project = Ninjs::Project.new config[:name]
-      project.root = config[:directory] unless config[:directory].nil?
-      puts project.root
+      settings.merge!(config) unless config.nil?
+      
+      raise 'you must specify a project name: ninjs create ProjectName' if settings[:name].nil?
+      
+      project = Ninjs::Project.new({ name: settings[:name], root: settings[:root] })
       project.create
     end
     
-    def compile(force_compress = false)
-      project_path = Dir.getwd << '/'
-      raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}/ninjs.conf"
-      project = Ninjs::Project.new
-      project.config.output = 'compressed' if force_compress
+    def compile(options = nil)
+      settings = {
+        force_compress: false,
+        path: File.expand_path(Dir.getwd)
+      }
+      
+      settings.merge!(options) unless options.nil?
+      
+      raise "ninjs.conf was not located in #{settings[:path]}" unless File.exists? "#{settings[:path]}/ninjs.conf"
+      project = Ninjs::Project.new(root: settings[:path])
+      project.config.output = 'compressed' if settings[:force_compress]
       project.update
     end
     
     def generate(config)
       begin
-        conf_path = "#{Dir.getwd}/ninjs.conf"
-        raise "ninjs.conf was not located in #{conf_path}" unless File.exists? "#{conf_path}"
+        conf_path = "#{config[:project].root}/ninjs.conf"
+        raise "ninjs.conf was not located in #{conf_path}" unless File.exists? conf_path
         generator = Ninjs::Generator.new(config)
         generator.generate
       end
     end
 
-    def update
-      project_path = Dir.getwd << '/'
-      raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}ninjs.conf"
+    def update(path = nil)
+      path = File.expand_path Dir.getwd if path.nil?
+      raise "ninjs.conf was not located in #{path}" unless File.exists? "#{path}/ninjs.conf"
       
-      project = Ninjs::Project.new
+      project = Ninjs::Project.new({ root: path })
       project.create_ninjs_lib_file
       project.create_utility_lib_file
     end

data/lib/ninjs/configuration.rb

@@ -1,82 +1,64 @@
 module Ninjs
     class Configuration
-      
-      attr_reader :path,
-                  :settings,
-                  :name,
-                  :dependencies,
-                  :autoload,
-                  :src_dir,
-                  :dest_dir
-                  
-      attr_accessor :output,
-                    :root,
-                    :asset_root
-                  
+
+      attr_accessor :root,
+                    :name,
+                    :src_dir,
+                    :dest_dir,
+                    :asset_root,
+                    :asset_root_relative,
+                    :output,
+                    :dependencies,
+                    :autoload,
+                    :module_alias
+
       def initialize(project_path)
         @root =  File.expand_path project_path
-        @settings = Hash.new
-        @asset_root = @root
-        
-        setting(:name, 'application')
-        setting(:src_dir, 'modules')
-        setting(:dest_dir, 'application')
-        setting(:output, 'expanded')
-        setting(:dependencies, ['<jquery/latest>'])
-        setting(:autoload, ['../lib/utilities'])
-                
-        optional_settings.each do |label, setting|
-          setting(label, setting)
-        end
-        
+        @name = 'application'
+        @src_dir = 'modules'
+        @dest_dir = 'application'
+        @asset_root_relative = '../'
+        @asset_root = File.expand_path('../', @root)
+        @output = 'expanded'
+        @dependencies = ['<jquery/latest>']
+        @autoload = ['../lib/utilities']
+        @module_alias = 'mod'
+
         read if File.exists? "#{@root}/ninjs.conf"
       end
-      
-      def optional_settings
-        @settings.reject do |key, value|
-          key.to_s.match /name|src_dir|dest_dir|output|dependencies|autoload/
-        end
-      end
-      
-      def setting(name, value)
-        instance_variable_set("@#{name}", value)
-        @settings[name] = value
-      end
-      
+
       def write
         File.open("#{@root}/ninjs.conf", "w+") do |conf_file|
           conf_file << "name: #{@name}\n"
           conf_file << "src_dir: #{@src_dir}\n"
           conf_file << "dest_dir: #{@dest_dir}\n"
+          conf_file << "asset_root: #{@asset_root_relative} # relative to project root\n"
           conf_file << "output: #{@output}\n"
           conf_file << "dependencies: #{array_to_yml @dependencies}\n"
           conf_file << "autoload: #{array_to_yml @autoload}\n"
-          
-          optional_settings.each do |setting, value|
-            conf_file << "setting: #{value}\n"
-          end
+          conf_file << "module_alias: #{@module_alias}\n"
         end
-        
+
         puts Ninjs::Notification.notify "ninjs.conf created", :added
       end
- 
+
       def read
-        config = YAML.load_file("#{@project_path}ninjs.conf")
-        
+        config = YAML.load_file("#{@root}/ninjs.conf")
+
         @name = config['name']
-        @output = config['output']
         @src_dir = config['src_dir']
         @dest_dir = config['dest_dir']
-        
+        @asset_root_relative = config['asset_root'] || @asset_root_relative
+        @asset_root = File.expand_path(@asset_root_relative, @root)
+        @output = config['output']
         @dependencies = config['dependencies'] || Array.new
         @autoload = config['autoload'] || Array.new
-        
-        @asset_root = config['asset_root'] unless config['ass'].nil?
+        @module_alias = config['module_alias'] || 'mod'
       end
-      
+
       def array_to_yml(array)
         yml = array.empty? ? '[]' : %Q{['#{array.join("', '")}']}
       end
-      
+
     end
 end

data/lib/ninjs/generator.rb

@@ -11,7 +11,7 @@ module Ninjs
       @alias = config[:alias].nil? ? false : true
       @app_name = config[:alias] || @project.config.name
       @dest = config[:dest] || @project.config.src_dir.is_a?(String) ? @project.config.src_dir : @project.config.src_dir.first
-      @dependencies = config[:dependencies] || { :elements => false, :model => false }
+      @dependencies = config[:dependencies] || { elements: false, model: false }
     end
     
     def generate
@@ -23,11 +23,11 @@ module Ninjs
     def generate_module_file
       module_content = Array.new
       module_content << "(function(#{@app_name if @alias}) {\n"
-      module_content << "\tvar mod = #{@app_name}.add_module('#{@name}');\n\n"
+      module_content << "\tvar #{@project.config.module_alias} = #{@app_name}.add_module('#{@name}');\n\n"
       module_content << %Q{\t//= require "../elements/#{@name.downcase}.elements"\n} if @dependencies[:elements] || @type === 'elements'
       module_content << %Q{\t//= require "../models/#{@name.downcase}.model"\n\n} if @dependencies[:model] || @type === 'model'
-      module_content << "\t#{@app_name}.#{@module_name}.actions = function() {\n\t\t\n\t};\n\n"
-      module_content << "\t#{@app_name}.#{@module_name}.run();\n"
+      module_content << "\t#{@project.config.module_alias}.actions = function() {\n\t\t\n\t};\n\n"
+      module_content << "\t#{@project.config.module_alias}.run();\n"
       module_content << "\n})(#{@project.config.name if @alias});"
       
       
@@ -41,7 +41,7 @@ module Ninjs
     
     def generate_elements_file
       File.open("#{@project.root}/elements/#{@module_name}" + ".elements.js", "w") do |file|
-        file << %Q{\tmod.dom.ready(function() {\n\t\t#{@app_name}.#{@module_name}.elements({\n\t\t\t\n\t\t});\n\t});\n}
+        file << %Q{\t#{@project.config.module_alias}.dom.ready(function() {\n\t\tmod.elements({\n\t\t\t\n\t\t});\n\t});\n}
         puts Ninjs::Notification.added "created #{@module_name}.elements.js"
       end unless File.exists? "#{@project.root}/elements/#{@module_name}.elements.js"
       
@@ -50,7 +50,7 @@ module Ninjs
     
     def generate_model_file
       File.open "#{@project.root}/models/#{@module_name}.model.js", "w" do |file|
-        file << %Q{\t#{@app_name}.#{@module_name}.set_data({\n\t\t\n\t});\n}
+        file << %Q{\t#{@project.config.module_alias}.set_data({\n\t\t\n\t});\n}
         puts Ninjs::Notification.added "created #{@module_name}.model.js"
       end unless File.exists? "#{@project.root}/models/#{@module_name}.model.js"
       

data/lib/ninjs/notification.rb

@@ -2,11 +2,11 @@ module Ninjs
   class Notification
     @@growl_support = false
     @@indicators = {
-      :none => "",
-      :log => "\e[32m>>>\e[0m ",
-      :event => "\e[33m<<<\e[0m ",
-      :added => "\e[32m+++\e[0m ",
-      :error => "\e[0;31m!!!\e[0m "
+      none: "",
+      log: "\e[32m>>>\e[0m ",
+      event: "\e[33m<<<\e[0m ",
+      added: "\e[32m+++\e[0m ",
+      error: "\e[0;31m!!!\e[0m "
     }
     
     def self.notify(message, style)

data/lib/ninjs/project.rb

@@ -3,25 +3,33 @@ module Ninjs
     attr_reader :root,
                 :config,
                 :modules
-                
-    
-    def initialize(name = nil)
-      if name.nil?
-        raise ArgumentError, "Ninjs::Project.new(name): name is required without a configuration file" unless File.exists? 'ninjs.conf'
-      end
+
+    def initialize(options = nil)
+      settings = {
+        name: nil,
+        root: Dir.getwd
+      }
       
-      @root = File.expand_path Dir.getwd
+      settings.merge!(options) unless options.nil?
+
+      @name = settings[:name]
+      @root = File.expand_path(settings[:root])
+
+      if @name.nil?
+        raise ArgumentError, "Ninjs::Project.new({ name: 'Name' }): name is required without a configuration file" unless File.exists? "#{@root}/ninjs.conf"
+      end
+
       @modules = Array.new
       @config = Ninjs::Configuration.new @root
-      @config.setting :name, name unless name.nil?
+      @config.name = @name unless @name.nil?
     end
-    
+
     def root=(path)
       @root = File.expand_path path
       @config.root = @root
       @config.asset_root = @root
     end
-    
+
     def create
       puts Ninjs::Notification.notice "Creating the #{@config.name} project in #{@root}" 
       create_project_scaffold
@@ -31,7 +39,7 @@ module Ninjs
       create_ninjs_application_file
       import_test_files
     end
-    
+
     def create_project_scaffold
       Dir.mkdir "#{@root}" unless File.exists? "#{@root}"
       Ninjs::Manifest.directories.each do |folder|
@@ -45,7 +53,7 @@ module Ninjs
       ninjs_lib_secretary = Sprockets::Secretary.new(
         :root         => "#{Ninjs::BASE_DIR}",
         :load_path    => ["repository"],
-        :source_files => ["repository/ninjs/core/nin.js"]
+        source_files: ["repository/ninjs/core/nin.js"]
       )
 
       ninjs_lib_secretary.concatenation.save_to "#{@root}/lib/nin.js"
@@ -55,9 +63,9 @@ module Ninjs
     
     def create_utility_lib_file
       utility_lib_secretary = Sprockets::Secretary.new(
-        :root         => "#{Ninjs::BASE_DIR}",
-        :load_path    => ["repository"],
-        :source_files => ["repository/ninjs/utilities/all.js"]
+        root: "#{Ninjs::BASE_DIR}",
+        load_path: ["repository"],
+        source_files: ["repository/ninjs/utilities/all.js"]
       )
       
       utility_lib_secretary.concatenation.save_to "#{@root}/lib/utilities.js"
@@ -67,7 +75,7 @@ module Ninjs
     
     def create_ninjs_application_file
       File.open("#{@root}/application/#{@config.name.downcase}.js", "w+") do |file|
-        file << "//-- Ninjs #{Time.now.to_s}  --//\n"
+        file << "//-- This file was automatically generated by Ninjs @ #{Time.now.to_s} DO NOT EDIT THIS FILE --//\n"
         file << File.open("#{@root}/lib/nin.js", 'r').readlines.join('')
         file << "\nvar #{@config.name} = new NinjsApplication();"
       end
@@ -104,17 +112,17 @@ module Ninjs
       @modules = Array.new
       if @config.src_dir.is_a? Array
         @config.src_dir.each do |directory| 
-          add_scripts_to_models File.expand_path "#{directory}"
+          add_scripts_to_models File.expand_path(directory, @root)
         end 
       else
-        add_scripts_to_models File.expand_path "#{@config.src_dir}"
+        add_scripts_to_models File.expand_path(@config.src_dir, @root)
       end
     end
     
     def add_scripts_to_models(directory)
       Dir["#{directory}/*.js"].each do |file|
         module_filename = file.gsub(directory, '')
-        @modules << "#{directory}#{module_filename}" unless module_filename.match(/^_/)
+        @modules << "#{directory}#{module_filename}" unless module_filename.match(/^\/_/)
       end
     end
     
@@ -131,7 +139,7 @@ module Ninjs
           :root         => "#{Ninjs::BASE_DIR}",
           :asset_root   => @config.asset_root,
           :load_path    => ["repository"],
-          :source_files => ["#{module_file}"]
+          source_files: ["#{module_file}"]
         )
 
         module_file = ninjs_lib_secretary.concatenation
@@ -185,7 +193,7 @@ module Ninjs
           :root         => "#{Ninjs::BASE_DIR}",
           :asset_root   => @config.asset_root,
           :load_path    => ["repository"],
-          :source_files => ["#{file}"]
+          source_files: ["#{file}"]
         )
 
         application_file = ninjs_lib_secretary.concatenation
@@ -211,7 +219,5 @@ module Ninjs
       end
     end
   
-  end
-  # class Project
-end
-#module Ninjs
+  end # class Project
+end # module Ninjs