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

@@ -11,57 +11,45 @@
   def dcfirst
     self[0,1].downcase + self[1..-1]
   end
 end
 
+# Primary RestfulX configuration options
 module RestfulX
   # Computes necessary configuration options from the environment. This can be used in Rails, Merb
   # or standalone from the command line.
   module Configuration
+    # We try to figure out the application root using a number of possible options
     APP_ROOT = defined?(RAILS_ROOT) ? RAILS_ROOT : defined?(Merb) ? Merb.root : File.expand_path(".")
 
-    # Extract project, package, controller names from the environment. This will respect
-    # config/restfulx.yml if it exists, you can override all of the defaults there. The defaults are:
-    # - *base-package* same as project name downcased
-    # - *controller-name* 'ApplicationController'
-    #
-    # Here's a sample restfulx.yml file:
-    #
-    # RestfulX code generation configuration options
-    # 
-    # By default flex models, commands, controllers and components are genearated into
-    # app/flex/<your rails project name> folder. If you'd like to customize the target folder 
-    # (to say append a "com" package before your rails project name) uncomment the line below
-    # base-package must follow the usual flex package notation (a string separated by ".")
-    # 
-    # base-package: com.pomodo
-    # 
-    # Main RestfulX controller is typically named AppicationController. This controller is created in 
-    # <base-package>.controllers folder. You can customize the name by uncommenting the following line 
-    # and changing the controller name.
-    # 
-    # controller-name: ApplicationController
+    # Extract project, package, controller name, etc from the environment. This will respect
+    # config/restfulx.yml if it exists, you can override all of the defaults there.
     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('.', '/')
+        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