dima-restfulx 1.2.2 → 1.2.3

data/README.rdoc

@@ -39,7 +39,7 @@ For details on how to get started with the RestfulX framework refer to:
 
 Report bugs or track framework development progress:
 
-    http://restfulx.lighthouseapp.com/dashboard
+    http://github.com/dima/restfulx_framework/issues
   
 Get involved with the community:
       

data/Rakefile

@@ -9,12 +9,14 @@ begin
     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.files =  FileList["[A-Z]*", "{bin,app_generators,rails_generators,rxgen_generators,lib,test,spec,tasks}/**/*"]
+    gem.files.exclude 'test/**/*.log', 'test/**/*.sqlite3'
+    gem.test_files.exclude 'test/**/*.log', 'test/**/*.sqlite3'
     gem.add_dependency('rubigen', '>= 1.5.0')
     gem.add_dependency('activesupport', '>=2.0.0')
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install dima-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/rdoctask'

data/VERSION.yml

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

data/app_generators/rx_app/rx_app_generator.rb

@@ -79,11 +79,11 @@ class RxAppGenerator < RubiGen::Base
         m.template 'index.html.erb', 'public/index.html'
       end
       
-      %w(components controllers commands models events).each do |dir|
+      %w(views controllers commands models events helpers).each do |dir|
         m.directory "#{flex_root}/#{base_folder}/#{dir}"
       end
       
-      m.directory "#{flex_root}/#{base_folder}/components/generated"
+      m.directory "#{flex_root}/#{base_folder}/views/generated"
 
       m.template 'project-textmate.erb', "#{project_name}.tmproj"
       m.template 'mainapp.mxml', File.join("#{flex_root}", "#{flex_project_name}.mxml")

data/app_generators/rx_app/templates/actionscript.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored,Nested" 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=""/>

data/app_generators/rx_app/templates/actionscriptair.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored,Nested" 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=""/>

data/app_generators/rx_app/templates/mainapp-config.xml

@@ -11,6 +11,7 @@
        <name>DateTime</name>
        <name>Lazy</name>
        <name>Ignored</name>
+       <name>Nested</name>
     </keep-as3-metadata>
     <optimize>true</optimize>
     <keep-generated-actionscript>false</keep-generated-actionscript>

data/app_generators/rx_app/templates/mainapp.mxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:<%= application_tag %> xmlns:mx="http://www.adobe.com/2006/mxml"
-  xmlns:generated="<%= base_package %>.components.generated.*"
+  xmlns:generated="<%= base_package %>.views.generated.*"
   paddingBottom="8" paddingLeft="8" paddingRight="8" paddingTop="8"
   layout="horizontal" styleName="plain" initialize="init()">
   <mx:Script>
@@ -14,12 +14,13 @@
       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;
+<% else -%>
+      import org.restfulx.services.http.XMLHTTPServiceProvider;
 <% end -%>
       import org.restfulx.Rx;
       import <%= base_package %>.controllers.<%= command_controller_name %>;
@@ -53,9 +54,15 @@
           AIRServiceProvider.ID, "<%= base_package %>");
 <% if distributed -%>
 
+<% if use_gae -%>
+        Rx.changes.setSyncProviders(
+          ISyncingServiceProvider(Rx.services.getServiceProvider(AIRServiceProvider.ID)),
+            Rx.services.getServiceProvider(GAEHTTPServiceProvider.ID));
+<% else -%>
         Rx.changes.setSyncProviders(
           ISyncingServiceProvider(Rx.services.getServiceProvider(AIRServiceProvider.ID)),
             Rx.services.getServiceProvider(XMLHTTPServiceProvider.ID));
+<% end -%>
 
         Rx.changes.addEventListener(PushStartEvent.ID, onPushStart);
         Rx.changes.addEventListener(PushEndEvent.ID, onPushEnd);
@@ -93,7 +100,11 @@
         online = (socketMonitor.available) ? true : false;
   
         if (online) {
+<% if use_gae -%>
+          Rx.defaultServiceId = GAEHTTPServiceProvider.ID;
+<% else -%>
           Rx.defaultServiceId = XMLHTTPServiceProvider.ID;
+<% end -%>
         } else {
           Rx.defaultServiceId = AIRServiceProvider.ID;
         }
