dima-restfulx 1.2.2 → 1.2.3

data/rails_generators/rx_config/templates/restfulx.erb

@@ -1,12 +1,47 @@
-# When you do file uploads from Flash with File.upload() that, unfortunately generates a new session id,
-# which will fail to authenticate if you are using restful-authentication plugin or equivalent.
-#
-# The following code is a work-around for the Flash bug that prevents file uploader
-# from sending correct session_id. Here, we hack the Session#initialize method and force the session_id
-# to load from the query string via the request URI.
-#
-# Based on the code from http://seventytwo.co.uk/posts/making-swfupload-and-rails-work-together
-#
+# the following patches allow us to overwrite session key on file uploads from Flash, 
+# which ends up creating a new session for every File.upload() invocation.
+
+<% if RAILS_GEM_VERSION =~ /^2.3/ -%>
+require 'rack/utils'
+
+class FlashSessionCookieMiddleware
+  def initialize(app, session_key = '_session_id')
+    @app = app
+    @session_key = session_key
+    @session_token = "_session_id"
+  end
+
+  def call(env)
+    if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
+      params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
+      env['HTTP_COOKIE'] = [ @session_key, params[@session_token] ].join('=').freeze unless params[@session_token].nil?
+    end
+    @app.call(env)
+  end
+end
+
+class FlexNestedAttributeMiddleware
+  def initialize(app)
+    @app = app
+  end
+  
+  def call(env)
+    req = Rack::Request.new(env)
+    if req && req.path_info =~ /\.fxml$/
+      if req.put? || req.post? || req.delete?
+        req.params.each do |key,value|
+          value.select { |k,v| k =~ /\_attributes$/ }.each do |match|
+            env['rack.request.form_hash'][key][match[0]] = ActiveSupport::JSON.decode(match[1])
+          end
+        end
+      end
+    end
+    @app.call(env)
+  end
+end
+
+ActionController::Dispatcher.middleware.insert_after 'ActionController::ParamsParser', FlexNestedAttributeMiddleware
+<% else -%>
 class CGI::Session
   alias original_initialize initialize
 
@@ -27,6 +62,7 @@ class CGI::Session
     return option
   end
 end
+<% end -%>
 
 # If you have configured your Rails/Flex/AIR application to share authenticity_token
 # comment this out to enable forgery protection. By default, this is disabled to allow
@@ -35,5 +71,5 @@ ActionController::Base.allow_forgery_protection = false
 
 <% if distributed -%>
 # If we are in distributed mode we need to make sure that the RestfulX::UUIDHelper is loaded
-require "restfulx/uuid_helper"
+require "restfulx/active_record_uuid_helper"
 <% end -%>

data/rails_generators/rx_config/templates/restfulx.yml

@@ -2,22 +2,22 @@
 
 # This option controls what the main Flex application file will be called.
 # By default it will be equal to the name of your rails project camelized
-project-name: <%= project_name %>
+project_name: <%= project_name %>
 
 # This options determines what the root folder for generated Flex code is.
 # By default 'app/flex'
-flex-root: <%= flex_root %>
+flex_root: <%= flex_root %>
 
 # By default flex models, commands, controllers and components are genearated into
 # <flex-root>/<your rails project name> folder. If you'd like to customize the target folder 
 # (to say append a "com" package before your rails project name) uncomment the line below
 # base-package must follow the usual flex package notation (a string separated by ".")
-base-package: <%= base_package %>
+base_package: <%= base_package %>
 
 # Main RestfulX 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: <%= command_controller_name %>
+controller_name: <%= command_controller_name %>
 
 # If you are using Rails on the back-end and Adobe AIR as the client you can generate Rails/Flex/AIR
 # code to take advantage of synchronization (online/offline) support in RestfulX by changing the following
@@ -35,17 +35,21 @@ defaults: &defaults
     tables: [table1 table2]
     fields: [field1 field2]
     
+# set up specific options for development environment
 development:
   <<: *defaults
 
+# set up specific options for test environment
 test:
   <<: *defaults
 
+# set up specific options for production environment
 production:
   <<: *defaults
   
