dima-restfulx 1.2.1 → 1.2.2

data/Rakefile

@@ -1,42 +1,77 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
+require 'rake'
 
 begin
-  require 'bones'
-  Bones.setup
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "restfulx"
+    gem.summary = "RestfulX Framework Code Generation Engine / Rails 2.1+ Integration Support"
+    gem.email = "dima.berastau@gmail.com"
+    gem.homepage = "http://restfulx.org"
+    gem.rubyforge_project = "restfulx"
+    gem.authors = ["Dima Berastau"]
+    gem.files =  FileList["[A-Z]*", "{bin,app_generators,rails_generators,rxgen_generators,lib,test,spec}/**/*"]
+    gem.add_dependency('rubigen', '>= 1.5.0')
+    gem.add_dependency('activesupport', '>=2.0.0')
+  end
 rescue LoadError
-  load 'tasks/setup.rb'
+  puts "Jeweler not available. Install it with: sudo gem install dima-jeweler -s http://gems.github.com"
 end
 
-ensure_in_path 'lib'
-require 'restfulx'
-
-depend_on 'rubigen', '1.4.0'
-depend_on 'activesupport', '2.0.0'
-
-task :default => 'spec:run'
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  config = YAML.load(File.read('VERSION.yml'))
+  rdoc.rdoc_dir = 'doc/api'
+  rdoc.title = "RestfulX #{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  rdoc.options << '--line-numbers' << '--inline-source' #<< '-Tjamis'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
 
-PROJ.name = 'restfulx'
-PROJ.summary = 'RestfulX Framework Code Generation Engine / Rails 2.1+ Integration Support'
-PROJ.authors = 'Dima Berastau'
-PROJ.email = 'dima.berastau@gmail.com'
-PROJ.url = 'http://wiki.github.com/dima/restfulx'
-PROJ.version = RestfulX::VERSION
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
 
-PROJ.executables = ['bin/rx-gen']
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/restfulx/"
+        local_dir = 'doc/api'
 
-#PROJ.rdoc.opts << '-Tjamis'
-PROJ.rdoc.exclude << %w(.txt)
-PROJ.rdoc.main = 'README.rdoc'
-PROJ.rdoc.dir = 'doc/api'
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
 
-PROJ.readme_file = 'README.rdoc'
-PROJ.rubyforge.name = 'restfulx'
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = false
+end
 
-PROJ.exclude << %w(.DS_Store .gitignore .log, .sqlite3)
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/**/test_*.rb']
+    t.verbose = true
+  end
+rescue LoadError
+  puts "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+end
 
-PROJ.spec.opts << '--color'
-PROJ.test.opts << '-W1'
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+rescue LoadError
+  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+end
 
-# EOF
+task :default => :test

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 2
+:major: 1
+:minor: 2

data/app_generators/rx_app/rx_app_generator.rb

@@ -8,7 +8,11 @@ class RxAppGenerator < RubiGen::Base
               :command_controller_name, 
               :component_names, 
               :application_tag,
-              :use_air
+              :use_air,
+              :use_gae,
+              :flex_root,
+              :base_flex_package,
+              :distributed
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -16,9 +20,14 @@ class RxAppGenerator < RubiGen::Base
     @destination_root = File.expand_path(args.shift)
     
     @project_name, @flex_project_name, @command_controller_name, 
-      @base_package, @base_folder = extract_names(base_name)
+      @base_package, @base_folder, @flex_root, @distributed = extract_names(base_name)
 
+    @base_package = options[:base_flex_package] if options[:base_flex_package]
+    @base_folder = options[:base_flex_package].gsub('.', '/').gsub(/\W/, '') if options[:base_flex_package]
+    @flex_root = options[:flex_root] if options[:flex_root]
+    @use_gae = options[:gae]
     @use_air = options[:air_config]
+    @distributed = options[:distributed] unless @distributed
     if @use_air
       @application_tag = 'WindowedApplication'
     else
@@ -32,7 +41,7 @@ class RxAppGenerator < RubiGen::Base
     record do |m|
       m.directory ''
       
-      %w(script lib db bin-debug).each { |dir| m.directory dir }
+      %w(script lib db config bin-debug).each { |dir| m.directory dir }
       
       if options[:gae]
         m.file 'index.yaml', 'index.yaml' unless File.exist?('index.yaml')
@@ -44,6 +53,7 @@ class RxAppGenerator < RubiGen::Base
         m.file 'empty.txt', 'app/models/__init__.py'
       end
 
