restfulx 1.2.1 → 1.2.2

data/rails_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,15 +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;
-			if (Application.application.parameters.authenticity_token) {
-			  Rx.defaultMetadata = { authenticity_token : Application.application.parameters.authenticity_token };
-			}
+			Rx.authenticityToken = Application.application.parameters.authenticity_token;
     }
   }
 }

data/rails_generators/rx_main_app/rx_main_app_generator.rb

@@ -0,0 +1,60 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'restfulx') if !defined?(RestfulX)
+
+module Rails
+  module Generator
+    module Commands
+      class Create
+        include SchemaToYaml
+      end
+    end
+  end
+end
+
+class RxMainAppGenerator < Rails::Generator::Base
+  include RestfulX::Configuration
+  
+  attr_reader :project_name, 
+              :flex_project_name, 
+              :base_package, 
+              :base_folder, 
+              :command_controller_name,
+              :model_names, 
+              :component_names,
+              :controller_names,
+              :use_air,
+              :application_tag,
+              :flex_root,
+              :distributed
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @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)
+      @use_air = true if File.read(project_file_name) =~/com.adobe.flexbuilder.apollo.apollobuilder/m
+    end
+
+    if @use_air
+      @application_tag = 'WindowedApplication'
+    else
+      @application_tag = 'Application'
+    end
+
+    @component_names = []
+    if File.exists?("#{flex_root}/#{base_folder}/components/generated")
+      @component_names = list_mxml_files("#{flex_root}/#{base_folder}/components/generated")
+    end
+  end
+
+  def manifest
+    record do |m|      
+      m.template 'mainapp.mxml', File.join("#{flex_root}", "#{flex_project_name}.mxml")
+    end
+  end
+
+  def banner
+    "Usage: #{$0} #{spec.name}" 
+  end
+end

data/rails_generators/rx_main_app/templates/mainapp.mxml

@@ -0,0 +1,129 @@
+<?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 -%>
+      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 -%>
+        <%= command_controller_name %>.initialize();
+<% 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/rails_generators/rx_scaffold/rx_scaffold_generator.rb

@@ -61,21 +61,36 @@ module Rails
         end
       end
     end
+    module Commands
+      class Create
+        include SchemaToYaml
+      end
+    end
   end
 end
 
 class RxScaffoldGenerator < Rails::Generator::NamedBase
-  include RestfulX::Configuration 
+  include RestfulX::Configuration
+  include SchemaToYaml
   
   attr_reader   :project_name, 
                 :flex_project_name, 
                 :base_package, 
                 :base_folder, 
-                :command_controller_name
+                :command_controller_name,
+                :flex_root,
+                :distributed
 
   attr_reader   :belongs_tos, 
                 :has_manies,
-                :has_ones
+                :has_ones,
+                :attachment_field,
+                :has_many_through,
+                :polymorphic,
+                :tree_model,
+                :layout,
+                :ignored_fields,
+                :args_for_generation
     
   attr_reader   :controller_name,
                 :controller_class_path,
@@ -92,9 +107,10 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
       
   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
     @controller_name = @name.pluralize
-
+    
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, 
       @controller_class_nesting_depth = extract_modules(@controller_name)
     @controller_class_name_without_nesting, @controller_underscore_name, @controller_plural_name = inflect_names(base_name)
@@ -110,24 +126,26 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
   
   def manifest
     record do |m|