-# Special model.yml fields for RestfulX code-generation:
+# The following special model.yml fields are supported.
 #
+# For example:
 # attachment_field: [avatar]
 #   * arg takes Paperclip field name, or takes [uploaded_data] for Attachment_Fu
 # belongs_to: [account, profile]

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

@@ -125,7 +125,7 @@ class RxScaffoldGenerator < Rails::Generator::NamedBase
   end
   
   def manifest
-    record do |m|      
+    record do |m|
       unless options[:flex_view_only]
         m.template 'model.as.erb',
           File.join("#{@flex_root}", base_folder, "models", "#{@class_name}.as"), 
@@ -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/rx_controller_generator.rb

@@ -26,6 +26,7 @@ class RxControllerGenerator < RubiGen::Base
       if options[:gae]
         m.file 'restful.py', 'app/controllers/restful.py' if !File.exist?('app/controllers/restful.py')
         m.file 'assist.py', 'app/models/assist.py' if !File.exist?('app/models/assist.py')
+        m.file 'iso8601.py', 'app/models/iso8601.py' if !File.exist?('app/models/iso8601.py')
       end
     end
   end

data/rxgen_generators/rx_controller/templates/assist.py

@@ -23,11 +23,11 @@
 __author__ = 'Dima Berastau'
 
 from google.appengine.ext import db
-import datetime
+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:
@@ -51,13 +51,13 @@ def update_model_from_params(model, params):
       elif isinstance(getattr(model, k), int) and v != "":
         setattr(model, k, int(v))
       elif isinstance(getattr(model, k), datetime.datetime) and v != "":
-        value = datetime.datetime.strptime(v, "%Y-%m-%dT%H:%M:%S%Z")
+        value = iso8601.parse_date(v)
         setattr(model, k, value)
       elif isinstance(getattr(model, k), datetime.date) and v != "":
         value = datetime.datetime.strptime(v, "%Y-%m-%d")
         setattr(model, k, datetime.date(value.year, value.month, value.day))
       elif isinstance(getattr(model, k), datetime.time) and v != "":
-        value = datetime.datetime.strptime(v, "%Y-%m-%dT%H:%M:%S%Z")
+        value = iso8601.parse_date(v)
         setattr(model, k, datetime.time(value.hour, value.minute, value.second))
       else:
         setattr(model, k, v)

data/rxgen_generators/rx_controller/templates/iso8601.py

