dm-rails 1.0.4 → 1.1.0.rc1

data/Gemfile

@@ -1,37 +1,63 @@
+require 'pathname'
+
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0'
+SOURCE       = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION   = '~> 1.0.2'
 
 group :runtime do
 
-  git 'git://github.com/rails/rails.git', :branch => '3-0-stable' do
+  gem 'actionpack',      '~> 3.0.4', :require => 'action_pack'
+  gem 'activesupport',   '~> 3.0.4', :require => 'active_support'
+  gem 'dm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
+  gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}"
+  gem 'i18n',            '~> 0.5.0'
+  gem 'railties',        '~> 3.0.4', :require => 'rails'
 
-    gem 'activesupport', :require => 'active_support'
-    gem 'actionpack',    :require => 'action_pack'
-    gem 'railties',      :require => 'rails'
+end
 
-  end
+group :development do
 
-  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
-  gem 'dm-active_model', DM_VERSION, :git => "#{DATAMAPPER}/dm-active_model.git"
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rake',    '~> 0.8.7'
+  gem 'rspec',   '~> 1.3.1'
 
 end
 
-group :development do
+group :quality do
 
-  gem 'rake',            '~> 0.8.7'
-  gem 'jeweler',         '~> 1.4'
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :datamapper do
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
+
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-  gem 'metric_fu',       '~> 1.3'
-  gem 'rcov',            '~> 0.9.7'
-  gem 'reek',            '~> 1.2.7'
-  gem 'roodi',           '~> 2.1'
-  gem 'yard',            '~> 0.5'
-  gem 'yardstick',       '~> 0.1'
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
+    gem 'data_objects', DO_VERSION, options.dup
+
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
+  end
+
+  gem 'dm-migrations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}"
+
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
+  end
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2010 The dm-rails team
+Copyright (c) 2011-2010 The dm-rails team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,6 +1,6 @@
 = dm-rails
 
