ruboss4ruby 1.0.5 → 1.1.0

data/lib/ruboss4ruby.rb

@@ -1,43 +1,74 @@
-# Merb specific handling
+# Sets up all the relevant configuration options and brings together 
+# patches for Rails, Merb, ActiveRecord and Data Mapper.
+#
+# Loads Ruboss specific rake tasks if appropriate.
+module Ruboss4Ruby
+
+  # :stopdoc:
+  VERSION = '1.1.0'
+  RUBOSS_FRAMEWORK_VERSION = '1.1.0'
+  LIB_DIR = File.join(File.dirname(__FILE__), 'ruboss4ruby/')
+  # :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
+  # the _filename_ does not have to be equivalent to the directory.
+  #
+  def self.require_all_libs_relative_to( fname, dir = nil )
+    dir ||= ::File.basename(fname, '.*')
+    search_me = ::File.expand_path(
+        ::File.join(::File.dirname(fname), dir, '*', '*.rb'))
+
+    Dir.glob(search_me).sort.each {|rb| require rb}
+  end
+
+end
+
+require Ruboss4Ruby::LIB_DIR + 'configuration'
+
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  Merb::BootLoader.before_app_loads do
-    Merb.add_mime_type(:fxml,  :to_fxml,  %w[application/xml text/xml application/x-xml], :charset => "utf-8")
+  Merb::Plugins.add_rakefiles 'ruboss4ruby/tasks'
 
-    # generators = File.join(File.dirname(__FILE__), '..', 'merb_generators')
-    # Merb.add_generators generators / :ruboss_config
-    # Merb.add_generators generators / :ruboss_flex_app
-    # Merb.add_generators generators / :ruboss_controller
-    # Merb.add_generators generators / :ruboss_scaffold
-    # Merb.add_generators generators / :ruboss_resource_controller
+  Merb::BootLoader.before_app_loads do
     
-    require 'ruboss4ruby/version'
-    require 'ruboss4ruby/configuration'
-    require 'ruboss4ruby/active_foo' if defined?(ActiveRecord::Base)
-  end
-  
-  # TODO: can we find out if use_orm :activerecord is on and only then load active record specific tasks?
-  Merb::Plugins.add_rakefiles "ruboss4ruby/tasks", "ruboss4ruby/active_record_tasks"  
+    if defined?(ActiveRecord::Base)
+      Merb.add_mime_type(:fxml,  :to_fxml,  %w[application/xml text/xml application/x-xml], :charset => "utf-8")
+      ['active_foo', 'active_record_default_methods'].each { |lib| require Ruboss4Ruby::LIB_DIR + lib }
+      Merb::Plugins.add_rakefiles 'ruboss4ruby/active_record_tasks'
+    else
+      Merb.add_mime_type(:fxml,  :to_xml,  %w[application/xml text/xml application/x-xml], :charset => "utf-8")
+      if defined?(Merb::Orms::DataMapper)
+        require Ruboss4Ruby::LIB_DIR + 'datamapper_foo'
+      end
+    end
+  end    
 elsif defined?(ActionController::Base)
-  # if we are not running in Merb, we've got to be running in Rails
+  # if we are not running in Merb, try to hook up Rails
   Mime::Type.register_alias "application/xml", :fxml
+  
+  ['active_foo', 'active_record_default_methods', 'rails/swf_helper'].each { |lib| require Ruboss4Ruby::LIB_DIR + lib }
 
-  require File.join(File.dirname(__FILE__),'ruboss4ruby', 'version')
-  require File.join(File.dirname(__FILE__),'ruboss4ruby', 'configuration')
-  require File.join(File.dirname(__FILE__),'ruboss4ruby', 'active_foo')
-  require File.join(File.dirname(__FILE__), 'ruboss4ruby', 'ruboss_helper')
-  ActionView::Base.send :include, RubossHelper unless ActionView::Base.included_modules.include?(RubossHelper)
-  require File.join(File.dirname(__FILE__), 'ruboss4ruby', 'ruboss_test_helpers')  
-  Test::Unit::TestCase.send :include, RubossTestHelpers unless Test::Unit::TestCase.included_modules.include?(RubossTestHelpers)
+  ActionView::Base.send :include, SWFHelper unless ActionView::Base.included_modules.include?(SWFHelper)  
 
+  # We mess with default +render+ implementation a bit to add support for expressions
+  # such as format.fxml { render :fxml => @foo }
   module ActionController