@@ -101,8 +112,13 @@
 
       private function getCurrentProviderName(id:int):String {
         switch (id) {
+<% if use_gae -%>
+          case GAEHTTPServiceProvider.ID:
+            return "GAE";
+<% else -%>
           case XMLHTTPServiceProvider.ID:
-            return "Rails";
+            return "XML/HTTP";
+<% end -%>
           case AIRServiceProvider.ID:
             return "AIR (SQLite)";
           default :

data/app_generators/rx_app/templates/restfulx.yml

@@ -2,50 +2,35 @@
 
 # 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 %>
+project_name: <%= project_name %>
 
 # This options determines what the root folder for generated Flex code is.
 # By default 'app/flex'
-flex-root: <%= flex_root %>
+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 %>
+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 %>
+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
+# Choose the layout to use for generated Flex view components
+layouts:
+  default: 'default'
   
-# Special model.yml fields for RestfulX code-generation:
+# The following special model.yml fields are supported.
 #
+# For example:
 # attachment_field: [avatar]
 #   * arg takes Paperclip field name, or takes [uploaded_data] for Attachment_Fu
 # belongs_to: [account, profile]

data/bin/rx-gen

@@ -22,7 +22,7 @@ require 'rubigen'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'restfulx')
 
 if %w(-v --version).include? ARGV.first
-  puts "#{File.basename($0)} #{RestfulX::VERSION}"
+  puts "#{File.basename($0)} #{RestfulX::FRAMEWORK_VERSION}"
   exit(0)
 end
 

data/lib/restfulx/active_foo.rb

@@ -2,7 +2,6 @@
 # ~wrong~ from the point of view of Flex clients.
 #
 # Some of these things are:
-# * Date formats
 # * XML format (Flex *really* doesn't like dashes in XML messages)
 # * Errors (we need to be more specific and communicate what went wrong *where*) 
 #
@@ -89,6 +88,9 @@ module ActiveSupport
           options[:indent]   ||= 2
           options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])
           options.merge!(:dasherize => false)
+          
+          options[:attributes] ||= {}
+          options[:attributes].merge!(:type => "array")
 
           root     = options.delete(:root).to_s
           children = options.delete(:children)
@@ -103,9 +105,9 @@ module ActiveSupport
 
           xml = options[:builder]
           if empty?
-            xml.tag!(root, options[:skip_types] ? {} : {:type => "array"})
+            xml.tag!(root, options[:attributes])
           else