-      m.dependency 'scaffold', [name] + @args, :skip_migration => true, :collision => :skip unless options[:flex_only]
-      
-      # Generate Flex AS model and MXML component based on the
-      # RestfulX templates.
-      m.template 'model.as.erb',
-        File.join("app", "flex", 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"), 
-        :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
+      unless options[:flex_view_only]
+        m.template 'model.as.erb',
+          File.join("#{@flex_root}", base_folder, "models", "#{@class_name}.as"), 
+          :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
+          
+        m.template "controllers/#{RxSettings.controller_pattern}.rb.erb", File.join("app/controllers", 
+          controller_class_path, "#{controller_file_name}_controller.rb") unless options[:flex_only]
         
-      m.template 'controller.rb.erb', File.join("app/controllers", controller_class_path, 
-        "#{controller_file_name}_controller.rb"), :collision => :force unless options[:flex_only]
-      
-      # Create a new generated ActiveRecord model based on the RestfulX templates.
-      m.template 'model.rb.erb', File.join("app", "models", "#{file_name}.rb"), 
-        :collision => :force unless options[:flex_only]
+        m.template 'model.rb.erb', File.join("app", "models", "#{file_name}.rb") unless options[:flex_only]
+      end
+        
+      if @layout.size > 0
+        m.template "layouts/#{@layout}.erb",
+          File.join("#{@flex_root}", base_folder, "components", "generated", "#{@class_name}Box.mxml"), 
+          :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
+      else
+        m.template "layouts/#{RxSettings.layouts.default}.erb",
+          File.join("#{@flex_root}", base_folder, "components", "generated", "#{@class_name}Box.mxml"), 
+          :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
+      end
 
       unless options[:skip_fixture] 
         m.template 'fixtures.yml.erb',  File.join("test", "fixtures", "#{table_name}.yml"), 
@@ -135,11 +153,13 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
       end
       
       unless options[:skip_migration]
-        m.directory 'schema/migration'
+        FileUtils.rm Dir.glob("db/migrate/[0-9]*_create_#{file_path.gsub(/\//, '_').pluralize}.rb"), :force => true        
         m.migration_template 'migration.rb.erb', 'db/migrate', :assigns => {
           :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
         }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" unless options[:flex_only]
       end
+      
+      m.route_resources controller_file_name
 
       m.dependency 'rx_controller', [name] + @args, :collision => :force
     end
@@ -147,33 +167,67 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
   
   protected
   def extract_relationships
+    # arrays
     @belongs_tos = []
     @has_ones = []
     @has_manies = []
-    # Figure out has_one, has_many and belongs_to based on args
+    @attachment_field = []
+    @polymorphic = []
+    @tree_model = []
+    @layout = []
+    @ignored_fields = []
+    
+    # hashes
+    @has_many_through = {}
+
     @args.each do |arg|
+      # arrays
       if arg =~ /^has_one:/
-        # arg = "has_one:arg1,arg2", so all the has_one are together
         @has_ones = arg.split(':')[1].split(',')
       elsif arg =~ /^has_many:/
-        # arg = "has_many:arg1,arg2", so all the has_many are together 
         @has_manies = arg.split(":")[1].split(",")
-      elsif arg =~ /^belongs_to:/ # belongs_to:arg1,arg2
+      elsif arg =~ /^belongs_to:/
         @belongs_tos = arg.split(":")[1].split(',')
+      elsif arg =~ /^attachment_field:/
+        @attachment_field = arg.split(":")[1].split(',')
+      elsif arg =~ /^polymorphic:/
+        @polymorphic = arg.split(":")[1].split(',')
+      elsif arg =~ /^tree_model:/
+        @tree_model = arg.split(":")[1].split(',')
+      elsif arg =~ /^layout:/
+        @layout = arg.split(":")[1].split(',')
+      elsif arg =~ /^ignored_fields:/
+        @ignored_fields = arg.split(":")[1].split(',')
+      # hashes
+      elsif arg =~ /^has_many_through:/
+        hmt_arr = arg.split(":")[1].split(',')
+        @has_many_through[hmt_arr.first] = hmt_arr.last
       end
     end
     
-    # Remove the has_one and has_many arguments since they are
-    # not for consumption by the scaffold generator, and since
-    # we have already used them to set the @belongs_tos, @has_ones and
-    # @has_manies.
-    @args.delete_if { |elt| elt =~ /^(has_one|has_many|belongs_to):/ }
+    # delete special fields from @args ivar
+    %w(has_one has_many belongs_to attachment_field has_many_through 
+      polymorphic tree_model layout ignored_fields).each do |special_field|
+      @args.delete_if { |f| f =~ /^(#{special_field}):/ }
+    end
+    
+    @args_for_generation = @args.clone
+    
+    # delete ignored_fields from @args ivar
+    @ignored_fields.each do |ignored|
+      @args.delete_if { |f| f =~ /^(#{ignored}):/ }
+    end
+    
   end
   
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
-    opt.on("--flex-only", "Scaffold Flex code only", 
-      "Default: false") { |v| options[:flex_only] = v}
+    opt.on("-f", "--flex-only", "Only generate the Flex/AIR files", 
+      "Default: false") { |v| options[:flex_only] = 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/rails_generators/rx_scaffold/templates/{controller.rb.erb → controllers/default.rb.erb}

@@ -8,7 +8,11 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @<%= table_name %> }
+<% if attachment_field.size > 0 -%>
+      format.fxml  { render :fxml => @<%= table_name %>.to_fxml(:methods => [:attachment_url]) }
+<% else -%>
       format.fxml  { render :fxml => @<%= table_name %> }
+<% end -%>
     end
   end
 
@@ -21,7 +25,11 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @<%= file_name %> }
+<% if attachment_field.size > 0 -%>
+      format.fxml  { render :fxml => @<%= file_name %>.to_fxml(:methods => [:attachment_url]) }
+<% else -%>
       format.fxml  { render :fxml => @<%= file_name %> }
+<% end -%>
     end
   end
 
@@ -52,7 +60,11 @@ class <%= controller_class_name %>Controller < ApplicationController
         flash[:notice] = '<%= class_name %> was successfully created.'
         format.html { redirect_to(@<%= file_name %>) }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
+<% if attachment_field.size > 0 -%>
+        format.fxml  { render :fxml => @<%= file_name %>.to_fxml(:methods => [:attachment_url]) }
+<% else -%>
         format.fxml  { render :fxml => @<%= file_name %> }
+<% end -%>
       else
         format.html { render :action => "new" }
         format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
@@ -65,14 +77,30 @@ class <%= controller_class_name %>Controller < ApplicationController
   # PUT /<%= table_name %>/1.xml
   # PUT /<%= table_name %>/1.fxml
   def update
+<% if distributed -%>
+    begin
+      @<%= file_name %> = <%= class_name %>.find(params[:id])
+      @saved = @<%= file_name %>.update_attributes(params[:<%= file_name %>])
+    rescue
+      @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>])
+      @<%= file_name %>.id = params[:id]
+      @saved = @<%= file_name %>.save
+    end
+<% else -%>
     @<%= file_name %> = <%= class_name %>.find(params[:id])
+    @saved = @<%= file_name %>.update_attributes(params[:<%= file_name %>])
+<% end -%>
 
     respond_to do |format|
-      if @<%= file_name %>.update_attributes(params[:<%= file_name %>])
+      if @saved
         flash[:notice] = '<%= class_name %> was successfully updated.'
         format.html { redirect_to(@<%= file_name %>) }
         format.xml  { head :ok }
+<% if attachment_field.size > 0 -%>
+        format.fxml  { render :fxml => @<%= file_name %>.to_fxml(:methods => [:attachment_url]) }
+<% else -%>
         format.fxml  { render :fxml => @<%= file_name %> }
+<% end -%>
       else
         format.html { render :action => "edit" }
         format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }

data/rails_generators/rx_scaffold/templates/controllers/resource_controller.rb.erb

@@ -0,0 +1,23 @@
+class <%= controller_class_name %>Controller < ResourceController::Base
+  
+  before_filter :load_fxml_params
+  
+  index.wants.fxml            { render :fxml => @collection.to_fxml(@fxml_params) }
+  show.wants.fxml             { render :fxml => @object.to_fxml(@fxml_params) }
+  create.wants.fxml           { render :fxml => @object.to_fxml(@fxml_params) }
+  create.failure.wants.fxml   { render :fxml => @object.errors }
+  update.wants.fxml           { render :fxml => @object.to_fxml(@fxml_params) }
+  update.failure.wants.fxml   { render :fxml => @object.errors }
+  destroy.wants.fxml          { render :fxml => @object }
+
+private
+
+  def collection
+    @collection = end_of_association_chain.all
+  end
+  
+  def load_fxml_params
+    @fxml_params = { }
+  end
+  
+end

data/rails_generators/rx_scaffold/templates/fixtures.yml.erb

@@ -2,34 +2,38 @@
 
 <% unless attributes.empty? && belongs_tos.empty? -%>
 <%= class_name.underscore -%>_one:
+  id: <%%= Fixtures.identify(:<%= class_name.underscore %>_one) %>
 <% for attribute in attributes -%>
   <%= attribute.name %>: <%= attribute.default("#{class_name}1") %>
 <% end -%>
 <% for model in belongs_tos -%>
-  <%= model %>: <%= model %>_one
+  <%= model %>_id: <%%= Fixtures.identify(:<%= model %>_one) %>
 <% end -%>
 
 <%= class_name.underscore -%>_two:
+  id: <%%= Fixtures.identify(:<%= class_name.underscore %>_two) %>
 <% for attribute in attributes -%>
   <%= attribute.name %>: <%= attribute.default("#{class_name}2") %>
 <% end -%>
 <% for model in belongs_tos -%>
-  <%= model %>: <%= model %>_two
+  <%= model %>_id: <%%= Fixtures.identify(:<%= model %>_two) %>
 <% end -%>
 
 <%= class_name.underscore -%>_three:
+  id: <%%= Fixtures.identify(:<%= class_name.underscore %>_three) %>
 <% for attribute in attributes -%>
   <%= attribute.name %>: <%= attribute.default("#{class_name}3") %>
 <% end -%>
 <% for model in belongs_tos -%>
-  <%= model %>: <%= model %>_three
+  <%= model %>_id: <%%= Fixtures.identify(:<%= model %>_three) %>
 <% end -%>
 
 <%= class_name.underscore -%>_four:
+  id: <%%= Fixtures.identify(:<%= class_name.underscore %>_four) %>
 <% for attribute in attributes -%>
   <%= attribute.name %>: <%= attribute.default("#{class_name}4") %>
 <% end -%>
 <% for model in belongs_tos -%>
-  <%= model %>: <%= model %>_four
-<% end -%>
+  <%= model %>_id: <%%= Fixtures.identify(:<%= model %>_four) %>
 <% end -%>
+<% end -%>