dima-ruboss4ruby 1.0.5 → 1.1.0

data/generators/ruboss_controller/ruboss_controller_generator.rb

@@ -0,0 +1,34 @@
+class RubossControllerGenerator < RubiGen::Base
+  include Ruboss4Ruby::Configuration
+  
+  attr_reader :project_name, 
+              :flex_project_name, 
+              :base_package, 
+              :base_folder, 
+              :command_controller_name,
+              :model_names, 
+              :command_names,
+              :component_names,
+              :use_air,
+              :application_tag
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @project_name, @flex_project_name, @command_controller_name, @base_package, @base_folder = extract_names
+    
+    @model_names = list_as_files("app/flex/#{base_folder}/models")
+    @command_names = list_as_files("app/flex/#{base_folder}/commands")
+  end
+
+  def manifest
+    record do |m|      
+      m.template 'controller.as.erb', File.join("app/flex/#{base_folder}/controllers", 
+        "#{command_controller_name}.as")      
+    end
+  end
+
+  protected
+    def banner
+      "Usage: #{$0} #{spec.name}" 
+    end
+end

data/{merb_generators/templates/ruboss_controller → generators/ruboss_controller/templates}/controller.as.erb

@@ -29,10 +29,6 @@ package <%= base_package %>.controllers {
       if (!RubossUtils.isEmpty(airDatabaseName)) Ruboss.airDatabaseName = airDatabaseName;
       controller = new <%= command_controller_name %>(new SingletonEnforcer, extraServices,
         defaultServiceId);
-			Ruboss.sessionToken = Application.application.parameters.session_token;
-			if (Application.application.parameters.authenticity_token) {
-			  Ruboss.defaultMetadata = { authenticity_token : Application.application.parameters.authenticity_token };
-			}
     }
   }
 }

