ruboss4ruby 1.0.2 → 1.0.3

data/merb_generators/ruboss_controller.rb

@@ -41,9 +41,9 @@ module Merb::Generators
       File.join(File.dirname(__FILE__), 'templates', 'ruboss_controller')
     end
     
-    template :controller do
-      source('controller.as.erb')
-      destination(File.join('app', 'flex', base_folder, 'controllers', "#{command_controller_name}.as"))
+    template :controller do |t|
+      t.source = 'controller.as.erb'
+      t.destination = File.join('app', 'flex', base_folder, 'controllers', "#{command_controller_name}.as")
     end
 
     desc <<-DESC

data/merb_generators/ruboss_flex_app.rb

@@ -59,9 +59,9 @@ module Merb::Generators
       Generates main flex application file.
     DESC
     
-    template :main_app do
-      source('mainapp.mxml')
-      destination(File.join('app', 'flex', "#{project_name}.mxml"))
+    template :main_app do |t|
+      t.source = 'mainapp.mxml'
+      t.destination = File.join('app', 'flex', "#{project_name}.mxml")
     end
   end
   

data/merb_generators/ruboss_resource_controller.rb

@@ -1,4 +1,4 @@
-Merb::Generators::ResourceControllerGenerator.template :ruboss_resource_controller do
-  source(File.dirname(__FILE__), "templates/ruboss_resource_controller/controller.rb.erb")
-  destination("app/controllers", base_path, "#{file_name}.rb")
+Merb::Generators::ResourceControllerGenerator.template :ruboss_resource_controller, :orm => :activerecord do |t|
+  t.source = File.dirname(__FILE__) / "templates/ruboss_resource_controller/controller.rb.erb"
+  t.destination = "app/controllers" / base_path / "#{file_name}.rb"
 end

data/merb_generators/ruboss_scaffold.rb

@@ -1,6 +1,8 @@
 require 'ruboss4ruby/configuration'
 require 'ruboss4ruby/generated_attribute'
 
+#NOTE: this is currently (merb 0.9.9 broken and needs to be rethought anyway. This line of thinking was based
+# on the kind of code generation you could do with rails, it's a different code generation paradigm with Merb anyway)
 module Merb::Generators
   class RubossScaffoldGenerator < NamespacedGenerator
     include Ruboss::Configuration
@@ -12,35 +14,8 @@ module Merb::Generators
     second_argument :properties, :as => :hash, :required => true, :default => {}, :desc => "space separated model properties in form of name:type. Example: state:string"
     
     def initialize(*args)
-      super
       @project_name, @flex_project_name, @command_controller_name, @base_package, @base_folder = extract_names
-      
-      @belongs_tos = []
-      @has_ones = []
-      @has_manies = []
-      # Figure out has_one, has_many and belongs_to based on args
-      self.properties.each do |key,value|
-        puts key + value
-        key = key.to_sym
-        if key == :has_one
-          # arg = "has_one:arg1,arg2", so all the has_one are together
-          @has_ones = value.split(',')
-        elsif key == :has_many
-          # arg = "has_many:arg1,arg2", so all the has_many are together 
-          @has_manies = value.split(",")
-        elsif key == :belongs_to # belongs_to:arg1,arg2
-          @belongs_tos = value.split(',')
-        end
-      end
-      
-      puts belongs_tos
-      puts has_manies
-      
-      # 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.
-      self.properties.delete_if { |key, value| key =~ /^(has_one|has_many|belongs_to)/ }
+      super
     end
     
     def table_name
@@ -90,6 +65,35 @@ module Merb::Generators
     end
     
     def attributes
