dima-restfulx 1.2.1 → 1.2.2

data/rails_generators/rx_scaffold/templates/model.rb.erb

@@ -1,4 +1,7 @@
 class <%= class_name %> < ActiveRecord::Base
+<% if distributed -%>
+  include RestfulX::UUIDHelper
+<% end -%>
 <% for model in belongs_tos -%>
   belongs_to :<%= model %>
 <% end -%>
@@ -6,6 +9,38 @@ class <%= class_name %> < ActiveRecord::Base
   has_one :<%= model %>
 <% end -%>
 <% for model in has_manies -%>
-  has_many :<%= model %>
+  has_many :<%= model %>, :dependent => :destroy
+<% end -%>
+<% for model in polymorphic -%>
+  belongs_to :<%= model %>, :polymorphic => true
+<% end -%>
+<% if has_many_through.size > 0 -%>
+<% has_many_through.each do |k,v| %>
+  has_many :<%= k %>
+  has_many :<%= v %>, :through => :<%= k %>
+<% end -%>
+<% end -%>
+<% if tree_model.size > 0 -%>
+  acts_as_category
+<% end -%>
+<% if attachment_field.size > 0 -%>
+<% if RxSettings.attachment_plugin == 'paperclip' -%>
+  # paperclip examples:
+  #   http://github.com/thoughtbot/paperclip/tree/master
+  has_attached_file :<%= attachment_field[0] %>,
+    :styles => { :medium => "600x480>", :thumb  => "100x100#" }
+    
+  def attachment_url
+    <%= attachment_field[0] %>.url(:original)
+  end
+<% elsif RxSettings.attachment_plugin == 'attachment_fu' -%>
+  # attachment_fu examples:
+  #   http://github.com/technoweenie/attachment_fu/blob/ab1e4f7b0b9de85e0c9decf061d2ef5c1dc0feaa/README#L56-69
+  has_attachment
+  
+  def attachment_url
+    "" # FIX ME
+  end
+<% end -%>
 <% end -%>
 end

data/rails_generators/rx_yaml_scaffold/rx_yaml_scaffold_generator.rb

@@ -26,14 +26,31 @@ class RxYamlScaffoldGenerator < Rails::Generator::Base
           line = extract_attrs(line, attrs)
         end
         line = model[0].camelcase + " " + line
-        puts 'running: rx_scaffold ' + line
-        Rails::Generator::Scripts::Generate.new.run(["rx_scaffold"] + line.split, 
-          :flex_only => options[:flex_only])
-        puts 'done ...'
-        sleep 1
+        
+        if ARGV.size > 0
+          ARGV.each do |arg|
+            if model[0].camelcase == arg
+              puts 'running: rx_scaffold ' + line
+              Rails::Generator::Scripts::Generate.new.run(["rx_scaffold"] + line.split, 
+                :flex_only => options[:flex_only],
+                :flex_view_only => options[:flex_view_only],
+                :rails_only => options[:rails_only])
+              puts 'done ...'
+              sleep 1
+            end
+          end
+        else
+          puts 'running: rx_scaffold ' + line
+          Rails::Generator::Scripts::Generate.new.run(["rx_scaffold"] + line.split, 
+            :flex_only => options[:flex_only],
+            :flex_view_only => options[:flex_view_only],
+            :rails_only => options[:rails_only])
+          puts 'done ...'
+          sleep 1
+        end
       end
-      Rails::Generator::Scripts::Generate.new.run(["rx_config"], :main_only => true, 
-        :skip_framework => options[:skip_framework])
+      
+      Rails::Generator::Scripts::Generate.new.run(["rx_main_app"])
     end
   end
 