data/generators/ruboss_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 ruboss_main_app`

data/generators/ruboss_main_app/ruboss_main_app_generator.rb

@@ -0,0 +1,46 @@
+class RubossMainAppGenerator < RubiGen::Base
+  include Ruboss4Ruby::Configuration
+  
+  attr_reader :project_name, 
+              :flex_project_name, 
+              :base_package, 
+              :base_folder, 
+              :command_controller_name,
+              :model_names, 
+              :command_names,
+              :component_names,
+              :use_air,
+              :application_tag
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @project_name, @flex_project_name, @command_controller_name, @base_package, @base_folder = 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?("app/flex/#{base_folder}/components/generated")
+      @component_names = list_mxml_files("app/flex/#{base_folder}/components/generated")
+    end
+  end
+
+  def manifest
+    record do |m|      
+      m.template 'mainapp.mxml', File.join('app', 'flex', "#{project_name}.mxml")
+    end
+  end
+
+  protected
+    def banner
+      "Usage: #{$0} #{spec.name}" 
+    end
+end

data/generators/ruboss_main_app/templates/mainapp.mxml

@@ -0,0 +1,31 @@
+<?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 -%>
+      import org.ruboss.services.air.AIRServiceProvider;
+<% end -%>
+      import org.ruboss.Ruboss;
+      import <%= base_package %>.controllers.<%= command_controller_name %>;
+
+      private function init():void {
+<% if use_air -%>
+        <%= command_controller_name %>.initialize([AIRServiceProvider], AIRServiceProvider.ID, "<%= base_package %>");
+<% else -%>
+        <%= command_controller_name %>.initialize();
+<% end -%>
+      }
+    ]]>
+  </mx:Script>
+  <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/ruboss_scaffold/USAGE

@@ -0,0 +1,29 @@
+Description:
+    Scaffolds an entire Ruboss resources. The resource is ready to use as a
+    starting point for your restful, resource-oriented application.
+    
+    ruboss_scaffold :
+      1. Generates all required Flex code.
+      2. You can pass special belongs_to, has_one and has_many attributes
+         to generate appropriate relationships.
+
+    Pass the name of the model, either CamelCased or under_scored, as the first
+    argument, and an optional list of attribute pairs.
+
+    Attribute pairs are column_name:sql_type arguments specifying the
+    model's attributes. Timestamps are added by default, so you don't have to
+    specify them by hand as 'created_at:datetime updated_at:datetime'.
+    
+    The syntax for belongs_to, has_one and has_many attributes is as follows:
+      belongs_to:<relationship_name> or
+      belongs_to:<relationship_name>,<another_relationship>,<and_another>
+
+    You don't have to think up every attribute up front, but it helps to
+    sketch out a few so you can start working with the resource immediately.
+
+    For example, `ruboss_scaffold post title:string body:text published:boolean`
+    gives you a model with those three attributes.
+
+Examples:
+    `./script/generate ruboss_scaffold project name:string has_many:tasks`
+    `./script/generate ruboss_scaffold task name:string belongs_to:project`

data/generators/ruboss_scaffold/ruboss_scaffold_generator.rb

@@ -0,0 +1,117 @@
+module Ruboss4Ruby
+  module Generator
+    class GeneratedAttribute
+      attr_accessor :name, :type, :flex_name
+
+      def initialize(name, type)
+        @name, @type = name, type.to_sym
+        @flex_name = name.camelcase(:lower)
+      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'
+        end
+      end
+      
+      def flex_default(prefix = '')
+        @flex_default = case type
+          when :integer, :float, :decimal   then '0'
+          when :string, :text               then '""'
+          when :boolean                     then 'false'
+          else
+            'null'
+        end
+      end
+    end
+  end
+end
+
+class RubossScaffoldGenerator < RubiGen::Base
+  include Ruboss4Ruby::Configuration 
+  
+  attr_reader   :project_name, 
+                :flex_project_name, 
+                :base_package, 
+                :base_folder, 
+                :command_controller_name
+
+  attr_reader   :belongs_tos, 
+                :has_manies,
+                :has_ones
+    
+  attr_reader   :name,
+                :class_name,
+                :file_name
+                                
+  attr_accessor :constructor_args
+      
+  def initialize(runtime_args, runtime_options = {})
+    super
+
+    # Name argument is required.
+    usage if runtime_args.empty?
+
+    @args = runtime_args.dup
+    @name = @args.shift
+    @file_name = @name.underscore
+    @class_name = @name.camelize
+    
+    @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
+    @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 manifest
+    record do |m|      
+      # Generate Flex AS model and MXML component based on the
+      # Ruboss templates.
+      
+      puts @file_name
+      
+      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}" }
+
+      # Run the rcontroller generator to clobber the
+      # RubossCommandController subclass to include the new models.
+      m.dependency 'ruboss_controller', [name] + @args, :collision => :force
+    end
+  end
+  
+  protected
+    def attributes
+      @attributes ||= @args.collect do |attribute|
+        Ruboss4Ruby::Generator::GeneratedAttribute.new(*attribute.split(":"))
+      end
+    end
+end

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

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml" width="100%" label="<%= class_name %>"
+  xmlns:rcomponents="org.ruboss.components.*">
+  <mx:Script><![CDATA[
+    import org.ruboss.Ruboss;
+    import org.ruboss.utils.RubossUtils;
+    import <%= base_package %>.models.<%= class_name %>;
+<% for model in belongs_tos -%>
+    import <%= base_package %>.models.<%= model.camelcase %>;
+<% end -%>
+
+    [Bindable]
+    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.pluralize %>List.selectedIndex = -1;
+    }
+
+    private function save<%= class_name %>():void {
+      if (_<%= class_name.dcfirst %>.id) {
+        update<%= class_name %>();
+      } else {
+        create<%= class_name %>();
+      }
+    }
+  
+    private function create<%= class_name %>():void {
+      var <%= class_name.dcfirst %>:<%= class_name %> = new <%= class_name %>();
+<% 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 %>.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});
+    }
+  
+    private function on<%= class_name %>Select():void {
+      _<%= class_name.dcfirst %> = RubossUtils.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 %>Update(<%= class_name.dcfirst %>:<%= class_name %>):void {
+      <%= class_name.dcfirst.pluralize %>List.selectedItem = <%= class_name.dcfirst %>;
+      _<%= class_name.dcfirst %> = RubossUtils.clone(<%= class_name.dcfirst %>) as <%= class_name %>;
+    }
+  
+    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 && !RubossUtils.isEmpty(<%= class_name.dcfirst %>.id);
+    }
+  ]]></mx:Script>
+  <mx:Panel id="<%= class_name.dcfirst.pluralize %>Panel"
+    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%"
+      dataProvider="{Ruboss.models.index(<%= class_name %>)}"
+      change="on<%= class_name %>Select()"/>
+    <mx:ControlBar width="100%">
+      <mx:Button label="New <%= class_name %>" width="100%" height="30"
+        click="new<%= class_name %>()"/>
+    </mx:ControlBar>
+  </mx:Panel>
+  <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.ucfirst %>" width="100%">
+<% if attribute.type == :boolean -%>
+        <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 %>}"/>
+<% elsif attribute.type == :text -%>
+        <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 -%>
+        <rcomponents: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 %>}"/>
+<% else -%>
+        <mx:TextInput id="<%= attribute.flex_name %>TextInput" width="100%" text="{_<%= class_name.dcfirst %>.<%= attribute.flex_name %>}"/>
+<% end -%>
+      </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="{Ruboss.models.index(<%= model.camelcase %>)}" prompt="<%= model.camelcase %> ..."
+          selectedItem="{_<%= class_name.dcfirst %>.<%= model.camelcase(:lower) %>}" />
+      </mx:FormItem>
+<% end -%>
+    </mx:Form>
+    <mx:ControlBar width="100%">
+      <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 %>)}"
+        click="destroy<%= class_name %>()"/>
+    </mx:ControlBar>
+  </mx:Panel>
+</mx:HBox>

data/generators/ruboss_scaffold/templates/model.as.erb

@@ -0,0 +1,42 @@
+package <%= base_package %>.models {
+<% if has_manies.length > 0 -%>
+  import org.ruboss.collections.ModelsCollection;
+<% end -%>
+  import org.ruboss.models.RubossModel;
+  
+  [Resource(name="<%= resource_controller_name %>")]
+  [Bindable]
+  public class <%= class_name %> extends RubossModel {
+<% if attributes && !attributes.empty? && attributes[0].flex_type != "Boolean" -%>
+    public static const LABEL:String = "<%= attributes[0].flex_name %>";
+<% else -%>
+    public static const LABEL:String = "id";
+<% end -%>
+
+<% for attribute in attributes -%>
+<% if attribute.type == :datetime || attribute.type == :time -%>
+    [DateTime]
+<% end -%>
+    public var <%= attribute.flex_name %>:<%= attribute.flex_type %>;
+
+<% end -%>
+<% for model in belongs_tos -%>
+    [BelongsTo]
+    public var <%= model.camelcase(:lower) %>:<%= model.camelcase %>;
+
+<% end -%>
+<% for model in has_ones -%>
+    [HasOne]
+    public var <%= model.camelcase(:lower) %>:<%= model.camelcase %>;
+    
+<% end -%>
+<% for model in has_manies -%>
+    [HasMany]
+    public var <%= model.camelcase(:lower) %>:ModelsCollection;
+    
+<% end -%>
+    public function <%= class_name %>() {
+      super(LABEL);
+    }
+  }
+}

data/generators/ruboss_yaml_scaffold/USAGE

@@ -0,0 +1,7 @@
+Description:
+    Scaffolds an entire application based on db/model.yml file. This generator
+    transforms entries in db/model.yml into command line calls to 
+    "ruboss_scaffold".
+
+Examples:
+    `./script/generate ruboss_yaml_scaffold`

data/generators/ruboss_yaml_scaffold/ruboss_yaml_scaffold_generator.rb

@@ -0,0 +1,43 @@
+require 'yaml'
+
+class RubossYamlScaffoldGenerator < RubiGen::Base
+  include Ruboss4Ruby::Configuration
+
+  def extract_attrs(line, attrs)
+    attrs.each do |key,value|
+      if value.class == Array
+        line << " #{key}:#{value.join(',')}"
+      else
+        line << " #{key}:#{value}"
+      end    
+    end
+    line
+  end
+  
+  def manifest
+    record do |m|
+      models = YAML.load(File.open(File.join(APP_ROOT, 'db/model.yml'), 'r'))
+      models.each do |model|
+        line = ""
+        attrs = model[1]
+        if attrs.class == Array
+          attrs.each do |elm|
+            line = extract_attrs(line, elm)
+          end
+        else
+          line = extract_attrs(line, attrs)
+        end
+        line = model[0].camelcase + " " + line
+        puts 'running: ruboss_scaffold ' + line
+        RubiGen::Scripts::Generate.new.run(["ruboss_scaffold"] + line.split)
+        puts 'done ...'
+      end
+      RubiGen::Scripts::Generate.new.run(["ruboss_main_app"])
+    end
+  end
+
+  protected
+  def banner
+    "Usage: #{$0} #{spec.name}" 
+  end
+end

data/lib/ruboss4ruby/active_foo.rb

@@ -12,9 +12,6 @@ module ActiveSupport
     module Hash
       module Conversions
         def to_fxml(options = {})
-          if self.empty? && !options[:root]
-            raise "empty hash being converted to FXML must specify :root option, e.g. <class_name>.to_s.underscore.pluralize"
-          end
           options.merge!(:dasherize => false)
           options[:indent] ||= 2
           options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
@@ -71,9 +68,6 @@ module ActiveSupport
     module Array
       module Conversions
         def to_fxml(options = {})
-          if self.empty? && !options[:root]
-            raise "empty array being converted to FXML must specify :root option, e.g. <class_name>.to_s.underscore.pluralize"
-          end
           raise "Not all elements respond to to_fxml" unless all? { |e| e.respond_to? :to_fxml }
 
           options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
@@ -110,64 +104,6 @@ end
 
 module ActiveRecord
   # Flex friendly XML serialization patches
-  class Base
-    class << self
-      # TODO: this doesn't work with hash based to_fxml(:include) options, only array based
-      def default_fxml_methods(*args)
-        methods = *args.dup
-        module_eval <<-END 
-          def self.default_fxml_methods_array
-            return [#{methods.inspect}].flatten
-          end
-        END
-      end
-      
-      def default_fxml_includes(*args)
-        includes = *args.dup
-        module_eval <<-END
-          def self.default_fxml_include_params
-            return [#{includes.inspect}].flatten
-          end
-        END
-      end
-            
-      def default_fxml_hash(already_included = [])
-        # return {} unless self.class.respond_to?(:default_fxml_include_params) || self.class.respond_to?(:default_fxml_methods_array)
-        default_hash = {:include => {}}
-        default_hash[:methods] = self.default_fxml_methods_array if self.respond_to?(:default_fxml_methods_array)
-        if self.respond_to?(:default_fxml_include_params)
-          default_includes = self.default_fxml_include_params
-          default_hash[:include] = default_includes.inject({}) do |include_hash, included|
-            next if already_included.include?(included) # We only want to include things once, to avoid infinite loops
-            included_class = included.to_s.singularize.camelize.constantize
-            include_hash[included] = included_class.default_fxml_hash(already_included + default_includes) 
-            include_hash
-          end
-        end
-        default_hash
-      end 
-      
-      # options[:include] can be a Hash, Array, Symbol or nil.
-      # We always want it as a Hash.  This translates includes to a Hash like this:
-      # If it's a nil, return an empty Hash ({})
-      # If it's a Hash, then it is just returned
-      # If it's an array, then it returns a Hash with each array element as a key, and values of empty Hashes.
-      # If it's a symbol, then it returns a Hash with a single key/value pair, with the symbol as the key and an empty Hash as the value.
-      def includes_as_hash(includes = nil)      
-        res = case
-          when includes.is_a?(Hash)
-            includes      
-          when includes.nil?
-           {}  
-          else #Deal with arrays and symbols
-            res = [includes].flatten.inject({}) {|include_hash, included| include_hash[included] = {} ; include_hash}
-        end
-        res
-      end           
-      
-    end
-  end
-
   module Serialization
     def to_fxml(options = {}, &block)
       options.merge!(:dasherize => false)

data/lib/ruboss4ruby/active_record_default_methods.rb

@@ -0,0 +1,54 @@
+module ActiveRecord
+  
+  class Base
+    class << self
+            
+      def default_methods(*args)
+        methods = *args.dup
+        module_eval <<-END 
+            def self.default_methods_array
+              return [#{methods.inspect}].flatten
+            end
+          END
+      end
+            
+      def defaults_hash(already_included = [], ignore_default_methods = nil)
+        defaults_hash = {:include => {}}
+        unless ignore_default_methods
+          defaults_hash[:methods] = self.default_methods_array if self.respond_to?(:default_methods_array)
+        end
+        defaults_hash
+      end 
+
+    end
+  
+  end    
+  
+  module Serialization
+    
+    alias_method :xml_defaults_old_to_xml, :to_xml unless method_defined?(:xml_defaults_old_to_xml)
+    
+    alias_method :json_defaults_old_to_json, :to_json unless method_defined?(:json_defaults_old_to_json)
+    
+    def to_xml(options = {}, &block)
+      unless options[:ignore_defaults]
+        unless options[:ignore_default_methods]
+          options[:methods] = [options[:methods] || []].flatten + (self.class.defaults_hash[:methods] || [])
+        end
+      end
+      xml_defaults_old_to_xml(options, &block)
+    end
+    
+    def to_json(options = {}, &block)
+      unless options[:ignore_defaults]
+        unless options[:ignore_default_methods]
+          options[:methods] = [options[:methods] || []].flatten + (self.class.defaults_hash[:methods] || [])
+        end
+      end
+      json_defaults_old_to_json(options, &block)      
+    end
+    
+  end
+    
+ 
+end