+    # Override render to add support for render :fxml
     class Base
       alias_method :old_render, :render unless method_defined?(:old_render)
 
       # so that we can have handling for :fxml option and write code like
       # format.fxml  { render :fxml => @projects }
       def render(options = nil, extra_options = {}, &block)
-        if options && options[:fxml]
+        if options.is_a?(Hash) && options[:fxml]
           xml = options[:fxml]
           response.content_type ||= Mime::XML
           render_for_text(xml.respond_to?(:to_fxml) ? xml.to_fxml : xml, options[:status])
@@ -48,7 +79,9 @@ elsif defined?(ActionController::Base)
     end
   end
 
-  module RubossController
+  # It is possible to pass metadata with any Ruboss model. This module adds support for
+  # extracting that metadata into the standard params hash.
+  module Ruboss4RubyController
     private
 
     # Extract any keys named _metadata from the models in the params hash
@@ -63,8 +96,20 @@ elsif defined?(ActionController::Base)
       params.merge!(metadata) unless metadata.empty?
     end  
   end
+  
+  module ActiveRecord
+    # ActiveRecord named scopes are computed *before* ruboss4ruby gem gets loaded
+    # this patch addresses that and makes sure +to_fxml+ calls are properly
+    # delegated
+    module NamedScope
+      # make sure we properly delegate +to_fxml+ calls to the proxy
+      class Scope
+        delegate :to_fxml, :to => :proxy_found
+      end
+    end
+  end
 
-  ActionController::Base.send :include, RubossController  
+  ActionController::Base.send :include, Ruboss4RubyController  
   ActionController::Base.send :prepend_before_filter, :extract_metadata_from_params  
 
   # temporarily disable forgery protection site-wise

data/rails_generators/ruboss_config/ruboss_config_generator.rb

@@ -1,20 +1,8 @@
-################################################################################
-# Copyright 2008, Ruboss Technology Corporation.
-#
-# This software is dual-licensed under both the terms of the Ruboss Commercial
-# License v1 (RCL v1) as published by Ruboss Technology Corporation and under
-# the terms of the GNU General Public License v3 (GPL v3) as published by the
-# Free Software Foundation.
-#
-# Both the RCL v1 (rcl-1.0.txt) and the GPL v3 (gpl-3.0.txt) are included in
-# the source code. If you have purchased a commercial license then only the
-# 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 'open-uri'
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ruboss4ruby') if !defined?(Ruboss4Ruby)
 
 class RubossConfigGenerator < Rails::Generator::Base
-  include Ruboss::Configuration
+  include Ruboss4Ruby::Configuration
     
   attr_reader :project_name, 
               :flex_project_name, 
@@ -86,7 +74,7 @@ class RubossConfigGenerator < Rails::Generator::Base
         
         m.directory "app/flex/#{base_folder}/components/generated"
         
-        framework_release = Ruboss::RUBOSS_FRAMEWORK_VERSION
+        framework_release = Ruboss4Ruby::RUBOSS_FRAMEWORK_VERSION
         framework_distribution_url = "http://ruboss.com/releases/ruboss-#{framework_release}.swc"
         framework_destination_file = "lib/ruboss-#{framework_release}.swc"
         

data/rails_generators/ruboss_config/templates/mainair-app.xml

@@ -60,10 +60,10 @@
 		<!-- <resizable></resizable> -->
 
 		<!-- The window's initial width. Optional. -->
-		<!-- <width></width> -->
+		<width>800</width>
 
 		<!-- The window's initial height. Optional. -->
-		<!-- <height></height> -->
+		<height>600</height>
 
 		<!-- The window's initial x position. Optional. -->
 		<!-- <x></x> -->

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

@@ -2,7 +2,7 @@
   <benchmark>false</benchmark>
   <default-background-color>#FFFFFF</default-background-color>
   <compiler>
-    <incremental>true</incremental>
+    <incremental>false</incremental>
     <keep-as3-metadata append="true">
        <name>Resource</name>
        <name>HasOne</name>

data/rails_generators/ruboss_config/templates/ruboss.yml

@@ -7,10 +7,8 @@
 
 #base-package: com.pomodo
 
-# Main ruboss controller is typically named after your rails project name (camel-cased with a word
-# Controller appended at the end, e.g. if your application is called "pomodo" the flex application
-# controller will be called "PomodoController"). This controller is created in 
+# Main ruboss 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: PomodoController
+#controller-name: ApplicationController

data/rails_generators/ruboss_config/templates/ruboss_tasks.rake