-This gem provides the railtie that allows {datamapper}[http://github.com/datamapper/dm-core] to hook into {rails3}[http://github.com/rails/rails] and thus behave like a rails framework component. Just like activercord does in rails, {dm-rails}[http://github.com/datamapper/dm-rails] uses the railtie API to hook into rails. The two are actually hooked into rails almost identically.
+This gem provides the railtie that allows {datamapper}[http://github.com/datamapper/dm-core] to hook into {rails3}[http://github.com/rails/rails] and thus behave like a rails framework component. Just like activerecord does in rails, {dm-rails}[http://github.com/datamapper/dm-rails] uses the railtie API to hook into rails. The two are actually hooked into rails almost identically.
 
 Creating new datamapper apps on rails3 from scratch is actually really easy. The following will guide you through the process.
 
@@ -37,6 +37,7 @@ gives us. First you need to uncomment/remove a seemingly invalid rspec configura
   Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
   RSpec.configure do |config|
+
     # == Mock Framework
     #
     # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -46,15 +47,8 @@ gives us. First you need to uncomment/remove a seemingly invalid rspec configura
     # config.mock_with :rr
     config.mock_with :rspec
 
-    config.before(:all) { DataMapper.auto_migrate! }
-
-    # I can't find that option when looking at current rspec-core source
-    # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+    config.before(:suite) { DataMapper.auto_migrate! }
 
-    # If you're not using ActiveRecord, or you'd prefer not to run each of your
-    # examples within a transaction, comment the following line or assign false
-    # instead of true.
-    # config.use_transactional_fixtures = true
   end
 
 With this in place, running
@@ -105,7 +99,7 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
   gem 'actionmailer',       RAILS_VERSION, :require => 'action_mailer'
   gem 'railties',           RAILS_VERSION, :require => 'rails'
 
-  gem 'dm-rails',          '~> 1.0.3'
+  gem 'dm-rails',          '~> 1.1.0.rc1'
   gem 'dm-sqlite-adapter', DM_VERSION
 
   # You can use any of the other available database adapters.
@@ -542,11 +536,12 @@ Currently dm-rails publishes the same benchmarking information like active_recor
   Completed in 9ms (Views: 7.6ms | Models: 0.6ms) with 200
 
 
-== Current Issues
+== Migrations
 
-* migrations might not work perfectly
-* rspec-2 is not yet integrated
+The latest released version of {dm-migrations}[http://github.com/datamapper/dm-migrations] suffers from a {bug}[http://datamapper.lighthouseapp.com/projects/20609/tickets/1214]
+that prevents any migration to be run at all when invoked via the standard `rake db:migrate` command. Currently, there are two ways to workaround that.
 
+You can either point {dm-migrations}[http://github.com/datamapper/dm-migrations] to :git in your application's Gemfile, or you can patch the generated Rakefile as shown at the bottom of the related {bug report}[http://datamapper.lighthouseapp.com/projects/20609/tickets/1214].
 
 == TODO (not necessarily in that order)
 
@@ -589,4 +584,4 @@ Thx to all contributors, every patch, big or small is very much appreciated!
 
 == Copyright
 
-Copyright (c) 2010-2010 The dm-rails team. See {LICENSE}[http://github.com/datamapper/dm-rails/blob/master/LICENSE] for details.
+Copyright (c) 2011-2010 The dm-rails team. See {LICENSE}[http://github.com/datamapper/dm-rails/blob/master/LICENSE] for details.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -14,12 +14,6 @@ begin
     gem.authors     = [ 'Martin Gamsjaeger (snusnu)', 'Dan Kubb' ]
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'dm-core',         '~> 1.0.0'
-    gem.add_dependency 'dm-active_model', '~> 1.0.3'
-    gem.add_dependency 'activesupport',   '~> 3.0.0'
-    gem.add_dependency 'actionpack',      '~> 3.0.0'
-    gem.add_dependency 'railties',        '~> 3.0.0'
   end
 
   Jeweler::GemcutterTasks.new
@@ -29,4 +23,5 @@ rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end
 
-task(:spec) {} # stub out the spec task for as long as we don't have any specs
+require "spec/rake/spectask"
+Spec::Rake::SpecTask.new

data/VERSION

@@ -1,2 +1,2 @@
-1.0.4
+1.1.0.rc1
 

data/dm-rails.gemspec

@@ -1,87 +1,107 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rails}
-  s.version = "1.0.4"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]
-  s.date = %q{2010-10-24}
+  s.date = %q{2011-02-28}
   s.description = %q{Integrate DataMapper with Rails 3}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dm-rails.gemspec",
-     "lib/dm-rails.rb",
-     "lib/dm-rails/configuration.rb",
-     "lib/dm-rails/mass_assignment_security.rb",
-     "lib/dm-rails/middleware/identity_map.rb",
-     "lib/dm-rails/railtie.rb",
-     "lib/dm-rails/railties/controller_runtime.rb",
-     "lib/dm-rails/railties/database.rake",
-     "lib/dm-rails/railties/i18n_support.rb",
-     "lib/dm-rails/railties/log_listener.rb",
-     "lib/dm-rails/railties/log_subscriber.rb",
-     "lib/dm-rails/session_store.rb",
-     "lib/dm-rails/setup.rb",
-     "lib/dm-rails/storage.rb",
-     "lib/generators/data_mapper.rb",
-     "lib/generators/data_mapper/migration/migration_generator.rb",
-     "lib/generators/data_mapper/migration/templates/migration.rb",
-     "lib/generators/data_mapper/model/model_generator.rb",
-     "lib/generators/data_mapper/model/templates/model.rb",
-     "lib/generators/data_mapper/observer/observer_generator.rb",
-     "lib/generators/data_mapper/observer/templates/observer.rb",
-     "tasks/ci.rake",
-     "tasks/clean.rake",
-     "tasks/local_gemfile.rake",
-     "tasks/metrics.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dm-rails.gemspec",
+    "lib/dm-rails.rb",
+    "lib/dm-rails/configuration.rb",
+    "lib/dm-rails/mass_assignment_security.rb",
+    "lib/dm-rails/middleware/identity_map.rb",
+    "lib/dm-rails/multiparameter_attributes.rb",
+    "lib/dm-rails/railtie.rb",
+    "lib/dm-rails/railties/controller_runtime.rb",
+    "lib/dm-rails/railties/database.rake",
+    "lib/dm-rails/railties/i18n_support.rb",
+    "lib/dm-rails/railties/log_listener.rb",
+    "lib/dm-rails/railties/log_subscriber.rb",
+    "lib/dm-rails/session_store.rb",
+    "lib/dm-rails/setup.rb",
+    "lib/dm-rails/storage.rb",
+    "lib/generators/data_mapper.rb",
+    "lib/generators/data_mapper/migration/migration_generator.rb",
+    "lib/generators/data_mapper/migration/templates/migration.rb",
+    "lib/generators/data_mapper/model/model_generator.rb",
+    "lib/generators/data_mapper/model/templates/model.rb",
+    "lib/generators/data_mapper/observer/observer_generator.rb",
+    "lib/generators/data_mapper/observer/templates/observer.rb",
+    "spec/models/fake.rb",
+    "spec/models/topic.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/unit/mass_assignment_security_spec.rb",
+    "spec/unit/multiparameter_attributes_spec.rb",
+    "tasks/clean.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
   s.homepage = %q{http://github.com/datamapper/dm-rails}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Use DataMapper with Rails 3}
+  s.test_files = [
+    "spec/models/fake.rb",
+    "spec/models/topic.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/mass_assignment_security_spec.rb",
+    "spec/unit/multiparameter_attributes_spec.rb"
+  ]
 
   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
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.3"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<railties>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<railties>, ["~> 3.0.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-active_model>, ["~> 1.0.3"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_dependency(%q<railties>, ["~> 3.0.0"])
+      s.add_dependency(%q<actionpack>, ["~> 3.0.4"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-active_model>, ["~> 1.0.2"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<railties>, ["~> 3.0.4"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-active_model>, ["~> 1.0.3"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-    s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-    s.add_dependency(%q<railties>, ["~> 3.0.0"])
+    s.add_dependency(%q<actionpack>, ["~> 3.0.4"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-active_model>, ["~> 1.0.2"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<railties>, ["~> 3.0.4"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

data/lib/dm-rails/mass_assignment_security.rb

@@ -5,9 +5,16 @@ require 'active_model'
 
 module ActiveModel
   module MassAssignmentSecurity
+    # Provides a patched version of the Sanitizer used in Rails to handle property
+    # and relationship objects as keys. There is no way to inject a custom sanitizer
+    # without reimplementing the permission sets.
     module Sanitizer
-      # Returns all attributes not denied by the authorizer. Property keys can
-      # be a Symbol, String, DataMapper::Property, or DataMapper::Relationship
+      # Returns all attributes not denied by the authorizer.
+      #
+      # @param [Hash{Symbol,String,::DataMapper::Property,::DataMapper::Relationship=>Object}] attributes
+      #   Names and values of attributes to sanitize.
+      # @return [Hash]
+      #   Sanitized hash of attributes.
       def sanitize(attributes)
         sanitized_attributes = attributes.reject do |key, value|
           key_name = key.name rescue key
@@ -21,7 +28,11 @@ module ActiveModel
 end
 
 module DataMapper
-  # = Active Model Mass-Assignment Security
+  # Include this module into a DataMapper model to enable ActiveModel's mass
+  # assignment security.
+  #
+  # To use second parameter of {#attributes=} make sure to include this module
+  # last.
   module MassAssignmentSecurity
     extend ::ActiveSupport::Concern
     include ::ActiveModel::MassAssignmentSecurity
@@ -32,34 +43,47 @@ module DataMapper
       def logger
         @logger ||= ::DataMapper.logger
       end
-
     end
 
-    # Allows you to set all the attributes at once by passing in a hash with keys
-    # matching the attribute names (which again matches the column names).
+    # Sanitizes the specified +attributes+ according to the defined mass-assignment
+    # security rules and calls +super+ with the result.
+    #
+    # Use either +attr_accessible+ to specify which attributes are allowed to be
+    # assigned via {#attributes=}, or +attr_protected+ to specify which attributes
+    # are *not* allowed to be assigned via {#attributes=}.
+    #
+    # +attr_accessible+ and +attr_protected+ are mutually exclusive.
+    #
+    # @param [Hash{Symbol,String,::DataMapper::Property,::DataMapper::Relationship=>Object}] attributes
+    #   Names and values of attributes to sanitize.
+    # @param [Boolean] guard_protected_attributes
+    #   Determines whether mass-security rules are applied (when +true+) or not.
+    # @return [Hash]
+    #   Sanitized hash of attributes.
+    # @api public
     #
-    # If +guard_protected_attributes+ is true (the default), then sensitive
-    # attributes can be protected from this form of mass-assignment by using
-    # the +attr_protected+ macro. Or you can alternatively specify which
-    # attributes *can* be accessed with the +attr_accessible+ macro. Then all the
-    # attributes not included in that won't be allowed to be mass-assigned.
+    # @example [Usage]
+    #   class User
+    #     include DataMapper::Resource
+    #     include DataMapper::MassAssignmentSecurity
     #
-    #   class User < ActiveRecord::Base
-    #     attr_protected :is_admin
+    #     property :name, String
+    #     property :is_admin, Boolean
+    #
+    #     # Only allow name to be set via #attributes=
+    #     attr_accessible :name
     #   end
     #
     #   user = User.new
     #   user.attributes = { :username => 'Phusion', :is_admin => true }
-    #   user.username   # => "Phusion"
-    #   user.is_admin?  # => false
+    #   user.username  # => "Phusion"
+    #   user.is_admin  # => false
     #
     #   user.send(:attributes=, { :username => 'Phusion', :is_admin => true }, false)
-    #   user.is_admin?  # => true
+    #   user.is_admin  # => true
     def attributes=(attributes, guard_protected_attributes = true)
       attributes = sanitize_for_mass_assignment(attributes) if guard_protected_attributes
       super(attributes)
     end
-
   end
 end
-

data/lib/dm-rails/multiparameter_attributes.rb

@@ -0,0 +1,167 @@
+require 'active_support/core_ext/module/aliasing'
+
+module Rails
+  module DataMapper
+    # Encapsulates an error of a multiparameter assignment.
+    class MultiparameterAssignmentError < StandardError
+      # Gets the target attribute of the assignment.
+      # @return [String]
+      attr_reader :attribute
+
+      # Gets the assigned values.
+      # @return [Array]
+      attr_reader :values
+
+      # Gets the exception raised on the assignment.
+      # @return [Exception]
+      attr_reader :exception
+
+      # Initializes a new instance of the {MultiparameterAssignmentError} class.
+      #
+      # @param [String] attribute The target attribute of the assignment.
+      # @param [Array] values The assigned values.
+      # @param [Exception] exception The exception raised on the assignment.
+      def initialize(attribute, values, exception)
+        super("Could not assign #{values.inspect} to #{attribute} (#{exception.message}).")
+        @attribute = attribute
+        @values = values
+        @exception = exception
+      end
+    end
+
+    # Raised by {MultiparameterAttributes#attributes=} when there are errors when
+    # merging multiparameter attributes. Use {#errors} to get the array of errors
+    # occured.
+    class MultiparameterAssignmentErrors < StandardError
+      # Gets the array of assignment errors.
+      # @return [Array<MultiparameterAssignmentError>]
+      attr_reader :errors
+
+      # Initializes a new instance of the {MultiparameterAssignmentErrors} class.
+      #
+      # @param [Array<MultiparameterAssignmentError>] errors
+      #   The array of assignment errors.
+      # @param [String] message Optional error message.
+      def initialize(errors, message = nil)
+        super(message || "#{errors.size} error#{errors.size == 1 ? '' : 's'} on assignment of multiparameter attributes.")
+        @errors = errors
+      end
+    end
+
+    # Include this module into a DataMapper model to enable multiparameter
+    # attributes.
+    #
+    # A multiparameter attribute has +attr(Xc)+ as name where +attr+ specifies
+    # the attribute, +X+ the position of the value, and +c+ an optional typecast
+    # identifier. All values that share an +attr+ are sorted by their position,
+    # optionally cast using +#to_c+ (where +c+ is the typecast identifier) and
+    # then used to instantiate the proper attribute value.
+    #
+    # @example
+    #   # Assigning a hash with multiparameter values for a +Date+ property called
+    #   # +written_on+:
+    #   resource.attributes = {
+    #       'written_on(1i)' => '2004',
+    #       'written_on(2i)' => '6',
+    #       'written_on(3i)' => '24' }
+    #
+    #   # +Date+ will be initialized with each string cast to a number using
+    #   # #to_i.
+    #   resource.written_on == Date.new(2004, 6, 24)
+    module MultiparameterAttributes
+      # Merges multiparameter attributes and calls +super+ with the merged
+      # attributes.
+      #
+      # @param [Hash{String,Symbol=>Object}] attributes
+      #   Names and values of attributes to assign.
+      # @return [Hash]
+      #   Names and values of attributes assigned.
+      # @raise [MultiparameterAssignmentErrors]
+      #   One or more multiparameters could not be assigned.
+      # @api public
+      def attributes=(attributes)
+        attribs = attributes.dup
+        multi_parameter_attributes = []
+        attribs.each do |k, v|
+          if k.to_s.include?("(")
+            multi_parameter_attributes << [ k, v ]
+            attribs.delete(k)
+          end
+        end
+
+        attribs.merge!(merge_multiparameter_attributes(multi_parameter_attributes))
+        super(attribs)
+      end
+
+    protected
+      def merge_multiparameter_attributes(pairs)
+        pairs = extract_multiparameter_attributes(pairs)
+
+        errors = []
+        attributes = {}
+        pairs.each do |name, values_with_empty_parameters|
+          # ActiveRecord keeps the empty values to set dates without a year.
+          # Removing all nils (instead of removing only trailing nils) seems
+          # like a weird behavior though.
+          values = values_with_empty_parameters.compact
+
+          if values.empty?
+            attributes[name] = nil
+            next
+          end
+
+          klass = properties[name].primitive
+          begin
+            attributes[name] =
+              if klass == Time
+                Time.local(*values)
+              elsif klass == Date
+                # Date does not replace nil values with defaults.
+                Date.new(*values_with_empty_parameters.map { |v| v.nil? ? 1 : v })
+              else
+                klass.new(*values)
+              end
+          rescue => ex
+            errors << MultiparameterAssignmentError.new(name, values, ex)
+          end
+        end
+
+        unless errors.empty?
+          raise MultiparameterAssignmentErrors.new(errors)
+        end
+
+        attributes
+      end
+
+      def extract_multiparameter_attributes(pairs)
+        attributes = {}
+
+        for multiparameter_name, value in pairs
+          unless multiparameter_name =~ /\A ([^\)]+) \(  ([0-9]+) ([a-z])?  \) \z/x
+            raise "Invalid multiparameter name #{multiparameter_name.inspect}."
+          end
+
+          name, position, typecast = $1, $2, $3
+          attributes[name] ||= []
+
+          parameter_value =
+            if value.empty?
+              nil
+            elsif typecast
+              value.send('to_' + typecast)
+            else
+              value
+            end
+
+          attributes[name] << [ position, parameter_value ]
+        end
+
+        # Order each parameter array according to the position, then discard the
+        # position.
+        attributes.each { |name, values|
+          attributes[name] = values.sort_by{ |v| v.first }.collect { |v| v.last }
+        }
+      end
+    end # MultiparameterAttributes
+  end
+end

data/lib/dm-rails/railtie.rb

@@ -20,6 +20,7 @@ require "dm-rails/railties/i18n_support"
 # but users will still need to include it into the
 # models they want it to use it in.
 require 'dm-rails/mass_assignment_security'
+require 'dm-rails/multiparameter_attributes'
 
 module Rails
   module DataMapper
@@ -39,7 +40,8 @@ module Rails
       end
 
       def setup_i18n_support(app)
-        ::DataMapper::Model.append_inclusions(Rails::DataMapper::I18nSupport)
+        ::DataMapper::Model.append_extensions(::ActiveModel::Translation)
+        ::DataMapper::Model.append_extensions(Rails::DataMapper::I18nSupport)
       end
 
       def setup_controller_runtime(app)
@@ -56,6 +58,7 @@ module Rails
 
       initializer 'data_mapper.configuration' do |app|
         configure_data_mapper(app)
+        ::DataMapper::Model.append_inclusions(Rails::DataMapper::MultiparameterAttributes)
       end
 
       initializer 'data_mapper.logger' do |app|

data/lib/dm-rails/session_store.rb

@@ -60,6 +60,10 @@ module Rails
         self.class.session_class.first_or_new(:session_id => sid)
       end
 
+      def destroy(env)
+        find_session(current_session_id(env)).destroy
+      end
+
     end
 
   end

data/spec/models/fake.rb

@@ -0,0 +1,31 @@
+module Rails; module DataMapper; module Models
+  class Composite
+    attr_accessor :args
+
+    def initialize(*args)
+      @args = args
+    end
+
+    def ==(other)
+      eql?(other)
+    end
+
+    def eql?(other)
+      !other.nil? && other.args == args
+    end
+  end
+
+  class Fake
+    super_module = Module.new do
+      def _super_attributes=(*args)
+      end
+
+      def attributes=(*args)
+        self.send(:_super_attributes=, *args)
+      end
+    end
+    include super_module
+
+    include ::Rails::DataMapper::MultiparameterAttributes
+  end
+end; end; end

data/spec/models/topic.rb

@@ -0,0 +1,11 @@
+module Rails; module DataMapper; module Models
+  class Topic
+    include ::DataMapper::Resource
+    include ::Rails::DataMapper::MultiparameterAttributes
+
+    property :id, Serial
+    property :last_read, Date
+    property :written_on, Time
+    property :updated_at, DateTime
+  end
+end; end; end

data/spec/spec.opts

@@ -0,0 +1,3 @@
+--format progress
+--color
+--backtrace

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+$:.unshift File.expand_path File.dirname(__FILE__) + '../lib'
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
+require 'dm-core/spec/lib/spec_helper'
+require 'dm-core/spec/lib/pending_helpers'
+
+DataMapper::Spec.setup
+DataMapper.finalize
+
+Spec::Runner.configure do |config|
+
+  config.extend(DataMapper::Spec::Adapters::Helpers)
+  config.include(DataMapper::Spec::PendingHelpers)
+
+  config.after :all do
+    DataMapper::Spec.cleanup_models
+  end
+
+end

data/spec/unit/mass_assignment_security_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'dm-rails/mass_assignment_security'
+
+# Because mass-assignment security is based on ActiveModel we just have to
+# ensure that ActiveModel is called.
+describe DataMapper::MassAssignmentSecurity do
+  before :all do
+    class Fake
+      super_module = Module.new do
+        def _super_attributes=(*args)
+        end
+
+        def attributes=(*args)
+          self.send(:_super_attributes=, *args)
+        end
+      end
+      include super_module
+
+      include ::DataMapper::MassAssignmentSecurity
+    end
+  end
+
+  describe '#attributes=' do
+    it 'calls super with sanitized attributes' do
+      attributes = { :name => 'John', :is_admin => true }
+      sanitized_attributes = { :name => 'John' }
+      model = Fake.new
+      model.should_receive(:sanitize_for_mass_assignment).with(attributes).and_return(sanitized_attributes)
+      model.should_receive(:_super_attributes=).with(sanitized_attributes)
+
+      model.attributes = attributes
+    end
+
+    it 'skips sanitation when called with true' do
+      attributes = { :name => 'John', :is_admin => true }
+      sanitized_attributes = { :name => 'John' }
+      model = Fake.new
+      model.should_receive(:_super_attributes=).with(attributes)
+
+      model.send(:attributes=, attributes, true)
+    end
+  end
+end

data/spec/unit/multiparameter_attributes_spec.rb

@@ -0,0 +1,167 @@
+require 'spec_helper'
+require 'dm-rails/multiparameter_attributes'
+
+# Since multiparameters are a feature of Rails some tests are based on the test
+# suite of Rails.
+describe Rails::DataMapper::MultiparameterAttributes do
+  before :all do
+    load Pathname(__FILE__).dirname.parent.join('models/topic.rb').expand_path
+    load Pathname(__FILE__).dirname.parent.join('models/fake.rb').expand_path
+    model = ::Rails::DataMapper::Models::Topic
+    model.auto_migrate! if model.respond_to?(:auto_migrate!)
+  end
+
+  describe '#attributes=' do
+    date_inputs = [
+      [ 'date',
+        { 'last_read(1i)' => '2004', 'last_read(2i)' => '6', 'last_read(3i)' => '24' },
+        Date.new(2004, 6, 24) ],
+      [ 'date with empty year',
+        { 'last_read(1i)' => '', 'last_read(2i)' => '6', 'last_read(3i)' => '24' },
+        Date.new(1, 6, 24) ],
+      [ 'date with empty month',
+        { 'last_read(1i)' => '2004', 'last_read(2i)' => '', 'last_read(3i)' => '24' },
+        Date.new(2004, 1, 24) ],
+      [ 'date with empty day',
+        { 'last_read(1i)' => '2004', 'last_read(2i)' => '6', 'last_read(3i)' => '' },
+        Date.new(2004, 6, 1) ],
+      [ 'date with empty day and year',
+        { 'last_read(1i)' => '', 'last_read(2i)' => '6', 'last_read(3i)' => '' },
+        Date.new(1, 6, 1) ],
+      [ 'date with empty day and month',
+        { 'last_read(1i)' => '2004', 'last_read(2i)' => '', 'last_read(3i)' => '' },
+        Date.new(2004, 1, 1) ],
+      [ 'date with empty year and month',
+        { 'last_read(1i)' => '', 'last_read(2i)' => '', 'last_read(3i)' => '24' },
+        Date.new(1, 1, 24) ],
+      [ 'date with all empty',
+        { 'last_read(1i)' => '', 'last_read(2i)' => '', 'last_read(3i)' => '' },
+        nil ],
+    ]
+
+    date_inputs.each do |(name, attributes, date)|
+      it "converts #{name}" do
+        topic = ::Rails::DataMapper::Models::Topic.new
+        topic.attributes = attributes
+        topic.last_read.should == date
+      end
+    end
+
+    time_inputs = [
+      [ 'time',
+        { 'written_on(1i)' => '2004', 'written_on(2i)' => '6', 'written_on(3i)' => '24',
+          'written_on(4i)' => '16', 'written_on(5i)' => '24', 'written_on(6i)' => '00' },
+        Time.local(2004, 6, 24, 16, 24, 0) ],
+      [ 'time with old date',
+        { 'written_on(1i)' => '1901', 'written_on(2i)' => '12', 'written_on(3i)' => '31',
+          'written_on(4i)' => '23', 'written_on(5i)' => '59', 'written_on(6i)' => '59' },
+        Time.local(1901, 12, 31, 23, 59, 59) ],
+      [ 'time with all empty',
+        { 'written_on(1i)' => '', 'written_on(2i)' => '', 'written_on(3i)' => '',
+          'written_on(4i)' => '', 'written_on(5i)' => '', 'written_on(6i)' => '' },
+        nil ],
+      [ 'time with empty seconds',
+        { 'written_on(1i)' => '2004', 'written_on(2i)' => '6', 'written_on(3i)' => '24',
+          'written_on(4i)' => '16', 'written_on(5i)' => '24', 'written_on(6i)' => '' },
+        Time.local(2004, 6, 24, 16, 24, 0) ],
+    ]
+
+    time_inputs.each do |(name, attributes, time)|
+      it "converts #{name}" do
+        topic = ::Rails::DataMapper::Models::Topic.new
+        topic.attributes = attributes
+        topic.written_on.should == time
+      end
+    end
+
+    date_time_inputs = [
+      [ 'datetime',
+        { 'updated_at(1i)' => '2004', 'updated_at(2i)' => '6', 'updated_at(3i)' => '24',
+          'updated_at(4i)' => '16', 'updated_at(5i)' => '24', 'updated_at(6i)' => '00' },
+        DateTime.new(2004, 6, 24, 16, 24, 0) ],
+    ]
+
+    date_time_inputs.each do |(name, attributes, time)|
+      it "converts #{name}" do
+        topic = ::Rails::DataMapper::Models::Topic.new
+        topic.attributes = attributes
+        topic.updated_at.should == time
+      end
+    end
+
+    it 'calls super with merged multiparameters' do
+      multiparameter_hash = {
+        'composite(1)'  => 'a string',
+        'composite(2)'  => '1.5',
+        'composite(3i)' => '1.5',
+        'composite(4f)' => '1.5',
+        'composite(5)'  => '',
+        'composite(6i)' => '',
+        'composite(7f)' => '',
+      }
+      attributes = { 'composite' => Object.new }
+
+      ::Rails::DataMapper::Models::Composite.
+        should_receive(:new).
+        with('a string', '1.5', '1.5'.to_i, '1.5'.to_f).
+        and_return(attributes['composite'])
+
+      composite_property = mock(::DataMapper::Property)
+      composite_property.stub!(:primitive).and_return(::Rails::DataMapper::Models::Composite)
+
+      resource = ::Rails::DataMapper::Models::Fake.new
+      resource.stub!(:properties).and_return('composite' => composite_property)
+
+      resource.should_receive(:_super_attributes=).with(attributes)
+
+      resource.attributes = multiparameter_hash
+    end
+
+    it 'raises exception on failure' do
+      multiparameter_hash = { 'composite(1)'  => 'a string' }
+      attributes = { 'composite' => Object.new }
+
+      composite_exception = StandardError.new('foo')
+      ::Rails::DataMapper::Models::Composite.
+        should_receive(:new).with('a string').and_raise(composite_exception)
+
+      composite_property = mock(::DataMapper::Property)
+      composite_property.stub!(:primitive).and_return(::Rails::DataMapper::Models::Composite)
+
+      resource = ::Rails::DataMapper::Models::Fake.new
+      resource.stub!(:properties).and_return('composite' => composite_property)
+
+      lambda { resource.attributes = multiparameter_hash }.
+        should raise_error(::Rails::DataMapper::MultiparameterAssignmentErrors) { |ex|
+          ex.errors.size.should == 1
+
+          error = ex.errors[0]
+          error.attribute.should == 'composite'
+          error.values.should == ['a string']
+          error.exception.should == composite_exception
+        }
+    end
+  end
+
+  describe 'new' do
+    it "merges multiparameters" do
+      attributes = {
+        'updated_at(1i)' => '2004', 'updated_at(2i)' => '6', 'updated_at(3i)' => '24',
+        'updated_at(4i)' => '16', 'updated_at(5i)' => '24', 'updated_at(6i)' => '00' }
+
+      topic = ::Rails::DataMapper::Models::Topic.new(attributes)
+      topic.updated_at.should == DateTime.new(2004, 6, 24, 16, 24, 0)
+    end
+  end
+
+  describe 'create' do
+    it "merges multiparameters" do
+      attributes = {
+        'updated_at(1i)' => '2004', 'updated_at(2i)' => '6', 'updated_at(3i)' => '24',
+        'updated_at(4i)' => '16', 'updated_at(5i)' => '24', 'updated_at(6i)' => '00' }
+
+      topic = ::Rails::DataMapper::Models::Topic.create(attributes)
+      topic.updated_at.should == DateTime.new(2004, 6, 24, 16, 24, 0)
+    end
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rails
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -16,89 +11,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +02:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: actionpack
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-active_model
-  prerelease: false
+  name: activesupport
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
-        version: 1.0.3
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
+  name: dm-core
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 1.0.2
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
+  name: dm-active_model
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 1.0.2
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: railties
-  prerelease: false
+  name: i18n
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 0.5.0
   type: :runtime
+  prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: railties
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: Integrate DataMapper with Rails 3
 email: gamsnjaga@gmail.com
 executables: []
@@ -110,7 +124,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -121,6 +134,7 @@ files:
 - lib/dm-rails/configuration.rb
 - lib/dm-rails/mass_assignment_security.rb
 - lib/dm-rails/middleware/identity_map.rb
+- lib/dm-rails/multiparameter_attributes.rb
 - lib/dm-rails/railtie.rb
 - lib/dm-rails/railties/controller_runtime.rb
 - lib/dm-rails/railties/database.rake
@@ -137,10 +151,13 @@ files:
 - lib/generators/data_mapper/model/templates/model.rb
 - lib/generators/data_mapper/observer/observer_generator.rb
 - lib/generators/data_mapper/observer/templates/observer.rb
-- tasks/ci.rake
+- spec/models/fake.rb
+- spec/models/topic.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/unit/mass_assignment_security_spec.rb
+- spec/unit/multiparameter_attributes_spec.rb
 - tasks/clean.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
@@ -148,8 +165,8 @@ homepage: http://github.com/datamapper/dm-rails
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -157,25 +174,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Use DataMapper with Rails 3
-test_files: []
-
+test_files: 
+- spec/models/fake.rb
+- spec/models/topic.rb
+- spec/spec_helper.rb
+- spec/unit/mass_assignment_security_spec.rb
+- spec/unit/multiparameter_attributes_spec.rb

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-vendor

data/tasks/ci.rake

@@ -1 +0,0 @@
-task :ci => [ 'metrics:all' ]

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
-task :local_gemfile do |t|
-
-  root       = Pathname(__FILE__).dirname.parent
-  datamapper = root.parent
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end

data/tasks/metrics.rake

@@ -1,37 +0,0 @@
-begin
-  require 'metric_fu'
-rescue LoadError
-  namespace :metrics do
-    task :all do
-      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
-    end
-  end
-end
-
-begin
-  require 'reek/adapters/rake_task'
-
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose       = false
-    t.source_files  = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort 'Reek is not available. In order to run reek, you must: gem install reek'
-  end
-end
-
-begin
-  require 'roodi'
-  require 'rake/tasklib'
-  require 'roodi_task'
-
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
-  end
-end