+      m.template 'restfulx.yml', 'config/restfulx.yml'
       m.file 'default_tasks.rake', 'Rakefile' unless File.exist?('Rakefile')      
       m.file 'flex.properties', '.flexProperties'
       m.file 'generate.rb', 'script/generate', { :chmod => 0755 }
@@ -70,15 +80,15 @@ class RxAppGenerator < RubiGen::Base
       end
       
       %w(components controllers commands models events).each do |dir|
-        m.directory "app/flex/#{base_folder}/#{dir}"
+        m.directory "#{flex_root}/#{base_folder}/#{dir}"
       end
       
-      m.directory "app/flex/#{base_folder}/components/generated"
+      m.directory "#{flex_root}/#{base_folder}/components/generated"
 
-      m.template 'project-textmate.erb', "#{project_name.underscore}.tmproj"
-      m.template 'mainapp.mxml', File.join('app', 'flex', "#{project_name}.mxml")
-      m.template 'mainapp-config.xml', File.join('app', 'flex', "#{project_name}-config.xml")
-      m.template 'mainair-app.xml', File.join('app', 'flex', "#{project_name}-app.xml") if @use_air      
+      m.template 'project-textmate.erb', "#{project_name}.tmproj"
+      m.template 'mainapp.mxml', File.join("#{flex_root}", "#{flex_project_name}.mxml")
+      m.template 'mainapp-config.xml', File.join("#{flex_root}", "#{flex_project_name}-config.xml")
+      m.template 'mainair-app.xml', File.join("#{flex_root}", "#{flex_project_name}-app.xml") if @use_air      
     end
   end
 
@@ -90,5 +100,11 @@ class RxAppGenerator < RubiGen::Base
       "Default: false") { |v| options[:air_config] = v }
     opt.on("--gae", "Generate Google App Engine Python classes in addition to RestfulX Flex resources.", 
       "Default: false") { |v| options[:gae] = v }
+    opt.on("--flex-root [FOLDER]", "Root folder for generated flex code.", 
+      "Default: app/flex") { |v| options[:flex_root] = v }
+    opt.on("--base-flex-package [PACKAGE]", "Base package for your application.", 
+      "Default: #{flex_project_name}") { |v| options[:base_flex_package] = v }
+    opt.on("--distributed", "Creates migrations, controllers and models that use UUIDs and are distribution ready", 
+      "Default: false") { |v| options[:distributed] = v }
   end
 end

data/app_generators/rx_app/templates/actionscript.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<actionScriptProperties mainApplicationPath="<%= project_name %>.mxml" version="3">
-<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="public/bin" rootURL="http://localhost:3000/bin" sourceFolderPath="app/flex" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<actionScriptProperties mainApplicationPath="<%= flex_project_name %>.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="public/bin" rootURL="http://localhost:3000/bin" sourceFolderPath="<%= flex_root %>" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
   <compilerSourcePath/>
   <libraryPath defaultLinkType="1">
     <libraryPathEntry kind="4" path=""/>
@@ -9,7 +9,7 @@
   <sourceAttachmentPath/>
 </compiler>
 <applications>
-  <application path="<%= project_name %>.mxml"/>
+  <application path="<%= flex_project_name %>.mxml"/>
 </applications>
 <modules/>
 <buildCSSFiles/>

data/app_generators/rx_app/templates/actionscriptair.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<actionScriptProperties mainApplicationPath="<%= project_name %>.mxml" version="3">
-<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="app/flex" strict="true" useApolloConfig="true" verifyDigests="true" warn="true">
+<actionScriptProperties mainApplicationPath="<%= flex_project_name %>.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="<%= flex_root %>" strict="true" useApolloConfig="true" verifyDigests="true" warn="true">
   <compilerSourcePath/>
   <libraryPath defaultLinkType="1">
     <libraryPathEntry kind="4" path=""/>
@@ -9,7 +9,7 @@
   <sourceAttachmentPath/>
 </compiler>
 <applications>
-  <application path="<%= project_name %>.mxml"/>
+  <application path="<%= flex_project_name %>.mxml"/>
 </applications>
 <modules/>
 <buildCSSFiles/>

data/app_generators/rx_app/templates/app.yaml.erb

@@ -1,4 +1,4 @@
-application: <%= project_name.downcase %>
+application: <%= project_name %>
 version: 1
 runtime: python
 api_version: 1

data/app_generators/rx_app/templates/default_tasks.rake

@@ -15,7 +15,7 @@ namespace :flex do
   desc "Build flex application"
   task :build do
     libs = [] # you can add libraries that are not in lib folder here
-    compile_app(get_executable('mxmlc'), 'bin-debug', "-library-path+=#{libs.join(',')}")  
+    compile_application(:destination => 'bin-debug', :opts => "-library-path+=#{libs.join(',')}")  
   end
 end
 