@@ -41,9 +58,11 @@ class RxYamlScaffoldGenerator < Rails::Generator::Base
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
-    opt.on("--flex-only", "Only generate the Flex/AIR files.", 
+    opt.on("-f", "--flex-only", "Only generate the Flex/AIR files", 
       "Default: false") { |v| options[:flex_only] = 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("-r", "--rails-only", "Only generate the Rails files", 
+      "Default: false") { |v| options[:rails_only] = v }
+    opt.on("-fv", "--flex-view-only", "Only generate the Flex component files", 
+      "Default: false") { |v| options[:flex_view_only] = v }
   end
 end

data/{generators → rxgen_generators}/rx_controller/rx_controller_generator.rb

@@ -7,20 +7,21 @@ class RxControllerGenerator < RubiGen::Base
               :base_folder, 
               :command_controller_name,
               :model_names, 
-              :command_names
+              :command_names,
+              :flex_root
 
   def initialize(runtime_args, runtime_options = {})
     super
     @project_name, @flex_project_name, @command_controller_name, 
-      @base_package, @base_folder = extract_names
+      @base_package, @base_folder, @flex_root = extract_names
     
-    @model_names = list_as_files("app/flex/#{base_folder}/models")
-    @command_names = list_as_files("app/flex/#{base_folder}/commands")
+    @model_names = list_as_files("#{flex_root}/#{base_folder}/models")
+    @command_names = list_as_files("#{flex_root}/#{base_folder}/commands")
   end
 
   def manifest
     record do |m|
-      m.template 'controller.as.erb', File.join("app/flex/#{base_folder}/controllers", 
+      m.template 'controller.as.erb', File.join("#{flex_root}/#{base_folder}/controllers", 
         "#{command_controller_name}.as")
       if options[:gae]
         m.file 'restful.py', 'app/controllers/restful.py' if !File.exist?('app/controllers/restful.py')

data/{generators → rxgen_generators}/rx_controller/templates/assist.py

@@ -51,13 +51,13 @@ def update_model_from_params(model, params):
       elif isinstance(getattr(model, k), int) and v != "":
         setattr(model, k, int(v))
       elif isinstance(getattr(model, k), datetime.datetime) and v != "":
-        value = datetime.datetime.strptime(v, "%Y-%m-%dT%H:%M:%S")
+        value = datetime.datetime.strptime(v, "%Y-%m-%dT%H:%M:%S%Z")
         setattr(model, k, value)
       elif isinstance(getattr(model, k), datetime.date) and v != "":
         value = datetime.datetime.strptime(v, "%Y-%m-%d")
         setattr(model, k, datetime.date(value.year, value.month, value.day))
       elif isinstance(getattr(model, k), datetime.time) and v != "":
-        value = datetime.datetime.strptime(v, "%Y-%m-%dT%H:%M:%S")
+        value = datetime.datetime.strptime(v, "%Y-%m-%dT%H:%M:%S%Z")
         setattr(model, k, datetime.time(value.hour, value.minute, value.second))
       else:
         setattr(model, k, v)

data/{generators → rxgen_generators}/rx_controller/templates/controller.as.erb

@@ -14,8 +14,8 @@ package <%= base_package %>.controllers {
     
     public static var commands:Array = [<%= command_names %>]; /* Commands */
     
-    public function <%= command_controller_name %>(enforcer:SingletonEnforcer, extraServices:Array,
-      defaultServiceId:int = -1) {
+    public function <%= command_controller_name %>(enforcer:SingletonEnforcer, 
+      extraServices:Array, defaultServiceId:int = -1) {
       super(commands, models, extraServices, defaultServiceId);
     }
     
@@ -24,11 +24,13 @@ package <%= base_package %>.controllers {
       return controller;
     }
     
-    public static function initialize(extraServices:Array = null, defaultServiceId:int = -1,
-      airDatabaseName:String = null):void {
+    public static function initialize(extraServices:Array = null, 
+      defaultServiceId:int = -1, airDatabaseName:String = null):void {
       if (!RxUtils.isEmpty(airDatabaseName)) Rx.airDatabaseName = airDatabaseName;
-      controller = new <%= command_controller_name %>(new SingletonEnforcer, extraServices,
-        defaultServiceId);
+      controller = new <%= command_controller_name %>(new SingletonEnforcer, 
+        extraServices, defaultServiceId);
+			Rx.sessionToken = Application.application.parameters.session_token;
+			Rx.authenticityToken = Application.application.parameters.authenticity_token;
     }
   }
 }

data/rxgen_generators/rx_main_app/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Refreshes main Flex/AIR application file to make sure that
+    any of the generated components are included. Warning,
+    this will wipe your main application file. Used mostly
+    during code generation phase.
+
+Examples:
+    `./script/generate rx_main_app`

data/{generators → rxgen_generators}/rx_main_app/rx_main_app_generator.rb

@@ -11,11 +11,14 @@ class RxMainAppGenerator < RubiGen::Base
               :controller_names,
               :use_air,
               :use_gae,
-              :application_tag
+              :application_tag,
+              :flex_root,
+              :distributed
 
   def initialize(runtime_args, runtime_options = {})
     super
-    @project_name, @flex_project_name, @command_controller_name, @base_package, @base_folder = extract_names
+    @project_name, @flex_project_name, @command_controller_name, @base_package, @base_folder,
+      @flex_root, @distributed = extract_names
 
     project_file_name = APP_ROOT + '/.project'
     if File.exist?(project_file_name)
@@ -29,8 +32,8 @@ class RxMainAppGenerator < RubiGen::Base
     end
 
     @component_names = []
-    if File.exists?("app/flex/#{base_folder}/components/generated")
-      @component_names = list_mxml_files("app/flex/#{base_folder}/components/generated")
+    if File.exists?("#{flex_root}/#{base_folder}/components/generated")
+      @component_names = list_mxml_files("#{flex_root}/#{base_folder}/components/generated")
     end
     
     @controller_names = []
@@ -43,7 +46,7 @@ class RxMainAppGenerator < RubiGen::Base
 
   def manifest
     record do |m|      
-      m.template 'mainapp.mxml', File.join('app', 'flex', "#{project_name}.mxml")
+      m.template 'mainapp.mxml', File.join("#{flex_root}", "#{flex_project_name}.mxml")
       if options[:gae]
         m.template 'main.py.erb', 'main.py'
       end
@@ -56,5 +59,7 @@ class RxMainAppGenerator < RubiGen::Base
     opt.separator 'Options:'
     opt.on("--gae", "Generate Google App Engine Python classes in addition to RestfulX Flex resources.", 
       "Default: false") { |v| options[:gae] = 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/rxgen_generators/rx_main_app/templates/mainapp.mxml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:<%= application_tag %> xmlns:mx="http://www.adobe.com/2006/mxml"
+  xmlns:generated="<%= base_package %>.components.generated.*"
+  paddingBottom="8" paddingLeft="8" paddingRight="8" paddingTop="8"
+  layout="horizontal" styleName="plain" initialize="init()">
+  <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 -%>
+<% 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. -->
+<% for component in component_names -%>
+    <generated:<%= component %>/>
+<% end -%>
+  </mx:ViewStack>
+</mx:<%= application_tag %>>

data/{generators → rxgen_generators}/rx_scaffold/rx_scaffold_generator.rb

@@ -65,7 +65,8 @@ class RxScaffoldGenerator < RubiGen::Base
                 :flex_project_name, 
                 :base_package, 
                 :base_folder, 
-                :command_controller_name
+                :command_controller_name,
+                :flex_root
 
   attr_reader   :belongs_tos, 
                 :has_manies,
@@ -87,18 +88,18 @@ class RxScaffoldGenerator < RubiGen::Base
     @class_name = @name.camelize
     
     @project_name, @flex_project_name, @command_controller_name, 
-      @base_package, @base_folder = extract_names
+      @base_package, @base_folder, @flex_root = extract_names
     extract_relationships
   end
   
   def manifest
     record do |m|      
       m.template 'model.as.erb',
-        File.join("app", 'flex', base_folder, "models", "#{@class_name}.as"), 
+        File.join("#{flex_root}", base_folder, "models", "#{@class_name}.as"), 
         :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
 
       m.template 'component.mxml.erb',
-        File.join("app", 'flex', base_folder, "components", "generated", "#{@class_name}Box.mxml"), 
+        File.join("#{flex_root}", base_folder, "components", "generated", "#{@class_name}Box.mxml"), 
         :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
         
       if options[:gae]

data/{rails_generators → rxgen_generators}/rx_scaffold/templates/component.mxml.erb

@@ -10,23 +10,23 @@
 <% end -%>
 
     [Bindable]
-    private var _<%= class_name.dcfirst %>:<%= class_name %> = new <%= class_name %>();
+    private var <%= class_name.dcfirst %>:<%= class_name %> = new <%= class_name %>();
 
     private function new<%= class_name %>():void {
-      _<%= class_name.dcfirst %> = new <%= class_name %>();
+      <%= class_name.dcfirst %> = new <%= class_name %>();
       <%= class_name.dcfirst.pluralize %>List.selectedIndex = -1;
     }
 
     private function save<%= class_name %>():void {
-      if (_<%= class_name.dcfirst %>.id) {
-        update<%= class_name %>();
+      updateModelProperties();
+      if (<%= class_name.dcfirst %>.id) {
+        <%= class_name.dcfirst %>.update({onSuccess: on<%= class_name %>Update});
       } else {
-        create<%= class_name %>();
+        <%= class_name.dcfirst %>.create({onSuccess: on<%= class_name %>Create});
       }
     }
   
-    private function create<%= class_name %>():void {
-      var <%= class_name.dcfirst %>:<%= class_name %> = new <%= class_name %>();
+    private function updateModelProperties():void {
 <% for attribute in attributes -%>
 <% if attribute.type == :boolean -%>
       <%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_name %>CheckBox.selected;
@@ -46,55 +46,27 @@
 <% for model in belongs_tos -%>
       <%= class_name.dcfirst %>.<%= model.camelcase(:lower) %> = <%= model.camelcase %>(<%= model.camelcase(:lower) %>ComboBox.selectedItem);
 <% end -%>
-      <%= class_name.dcfirst %>.create({onSuccess: on<%= class_name %>Create});
-    }
-
-    private function update<%= class_name %>():void {
-<% for attribute in attributes -%>
-<% if attribute.type == :boolean -%>
-      _<%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_name %>CheckBox.selected;
-<% elsif attribute.type == :string -%>
-      _<%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_name %>TextInput.text;
-<% elsif attribute.type == :text -%>
-      _<%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_name %>TextArea.text;
-<% elsif attribute.type == :datetime || attribute.type == :time -%>
-      _<%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_name %>DateTimeTextInput.date;
-<% elsif attribute.type == :date -%>
-      _<%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_name %>DateField.selectedDate;
-<% else -%>
-      _<%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_type %>(<%= attribute.flex_name %>TextInput.text);
-<% end -%>
-<% end -%>
-
-<% for model in belongs_tos -%>
-      _<%= class_name.dcfirst %>.<%= model.camelcase(:lower) %> = <%= model.camelcase %>(<%= model.camelcase(:lower) %>ComboBox.selectedItem);
-<% end -%>
-      _<%= class_name.dcfirst %>.update({onSuccess: on<%= class_name %>Update});
     }
 
     private function destroy<%= class_name %>():void {
-      _<%= class_name.dcfirst %>.destroy({onSuccess: on<%= class_name %>Destroy});
+      <%= class_name.dcfirst %>.destroy({onSuccess: on<%= class_name %>Destroy});
     }
   
     private function on<%= class_name %>Select():void {
-      _<%= class_name.dcfirst %> = RxUtils.clone(<%= class_name.dcfirst.pluralize %>List.selectedItem) as <%= class_name %>;
+      <%= class_name.dcfirst %> = RxUtils.clone(<%= class_name.dcfirst.pluralize %>List.selectedItem) as <%= class_name %>;
     }
   
-    private function on<%= class_name %>Create(<%= class_name.dcfirst %>:<%= class_name %>):void {
-      _<%= class_name.dcfirst %> = new <%= class_name %>;
+    private function on<%= class_name %>Create(result:<%= class_name %>):void {
+      <%= class_name.dcfirst %> = new <%= class_name %>;
     }
   
-    private function on<%= class_name %>Update(<%= class_name.dcfirst %>:<%= class_name %>):void {
-      <%= class_name.dcfirst.pluralize %>List.selectedItem = <%= class_name.dcfirst %>;
-      _<%= class_name.dcfirst %> = RxUtils.clone(<%= class_name.dcfirst %>) as <%= class_name %>;
+    private function on<%= class_name %>Update(result:<%= class_name %>):void {
+      <%= class_name.dcfirst.pluralize %>List.selectedItem = result;
+      on<%= class_name %>Select();
     }
   
-    private function on<%= class_name %>Destroy(<%= class_name.dcfirst %>:<%= class_name %>):void {
-      on<%= class_name %>Create(<%= class_name.dcfirst %>);
-    }
-
-    private function canDelete<%= class_name %>(<%= class_name.dcfirst %>:<%= class_name %>):Boolean {
-      return <%= class_name.dcfirst %> != null && !RxUtils.isEmpty(<%= class_name.dcfirst %>.id);
+    private function on<%= class_name %>Destroy(result:<%= class_name %>):void {
+      on<%= class_name %>Create(result);
     }
   ]]></mx:Script>
   <mx:Panel id="<%= class_name.dcfirst.pluralize %>Panel"
@@ -115,17 +87,17 @@
 <% for attribute in attributes -%>
       <mx:FormItem label="<%= attribute.flex_name.ucfirst %>" width="100%">
 <% if attribute.type == :boolean -%>
-        <mx:CheckBox id="<%= attribute.flex_name %>CheckBox" selected="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+        <mx:CheckBox id="<%= attribute.flex_name %>CheckBox" selected="{<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
 <% elsif attribute.type == :string -%>
-        <mx:TextInput id="<%= attribute.flex_name %>TextInput" width="100%" text="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+        <mx:TextInput id="<%= attribute.flex_name %>TextInput" width="100%" text="{<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
 <% elsif attribute.type == :text -%>
-        <mx:TextArea id="<%= attribute.flex_name %>TextArea" width="100%" height="200" text="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+        <mx:TextArea id="<%= attribute.flex_name %>TextArea" width="100%" height="200" text="{<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
 <% elsif attribute.type == :datetime || attribute.type == :time -%>
-        <rx:DateTimeTextInput id="<%= attribute.flex_name %>DateTimeTextInput" width="200" date="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+        <rx:DateTimeTextInput id="<%= attribute.flex_name %>DateTimeTextInput" width="200" date="{<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
 <% elsif attribute.type == :date -%>
-        <mx:DateField id="<%= attribute.flex_name %>DateField" selectedDate="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+        <mx:DateField id="<%= attribute.flex_name %>DateField" selectedDate="{<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
 <% else -%>
-        <mx:TextInput id="<%= attribute.flex_name %>TextInput" width="100%" text="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+        <mx:TextInput id="<%= attribute.flex_name %>TextInput" width="100%" text="{<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
 <% end -%>
       </mx:FormItem>
 <% end -%>
@@ -134,7 +106,7 @@
         <mx:ComboBox id="<%= model.camelcase(:lower) %>ComboBox" width="200"
           labelField="{<%= model.camelcase %>.LABEL}"
           dataProvider="{Rx.models.index(<%= model.camelcase %>)}" prompt="<%= model.camelcase %> ..."
-          selectedItem="{_<%= class_name.dcfirst %>.<%= model.camelcase(:lower) %>}" />
+          selectedItem="{<%= class_name.dcfirst %>.<%= model.camelcase(:lower) %>}" />
       </mx:FormItem>
 <% end -%>
     </mx:Form>
@@ -142,7 +114,7 @@
       <mx:Button label="Save <%= class_name %>" width="50%" height="30"
         click="save<%= class_name %>()"/>
       <mx:Button label="Delete <%= class_name %>" width="50%" height="30"
-        enabled="{canDelete<%= class_name %>(_<%= class_name.dcfirst %>)}"
+        enabled="{RxUtils.canDeleteModel(<%= class_name.dcfirst %>)}"
         click="destroy<%= class_name %>()"/>
     </mx:ControlBar>
   </mx:Panel>

data/{generators → rxgen_generators}/rx_scaffold/templates/controller.py.erb

@@ -17,7 +17,7 @@ class Controller(restful.Controller):
     restful.send_successful_response(self, model.to_xml())
     
   def put(self):
-    model = <%= file_name %>.<%= class_name %>.get_or_insert(db.Key(restful.get_model_key(self)))
+    model = <%= file_name %>.<%= class_name %>.get(db.Key(restful.get_model_key(self)))
     assist.update_model_from_params(model, self.request.params)
     restful.send_successful_response(self, model.to_xml())