lib/uki/project.rb in uki-1.1.1 vs lib/uki/project.rb in uki-1.1.2

@@ -13,14 +13,18 @@
   
   def initialize dest
     @dest = dest
   end
   
+  # def name
+  #   File.basename File.expand_path(dest)
+  # end
+  
   def name
-    File.basename File.expand_path(dest)
+    File.basename(File.expand_path(dest)).sub(/[^a-z0-9_$]+/, '_')
   end
-  
+
   def create options
     verify_empty
     init_dest
     copy_frameworks
     copy_templates
@@ -159,38 +163,34 @@
     def extract_cjs container
       File.read(container).scan(CJS_REGEXP).map { |match| match[0].sub('.cjs', '.js') }
     end
     
     def init_dest
-      FileUtils.mkdir_p File.join(dest, project_name)
-      ['view', 'model', 'layout', 'controller'].each do |name| 
-        FileUtils.mkdir_p File.join(dest, project_name, name)
+      FileUtils.mkdir_p File.join(dest, name)
+      ['view', 'model', 'layout', 'controller'].each do |n| 
+        FileUtils.mkdir_p File.join(dest, name, n)
       end
     end
     
     def copy_templates
       File.open(File.join(dest, 'index.html'), 'w') do |f|
         f.write template('index.html').result(binding)
       end
-      File.open(File.join(dest, "#{project_name}.js"), 'w') do |f|
+      File.open(File.join(dest, "#{name}.js"), 'w') do |f|
         f.write template('myapp.js').result(binding)
       end
       
-      create_function 'layout.js', "#{project_name}.layout.main"
+      create_function 'layout.js', "#{name}.layout.main"
       
-      ['view', 'model', 'layout', 'controller'].each do |name|
-        File.open(File.join(dest, project_name, "#{name}.js"), 'w') do |f|
-          package_name = "#{project_name}.#{name}"
+      ['view', 'model', 'layout', 'controller'].each do |n|
+        File.open(File.join(dest, name, "#{n}.js"), 'w') do |f|
+          package_name = "#{name}.#{n}"
           f.write template('package.js').result(binding)
         end
       end
       
     end
     
-    def project_name
-      File.basename dest
-    end
-  
     def copy_frameworks
       FileUtils.mkdir_p File.join(dest, 'frameworks')
       frameworks_dest = File.join(dest, 'frameworks', 'uki')
       FileUtils.mkdir_p frameworks_dest
       FileUtils.cp_r File.join(path_to_uki_src, '.'), frameworks_dest
\ No newline at end of file