+      @belongs_tos = []
+      @has_ones = []
+      @has_manies = []
+      # Figure out has_one, has_many and belongs_to based on args
+      self.properties.each do |key,value|
+        puts key + value
+        key = key.to_sym
+        if key == :has_one
+          # arg = "has_one:arg1,arg2", so all the has_one are together
+          @has_ones = value.split(',')
+        elsif key == :has_many
+          # arg = "has_many:arg1,arg2", so all the has_many are together 
+          @has_manies = value.split(",")
+        elsif key == :belongs_to # belongs_to:arg1,arg2
+          @belongs_tos = value.split(',')
+        end
+      end
+      
+      puts "does this even run?"
+      
+      puts belongs_tos
+      puts has_manies
+      
+      # 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.
+      self.properties.delete_if { |key, value| key =~ /^(has_one|has_many|belongs_to)/ }
+      
       @attributes ||= self.properties.collect do |key, value|
         Ruboss::Generator::GeneratedAttribute.new(key, value)
       end
@@ -99,41 +103,37 @@ module Merb::Generators
       File.join(File.dirname(__FILE__), 'templates', 'ruboss_scaffold')
     end
     
-    # invoke :model do |generator|
-    #   generator.new(destination_root, options, model_name, self.properties)
-    # end
-    
     invoke :ruboss_resource_controller do |generator|
       generator.new(destination_root, options, controller_name)
     end
     
-    template :ar_model, :flex_only => false do
-      source('model.rb.erb')
-      destination(File.join('app', 'models', "#{file_name}.rb"))
+    template :ar_model, :flex_only => false do |t|
+      t.source = 'model.rb.erb'
+      t.destination = File.join('app', 'models', "#{file_name}.rb")
     end
     
     empty_directory :fixtures, File.join('spec', 'fixtures')
     
-    template :fixture, :flex_only => false do
-      source('fixtures.yml.erb')
-      destination(File.join('spec', 'fixtures', "#{table_name}.yml"))
+    template :fixture, :flex_only => false do |t|
+      t.source = 'fixtures.yml.erb'
+      t.destination = File.join('spec', 'fixtures', "#{table_name}.yml")
     end
     
     empty_directory :migrations, File.join('schema', 'migrations')
     
-    template :migration, :flex_only => false, :skip_migration => false do
-      source('migration.rb.erb')
-      destination(File.join('schema', 'migrations', "#{migration_file_name}.rb"))
+    template :migration, :flex_only => false, :skip_migration => false do |t|
+      t.source = 'migration.rb.erb'
+      t.destination = File.join('schema', 'migrations', "#{migration_file_name}.rb")
     end
     
-    template :as_model do
-      source('model.as.erb')
-      destination(File.join('app', 'flex', base_folder, 'models', "#{class_name}.as"))
+    template :as_model do |t|
+      t.source = 'model.as.erb'
+      t.destination = File.join('app', 'flex', base_folder, 'models', "#{class_name}.as")
     end
     
-    template :flex_component do
-      source('component.mxml.erb')
-      destination(File.join('app', 'flex', base_folder, 'components', 'generated', "#{class_name}Box.mxml"))
+    template :flex_component do |t|
+      t.source = 'component.mxml.erb'
+      t.destination = File.join('app', 'flex', base_folder, 'components', 'generated', "#{class_name}Box.mxml")
     end
 
     invoke :ruboss_controller do |generator|

data/rails_generators/ruboss_config/ruboss_config_generator.rb

@@ -12,8 +12,6 @@
 # commercial license, please go to http://ruboss.com.
 ################################################################################
 require 'open-uri'
-require 'ruboss4ruby/version'
-require 'ruboss4ruby/configuration'
 
 class RubossConfigGenerator < Rails::Generator::Base
   include Ruboss::Configuration
@@ -104,7 +102,9 @@ class RubossConfigGenerator < Rails::Generator::Base
         
         m.dependency 'ruboss_controller', @args
       end
+      m.template 'project-textmate.erb', "#{project_name.underscore}.tmproj"
       m.template 'mainapp.mxml', File.join('app/flex', "#{project_name}.mxml")
+      m.template 'mainapp-config.xml', File.join('app/flex', "#{project_name}-config.xml")
       m.template 'mainair-app.xml', File.join('app/flex', "#{project_name}-app.xml") if @use_air
     end
   end

data/rails_generators/ruboss_config/templates/index.html.erb

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

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