@@ -0,0 +1,92 @@
+from datetime import datetime, timedelta, tzinfo
+import re
+
+__all__ = ["parse_date", "ParseError"]
+
+# Adapted from http://delete.me.uk/2005/03/iso8601.html
+ISO8601_REGEX = re.compile(r"(?P<year>[0-9]{4})(-(?P<month>[0-9]{1,2})(-(?P<day>[0-9]{1,2})"
+    r"((?P<separator>.)(?P<hour>[0-9]{2}):(?P<minute>[0-9]{2})(:(?P<second>[0-9]{2})(\.(?P<fraction>[0-9]+))?)?"
+    r"(?P<timezone>Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?"
+)
+TIMEZONE_REGEX = re.compile("(?P<prefix>[+-])(?P<hours>[0-9]{2}).(?P<minutes>[0-9]{2})")
+
+class ParseError(Exception):
+    """Raised when there is a problem parsing a date string"""
+
+# Yoinked from python docs
+ZERO = timedelta(0)
+class Utc(tzinfo):
+    """UTC
+    
+    """
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+UTC = Utc()
+
+class FixedOffset(tzinfo):
+    """Fixed offset in hours and minutes from UTC
+    
+    """
+    def __init__(self, offset_hours, offset_minutes, name):
+        self.__offset = timedelta(hours=offset_hours, minutes=offset_minutes)
+        self.__name = name
+
+    def utcoffset(self, dt):
+        return self.__offset
+
+    def tzname(self, dt):
+        return self.__name
+
+    def dst(self, dt):
+        return ZERO
+    
+    def __repr__(self):
+        return "<FixedOffset %r>" % self.__name
+
+def parse_timezone(tzstring, default_timezone=UTC):
+    """Parses ISO 8601 time zone specs into tzinfo offsets
+    
+    """
+    if tzstring == "Z":
+        return default_timezone
+    # This isn't strictly correct, but it's common to encounter dates without
+    # timezones so I'll assume the default (which defaults to UTC).
+    # Addresses issue 4.
+    if tzstring is None:
+        return default_timezone
+    m = TIMEZONE_REGEX.match(tzstring)
+    prefix, hours, minutes = m.groups()
+    hours, minutes = int(hours), int(minutes)
+    if prefix == "-":
+        hours = -hours
+        minutes = -minutes
+    return FixedOffset(hours, minutes, tzstring)
+
+def parse_date(datestring, default_timezone=UTC):
+    """Parses ISO 8601 dates into datetime objects
+    
+    The timezone is parsed from the date string. However it is quite common to
+    have dates without a timezone (not strictly correct). In this case the
+    default timezone specified in default_timezone is used. This is UTC by
+    default.
+    """
+    if not isinstance(datestring, basestring):
+        raise ParseError("Expecting a string %r" % datestring)
+    m = ISO8601_REGEX.match(datestring)
+    if not m:
+        raise ParseError("Unable to parse date string %r" % datestring)
+    groups = m.groupdict()
+    tz = parse_timezone(groups["timezone"], default_timezone=default_timezone)
+    if groups["fraction"] is None:
+        groups["fraction"] = 0
+    else:
+        groups["fraction"] = int(float("0.%s" % groups["fraction"]) * 1e6)
+    return datetime(int(groups["year"]), int(groups["month"]), int(groups["day"]),
+        int(groups["hour"]), int(groups["minute"]), int(groups["second"]),
+        int(groups["fraction"]), tz)

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>
@@ -14,12 +14,13 @@
       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 -%>
 <% if use_gae -%>
       import org.restfulx.services.http.GAEHTTPServiceProvider;
+<% else -%>
+      import org.restfulx.services.http.XMLHTTPServiceProvider;
 <% end -%>
       import org.restfulx.Rx;
       import <%= base_package %>.controllers.<%= command_controller_name %>;
@@ -53,9 +54,15 @@
           AIRServiceProvider.ID, "<%= base_package %>");
 <% if distributed -%>
 
+<% if use_gae -%>
+        Rx.changes.setSyncProviders(
+          ISyncingServiceProvider(Rx.services.getServiceProvider(AIRServiceProvider.ID)),
+            Rx.services.getServiceProvider(GAEHTTPServiceProvider.ID));
+<% else -%>
         Rx.changes.setSyncProviders(
           ISyncingServiceProvider(Rx.services.getServiceProvider(AIRServiceProvider.ID)),
             Rx.services.getServiceProvider(XMLHTTPServiceProvider.ID));
+<% end -%>
 
         Rx.changes.addEventListener(PushStartEvent.ID, onPushStart);
         Rx.changes.addEventListener(PushEndEvent.ID, onPushEnd);
@@ -93,7 +100,11 @@
         online = (socketMonitor.available) ? true : false;
   
         if (online) {
+<% if use_gae -%>
+          Rx.defaultServiceId = GAEHTTPServiceProvider.ID;
+<% else -%>
           Rx.defaultServiceId = XMLHTTPServiceProvider.ID;
+<% end -%>
         } else {
           Rx.defaultServiceId = AIRServiceProvider.ID;
         }
@@ -101,8 +112,13 @@
 
       private function getCurrentProviderName(id:int):String {
         switch (id) {
+<% if use_gae -%>
+          case GAEHTTPServiceProvider.ID:
+            return "GAE";
+<% else -%>
           case XMLHTTPServiceProvider.ID:
-            return "Rails";
+            return "XML/HTTP";
+<% end -%>
           case AIRServiceProvider.ID:
             return "AIR (SQLite)";
           default :

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,
@@ -93,14 +100,20 @@ class RxScaffoldGenerator < RubiGen::Base
   end
   
   def manifest
-    record do |m|      
+    record do |m|   
       m.template 'model.as.erb',
         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