@@ -23,29 +23,16 @@ namespace :rx do
   namespace :test do
     desc "Build flex test swf file"
     task :build do
-      project_path = File.join(APP_ROOT, "app/flex", TEST_APP_NAME)
-    
       libs = Dir.glob(File.join(APP_ROOT, 'lib', '*.swc'))
       #libs << 'foobar' # you can add libraries that not in lib folder here
-    
-      target_project_path = File.join(APP_ROOT, "bin-debug", TEST_APP_NAME.sub(/.mxml$/, '.swf'))
-    
-      cmd = "#{get_executable('mxmlc')} +configname=air -library-path+=#{libs.join(',')} " << 
-        "-output #{target_project_path} -debug=true #{project_path}"
-
-      if !system("#{cmd}")
-        puts "failed to compile test application"
-      end
+      
+      compile_application(:application => TEST_APP_NAME, :destination => 'bin-debug', 
+        :opts => "+configname=air -library-path+=#{libs.join(',')}")
     end
     
     desc "Run flex test application"
     task :run do
-      project_path = File.join(APP_ROOT, "app/flex", TEST_APP_NAME)
-      target_project_air_descriptor = project_path.sub(/.mxml$/, '-app.xml')
-      
-      if !system("#{get_executable('adl')} #{target_project_air_descriptor} #{APP_ROOT}")
-        puts "failed to run test application"
-      end 
+      run_air_application(:application => TEST_APP_NAME)
     end
   end
 end

data/app_generators/rx_app/templates/generate.rb

@@ -13,5 +13,5 @@ require 'restfulx'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
 
-RubiGen::Base.use_component_sources!  
+RubiGen::Base.use_component_sources! [:rxgen]
 RubiGen::Scripts::Generate.new.run(ARGV)

data/app_generators/rx_app/templates/index.html.erb

@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 		<script type="text/javascript" src="javascripts/swfobject.js"></script>
 		<script type="text/javascript">
-		swfobject.embedSWF("bin/<%= project_name %>.swf", "mainApp", "100%", "100%", "9.0.0", "expressInstall.swf");
+		swfobject.embedSWF("bin/<%= flex_project_name %>.swf", "mainApp", "100%", "100%", "9.0.0", "expressInstall.swf");
 		</script>
 		<style>
 		  body { margin: 0px; overflow: hidden; }

data/app_generators/rx_app/templates/mainair-app.xml

@@ -15,13 +15,13 @@
 -->
 
 	<!-- The application identifier string, unique to this application. Required. -->
-	<id><%= project_name %></id>
+	<id><%= flex_project_name %></id>
 
 	<!-- Used as the filename for the application. Required. -->
-	<filename><%= project_name %></filename>
+	<filename><%= flex_project_name %></filename>
 
 	<!-- The name that is displayed in the AIR application installer. Optional. -->
-	<name><%= project_name %></name>
+	<name><%= flex_project_name %></name>
 
 	<!-- An application version designator (such as "v1", "2.5", or "Alpha 1"). Required. -->
 	<version>v1</version>

data/app_generators/rx_app/templates/mainapp.mxml

