document_form 0.1.0 → 0.1.2

data/MIT-LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2010 [name of plugin creator]
+Copyright (c) 2007-2008 Justin French
+Copyright (c) 2010 Maurizio Casimirri
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,3 +19,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Manifest

@@ -1,9 +1,7 @@
 MIT-LICENSE
-README
+README.textile
 Rakefile
 init.rb
 lib/document_form.rb
 lib/document_form/i18n.rb
-lib/mongo_mapper/plugins/multi_parameter_attributes.rb
-lib/mongoid/multi_parameter_attributes.rb
 Manifest

data/README.textile

@@ -0,0 +1,94 @@
+h1. DocumentForm a Form Builder for Mongoid
+
+DocumentForm is a Rails3 FormBuilder DSL that aims to provide a super fast and simple form-building tool to edit Mongoid documents in Rails3.
+DocumentForm is a fork of <a href="http://github.com/justinfrench/formtastic">formtastic</a>.
+
+h2. Basic Usage
+
+DocumentForm allows you to create a form almost without coding.
+
+Model
+
+<pre>
+class Person
+  include Mongoid::Document
+  include Mongoid::MultiParameterAttributes
+
+  validates_presence_of :name
+
+  field :name
+  field :secret,            :private => true
+  field :birthday,          :type => Date
+  field :department_number, :type => Integer, :range => 1..10
+
+  field :description,       :long => true
+end
+</pre>
+
+View
+
+<pre>
+  <% document_form_for @object do |f| %>
+    <%= f.inputs %>
+    <%= f.buttons %>
+  <% end %>
+</pre>
+
+ * Fields are rendered in the declaration order.
+ * Fields that has :private => true option are not rendered.
+
+h2. File upload support
+
+DocumentForm will render automatically file inputs for:
+
+ * Carrierwave
+ * Paperclip
+ * Any other upload library that generates a @_filename@ field in your model
+
+DocumentForm will configure automatically your form with @:multipart => true@ for each models that has at least a @_filename@ field.
+
+h2. Installation
+
+Put this in your @Gemfile@
+
+<pre>
+  gem document_form
+</pre>
+
+and run:
+
+<pre>
+  bundle install
+</pre>
+
+h2. Some advanced examples
+
+Belongs_to association
+
+<pre>
+class Person
+  include Mongoid::Document
+
+  referenced_in :department
+end
+</pre>
+
+Will render a drop down list of departments
+
+
+Has many association
+
+<pre>
+class Person
+  include Mongoid::Document
+
+  references_many :departments, :stored_as => :array
+end
+</pre>
+
+Will render a sequence of checkboxes to pick multiple departments
+
+h2. Other usage details
+
+Please refer to <a href="http://github.com/justinfrench/formtastic">formtastic documentation</a> for a more detailed usage guide until DocumentForm documentation will be available.
+

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('document_form', '0.1.0') do |p|
+Echoe.new('document_form', '0.1.2') do |p|
    p.description     = "Form Builder for Rails3 and MongoID or MongoMapper"
    p.url             = "http://github.com/mcasimir/document_form"
    p.author          = "Maurizio Casimirri"

data/document_form.gemspec

@@ -2,24 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{document_form}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Maurizio Casimirri"]
-  s.date = %q{2010-09-05}
+  s.authors = [%q{Maurizio Casimirri}]
+  s.date = %q{2011-12-04}
   s.description = %q{Form Builder for Rails3 and MongoID or MongoMapper}
   s.email = %q{maurizio.cas@gmail.com}
