lib/ninjs/configuration.rb in ninjs-0.10.2 vs lib/ninjs/configuration.rb in ninjs-0.11.0

@@ -1,53 +1,53 @@
 module Ninjs
     class Configuration
       
       attr_reader :name,
-                  :project_path,
                   :app_filename,
                   :directory,
                   :output,
                   :dependencies,
                   :autoload,
                   :config_path,
                   :asset_root,
                   :base_url,
-                  :tests_path
+                  :test_path
                   
-      def initialize(project_path, name = 'NinjsApplication')
+      def initialize(project_path, name = '')
+        @project_path = project_path
         @defaults = {
           :name => name,
-          :project_path => project_path,
-          :asset_root => project_path,
+          :app_filename => name.gsub(/\s|\-|\./, '').downcase,
           :output => 'expanded',
           :dependencies => ['<jquery/latest>'],
           :autoload => ['<ninjs/utilities/all>'],
           :base_url => 'http://www.example.com/',
-          :tests_path => 'tests/'
+          :test_path => 'tests/'
         }
 
         @defaults.each do |label, setting|
           instance_variable_set("@#{label}", setting)
         end
+        
+        if File.exists? "#{@project_path}ninjs.conf"
+          read
+        end
       end
       
       def create
-        default_content = conf_content @defaults
+        options = @defaults
+        options.delete :app_filename
+        default_content = conf_content options
         create_conf_file default_content
       end
       
       def conf_content(options)
-        content = <<-CONF
-name: #{options[:name]}
-project_path: #{options[:project_path]}
-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
+        content = String.new
+        options.each do |option, value|
+          content << "#{option}: #{value}\n"
+        end
+        content
       end
       
       def create_conf_file(content)
         File.open("#{@project_path}ninjs.conf", "w+") do |conf_file|
           conf_file << conf_content(@defaults)
@@ -55,40 +55,34 @@
         
         puts "ninjs.conf created"
       end
       
       def update
-        content = conf_content({
+        options = {
           :name => @name,
-          :project_path => @project_path,
-          :asset_root => @project_path,
+          :asset_root => @asset_root,
           :output => @output,
           :dependencies => @dependencies,
           :autoload => @autoload,
           :base_url => @base_url,
-          :tests_path => @tests_path
-        })
+          :test_path => @test_path
+        }
+        options.reject! { |option| option.nil? }
+        
+        content = conf_content options
         create_conf_file content
       end
       
       def read
-        begin
-          raise IOError, "#{@project_path}ninjs.conf does not exist", caller unless File.exists? "#{@project_path}ninjs.conf"
-          config = YAML.load_file("#{@project_path}ninjs.conf")
-          
-          @project_path = config['project_path']
-          @asset_root = config['asset_root']
-          @name = config['name']
-          @app_filename = config['name'].downcase
-          @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
-        end
+        config = YAML.load_file("#{@project_path}ninjs.conf")
+        @asset_root = config['asset_root'] unless config['asset_root'].nil?
+        @name = config['name']
+        @app_filename = config['name'].downcase
+        @output = config['output']
+        @dependencies = config['dependencies'] || Array.new
+        @autoload = config['autoload'] || Array.new
+        @base_url = config['base_url'] || 'http://www.example.com/'
+        @test_path = config['test_path'] || 'tests/'
       end
       
     end
 end
\ No newline at end of file