@@ -0,0 +1,21 @@
+<flex-config>
+  <benchmark>false</benchmark>
+  <default-background-color>#FFFFFF</default-background-color>
+  <compiler>
+    <incremental>true</incremental>
+    <keep-as3-metadata append="true">
+       <name>Resource</name>
+       <name>HasOne</name>
+       <name>HasMany</name>
+       <name>BelongsTo</name>
+       <name>DateTime</name>
+       <name>Lazy</name>
+       <name>Ignored</name>
+    </keep-as3-metadata>
+    <optimize>true</optimize>
+    <keep-generated-actionscript>false</keep-generated-actionscript>
+    <warn-no-constructor>false</warn-no-constructor>
+    <warn-no-explicit-super-call-in-constructor>false</warn-no-explicit-super-call-in-constructor>
+    <debug>false</debug>
+  </compiler>
+</flex-config>

data/rails_generators/ruboss_config/templates/mainapp.mxml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:<%= application_tag %> xmlns:mx="http://www.adobe.com/2006/mxml"
   xmlns:generated="<%= base_package %>.components.generated.*"
-  layout="vertical"
-  styleName="plain"
-  initialize="init()">
+  paddingBottom="8" paddingLeft="8" paddingRight="8" paddingTop="8"
+  layout="horizontal" styleName="plain" initialize="init()">
   <mx:Script>
     <![CDATA[
 <% if use_air -%>
       import org.ruboss.services.air.AIRServiceProvider;
 <% end -%>
-			import org.ruboss.Ruboss;
+      import org.ruboss.Ruboss;
       import <%= base_package %>.controllers.<%= command_controller_name %>;
 
       private function init():void {
@@ -21,9 +20,7 @@
       }
     ]]>
   </mx:Script>
-  <mx:ApplicationControlBar dock="true" width="100%">
-    <mx:LinkBar dataProvider="{mainViewStack}"/>
-  </mx:ApplicationControlBar>
+  <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 -%>

data/rails_generators/ruboss_config/templates/project-textmate.erb

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>currentDocument</key>
+	<string>app/flex/<%= project_name %>.mxml</string>
+	<key>documents</key>
+	<array>
+		<dict>
+			<key>expanded</key>
+			<true/>
+			<key>name</key>
+			<string><%= project_name.underscore %></string>
+			<key>regexFolderFilter</key>
+			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
+			<key>sourceDirectory</key>
+			<string></string>
+		</dict>
+	</array>
+  <key>fileHierarchyDrawerWidth</key> 
+  <integer>299</integer> 
+  <key>metaData</key> 
+  <dict/> 
+  <key>openDocuments</key>
+  <array>
+    <string>app/flex/<%= project_name %>.mxml</string>
+  </array>
+	<key>shellVariables</key>
+	<array>
+		<dict>
+			<key>enabled</key>
+			<true/>
+			<key>value</key>
+			<string>app/flex/<%= project_name %>.mxml</string>
+			<key>variable</key>
+			<string>TM_FLEX_FILE_SPECS</string>
+		</dict>
+		<dict>
+			<key>enabled</key>
+			<true/>
+			<key>value</key>
+			<string>public/bin/<%= project_name %>.swf</string>
+			<key>variable</key>
+			<string>TM_FLEX_OUTPUT</string>
+		</dict>
+	</array>
+  <key>showFileHierarchyDrawer</key>
+  <false/>
+  <key>windowFrame</key>
+  <string>{{5, 15}, {1073, 860}}</string>
+</dict>
+</plist>

data/rails_generators/ruboss_controller/ruboss_controller_generator.rb

@@ -11,8 +11,6 @@
 # RCL v1 applies; otherwise, only the GPL v3 applies. To learn more or to buy a
 # commercial license, please go to http://ruboss.com.
 ################################################################################
-require 'ruboss4ruby/configuration'
-
 class RubossControllerGenerator < Rails::Generator::Base
   include Ruboss::Configuration
   

data/rails_generators/ruboss_scaffold/ruboss_scaffold_generator.rb

@@ -11,8 +11,6 @@
 # RCL v1 applies; otherwise, only the GPL v3 applies. To learn more or to buy a
 # commercial license, please go to http://ruboss.com.
 ################################################################################