-            xml.tag!(root, options[:skip_types] ? {} : {:type => "array"}) {
+            xml.tag!(root, options[:attributes]) {
               yield xml if block_given?
               each { |e| e.to_fxml(opts.merge!({ :skip_instruct => true })) }
             }

data/lib/restfulx/active_record_tasks.rb

@@ -2,7 +2,7 @@
 # - db:mysql:stage
 # - db:refresh
 require File.join(File.dirname(__FILE__), 'tasks')
-require File.join(File.dirname(__FILE__), 'schema_to_yaml')
+require File.join(File.dirname(__FILE__), 'rails', 'schema_to_yaml')
 
 # stores local copy of the application environment ('production', 'test', etc)
 # so that appropriate values in config/database.yml are used
@@ -87,5 +87,4 @@ namespace :db do
       SchemaToYaml.schema_to_yaml
     end
   end
-  
 end

data/lib/restfulx/active_record_uuid_helper.rb

@@ -0,0 +1,17 @@
+# Patches ActiveRecord models to use UUID based IDs instead of the default numeric ones
+require 'uuidtools'
+
+# Extends ActiveRecord models with UUID based IDs
+module RestfulX
+  module UUIDHelper
+    def self.included(base)
+      base.class_eval do 
+        before_create :generate_uuid
+      end
+    end
+  
+    def generate_uuid
+      self.id = UUIDTools::UUID.random_create.to_s.gsub("-", "") unless self.id
+    end
+  end
+end

data/lib/restfulx/configuration.rb

@@ -1,6 +1,15 @@
 # Interestingly enough there's no way to *just* upper-case or down-case first letter of a given
 # string. Ruby's own +capitalize+ actually downcases all the rest of the characters in the string
 # We patch the class to add our own implementation.
+require "yaml" 
+require "erb" 
+require File.dirname(__FILE__) + "/rails/schema_to_yaml/settings/config" 
+require File.dirname(__FILE__) + "/rails/schema_to_yaml/settings/core" 
+
+Dir[File.dirname(__FILE__) + "/rails/schema_to_yaml/extensions/*.rb"].each do |f|
+  require f
+end
+
 class String
   # Upper-case first character of a string leave the rest of the string intact
   def ucfirst
@@ -13,33 +22,18 @@ class String
   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(".")
+    
+    RxSettings = SchemaToYaml::Settings::Core
 
-    # 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.downcase.gsub(/\W/, '')
@@ -52,12 +46,12 @@ module RestfulX
       # 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'] || flex_project_name.downcase
-        base_folder = base_package.gsub('.', '/').gsub(/\W/, '')
-        project_name = config['project-name'].downcase.gsub(/\W/, '') || 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"
+        controller_name = config['controller_name'] || "ApplicationController"
+        flex_root = config['flex_root'] || "app/flex"
         distributed = config['distributed'] || false
       rescue
         base_folder = base_package = flex_project_name.downcase

data/lib/restfulx/{schema_to_yaml → rails/schema_to_yaml}/extensions/enumerable.rb

@@ -1,3 +1,4 @@
+# Enumerable extensions
 module Enumerable
   # Helps you find duplicates
   # used in schema_to_yaml.rb for cleanup

data/lib/restfulx/{schema_to_yaml → rails/schema_to_yaml}/settings/config.rb

@@ -1,3 +1,4 @@
+# SchemaToYaml settings
 module SchemaToYaml
   module Settings
     class Config

data/lib/restfulx/{schema_to_yaml → rails/schema_to_yaml}/settings/core.rb

@@ -2,6 +2,9 @@
 # Used to read in settings from restfulx.yml for use in code generation
 module SchemaToYaml
   module Settings
+    # 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(".")
+    
     class Core
       class << self
         def name
@@ -29,7 +32,7 @@ module SchemaToYaml
         when Hash
           self._settings = name_or_hash
         when String, Symbol
-          root_path = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/" : ""
+          root_path = defined?(APP_ROOT) ? "#{APP_ROOT}/config/" : ""
           file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
           self._settings = YAML.load(ERB.new(File.read(file_path)).result)
           self._settings = _settings[RAILS_ENV] if defined?(RAILS_ENV)

data/lib/restfulx/{schema_to_yaml.rb → rails/schema_to_yaml.rb}

@@ -1,16 +1,7 @@
 # Used for analyzing your schema and exporting a model.yml file for Rx
-require "yaml" 
-require "erb" 
-require File.dirname(__FILE__) + "/schema_to_yaml/settings/config" 
-require File.dirname(__FILE__) + "/schema_to_yaml/settings/core" 
-
-Dir[File.dirname(__FILE__) + "/schema_to_yaml/extensions/*.rb"].each do |f|
-  require f
-end
-
+# Provides facilities to convert an existing Rails application schema.rb file to 
+# RestfulX model.yml file
 module SchemaToYaml
-  RxSettings = SchemaToYaml::Settings::Core
-
   # SchemaToYaml.schema_to_yaml
   #  - set of commands that introspects your database and formats your model.yml for export
   def self.schema_to_yaml
@@ -116,5 +107,4 @@ module SchemaToYaml
     File.open(yml_file, "w") { |f| f << schema.to_s }
     puts "Model.yml created at db/model.yml" 
   end
-
 end

data/lib/restfulx/rails/swf_helper.rb

@@ -1,6 +1,5 @@
 # Adds a little helper to make it easier empbedding SWFs in ERB templates.
 module SWFHelper
-  
   # Creates a swfObject Javascript call.  You must include swfobject.js to use this.
   # See http://code.google.com/p/swfobject/wiki/documentation for full details and documentation
   # of the swfobject js library.
@@ -11,8 +10,8 @@ module SWFHelper
                            :version => '9.0.0',
                            :express_install_swf => '/expressInstall.swf',
                            :flash_vars => nil,
-                           :params => nil,
-                           :attributes => nil,
+                           :params => { },
+                           :attributes => { },
                            :create_div => false, 
                            :include_authenticity_token => true,
                            :include_session_token => true
@@ -29,16 +28,17 @@ module SWFHelper
     #   flashVars['authenticity_token'] = <%= form_authenticity_token -%>
     #   flashVars['session_token'] = <%= session.session_id -%>
     # </script>
-    # If you include an authenticity_token parameter in flashVars, 
-    # then the Flex app will add it to Rx.defaultMetadata, so that it will be sent
-    # back up to your Rails app with every request.
     params[:flash_vars] ||= {}
     if params[:flash_vars].is_a?(Hash)
       if params[:include_authenticity_token] && ActionController::Base.allow_forgery_protection
         params[:flash_vars].reverse_merge!(:authenticity_token => form_authenticity_token)
       end
       if params[:include_session_token]
-        params[:flash_vars].reverse_merge!(:session_token => session.session_id)
+        if RAILS_GEM_VERSION =~ /^2.3/
+          params[:flash_vars].reverse_merge!(:session_token => request.session_options[:id])
+        else
+          params[:flash_vars].reverse_merge!(:session_token => session.session_id)
+        end
       end        
     end          
     
@@ -56,5 +56,4 @@ module SWFHelper
     swf_tag += content_tag(:div, nil, :id => params[:id]) if params[:create_div]    
     swf_tag
   end
-  
 end

data/lib/restfulx/tasks.rb

@@ -1,6 +1,5 @@
 # Rake tasks for building RestfulX-based Flex and AIR applications
 require 'rake'
-require 'ftools'
 require 'rexml/document'
 require 'activesupport'
 require File.join(File.dirname(__FILE__), 'configuration')

data/lib/restfulx.rb

@@ -5,17 +5,10 @@
 module RestfulX
 
   # :stopdoc:
-  VERSION = '1.2.2'
-  FRAMEWORK_VERSION = '1.2.2'
+  FRAMEWORK_VERSION = '1.2.3'
   LIB_DIR = File.join(File.dirname(__FILE__), 'restfulx/')
   # :startdoc:
 
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
   # Utility method used to require all files ending in .rb that lie in the
   # directory below this file that has the same name as the filename passed
   # in. Optionally, a specific _directory_ name can be passed in such that
@@ -28,7 +21,6 @@ module RestfulX
 
     Dir.glob(search_me).sort.each {|rb| require rb}
   end
-
 end
 
 require RestfulX::LIB_DIR + 'configuration'
@@ -54,7 +46,7 @@ elsif defined?(ActionController::Base)
   # if we are not running in Merb, try to hook up Rails
   Mime::Type.register_alias "application/xml", :fxml
   
-  ['active_foo', 'rails/swf_helper', 'schema_to_yaml'].each { |lib| require RestfulX::LIB_DIR + lib }
+  ['active_foo', 'rails/swf_helper', 'rails/schema_to_yaml'].each { |lib| require RestfulX::LIB_DIR + lib }
 
   ActionView::Base.send :include, SWFHelper unless ActionView::Base.included_modules.include?(SWFHelper)
   ActiveRecord::Migration.send :include, SchemaToYaml

data/rails_generators/rx_config/rx_config_generator.rb

@@ -22,7 +22,7 @@ class RxConfigGenerator < Rails::Generator::Base
       @flex_root = extract_names
     
     @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]