@@ -1,15 +1,5 @@
-################################################################################
-# Copyright 2008, Ruboss Technology Corporation.
-#
-# This software is dual-licensed under both the terms of the Ruboss Commercial
-# License v1 (RCL v1) as published by Ruboss Technology Corporation and under
-# the terms of the GNU General Public License v3 (GPL v3) as published by the
-# Free Software Foundation.
-#
-# Both the RCL v1 (rcl-1.0.txt) and the GPL v3 (gpl-3.0.txt) are included in
-# the source code. If you have purchased a commercial license then only the
-# 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/active_record_tasks'
-
+# if the gem is not installed system wide, we'll just skip the tasks
+begin
+  require 'ruboss4ruby/active_record_tasks'
+rescue LoadError
+end

data/rails_generators/ruboss_controller/USAGE

@@ -1,7 +1,6 @@
 Description:
     Generates/updates the main Flex application controller, typically
-    app/flex/<yourappname>/controllers/<YourAppName>Controller.as, e.g.
-    app/flex/pomodo/controllers/PomodoController.as
+    app/flex/<yourappname>/controllers/ApplicationController.as
     
     It pulls out all available models and commands from respective
     folders and makes sure they'll be pulled into the Flex application

data/rails_generators/ruboss_controller/ruboss_controller_generator.rb

@@ -1,18 +1,7 @@
-################################################################################
-# Copyright 2008, Ruboss Technology Corporation.
-#
-# This software is dual-licensed under both the terms of the Ruboss Commercial
-# License v1 (RCL v1) as published by Ruboss Technology Corporation and under
-# the terms of the GNU General Public License v3 (GPL v3) as published by the
-# Free Software Foundation.
-#
-# Both the RCL v1 (rcl-1.0.txt) and the GPL v3 (gpl-3.0.txt) are included in
-# the source code. If you have purchased a commercial license then only the
-# 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 File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ruboss4ruby') if !defined?(Ruboss4Ruby)
+
 class RubossControllerGenerator < Rails::Generator::Base
-  include Ruboss::Configuration
+  include Ruboss4Ruby::Configuration
   
   attr_reader :project_name, 
               :flex_project_name, 

data/rails_generators/ruboss_controller/templates/controller.as.erb