-  s.extra_rdoc_files = ["README", "lib/document_form.rb", "lib/document_form/i18n.rb", "lib/mongo_mapper/plugins/multi_parameter_attributes.rb", "lib/mongoid/multi_parameter_attributes.rb"]
-  s.files = ["MIT-LICENSE", "README", "Rakefile", "init.rb", "lib/document_form.rb", "lib/document_form/i18n.rb", "lib/mongo_mapper/plugins/multi_parameter_attributes.rb", "lib/mongoid/multi_parameter_attributes.rb", "Manifest", "document_form.gemspec"]
+  s.extra_rdoc_files = [%q{README.textile}, %q{lib/document_form.rb}, %q{lib/document_form/i18n.rb}]
+  s.files = [%q{MIT-LICENSE}, %q{README.textile}, %q{Rakefile}, %q{init.rb}, %q{lib/document_form.rb}, %q{lib/document_form/i18n.rb}, %q{Manifest}, %q{document_form.gemspec}]
   s.homepage = %q{http://github.com/mcasimir/document_form}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Document_form", "--main", "README"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Document_form}, %q{--main}, %q{README.textile}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{document_form}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Form Builder for Rails3 and MongoID or MongoMapper}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/document_form.rb

@@ -20,12 +20,15 @@ if defined? Mongoid
           access = name.to_s
 
           @field_list << access
-          set_field(access, options)
+          check_field_name!(name)
+          add_field(access, options)
           attr_protected name if options[:accessible] == false
         end
       end
     end
   end
+
+
 end
 
 
@@ -36,7 +39,7 @@ module DocumentForm #:nodoc:
     @@default_text_field_size = 60
     @@all_fields_required_by_default = false
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { (%{<abbr title="#{::DocumentForm::I18n.t(:required)}">*</abbr>}).html_safe }
+    @@required_string = "*" #proc { (%{<abbr title="#{::DocumentForm::I18n.t(:required)}">*</abbr>}).html_safe }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
@@ -51,7 +54,7 @@ module DocumentForm #:nodoc:
                    :required_string, :optional_string, :inline_errors, :label_str_method, :collection_label_methods,
                    :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :default_commit_button_accesskey
 
-    RESERVED_COLUMNS = [:_id, :created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+    RESERVED_COLUMNS = [:_id, :_type, :created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
     INLINE_ERROR_TYPES = [:sentence, :list, :first]
 
@@ -104,11 +107,25 @@ module DocumentForm #:nodoc:
     #
     def input(method, options = {})
 
+      if options[:class].present?
+        options[:input_html] ||= {}
+        options[:input_html][:class] = options[:class]
+      end
+
 
       options[:required] = method_required?(method) unless options.key?(:required)
       mm_key = mongomapper_key(method)
 
-      return nil if !options[:as] && mm_key.type.nil?
+      if mm_key
+        return nil if !options[:as] && mm_key.type.nil?
+
+        if(!options[:as] && mm_key.options[:in].present?)
+          options[:as] = :select
+          options[:collection] = mm_key.options[:in]
+        end
+      end
+
+
       options[:as]     ||= default_input_type(method, options)
 
       html_class = [ options[:as], (options[:required] ? :required : :optional) ]
@@ -289,6 +306,7 @@ module DocumentForm #:nodoc:
         inputs_for_nested_attributes(*(args << html_options), &block)
       elsif block_given?
         field_set_and_list_wrapping(*(args << html_options), &block)
+        return nil
       else
         if @object && args.empty?
           args  = []
@@ -465,7 +483,7 @@ module DocumentForm #:nodoc:
     protected
 
       class FieldAdapter
-        attr_accessor :name, :type, :required, :options
+        attr_accessor :name, :type, :required, :options, :association, :macro
       end
 
       class OrderedHashWithIndifferentAccess < ActiveSupport::OrderedHash
@@ -504,7 +522,8 @@ module DocumentForm #:nodoc:
               mmfl.delete("_id")
               mmfl
             when :mongoid
-              resource_class.fields.stringify_keys
+              #raise resource_class.fields.stringify_keys.inspect
+             resource_class.fields.stringify_keys
           end || {}
 
           flds.keys.each do |name|
@@ -513,7 +532,7 @@ module DocumentForm #:nodoc:
             fa          = FieldAdapter.new
             fa.name     = name
             fa.options  = field.options
-            fa.type     = field.type
+            fa.type     = (name.to_s =~ /_id$/) ? BSON::ObjectId : field.type
             fa.required = is_required_field?(field)
 
             flds[name]  = fa
@@ -527,6 +546,19 @@ module DocumentForm #:nodoc:
             f = unordered[fn]
             if f
               @df_resource_fields[fn] = f
+
+            elsif orm == :mongoid
+              f = resource_class.associations[fn]
+
+              if f && !f.options[:private]
+                fa          = FieldAdapter.new
+                fa.name     = fn
+                fa.options  = f.options
+                fa.type     = f.association
+                fa.required = is_required_field?(f)
+                @df_resource_fields[fn] = fa
+              end
+
             end
           }
 
@@ -618,7 +650,12 @@ module DocumentForm #:nodoc:
       #   configuration option @@all_fields_required_by_default is used.
       #
       def method_required?(attribute) #:nodoc:
-        resource_fields[attribute].required
+          rf = resource_fields[attribute]
+          if !rf.nil?
+            rf.required
+          else
+            false
+          end
       end
 
       # Determines whether the given options evaluate to true
@@ -657,13 +694,22 @@ module DocumentForm #:nodoc:
 
       # Outputs a label and standard Rails text field inside the wrapper.
       def numeric_input(method, options)
+        options ||= {}
+        html_options = options[:input_html] || {}
+
+        html_options[:size] ||= 8
+        options[:input_html] = html_options
+
         basic_input_helper(:text_field, :numeric, method, options)
       end
 
       # Ouputs a label and standard Rails text area inside the wrapper.
       def text_input(method, options)
         options[:input_html] ||= {}
-        options[:input_html][:cols] ||= 60
+        options[:input_html][:cols] ||= options[:cols]
+        options[:input_html][:rows] ||= options[:rows]
+
+        #options[:input_html][:cols] ||= 60
         basic_input_helper(:text_area, :text, method, options)
       end
 
@@ -676,6 +722,7 @@ module DocumentForm #:nodoc:
       def markup_input(method, options)
         options[:input_html] ||= {}
         options[:input_html][:class] = "markup"
+        options[:input_html][:rows] ||= 20
         basic_input_helper(:text_area, :text, method, options)
       end
 
@@ -810,7 +857,10 @@ module DocumentForm #:nodoc:
       #
       def select_input(method, options)
         mm_key = mongomapper_key(method)
+        options[:include_blank] ||= mm_key.options[:allow_blank]
         options[:include_blank] = false if mm_key && mm_key.options[:required] && !options[:include_blank].present?
+        options[:collection]    ||= mm_key.options[:in]
+        options[:collection]    ||= mm_key.options[:collection]
 
         html_options = options.delete(:input_html) || {}
         options = set_include_blank(options)
@@ -974,10 +1024,10 @@ module DocumentForm #:nodoc:
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, li_content.html_safe, li_options).html_safe
         end
 
-        field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
+        field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content).html_safe
       end
       alias :boolean_radio_input :radio_input
 