@@ -6,20 +6,126 @@
   <mx:Script>
     <![CDATA[
 <% if use_air -%>
+<% if distributed -%>
+      import air.net.SocketMonitor;
+      import org.restfulx.events.PullEndEvent;
+      import org.restfulx.events.PullStartEvent;
+      import org.restfulx.events.PushEndEvent;
+      import org.restfulx.events.PushStartEvent;
+      import org.restfulx.controllers.ChangeController;
+      import org.restfulx.services.ISyncingServiceProvider;
+      import org.restfulx.services.http.XMLHTTPServiceProvider;
+<% end -%>
       import org.restfulx.services.air.AIRServiceProvider;
+<% end -%>
+<% if use_gae -%>
+      import org.restfulx.services.http.GAEHTTPServiceProvider;
 <% end -%>
       import org.restfulx.Rx;
       import <%= base_package %>.controllers.<%= command_controller_name %>;
+<% if use_air -%>
+<% if distributed -%>
+
+      [Bindable]
+      private var socketMonitor:SocketMonitor;
+
+      [Bindable]
+      private var online:Boolean;
+
+      [Bindable]
+      private var syncStatus:String;
+<% end -%>
+<% end -%>
 
       private function init():void {
 <% if use_air -%>
-        <%= command_controller_name %>.initialize([AIRServiceProvider], AIRServiceProvider.ID, "<%= base_package %>");
+<% if distributed -%>
+        Rx.httpRootUrl = "http://localhost:3000/";
+        Rx.enableSync = true;
+
+        socketMonitor = new SocketMonitor("localhost", 3000);
+        socketMonitor.pollInterval = 2000; /* miliseconds */
+        socketMonitor.addEventListener(StatusEvent.STATUS, onNetworkStatusChange);
+        socketMonitor.start();
+        
+<% end -%>
+        <%= command_controller_name %>.initialize([AIRServiceProvider], 
+          AIRServiceProvider.ID, "<%= base_package %>");
+<% if distributed -%>
+
+        Rx.changes.setSyncProviders(
+          ISyncingServiceProvider(Rx.services.getServiceProvider(AIRServiceProvider.ID)),
+            Rx.services.getServiceProvider(XMLHTTPServiceProvider.ID));
+
+        Rx.changes.addEventListener(PushStartEvent.ID, onPushStart);
+        Rx.changes.addEventListener(PushEndEvent.ID, onPushEnd);
+        Rx.changes.addEventListener(PullStartEvent.ID, onPullStart);
+        Rx.changes.addEventListener(PullEndEvent.ID, onPullEnd);
+<% end -%>
+<% else -%>
+<% if use_gae -%>
+        <%= command_controller_name %>.initialize([GAEHTTPServiceProvider], GAEHTTPServiceProvider.ID);
 <% else -%>
         <%= command_controller_name %>.initialize();
+<% end -%>
 <% end -%>
       }
+<% if use_air -%>
+<% if distributed -%>
+
+      private function onPushStart(event:Event):void {
+        syncStatus = "Pushing changes ...";
+      }
+      
+      private function onPushEnd(event:Event):void {
+        syncStatus = "Push complete.";
+      }
+      
+      private function onPullStart(event:Event):void {
+        syncStatus = "Pulling data...";
+      }
+      
+      private function onPullEnd(event:Event):void {
+        syncStatus = "Pull complete.";
+      }
+      
+      private function onNetworkStatusChange(event:StatusEvent):void {
+        online = (socketMonitor.available) ? true : false;
+  
+        if (online) {
+          Rx.defaultServiceId = XMLHTTPServiceProvider.ID;
+        } else {
+          Rx.defaultServiceId = AIRServiceProvider.ID;
+        }
+      }
+
+      private function getCurrentProviderName(id:int):String {
+        switch (id) {
+          case XMLHTTPServiceProvider.ID:
+            return "Rails";
+          case AIRServiceProvider.ID:
+            return "AIR (SQLite)";
+          default :
+            return "No idea";
+        }
+      }
+<% end -%>
+<% end -%>
     ]]>
   </mx:Script>
+<% if use_air -%>
+<% if distributed -%>
+  <mx:VBox height="100%">
+    <mx:Label text="Current Provider: {getCurrentProviderName(Rx.defaultServiceId)}"/>
+    <mx:Label text="Status: {online ? 'Online' : 'Offline' }"/>
+    <mx:HBox>
+      <mx:Button label="Push" click="{Rx.changes.push()}" enabled="{online}"/>
+      <mx:Button label="Pull" click="{Rx.changes.pull()}" enabled="{online}"/>
+    </mx:HBox>
+    <mx:Label text="{syncStatus}"/>
+  </mx:VBox>
+<% end -%>
+<% end -%>
   <mx:LinkBar dataProvider="{mainViewStack}" direction="vertical" borderStyle="solid" backgroundColor="#EEEEEE"/>
   <mx:ViewStack id="mainViewStack" width="100%" height="100%">
     <!-- For a simple demo, put all the components here. -->
@@ -28,4 +134,3 @@
 <% end -%>
   </mx:ViewStack>
 </mx:<%= application_tag %>>
-

data/app_generators/rx_app/templates/project-textmate.erb

@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>app/flex/<%= project_name %>.mxml</string>
+	<string>app/flex/<%= flex_project_name %>.mxml</string>
 	<key>documents</key>
 	<array>
 		<dict>
 			<key>expanded</key>
 			<true/>
 			<key>name</key>
-			<string><%= project_name.underscore %></string>
+			<string><%= project_name %></string>
 			<key>regexFolderFilter</key>
 			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
 			<key>sourceDirectory</key>
@@ -27,7 +27,7 @@
 			<key>enabled</key>
 			<true/>
 			<key>value</key>
-			<string>app/flex/<%= project_name %>.mxml</string>
+			<string>app/flex/<%= flex_project_name %>.mxml</string>
 			<key>variable</key>
 			<string>TM_FLEX_FILE_SPECS</string>
 		</dict>