-require 'ruboss4ruby/configuration'
-
 module Rails
   module Generator
     class GeneratedAttribute

data/rails_generators/ruboss_scaffold/templates/component.mxml.erb

@@ -98,8 +98,8 @@
   }
 ]]></mx:Script>
   <mx:Panel id="<%= class_name.downcase_first_letter.pluralize %>Panel"
-    title="<%= class_name.pluralize %>"
-    width="25%" height="100%">
+    title="<%= class_name.pluralize %>" cornerRadius="0" dropShadowEnabled="false" borderStyle="solid" 
+    borderThickness="1" backgroundColor="#EEEEEE" width="25%" height="100%">
     <mx:List id="<%= class_name.downcase_first_letter.pluralize %>List"
       width="100%" height="100%"
       dataProvider="{Ruboss.models.index(<%= class_name %>)}"
@@ -109,7 +109,8 @@
         click="new<%= class_name %>()"/>
     </mx:ControlBar>
   </mx:Panel>
-  <mx:Panel title="Edit <%= class_name %>" width="75%" height="100%">
+  <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 -%>
       <mx:FormItem label="<%= attribute.flex_name.capitalize_without_downcasing %>" width="100%">

data/rails_generators/ruboss_yaml_scaffold/ruboss_yaml_scaffold_generator.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'ruboss4ruby/configuration'
 
 class RubossYamlScaffoldGenerator < Rails::Generator::Base
   def extract_attrs(line, attrs)

data/test/controllers/application.rb

@@ -0,0 +1,15 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+
+  # See ActionController::RequestForgeryProtection for details
+  # Uncomment the :secret if you're not using the cookie session store
+  protect_from_forgery # :secret => 'c83e3ff98f15718c4544ca8821f2b6d4'
+  
+  # See ActionController::Base for details 
+  # Uncomment this to filter the contents of submitted sensitive data parameters
+  # from your application log (in this case, all fields with names like "password"). 
+  # filter_parameter_logging :password
+end

data/test/controllers/locations_controller.rb

@@ -0,0 +1,93 @@
+class LocationsController < ApplicationController
+  # GET /locations
+  # GET /locations.xml
+  def index
+    @locations = Location.find(:all)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @locations }
+      format.fxml  { render :fxml => @locations }
+    end
+  end
+
+  # GET /locations/1
+  # GET /locations/1.xml
+  def show
+    @location = Location.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @location }
+      format.fxml  { render :fxml => @location }
+    end
+  end
+
+  # GET /locations/new
+  # GET /locations/new.xml
+  def new
+    @location = Location.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @location }
+      format.fxml  { render :fxml => @location }
+    end
+  end
+
+  # GET /locations/1/edit
+  def edit
+    @location = Location.find(params[:id])
+  end
+
+  # POST /locations
+  # POST /locations.xml
+  def create
+    @location = Location.new(params[:location])
+
+    respond_to do |format|
+      if @location.save
+        flash[:notice] = 'Location was successfully created.'
+        format.html { redirect_to(@location) }
+        format.xml  { render :xml => @location, :status => :created, :location => @location }
+        format.fxml  { render :fxml => @location }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @location.errors, :status => :unprocessable_entity }
+        format.fxml  { render :fxml => @location.errors }
+      end
+    end
+  end
+
+  # PUT /locations/1
+  # PUT /locations/1.xml
+  def update
+    @location = Location.find(params[:id])
+
+    respond_to do |format|
+      if @location.update_attributes(params[:location])
+        flash[:notice] = 'Location was successfully updated.'
+        format.html { redirect_to(@location) }
+        format.xml  { head :ok }
+        format.fxml  { render :fxml => @location }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @location.errors, :status => :unprocessable_entity }
+        format.fxml  { render :fxml => @location.errors }
+      end
+    end
+  end
+
+  # DELETE /locations/1
+  # DELETE /locations/1.xml
+  def destroy
+    @location = Location.find(params[:id])
+    @location.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(locations_url) }
+      format.xml  { head :ok }
+      format.fxml  { render :fxml => @location }
+    end
+  end
+end