restfulx 1.2.2 → 1.2.3

data/rails_generators/rx_config/templates/session_store_flash.erb

@@ -0,0 +1 @@
+ActionController::Dispatcher.middleware.use FlashSessionCookieMiddleware, ActionController::Base.session_options[:key]

data/rails_generators/rx_main_app/rx_main_app_generator.rb

@@ -43,8 +43,8 @@ class RxMainAppGenerator < 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
 

data/rails_generators/rx_main_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>

data/rails_generators/rx_scaffold/rx_scaffold_generator.rb

@@ -139,11 +139,11 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
         
       if @layout.size > 0
         m.template "layouts/#{@layout}.erb",
-          File.join("#{@flex_root}", base_folder, "components", "generated", "#{@class_name}Box.mxml"), 
+          File.join("#{@flex_root}", base_folder, "views", "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"), 
+          File.join("#{@flex_root}", base_folder, "views", "generated", "#{@class_name}Box.mxml"), 
           :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
       end
 
@@ -155,11 +155,20 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
       unless options[:skip_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_name => "Create#{file_path.gsub(/\//, '_').pluralize.camelcase.gsub(/::/, '')}"
         }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}" unless options[:flex_only]
       end
-      
-      m.route_resources controller_file_name
+
+      m.directory(File.join('test/functional', controller_class_path))
+      m.directory(File.join('test/unit', class_path))
+      m.directory(File.join('test/unit/helpers', class_path))
+
+      m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
+      m.template('helper_test.rb',     File.join('test/unit/helpers',    controller_class_path, "#{controller_file_name}_helper_test.rb"))
+
+      if File.open('config/routes.rb').grep(/^\s*map.resources :#{controller_file_name}/).empty?
+        m.route_resources controller_file_name
+      end
 
       m.dependency 'rx_controller', [name] + @args, :collision => :force
     end
@@ -230,4 +239,4 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
     opt.on("-fv", "--flex-view-only", "Only generate the Flex component files", 
       "Default: false") { |v| options[:flex_view_only] = v }
   end
-end
+end

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

@@ -10,8 +10,8 @@ class <%= controller_class_name %>Controller < ResourceController::Base
   update.failure.wants.fxml   { render :fxml => @object.errors }
   destroy.wants.fxml          { render :fxml => @object }
 
-private
-
+  private
+  
   def collection
     @collection = end_of_association_chain.all
   end

data/rails_generators/rx_scaffold/templates/functional_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:<%= table_name %>)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create <%= file_name %>" do
+    assert_difference('<%= class_name %>.count') do
+      post :create, :<%= file_name %> => { }
+    end
+
+    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
+  end
+
+  test "should show <%= file_name %>" do
+    get :show, :id => <%= table_name %>(:one).id
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, :id => <%= table_name %>(:one).id
+    assert_response :success
+  end
+
+  test "should update <%= file_name %>" do
+    put :update, :id => <%= table_name %>(:one).id, :<%= file_name %> => { }
+    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
+  end
+
+  test "should destroy <%= file_name %>" do
+    assert_difference('<%= class_name %>.count', -1) do
+      delete :destroy, :id => <%= table_name %>(:one).id
+    end
+
+    assert_redirected_to <%= table_name %>_path
+  end
+end

data/rails_generators/rx_scaffold/templates/helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class <%= controller_class_name %>HelperTest < ActionView::TestCase
+end

data/rails_generators/rx_scaffold/templates/layouts/default.erb

@@ -9,12 +9,14 @@
     import <%= base_package %>.models.<%= model.camelcase %>;
 <% end -%>
 <% if attachment_field.size > 0 -%>
+    import flash.net.FileReference;
     import org.restfulx.utils.RxFileReference;
 <% end -%>
 
     [Bindable]
     private var <%= class_name.dcfirst %>:<%= class_name %> = new <%= class_name %>();
 <% if attachment_field.size > 0 -%>
+
     [Bindable]
     private var fileName:String = "None selected";
     