@@ -1073,6 +1123,11 @@ module DocumentForm #:nodoc:
       # This is an absolute abomination, but so is the official Rails select_date().
       #
       def date_or_datetime_input(method, options)
+
+        field_options = resource_fields[method].options
+        options ||= {}
+        options[:start_year]  ||= field_options[:start_year]
+
         position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
         i18n_date_order = ::I18n.t(:order, :scope => [:date])
         i18n_date_order = nil unless i18n_date_order.is_a?(Array)
@@ -1086,8 +1141,11 @@ module DocumentForm #:nodoc:
 
         default_time = ::Time.now
 
+        datetime_obj = @object.send(method) if @object
+
         # Gets the datetime object. It can be a Fixnum, Date or Time, or nil.
-        datetime = options[:selected] || (@object ? @object.send(method) : default_time) || default_time
+        datetime = options[:selected] || datetime_obj || default_time
+#        datetime = datetime.in_time_zone(Time.zone) if (datetime && datetime.respond_to?(:in_time_zone))
 
         html_options = options.delete(:input_html) || {}
         input_ids    = []
@@ -1227,29 +1285,31 @@ module DocumentForm #:nodoc:
       #
       #
       def array_input(method, options)
-        cls = self.model_name.constantize
-        assoc = cls.associations.find{|a| (!a.last.options[:in].nil?) && a.last.options[:in].to_sym == method && a.last.type == :many}
-        if assoc.present?
-          assoc_name = assoc.first
-          mm_assoc = assoc.last
+        m = method.to_s
+
+        if (m =~ /_ids/) && (assoc = resource_class.associations[m.gsub(/_ids$/, "").pluralize]) && assoc.association == Mongoid::Associations::ReferencesManyAsArray
+          f = resource_fields[m]
+          klass = f.options[:inverse_class_name].constantize
 
