ninjs 0.13.4 → 0.13.5

data/README.md

@@ -6,7 +6,7 @@ About
 
 ninjs is a new way of building JavaScript applications that allows you to write modular, testable, and reusable JavaScript. ninjs is not really a framework. It provides three essential JavaScript development tools in one coherent package.
 
-1. ninjs uses the "Sprockets" (http://getsprockets.org) JavaScript compiler to package and include scripts. This provides a way to manage all 3rd party and custom libraries and require them directly into your scripts.
+1. ninjs uses the "Sprockets" (http://getsprockets.org) JavaScript compiler to package and include scripts. This provides a way to manage all 3rd party and custom libraries and require them directly in your scripts.
 2. ninjs includes a small JavaScript framework, based on the module pattern (http://javascript.crockford.com/private.html) and "JavaScript: The Good Parts" (http://www.amazon.com/gp/product/B0026OR2ZY/ref=s9_bbs_gw_d6_ir01?pf_rd_m=ATVPDKIKX0DER&pf_rd_s=center-2&pf_rd_r=0HQ3A0RDW9269GPJRGW8&pf_rd_t=101&pf_rd_p=470938631&pf_rd_i=507846), which provides a solid foundation for any JavaScript application.
 3. The "ninjs" command line application eases the pain of repetitive tasks like compiling, scaffolding, and updating your application.
 

data/VERSION

@@ -1 +1 @@
-0.13.4
+0.13.5

data/bin/ninjs

@@ -12,16 +12,7 @@ rescue LoadError
 end
 
 header = <<-HEADER
-ninjs #{Ninjs::VERSION}
-Copyright (c) #{Time.new.year} Dayton Nolan
-Released under the MIT License
 
-Description: 
-The ninjs command line application is a simple way to quickly develop and manage your application. With it you can create an application, generate scaffolding, compile, and upgrade your application.
-
-Usage: ninjs [command] [arguments] [options (-h, --help)]
-
-Commands:
 HEADER
 
 create = <<-CREATE
@@ -111,14 +102,18 @@ optparse = OptionParser.new do|opts|
   
   opts.on( '-v', '--version', 'Display the version') do
     time = Time.now
-    Ninjs::Notification.notice 'ninjs ' + Ninjs::VERSION
-    Ninjs::Notification.notice "Copyright (c) #{time.year} Dayton Nolan"
-    Ninjs::Notification.notice "Released under the MIT License"
+    puts Ninjs::Notification.notice 'ninjs ' + Ninjs::VERSION
+    puts Ninjs::Notification.notice "Copyright (c) #{time.year} Dayton Nolan"
+    puts Ninjs::Notification.notice "Released under the MIT License"
     exit
   end
   
-  opts.on( '-a', '--alias', 'Generate application alias') do
-    options[:alias] = true
+  opts.on( '-a', '--alias [alias]', 'Generate application alias') do |als|
+    options[:alias] = als || "app"
+  end
+  
+  opts.on( '-d', '--dest [dest]', 'Module destination directory') do |dest|
+    options[:dest] = dest
   end
   
   opts.on('-e', '--elements', 'Generate elements file') do
@@ -158,10 +153,12 @@ case command
       puts help[:generate]
       exit
     end
+    
     errors = Hash.new
     type = ARGV[1]
     name = ARGV[2]
-    als = ARGV[3] || 'app'
+    als = options[:alias] || nil
+    dest = options[:dest] || nil
 
     errors[:type] = "Error! Scaffold type is required (ninjs generate module mymodule)" if type.nil?
     errors[:name] = "Error! Module name is required (ninjs generate module mymodule)" if name.nil?
@@ -173,16 +170,20 @@ case command
       exit
     end
     
-    with = {
+    dependencies = {
         :model => options[:model],
         :elements => options[:elements]
     }
 
-    if options[:alias]
-      Ninjs::Command.generate_with_alias(type, name, with, als)
-    else
-      Ninjs::Command.generate(type, name, with)
-    end
+    config = {
+      :type => type,
+      :name => name,
+      :alias => als,
+      :dest => dest,
+      :dependencies => dependencies
+    }
+    
+    Ninjs::Command.generate(config)
 # compile
   when "compile"
     if options[:help]

data/lib/ninjs/command.rb

@@ -2,9 +2,11 @@ module Ninjs
   module Command
     def watch
       require "fssm"
+      
       project_path = Dir.getwd << '/'
       raise "ninjs.conf was not located in #{project_path}" unless File.exists? "#{project_path}ninjs.conf"
-      Ninjs::Notification.log "Ninjs are watching for changes. Press Ctrl-C to stop."
+      
+      puts Ninjs::Notification.log "Ninjs are watching for changes. Press Ctrl-C to stop."
       project = Ninjs::Project.new
       project.update
 	    
@@ -26,12 +28,12 @@ module Ninjs
            glob g
 
            update do |base, relative|
-             Ninjs::Notification.event "change detected in #{relative}"
+             puts Ninjs::Notification.event "change detected in #{relative}"
              project.update
            end
 
            create do |base, relative|
-             Ninjs::Notification.event "#{relative} created"
+             puts Ninjs::Notification.event "#{relative} created"
              project.update
            end
          end
@@ -60,48 +62,29 @@ module Ninjs
       Ninjs::PackageManager.import(package)
     end
     
-    def generate(object, name, with)
-      begin
-        conf_path = "#{Dir.getwd}/ninjs.conf"
-        raise "ninjs.conf was not located in #{conf_path}" unless File.exists? "#{conf_path}"
-        generator = Ninjs::Generator.new(Ninjs::Project.new, name)
-        self.generate_object generator, object, with
-      end
-    end
-    
-    def generate_with_alias(object, name, with, als = 'app')
+    def generate(config)
       begin
         conf_path = "#{Dir.getwd}/ninjs.conf"
         raise "ninjs.conf was not located in #{conf_path}" unless File.exists? "#{conf_path}"
-        generator = Ninjs::Generator.new(Ninjs::Project.new, name)
-        generator.alias = true
-        generator.app_name = als
-        self.generate_object generator, object, with
+        generator = Ninjs::Generator.new(config)
+        generator.generate
       end
     end
-    
-    def generate_object(generator, object, with)
-      case object
-        when 'module'       
-          generator.generate_module_file(with)
-          generator.generate_elements_file if with[:elements]
-          generator.generate_model_file if with[:model]
-        when 'elements'
-          generator.generate_elements_file
-        when 'model'
-          generator.generate_model_file
-        end
-    end
 
     def update
       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 = Ninjs::Project.new
       project.create_ninjs_lib_file
       project.create_utility_lib_file
     end
     
-    module_function :create, :watch, :compile, :import, :generate, :generate_object, :generate_with_alias, :update
+    module_function :create,
+                    :watch,
+                    :compile,
+                    :import,
+                    :generate,
+                    :update
   end
 end

data/lib/ninjs/configuration.rb

@@ -4,7 +4,9 @@ module Ninjs
       attr_reader :name,
                   :dependencies,
                   :autoload,
-                  :asset_root
+                  :asset_root,
+                  :src_dir,
+                  :dest_dir
                   
       attr_accessor :output
                   
@@ -15,7 +17,9 @@ module Ninjs
           :name => name,
           :output => 'expanded',
           :dependencies => ['"<jquery/latest>"'],
-          :autoload => ['"../lib/utilities"']
+          :autoload => ['"../lib/utilities"'],
+          :src_dir => 'modules',
+          :dest_dir => 'application'
         }
         
         @asset_root = @project_path
@@ -47,7 +51,7 @@ module Ninjs
           conf_file << conf_content(@defaults)
         end
         
-        Ninjs::Notification.notify "ninjs.conf created", :added
+        puts Ninjs::Notification.notify "ninjs.conf created", :added
       end
  
       def read
@@ -55,6 +59,8 @@ module Ninjs
         
         @name = config['name']
         @output = config['output']
+        @src_dir = config['src_dir']
+        @dest_dir = config['dest_dir']
         
         @dependencies = config['dependencies'] || Array.new
         @autoload = config['autoload'] || Array.new

data/lib/ninjs/generator.rb

@@ -3,43 +3,52 @@ module Ninjs
     
     attr_writer :alias, :app_name
     
-    def initialize(project, name)
-      @project = project
-      @name = name
-      @alias = false
-      @app_name = @use_alias ? 'app' : @project.config.name
+    def initialize(config)
+      @type = config[:type]
+      @project = Ninjs::Project.new
+      @name = config[:name]
+      @module_name = config[:name].gsub(/^_/, '')
+      @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 }
     end
     
-    def generate_module_file(with = { :elements => false, :model => false })
-          
-      File.open "#{@project.project_path}modules/#{@name.downcase}.module.js", "w" do |file|
-        file << "(function(#{@app_name if @alias}){\n"
+    def generate
+      generate_module_file if @type === 'module'
+      generate_elements_file if @type === 'elements' || @dependencies[:elements]
+      generate_model_file if @type === 'model' || @dependencies[:model]
+    end
+    
+    def generate_module_file
+      File.open "#{@project.project_path}#{@dest}/#{@name}.module.js", "w" do |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"
+        file << %Q(\t//= require "../elements/#{@name.downcase}.elements"\n\n) if @dependencies[:elements] || @type === 'elements'
+        file << %Q(\t//= require "../models/#{@name.downcase}.model\n\n) if @dependencies[:model] || @type === 'model'
+        file << "\t#{@app_name}.#{@module_name}.actions = function() {\n\n\t};\n\n"
+        file << "\t#{@app_name}.#{@module_name}.run();\n"
+        file << "})(#{@project.config.name});" if @alias
+        puts Ninjs::Notification.added "created #{@name.downcase}.module.js"
+      end unless File.exists? "#{@project.project_path}#{@dest}/#{@name}.module.js"
       
       self
     end
     
     def generate_elements_file
-      File.open("#{@project.project_path}elements/#{@name.downcase}" + ".elements.js", "w") do |file|
-        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"
+      File.open("#{@project.project_path}elements/#{@module_name}" + ".elements.js", "w") do |file|
+        file << "#{@app_name}.#{@module_name}.elements({\n\n});"
+        puts Ninjs::Notification.added "created #{@module_name}.elements.js"
+      end unless File.exists? "#{@project.project_path}elements/#{@module_name}.elements.js"
       
       self
     end
     
     def generate_model_file
-      File.open "#{@project.project_path}models/#{@name.downcase}.model.js", "w" do |file|
-        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"
+      File.open "#{@project.project_path}models/#{@module_name}.model.js", "w" do |file|
+        file << "#{@app_name}.#{@module_name}.set_data({\n\t\n});"
+        puts Ninjs::Notification.added "created #{@module_name}.model.js"
+      end unless File.exists? "#{@project.project_path}models/#{@module_name}.model.js"
       
       self
     end

data/lib/ninjs/helpers.rb

@@ -2,6 +2,7 @@ module Ninjs
   module Helpers
     
     def create_module_filename(module_name)
+      module_name = module_name.split(/[\\\/]/).last
       split = module_name.split(/[\.\-\s]/)
       module_filename = String.new
       split.each do |piece|

data/lib/ninjs/notification.rb

@@ -10,7 +10,7 @@ module Ninjs
     }
     
     def self.notify(message, style)
-      puts @@indicators[style] + message
+      @@indicators[style] + message
     end
     
     def self.notice(message)

data/lib/ninjs/project.rb

@@ -22,7 +22,7 @@ module Ninjs
     end
     
     def create
-      Ninjs::Notification.notice "Creating the #{@config.name} project in #{@project_path}" 
+      puts Ninjs::Notification.notice "Creating the #{@config.name} project in #{@project_path}" 
       create_project_structure
       @config.create
       create_ninjs_lib_file
@@ -34,7 +34,7 @@ module Ninjs
     def create_project_structure
       Dir.mkdir "#{@project_path}" unless File.exists? "#{@project_path}"
       Ninjs::Manifest.directories.each do |folder|
-        Ninjs::Notification.added "#{folder}/ created" unless File.exists? "#{@project_path}#{folder}"
+        puts Ninjs::Notification.added "#{folder}/ created" unless File.exists? "#{@project_path}#{folder}"
         Dir.mkdir "#{@project_path}#{folder}" unless File.exists? "#{@project_path}#{folder}"
       end
     end
@@ -49,7 +49,7 @@ module Ninjs
 
       ninjs_lib_secretary.concatenation.save_to "#{@project_path}lib/nin.js"
 
-      Ninjs::Notification.added "lib/nin.js #{operation}"
+      puts Ninjs::Notification.added "lib/nin.js #{operation}"
     end
     
     def create_utility_lib_file
@@ -61,7 +61,7 @@ module Ninjs
       
       utility_lib_secretary.concatenation.save_to "#{@project_path}lib/utilities.js"
       
-      Ninjs::Notification.added "lib/utilities.js created"
+      puts Ninjs::Notification.added "lib/utilities.js created"
     end
     
     def create_ninjs_application_file
@@ -87,7 +87,7 @@ module Ninjs
       compile_modules
       update_application_file
       compress_application if @config.output == 'compressed'
-      Ninjs::Notification.log "application updated" unless @errors
+      puts Ninjs::Notification.log "application updated" unless @errors
       @errors = false
     end
     
@@ -107,11 +107,20 @@ module Ninjs
     end
     
     def get_updated_modules
-      # TODO actually check the files against a cache
       @modules = Array.new
-      Dir["#{@project_path}modules/*.js"].each do |file|
-        module_filename = file.gsub(@project_path + 'modules/', '')
-        @modules << module_filename unless module_filename.match(/^_/)
+      if @config.src_dir.is_a? Array
+        @config.src_dir.each do |directory| 
+          get_directory_modules "#{@project_path}#{directory}/"
+        end 
+      else
+        get_directory_modules "#{@project_path}#{@config.src_dir}/"
+      end
+    end
+    
+    def get_directory_modules(directory)
+      Dir["#{directory}*.js"].each do |file|
+        module_filename = file.gsub(directory, '')
+        @modules << "#{directory}#{module_filename}" unless module_filename.match(/^_/)
       end
     end
     
@@ -122,30 +131,37 @@ module Ninjs
       end
     end
     
+    def create_module_filename(module_name)
+      split = module_name.split(/[\.\-\s]/)
+      module_filename = String.new
+      split.each do |piece|
+        module_filename << piece unless piece.match(/^module$|^js$/i)
+      end
+      module_filename
+    end
+    
     def create_module_file(module_file, module_name)
       begin
-        module_src = "#{@project_path}modules/#{module_file}"
-
         ninjs_lib_secretary = Sprockets::Secretary.new(
           :root         => "#{Ninjs::BASE_DIR}",
           :asset_root   => @config.asset_root,
           :load_path    => ["repository"],
-          :source_files => ["#{module_src}"]
+          :source_files => ["#{module_file}"]
         )
 
         module_file = ninjs_lib_secretary.concatenation
-        message = File.exists?("#{@project_path}application/#{module_name}.js") ? "\e[32m>>>\e[0m application/#{module_name}.js updated" : "\e[32m>>>\e[0m application/#{module_name}.js created"
-        module_file.save_to "#{@project_path}application/#{module_name}.js"
+        message = File.exists?("#{@project_path}#{@config.dest_dir}/#{module_name}.js") ? "\e[32m>>>\e[0m #{@config.dest_dir}/#{module_name}.js updated" : "\e[32m>>>\e[0m #{@config.dest_dir}/#{module_name}.js created"
+        module_file.save_to "#{@project_path}#{@config.dest_dir}/#{module_name}.js"
         ninjs_lib_secretary.install_assets
 
       rescue Exception => error
         @errors = true
-        Ninjs::Notification.error "Sprockets error: #{error.message}"
+        puts Ninjs::Notification.error "Sprockets error: #{error.message}"
       end
     end
     
     def update_application_file
-      application_file = "#{@project_path}application/#{@app_filename}.js"
+      application_file = "#{@project_path}#{@config.dest_dir}/#{@app_filename}.js"
       
       File.open(application_file, "w+") do |file|
         write_dependencies(file)
@@ -192,12 +208,12 @@ module Ninjs
         application_file.save_to "#{file}"
       rescue Exception => error
         @errors = true
-        Ninjs::Notification.error "Sprockets error: #{error.message}"
+        puts Ninjs::Notification.error "Sprockets error: #{error.message}"
       end
     end
     
     def compress_application
-      application = @project_path + 'application'
+      application = @project_path + '#{@config.dest_dir}'
       modules = Dir.entries(application)
       modules.reject! { |file| file =~ /^\./ }
 

data/ninjs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ninjs}
-  s.version = "0.13.4"
+  s.version = "0.13.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = %q{2011-05-06}
+  s.date = %q{2011-05-17}
   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}
@@ -186,7 +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/extensions/jquery.elements.js",
     "repository/ninjs/tests/index.html",
     "repository/ninjs/tests/ninjs.test.js",
     "repository/ninjs/tests/ninjs.utilities.test.js",
@@ -203,6 +203,7 @@ Gem::Specification.new do |s|
     "repository/qunit/qunit.js",
     "repository/selectivizr/1.0.js",
     "repository/selectivizr/latest.js",
+    "repository/syntaxhighlighter/all.js",
     "repository/syntaxhighlighter/assets/css/syntaxhighlighter/shCore.css",
     "repository/syntaxhighlighter/assets/css/syntaxhighlighter/shCoreDefault.css",
     "repository/syntaxhighlighter/assets/css/syntaxhighlighter/shCoreDjango.css",
@@ -238,7 +239,6 @@ Gem::Specification.new do |s|
     "repository/syntaxhighlighter/assets/scss/syntaxhighlighter/_shThemeMidnight.scss",
     "repository/syntaxhighlighter/assets/scss/syntaxhighlighter/_shThemeRDark.scss",
     "repository/syntaxhighlighter/assets/scss/syntaxhighlighter/_theme_template.scss",
-    "repository/syntaxhighlighter/default.js",
     "repository/syntaxhighlighter/shAutoloader.js",
     "repository/syntaxhighlighter/shBrushAS3.js",
     "repository/syntaxhighlighter/shBrushAppleScript.js",
@@ -278,7 +278,11 @@ Gem::Specification.new do |s|
     "spec/fixtures/test.module.js",
     "spec/fixtures/updated.myapplication.js",
     "spec/fixtures/utilities.js",
+    "spec/helpers_spec.rb",
+    "spec/integration_spec.rb",
+    "spec/manifest_spec.rb",
     "spec/ninjs_spec.rb",
+    "spec/notification_spec.rb",
     "spec/spec_helper.rb",
     "tmp/ff9e83aa019b712b90200b8d1b8fa0c7e14576af.json",
     "tmp/metric_fu/_data/20110305.yml",
@@ -295,14 +299,19 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{nowarning}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ninjs is a command line application to help you write clean, modular javascript applications.}
   s.test_files = [
+    "spec/helpers_spec.rb",
+    "spec/integration_spec.rb",
+    "spec/manifest_spec.rb",
     "spec/ninjs_spec.rb",
+    "spec/notification_spec.rb",
     "spec/spec_helper.rb"
   ]
 
   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