+    @base_folder = options[:base_flex_package].gsub('.', '/') if options[:base_flex_package]
     @flex_root = options[:flex_root] if options[:flex_root]
     @distributed = options[:distributed]
     
@@ -49,18 +49,20 @@ class RxConfigGenerator < Rails::Generator::Base
     end
         
     @component_names = []
-    if File.exists?("#{flex_root}/#{base_folder}/components/generated")
-      @component_names = list_mxml_files("#{flex_root}/#{base_folder}/components/generated")
+    if File.exists?("#{flex_root}/#{base_folder}/views/generated")
+      @component_names = list_mxml_files("#{flex_root}/#{base_folder}/views/generated")
     end
   end
 
   def manifest
     record do |m|
-      m.file 'restfulx_tasks.rake', 'lib/tasks/restfulx_tasks.rake'
+      m.file 'restfulx_tasks.rake', 'lib/tasks/restfulx_tasks.rake' if !options[:skip_tasks]
       m.file 'flex.properties', '.flexProperties'
       m.template 'restfulx.yml', 'config/restfulx.yml'
       m.template 'restfulx.erb', 'config/initializers/restfulx.rb'
       
+      m.template 'session_store_flash.erb', 'config/initializers/session_store_flash.rb' if RAILS_GEM_VERSION =~ /2.3/
+      
       m.directory "#{flex_root}"
       
       if @use_air