-          collection = mm_assoc.name.to_s.camelize.singularize.constantize.all
+          collection = klass.all
           checked    = @object.send(:"#{method}") if @object
           checked    ||= []
 
 
           checkboxes = collection.map { |elem|
              name = "#{self.model_name.tableize.singularize}[#{method.to_s}][]"
-             ckb = if checked.include? elem._id.to_s
+             ckb = if checked.include? elem.id
                template.check_box_tag(name, elem._id, {}, :checked => "checked")
              else
                template.check_box_tag(name, elem._id)
              end
-             label = to_label(elem)
+             label = format_object(elem)
              [ckb, label].join(" ")
           }.map{|checkbox| "<li>#{checkbox}</li>"}.join
 
-          field_set_and_list_wrapping_for_method(method, options, checkboxes)
+          method = m.gsub(/_ids$/, "").pluralize.to_sym if !options[:label].present?
+
+          field_set_and_list_wrapping_for_method(method, options, checkboxes.html_safe)
         end
       end
       # Outputs a country select input, wrapping around a regular country_select helper.
@@ -1267,7 +1327,7 @@ module DocumentForm #:nodoc:
       #   f.input :location, :as => :country, :priority_countries => /Australia/ # set your own
       #
       def country_input(method, options)
-        raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless self.respond_to?(:country_select)
+        return basic_input_helper(:text_field, :string, method, options) unless self.respond_to?(:country_select)
 
         html_options = options.delete(:input_html) || {}
         priority_countries = options.delete(:priority_countries) || @@priority_countries
@@ -1451,8 +1511,8 @@ module DocumentForm #:nodoc:
         if column = resource_fields[method]
 
           # Special cases where the column type doesn't map to an input method.
-          type = column.type.name.underscore.to_sym
-
+          type = column.type.name.split("::").last.underscore.to_sym
+          type = :string if type == :object
 
           case type
           when :string
@@ -1517,55 +1577,84 @@ module DocumentForm #:nodoc:
     end
   end
 
-
-  def label_key(doc)
-    if doc.keys.has_key? :name
-      :name
-    elsif doc.keys.has_key? :title
-      :title
-    end
-  end
-
-  def to_label(obj)
-      lcol = label_key(obj.class)
-      if obj.respond_to? :to_label
-        obj.to_label
-      elsif lcol
-        obj.send :"#{lcol}"
-      else
-        ""
-      end
-  end
+#  def fields_method(doc)
+#    if (defined? MongoMapper) && (doc.include? MongoMapper::Document)
+#      :keys
+#    elsif (defined? Mongoid) && (doc.include? Mongoid::Document)
+#      :fields
+#    end
+#  end
+
+#  def label_key(doc)
+#    if doc.send(fields_method(doc)).has_key? :name
+#      :name
+#    elsif doc.send(fields_method(doc)).has_key? :title
+#      :title
+#    end
+#  end
+
+#  def to_label(obj)
+#      lcol = label_key(obj.class)
+#      if obj.respond_to? :to_label
+#        obj.to_label
+#      elsif lcol
+#        obj.send :"#{lcol}"
+#      else
+#        ""
+#      end
+#  end
 
   def format_object(object)
-    if  object.class.include? MongoMapper::Document
-      to_label(object)
+    if object.respond_to? :to_label
+      object.to_label
     elsif object.is_a? DateTime
       I18n.l(object)
     elsif object.is_a? Symbol
       t(object)
+    elsif object.respond_to? :name
+      object.name
+    elsif object.respond_to? :title
+      object.title
     else
       object
     end
   end
 
 
+      def referenced_in_input(method, options)
+
+        field = resource_fields[method]
+        association_class = field.name.to_s.singularize.camelize.constantize
 
+        options[:collection] = association_class.all.map {|obj| [format_object(obj), obj.id]}
+
+        if field.options[:allow_blank] == false || field.options[:required] == true
+          options[:include_blank] = false
+        end
+
+        select_input(method, options)
+      end
 
       def object_id_input(method, options)
+        field = resource_fields[method]
 
-        cls = self.model_name.constantize
-        key = cls.keys[method]
-        assoc = cls.associations[method.to_s.gsub(/_id$/, "")]
-        association_class = assoc.name.to_s.singularize.camelize.constantize
+        if options[:collection].nil?
+          if options[:class_name].present?
+            association_class = options[:class_name].camelize.constantize
+          else
+            association_class = field.name.to_s.gsub(/_id$/, "").singularize.camelize.constantize
+          end
+          options[:collection] = association_class.all.map {|obj| [format_object(obj), obj.id]}
+        end
 
