lib/restfulx/configuration.rb in dima-restfulx-1.2.1 vs lib/restfulx/configuration.rb in dima-restfulx-1.2.2

@@ -40,28 +40,33 @@
     # and changing the controller name.
     # 
     # controller-name: ApplicationController
     def extract_names(project = nil)
       if project
-        project_name = project.camelcase.gsub(/\s/, '')
-        project_name_downcase = project_name.downcase
+        project_name = project.downcase.gsub(/\W/, '')
+        flex_project_name = project_name.camelize
       else
-        project_name = APP_ROOT.split("/").last.camelcase.gsub(/\s/, '')
-        project_name_downcase = project_name.downcase
+        project_name = APP_ROOT.split("/").last.gsub(/\W/, '')
+        flex_project_name = project_name.camelize
       end
-      
+            
       # give a chance to override the settings via restfulx.yml
       begin      
         config = YAML.load(File.open("#{APP_ROOT}/config/restfulx.yml"))
-        base_package = config['base-package'] || project_name_downcase
-        base_folder = base_package.gsub('.', '/').gsub(/\s/, '')
-        project_name = config['project-name'].camelcase.gsub(/\s/, '') || project_name
+        base_package = config['base-package'] || flex_project_name.downcase
+        base_folder = base_package.gsub('.', '/').gsub(/\W/, '')
+        project_name = config['project-name'].downcase.gsub(/\W/, '') || project_name
+        flex_project_name = project_name.camelize
         controller_name = config['controller-name'] || "ApplicationController"
+        flex_root = config['flex-root'] || "app/flex"
+        distributed = config['distributed'] || false
       rescue
-        base_folder = base_package = project_name_downcase
+        base_folder = base_package = flex_project_name.downcase
         controller_name = "ApplicationController"
+        flex_root = "app/flex"
+        distributed = false
       end
-      [project_name, project_name_downcase, controller_name, base_package, base_folder]
+      [project_name, flex_project_name, controller_name, base_package, base_folder, flex_root, distributed]
     end
 
     # List files ending in *.as (ActionScript) in a given folder
     def list_as_files(dir_name)
       Dir.entries(dir_name).grep(/\.as$/).map { |name| name.sub(/\.as$/, "") }.join(", ")
\ No newline at end of file