@@ -35,7 +35,7 @@
 			<key>enabled</key>
 			<true/>
 			<key>value</key>
-			<string>public/bin/<%= project_name %>.swf</string>
+			<string>public/bin/<%= flex_project_name %>.swf</string>
 			<key>variable</key>
 			<string>TM_FLEX_OUTPUT</string>
 		</dict>

data/app_generators/rx_app/templates/project.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name><%= flex_project_name %></name>
+  <name><%= project_name %></name>
 	<comment></comment>
 	<projects>
 	</projects>

data/app_generators/rx_app/templates/projectair.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name><%= flex_project_name %></name>
+  <name><%= project_name %></name>
 	<comment></comment>
 	<projects>
 	</projects>

data/app_generators/rx_app/templates/restfulx.yml

@@ -0,0 +1,61 @@
+# RestfulX code generation configuration options
+
+# This option controls what the main Flex application file will be called.
+# By default it will be equal to the name of your rails project camelized
+project-name: <%= project_name %>
+
+# This options determines what the root folder for generated Flex code is.
+# By default 'app/flex'
+flex-root: <%= flex_root %>
+
+# By default flex models, commands, controllers and components are genearated into
+# <flex-root>/<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: <%= base_package %>
+
+# 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: <%= command_controller_name %>
+
+# If you are using Rails on the back-end and Adobe AIR as the client you can generate Rails/Flex/AIR
+# code to take advantage of synchronization (online/offline) support in RestfulX by changing the following
+# option to true. By default distribution is disabled.
+distributed: <%= distributed %>
+
+# These options control code-generation options for view components, Flex and Rails models and so on.
+# Allowing you to choose what controller patterns, layouts, attachment plugin you want to use, etc.
+defaults: &defaults
+  attachment_plugin:  'paperclip'              # => paperclip/attachment_fu
+  controller_pattern: 'default'                # => default/resource_controller
+  layouts:
+    default:  'default'                        # => default (more coming soon)
+  ignored:                                     # => ignored tables/fields won't appear in model.yml
+    tables: [table1 table2]
+    fields: [field1 field2]
+    
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults
+  
+# Special model.yml fields for RestfulX code-generation:
+#
+# attachment_field: [avatar]
+#   * arg takes Paperclip field name, or takes [uploaded_data] for Attachment_Fu
+# belongs_to: [account, profile]
+# has_many: [announcements, files, folders, users]
+# has_many_through: [permissions, roles]
+#   * has_many :roles, :through => :permissions
+# has_one:  [suitcase]
+# polymorphic: [commentable]
+# tree_model: [parent]
+# layout: [default]
+#   * default template is the only current theme, with more coming soon
+# ignored_fields: [children_count, ancestors_count, descendants_count, position]
+#   * specify fields you don't want generated for your template

data/lib/restfulx/active_foo.rb

@@ -11,13 +11,6 @@
 # Some of the things that are done can be called _monkey_ _patching_ while others can
 # be called extensions. Caveat emptor.
 
-# Flex friendly date, datetime formats
-ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.merge!(:flex_date => "%Y/%m/%d")
-ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(:flex_datetime => "%Y/%m/%d %H:%M:%S")
-
-Hash::XML_FORMATTING['date'] = Proc.new { |date| date.to_s(:flex_date) }
-Hash::XML_FORMATTING['datetime'] = Proc.new { |datetime| datetime.to_s(:flex_datetime) }
-
 # ActiveSupport specific patches. More specifically we add +to_fxml+ methods to Array and
 # Hash conversion modules
 module ActiveSupport

data/lib/restfulx/active_record_tasks.rb

@@ -2,6 +2,7 @@
 # - db:mysql:stage
 # - db:refresh
 require File.join(File.dirname(__FILE__), 'tasks')
+require File.join(File.dirname(__FILE__), 'schema_to_yaml')
 
 # stores local copy of the application environment ('production', 'test', etc)
 # so that appropriate values in config/database.yml are used
@@ -78,4 +79,13 @@ namespace :db do
     
   desc "Refresh the database environment for #{APP_ENV}"
   task :refresh => ['db:drop_if_exists', 'db:create', 'db:migrate', 'db:fixtures:load']
+  
+  # used to analyze your schema and dump out a model.yml file for converting old rails projects
+  namespace :schema do
+    desc "Create model.yml from schema.rb"
+    task :to_yaml => :environment do
+      SchemaToYaml.schema_to_yaml
+    end
+  end
+  
 end

data/lib/restfulx/configuration.rb

@@ -42,25 +42,30 @@ module RestfulX
     # 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