-        options[:collection] = association_class.all.map {|obj| [format_object(obj), obj.id]}
 
-        if key.options[:allow_blank] == false || key.options[:required] == true
+        if field.options[:allow_blank] == false || field.options[:required] == true
           options[:include_blank] = false
         end
 
         select_input(method, options)
+
+
       end
 
       # Used by select and radio inputs. The collection can be retrieved by
@@ -1911,6 +2000,8 @@ module DocumentForm #:nodoc:
           options[:html][:class] = class_names.join(" ")
 
           doctype = class_names.last.camelize.constantize
+
+
           has_attachments = false
           rfields = if doctype.respond_to?("fields")
             doctype.fields

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: document_form
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Maurizio Casimirri
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 +02:00
-default_executable: 
+date: 2011-12-04 00:00:00 Z
 dependencies: []
 
 description: Form Builder for Rails3 and MongoID or MongoMapper
@@ -25,23 +20,18 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.textile
 - lib/document_form.rb
 - lib/document_form/i18n.rb
-- lib/mongo_mapper/plugins/multi_parameter_attributes.rb
-- lib/mongoid/multi_parameter_attributes.rb
 files: 
 - MIT-LICENSE
-- README
+- README.textile
 - Rakefile
 - init.rb
 - lib/document_form.rb
 - lib/document_form/i18n.rb
-- lib/mongo_mapper/plugins/multi_parameter_attributes.rb
-- lib/mongoid/multi_parameter_attributes.rb
 - Manifest
 - document_form.gemspec
-has_rdoc: true
 homepage: http://github.com/mcasimir/document_form
 licenses: []
 
@@ -52,7 +42,7 @@ rdoc_options:
 - --title
 - Document_form
 - --main
-- README
+- README.textile
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -60,22 +50,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: document_form
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Form Builder for Rails3 and MongoID or MongoMapper

data/README

@@ -1,13 +0,0 @@
-DocumentForm
-============
-
-Introduction goes here.
-
-
-Example
-=======
-
-Example goes here.
-
-
-Copyright (c) 2010 [name of plugin creator], released under the MIT license

data/lib/mongo_mapper/plugins/multi_parameter_attributes.rb

@@ -1,98 +0,0 @@
-if defined? MongoMapper
-
-  module MongoMapper
-    module Plugins
-      module MultiParameterAttributes
-        def self.included(model)
-          model.plugin self
-        end
-
-        module InstanceMethods
-          def attributes=(new_attributes)
-            return if new_attributes.nil?
-
-            multi_parameter_attributes = []
-            normal_attributes = {}
-
-            new_attributes.each do |k, v|
-              if k.to_s.include?("(")
-                multi_parameter_attributes << [ k.to_s, v ]
-              else
-                normal_attributes[k] = v
-              end
-            end
-
-            assign_multiparameter_attributes(multi_parameter_attributes)
-
-            super(normal_attributes)
-          end
-
-          # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
-          # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
-          # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
-          # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
-          # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
-          # s for String, and a for Array. If all the values for a given attribute are empty, the attribute will be set to nil.
-          def assign_multiparameter_attributes(pairs)
-            execute_callstack_for_multiparameter_attributes(
-              extract_callstack_for_multiparameter_attributes(pairs)
-            )
-          end
-
-          def execute_callstack_for_multiparameter_attributes(callstack)
-            callstack.each do |name, values_with_empty_parameters|
-              # in order to allow a date to be set without a year, we must keep the empty values.
-              # Otherwise, we wouldn't be able to distinguish it from a date with an empty day.
-              values = values_with_empty_parameters.reject(&:nil?)
-
-              if !values.reject{|x| x.blank? }.empty?
-                key = self.class.keys[name]
-                raise ArgumentError, "Unknown key #{name}" if key.nil?
-                klass = key.type
-
-                value = if Time == klass
-                  Time.zone.local(*values.map(&:to_i))
-                elsif Date == klass
-                  begin
-                    values = values_with_empty_parameters.map{|v| v.blank? ? 1 : v.to_i}
-                    Date.new(*values)
-                  rescue ArgumentError => ex # if Date.new raises an exception on an invalid date
-                    Time.zone.local(*values.map(&:to_i)).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
-                  end
-                else
-                  klass.new(*values)
-                end
-                writer_method = "#{name}="
-                if respond_to?(writer_method)
-                  self.send(writer_method, value)
-                else
-                  self[name.to_s] = value
-                end
-              end
-            end
-          end
-
-          def extract_callstack_for_multiparameter_attributes(pairs)
-            attributes = { }
-
-            for pair in pairs
-              multiparameter_name, value = pair
-              attribute_name = multiparameter_name.split("(").first
-              attributes[attribute_name] = [] unless attributes.include?(attribute_name)
-
-              attributes[attribute_name] << [ find_parameter_position(multiparameter_name), value ]
-            end
-
-            attributes.each { |name, values| attributes[name] = values.sort_by{ |v| v.first }.collect { |v| v.last } }
-          end
-
-          def find_parameter_position(multiparameter_name)
-            multiparameter_name.scan(/\(([0-9]*).*\)/).first.first
-          end
-        end
-      end
-    end
-  end
-
-end
-