@@ -85,19 +87,26 @@ class RxConfigGenerator < Rails::Generator::Base
         m.file "html-template/history/#{file}", "html-template/history/#{file}"
       end
       
-      %w(components controllers commands models events).each do |dir|
+      %w(views controllers commands models events helpers).each do |dir|
         m.directory "#{flex_root}/#{base_folder}/#{dir}"
       end
       
-      m.directory "#{flex_root}/#{base_folder}/components/generated"
+      m.directory "#{flex_root}/#{base_folder}/views/generated"
       
       framework_release = RestfulX::FRAMEWORK_VERSION
       framework_distribution_url = "http://restfulx.github.com/releases/restfulx-#{framework_release}.swc"
       framework_destination_file = "lib/restfulx-#{framework_release}.swc"
       
       if !options[:skip_framework] && !File.exist?(framework_destination_file)
-        puts "fetching #{framework_release} framework binary from: #{framework_distribution_url} ..."
-        open(framework_destination_file, "wb").write(open(framework_distribution_url).read)
+        puts "Fetching #{framework_release} framework binary from: #{framework_distribution_url} ..."
+        begin
+          framework_swc = open(framework_distribution_url).read
+        rescue
+          puts "ERROR: Unable to download and install #{framework_distribution_url}."
+          puts "Please check your internet connectivity and try again."
+          exit
+        end
+        open(framework_destination_file, "wb").write(framework_swc) unless framework_swc.blank?
         puts "done. saved to #{framework_destination_file}"
       end
 
@@ -110,7 +119,7 @@ class RxConfigGenerator < Rails::Generator::Base
       
       m.template 'index.erb', 'app/views/flex/index.html.erb'
       
-      m.file 'routes.erb', 'config/routes.rb', :collision => :force
+      m.file 'routes.erb', 'config/routes.rb', :collision => :ask
       
       FileUtils.rm 'public/index.html' if File.exist?('public/index.html')
               
@@ -126,6 +135,8 @@ class RxConfigGenerator < Rails::Generator::Base
       "Default: false") { |v| options[:air_config] = v }
     opt.on("--skip-framework", "Don't fetch the latest framework binary. You'll have to link/build the framework yourself.", 
       "Default: false") { |v| options[:skip_framework] = v }
+    opt.on("--skip-tasks", "Don't install restfulx gem tasks hook into the project.", 
+      "Default: false") { |v| options[:skip_tasks] = 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.", 

data/rails_generators/rx_config/templates/actionscript.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored,Nested" 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=""/>

data/rails_generators/rx_config/templates/actionscriptair.properties

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored,Nested" 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=""/>

data/rails_generators/rx_config/templates/mainapp-config.xml

@@ -11,6 +11,7 @@
        <name>DateTime</name>
        <name>Lazy</name>
        <name>Ignored</name>
+       <name>Nested</name>
     </keep-as3-metadata>
     <optimize>true</optimize>
     <keep-generated-actionscript>false</keep-generated-actionscript>