@@ -83,10 +85,10 @@
 
     private function chooseFile():void {
       file = new RxFileReference("<%= attachment_field[0].camelcase(:lower) %>");
-      file.addEventListener(IOErrorEvent.IO_ERROR, ioErrorHandler, false, 0, true);
-      file.addEventListener(Event.SELECT, selectFile, false, 0, true);
-      file.addEventListener(Event.CANCEL, cancelBrowse, false, 0, true);
-      file.browse();
+      file.reference.addEventListener(IOErrorEvent.IO_ERROR, ioErrorHandler, false, 0, true);
+      file.reference.addEventListener(Event.SELECT, selectFile, false, 0, true);
+      file.reference.addEventListener(Event.CANCEL, cancelBrowse, false, 0, true);
+      file.reference.browse();
     }
     
     private function selectFile(event:Event):void { 
@@ -98,7 +100,7 @@
     }
     
     private function fileSelected(event:Event):void {
-      fileName = RxFileReference(event.target).name;
+      fileName = FileReference(event.target).name;
     }
     
     private function ioErrorHandler(event:Event):void {

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

@@ -19,10 +19,10 @@ class <%= migration_name %> < ActiveRecord::Migration
 <% if attachment_field.size > 0 -%>
 <% if RxSettings.attachment_plugin == 'paperclip' -%>
       # For paperclip
-      t.column :avatar_file_name, :string
-      t.column :avatar_content_type, :string
-      t.column :avatar_file_size, :integer
-      t.column :avatar_updated_at, :datetime
+      t.column :<%= attachment_field[0] %>_file_name, :string
+      t.column :<%= attachment_field[0] %>_content_type, :string
+      t.column :<%= attachment_field[0] %>_file_size, :integer
+      t.column :<%= attachment_field[0] %>_updated_at, :datetime
 <% elsif RxSettings.attachment_plugin == 'attachment_fu' -%>
       # For attachment_fu
       t.column :parent_id,  :integer

data/rxgen_generators/rx_config/rx_config_generator.rb

@@ -14,6 +14,8 @@ class RxConfigGenerator < RubiGen::Base
         open(framework_destination_file, "wb").write(open(framework_distribution_url).read)
         puts "done. saved to #{framework_destination_file}"
       end
+
+      m.dependency 'rx_controller', @args
     end
   end
 end

data/rxgen_generators/rx_controller/templates/assist.py

@@ -27,7 +27,7 @@ import datetime, iso8601
 
 # Some useful module methods
 def all(model):
-  items = "".join(str(item.to_xml()) for item in model.all())
+  items = "".join(str(item.to_xml().encode('UTF-8')) for item in model.all())
   if items == "":
     return '<entities type="array"/>'
   else:

data/rxgen_generators/rx_main_app/rx_main_app_generator.rb

@@ -32,8 +32,8 @@ class RxMainAppGenerator < RubiGen::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
     
     @controller_names = []

data/rxgen_generators/rx_main_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>

data/rxgen_generators/rx_scaffold/rx_scaffold_generator.rb

@@ -70,7 +70,14 @@ class RxScaffoldGenerator < RubiGen::Base
 
   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   :name,
                 :class_name,
@@ -98,9 +105,15 @@ class RxScaffoldGenerator < RubiGen::Base
         File.join("#{flex_root}", base_folder, "models", "#{@class_name}.as"), 
         :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
 
-      m.template 'component.mxml.erb',
-        File.join("#{flex_root}", base_folder, "components", "generated", "#{@class_name}Box.mxml"), 
-        :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
+      if @layout.size > 0
+        m.template "layouts/#{@layout}.erb",
+          File.join("#{@flex_root}", base_folder, "views", "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, "views", "generated", "#{@class_name}Box.mxml"), 
+          :assigns => { :resource_controller_name => "#{file_name.pluralize}" }
+      end
         
       if options[:gae]
         m.template 'controller.py.erb', "app/controllers/#{file_name.pluralize}.py"
@@ -113,23 +126,57 @@ class RxScaffoldGenerator < RubiGen::Base
   
   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
     
-    @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 attributes

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

@@ -8,9 +8,20 @@
 <% for model in belongs_tos -%>
     import <%= base_package %>.models.<%= model.camelcase %>;
 <% end -%>
+<% if attachment_field.size > 0 -%>
+    import flash.net.FileReference;
+    import org.restfulx.utils.RxFileReference;
+<% end -%>
 
     [Bindable]
     private var <%= class_name.dcfirst %>:<%= class_name %> = new <%= class_name %>();
+<% if attachment_field.size > 0 -%>
+
+    [Bindable]
+    private var fileName:String = "None selected";
+    
+    private var file:RxFileReference;
+<% end -%>
 
     private function new<%= class_name %>():void {
       <%= class_name.dcfirst %> = new <%= class_name %>();
@@ -41,36 +52,64 @@
 <% else -%>
       <%= class_name.dcfirst %>.<%= attribute.flex_name %> = <%= attribute.flex_type %>(<%= attribute.flex_name %>TextInput.text);
 <% end -%>
-<% end -%>
-
+<% end -%>  
 <% for model in belongs_tos -%>
       <%= class_name.dcfirst %>.<%= model.camelcase(:lower) %> = <%= model.camelcase %>(<%= model.camelcase(:lower) %>ComboBox.selectedItem);
+<% end -%>
+<% if attachment_field.size > 0 -%>
+      <%= class_name.dcfirst %>.attachment = file;
 <% end -%>
     }
-
+   
     private function destroy<%= class_name %>():void {
       <%= 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 %>;
     }
-  
+    
     private function on<%= class_name %>Create(result:<%= class_name %>):void {
       <%= class_name.dcfirst %> = new <%= 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(result:<%= class_name %>):void {
       on<%= class_name %>Create(result);
+    }    
+<% if attachment_field.size > 0 -%>
+
+    private function chooseFile():void {
+      file = new RxFileReference("<%= attachment_field[0].camelcase(:lower) %>");
+      file.reference.addEventListener(IOErrorEvent.IO_ERROR, ioErrorHandler, false, 0, true);
+      file.reference.addEventListener(Event.SELECT, selectFile, false, 0, true);
+      file.reference.addEventListener(Event.CANCEL, cancelBrowse, false, 0, true);
+      file.reference.browse();
+    }
+    
+    private function selectFile(event:Event):void { 
+      fileSelected(event)
+    }
+    
+    private function cancelBrowse(event:Event):void {
+      file = null;
     }
+    
+    private function fileSelected(event:Event):void {
+      fileName = FileReference(event.target).name;
+    }
+    
+    private function ioErrorHandler(event:Event):void {
+      fileChooser.errorString = "Failed to selected a file. Please try again.";
+    }
+<% end -%>
   ]]></mx:Script>
   <mx:Panel id="<%= class_name.dcfirst.pluralize %>Panel"
-    title="<%= class_name.pluralize %>" cornerRadius="0" dropShadowEnabled="false" borderStyle="solid" 
+    title="<%= class_name.pluralize %>" cornerRadius="0" dropShadowEnabled="false" borderStyle="solid"
     borderThickness="1" backgroundColor="#EEEEEE" width="25%" height="100%">
     <mx:List id="<%= class_name.dcfirst.pluralize %>List"
       width="100%" height="100%"
@@ -81,7 +120,7 @@
         click="new<%= class_name %>()"/>
     </mx:ControlBar>
   </mx:Panel>
-  <mx:Panel title="Edit <%= class_name %>" cornerRadius="0" dropShadowEnabled="false" borderStyle="solid" 
+  <mx:Panel title="Edit <%= class_name %>" cornerRadius="0" dropShadowEnabled="false" borderStyle="solid"
     borderThickness="1" backgroundColor="#EEEEEE" width="75%" height="100%">
     <mx:Form width="100%" height="100%">
 <% for attribute in attributes -%>
@@ -101,12 +140,19 @@
 <% end -%>
       </mx:FormItem>
 <% end -%>
+<% if attachment_field.size > 0 -%>
+      <mx:FormItem label="<%= attachment_field[0].camelcase %>:" width="100%" id="fileChooser">
+        <mx:Button label="Browse…" id="fileBrowseButton" click="chooseFile()"/>
+        <mx:Label text="{fileName}" maxWidth="190"/>
+        <mx:Image source="{<%= class_name.dcfirst %>.attachmentUrl}"/>
+      </mx:FormItem>
+<% end -%>
 <% for model in belongs_tos -%>
       <mx:FormItem label="<%= model.camelcase %>" width="100%">
         <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>