data/lib/mongoid/multi_parameter_attributes.rb

@@ -1,95 +0,0 @@
-module Mongoid
-  module MultiParameterAttributes
-    extend ActiveSupport::Concern
-
-    included do
-      self.before_validation :handle_multiparameter_attributes
-    end
-
-    module InstanceMethods
-      protected
-
-      def handle_multiparameter_attributes
-        multiparameter_attributes = []
-        self.attributes.each_pair do |attr_name, value|
-          multiparameter_attributes << [attr_name, value] if attr_name.include?("(")
-        end
-
-        assign_multiparameter_attributes(multiparameter_attributes) if multiparameter_attributes.any?
-      end
-
-      def assign_multiparameter_attributes(pairs)
-        execute_callstack_for_multiparameter_attributes(
-          extract_callstack_for_multiparameter_attributes(pairs)
-        )
-      end
-
-      def execute_callstack_for_multiparameter_attributes(callstack)
-        errors = []
-        callstack.each do |name, values_with_empty_parameters|
-          begin
-            klass = self.class.fields[name].type
-
-            puts "Class is #{klass.to_s}"
-            # in order to allow a date to be set without a year, we must keep the empty values.
-            # Otherwise, we wouldn't be able to distinguish it from a date with an empty day.
-            values = values_with_empty_parameters.reject(&:nil?)
-
-            if values.empty?
-              send(name + "=", nil)
-            else
-
-              value = if Time == klass
-                instantiate_time_object(name, values)
-              elsif Date == klass
-                begin
-                  values = values_with_empty_parameters.collect do |v| v.nil? ? 1 : v end
-                  Date.new(*values)
-                rescue ArgumentError => ex # if Date.new raises an exception on an invalid date
-                  instantiate_time_object(name, values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
-                end
-              else
-                klass.new(*values)
-              end
-
-              send(name + "=", value)
-            end
-          rescue => ex
-            errors << AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
-          end
-        end
-        unless errors.empty?
-          raise MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
-        end
-      end
-
-      def extract_callstack_for_multiparameter_attributes(pairs)
-        attributes = { }
-
-        for pair in pairs
-          multiparameter_name, value = pair
-          attribute_name = multiparameter_name.split("(").first
-          attributes[attribute_name] = [] unless attributes.include?(attribute_name)
-
-          parameter_value = value.empty? ? nil : type_cast_attribute_value(multiparameter_name, value)
-          attributes[attribute_name] << [ find_parameter_position(multiparameter_name), parameter_value ]
-        end
-
-        attributes.each { |name, values| attributes[name] = values.sort_by{ |v| v.first }.collect { |v| v.last } }
-      end
-
-      def type_cast_attribute_value(multiparameter_name, value)
-        multiparameter_name =~ /\([0-9]*([if])\)/ ? value.send("to_" + $1) : value
-      end
-
-      def find_parameter_position(multiparameter_name)
-        multiparameter_name.scan(/\(([0-9]*).*\)/).first.first
-      end
-
-      def instantiate_time_object(name, values)
-        Time.zone.local(*values)
-      end
-    end
-  end
-end
-