@@ -1,20 +1,22 @@
 package <%= base_package %>.controllers {
   import <%= base_package %>.models.*;
   import <%= base_package %>.commands.*;
-	
+
+	import mx.core.Application;		
   import org.ruboss.Ruboss;
-  import org.ruboss.controllers.RubossCommandsController;
+  import org.ruboss.controllers.RubossApplicationController;
   import org.ruboss.utils.RubossUtils;
 
-  public class <%= command_controller_name %> extends RubossCommandsController {
+  public class <%= command_controller_name %> extends RubossApplicationController {
     private static var controller:<%= command_controller_name %>;
     
     public static var models:Array = [<%= model_names %>]; /* Models */
     
+    public static var commands:Array = [<%= command_names %>]; /* Commands */
+    
     public function <%= command_controller_name %>(enforcer:SingletonEnforcer, extraServices:Array,
       defaultServiceId:int = -1) {
-      super([<%= command_names %>] /* Commands */, 
-        models, extraServices, defaultServiceId);
+      super(commands, models, extraServices, defaultServiceId);
     }
     
     public static function get instance():<%= command_controller_name %> {
@@ -27,7 +29,10 @@ package <%= base_package %>.controllers {
       if (!RubossUtils.isEmpty(airDatabaseName)) Ruboss.airDatabaseName = airDatabaseName;
       controller = new <%= command_controller_name %>(new SingletonEnforcer, extraServices,
         defaultServiceId);
-      Ruboss.commands = controller;
+			Ruboss.sessionToken = Application.application.parameters.session_token;
+			if (Application.application.parameters.authenticity_token) {
+			  Ruboss.defaultMetadata = { authenticity_token : Application.application.parameters.authenticity_token };
+			}
     }
   }
 }

data/rails_generators/ruboss_scaffold/ruboss_scaffold_generator.rb

@@ -1,16 +1,5 @@
-################################################################################
-# Copyright 2008, Ruboss Technology Corporation.
-#
-# This software is dual-licensed under both the terms of the Ruboss Commercial
-# License v1 (RCL v1) as published by Ruboss Technology Corporation and under
-# the terms of the GNU General Public License v3 (GPL v3) as published by the
-# Free Software Foundation.
-#
-# Both the RCL v1 (rcl-1.0.txt) and the GPL v3 (gpl-3.0.txt) are included in
-# the source code. If you have purchased a commercial license then only the
-# 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 File.join(File.dirname(__FILE__), '..', '..', 'lib', 'ruboss4ruby') if !defined?(Ruboss4Ruby)
+
 module Rails
   module Generator
     class GeneratedAttribute
@@ -24,50 +13,51 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer, :float, :decimal   then :text_field
-          when :datetime, :timestamp, :time then :datetime_select
-          when :date                        then :date_select
-          when :string                      then :text_field
-          when :text                        then :text_area
-          when :boolean                     then :check_box
-          else
-            :text_field
+        when :integer, :float, :decimal   then :text_field
+        when :datetime, :timestamp, :time then :datetime_select
+        when :date                        then :date_select
+        when :string                      then :text_field
+        when :text                        then :text_area
+        when :boolean                     then :check_box
+        else
+          :text_field
         end      
       end
 
       def default(prefix = '')
         @default = case type
-          when :integer                     then 1
-          when :float                       then 1.5
-          when :decimal                     then "9.99"
-          when :datetime, :timestamp, :time then Time.now.to_s(:db)
-          when :date                        then Date.today.to_s(:db)
-          when :string                      then prefix + name.camelize + "String"
-          when :text                        then prefix + name.camelize + "Text"
-          when :boolean                     then false
-          else
-            ""
+        when :integer                     then 1
+        when :float                       then 1.5
+        when :decimal                     then "9.99"
+        when :datetime, :timestamp, :time then Time.now.to_s(:db)
+        when :date                        then Date.today.to_s(:db)
+        when :string                      then prefix + name.camelize + "String"
+        when :text                        then prefix + name.camelize + "Text"
+        when :boolean                     then false
+        else
+          ""
         end      
       end
       
       def flex_type
         @flex_type = case type
-          when :integer                     then 'int'
-          when :date, :datetime, :time      then 'Date'
-          when :boolean                     then 'Boolean'
-          when :float, :decimal             then 'Number'
-          else
-            'String'
+        when :integer                     then 'int'
+        when :date, :datetime, :time      then 'Date'
+        when :boolean                     then 'Boolean'
+        when :float, :decimal             then 'Number'
+        else
+          'String'
         end
       end
-      
-      def flex_default(prefix = '')
+
+      def flex_default
         @flex_default = case type
-          when :integer, :float, :decimal   then '0'
-          when :string, :text               then '""'
-          when :boolean                     then 'false'
-          else
-            'null'
+        when :integer                 then '0'
+        when :date, :datetime, :time  then 'new Date'
+        when :boolean                 then 'false'
+        when :float, :decimal         then 'new Number'
+        else
+          "\"\""
         end
       end
     end
@@ -75,7 +65,7 @@ module Rails
 end
 
 class RubossScaffoldGenerator < Rails::Generator::NamedBase
-  include Ruboss::Configuration 
+  include Ruboss4Ruby::Configuration 
   
   attr_reader   :project_name, 
                 :flex_project_name, 
@@ -96,9 +86,7 @@ class RubossScaffoldGenerator < Rails::Generator::NamedBase
                 :controller_underscore_name,
                 :controller_singular_name,
                 :controller_plural_name
-                
-  attr_accessor :constructor_args
-                  
+                                  
   alias_method  :controller_file_name,  :controller_underscore_name
   alias_method  :controller_table_name, :controller_plural_name
       
@@ -117,28 +105,7 @@ class RubossScaffoldGenerator < Rails::Generator::NamedBase
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
-
-    @belongs_tos = []
-    @has_ones = []
-    @has_manies = []
-    # Figure out has_one, has_many and belongs_to based on args
-    @args.each do |arg|
-      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
-        @belongs_tos = arg.split(":")[1].split(',')
-      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):/ }
+    extract_relationships
   end
   
   def manifest
@@ -180,11 +147,35 @@ class RubossScaffoldGenerator < Rails::Generator::NamedBase
     end
   end
   
-  protected    
-    def add_options!(opt)
-      opt.separator ''
-      opt.separator 'Options:'
-      opt.on("-f", "--flex-only", "Scaffold Flex code only", 
-        "Default: false") { |v| options[:flex_only] = v}
+  protected
+  def extract_relationships
+    @belongs_tos = []
+    @has_ones = []
+    @has_manies = []
+    # Figure out has_one, has_many and belongs_to based on args
+    @args.each do |arg|
+      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
+        @belongs_tos = arg.split(":")[1].split(',')
+      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):/ }
+  end
+  
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("-f", "--flex-only", "Scaffold Flex code only", 
+      "Default: false") { |v| options[:flex_only] = v}
+  end
 end