dbussink

diff --git a/merb_helpers/lib/merb_helpers/form/builder.rb b/merb_helpers/lib/merb_helpers/form/builder.rb
index e7a6e9c..251a59a 100644
--- a/merb_helpers/lib/merb_helpers/form/builder.rb
+++ b/merb_helpers/lib/merb_helpers/form/builder.rb
@@ -283,8 +283,12 @@ module Merb::Helpers::Form::Builder
         contents = attrs.delete(:label)
       end
       if contents
+        if contents.is_a?(Hash)
+          attrs = attrs.merge(contents)

dbussink

Benchmarks will now run 10000 times
                                                       | DM 0.9.6 |  AR 2.1 |    DIFF |
---------------------------------------------------------------------------------------
Model.all limit(100) with relationship             x10 |    0.233 |   0.281 |   0.83x |
=======================================================================================
Total                                                  |    0.233 |   0.281 |   0.83x |

Benchmarks will now run 10000 times
                                                       | DM 0.9.6 |  AR 2.1 |    DIFF |
---------------------------------------------------------------------------------------

dbussink

.DS_Store
log/*
tmp/*
gems/cache/*
TAGS
*~
.#*
schema/schema.rb
schema/*_structure.sql
schema/*.sqlite3

dbussink

alarm = Thread.new(self) { sleep(5); Thread.main.wakeup }
puts "Going to sleep for 1000 seconds at #{Time.new}…"
sleep(10000); puts "Woke up at #{Time.new}!"

dbussink

SELECT "people"."id", "people"."name" FROM "people" 
INNER JOIN "addresses" ON ("people"."id" = "addresses"."person_id") 
WHERE ("addresses"."street" LIKE '%street%') 
ORDER BY "people"."id"

dbussink

:database_uri: sqlite3:///Users/dirkjan/Documents/projects/integrity/integrity.db
:export_directory: /Users/dirkjan/Documents/projects/ci
:hash_admin_password: true
:admin_username: dbussink
:admin_password: someSHA1hash

dbussink

diff --git a/lib/dm-core/model.rb b/lib/dm-core/model.rb
index 79dab8a..46f63b0 100644
--- a/lib/dm-core/model.rb
+++ b/lib/dm-core/model.rb
@@ -309,8 +309,8 @@ module DataMapper
     # TODO SPEC
     def copy(source, destination, query = {})
       repository(destination) do
-        repository(source).read_many(query).each do |resource|
-          self.create(resource)

dbussink

class Feedback
  include DataMapper::Resource
  def self.default_repository_name; :another; end
  property :id, Serial
  property :name, String, :length => (1..20)
  property :subject, String, :length => (10..127)
  property :email, String, :format => :email_address
  property :comment, Text, :length => (10..500)
  property :priv, Boolean
end

dbussink

dbussink@ey04-s00167 ~/ci/extlib $ multiruby /usr/bin/rake ci

VERSION = 1.8.7-p72
CMD     = ~/.multiruby/install/1.8.7-p72/bin/ruby /usr/bin/rake ci

(in /home/dbussink/ci/extlib)
rm -rf /home/dbussink/ci/extlib/ci
mkdir -p /home/dbussink/ci/extlib/ci
mkdir -p /home/dbussink/ci/extlib/ci/doc
mkdir -p /home/dbussink/ci/extlib/ci/cyclomatic

dbussink

(in /home/dbussink/rubinius)
BISON vm/parser/grammar.y
makedepend ...
CC vm/parser/grammar.cpp
CC vm/parser/grammar_runtime.cpp
CC vm/gen/instructions.cpp
CC vm/drivers/cli.cpp
LD vm/vm
vm/external_libs/libmquark/libmquark.a(quark.o): In function `quark_from_string':
/home/dbussink/rubinius/vm/external_libs/libmquark/quark.c:90: undefined reference to `hashtable_search'