bc25cc5c5140680cb1108e025b7effea463de9eb Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/1099b5371ff30409038ed7abda4664dd8e5dd6dc 1099b5371ff30409038ed7abda4664dd8e5dd6dc 2008-06-25T10:18:22-07:00 2008-06-25T10:18:22-07:00 Stripped whitespace with "sake strip" 111c9afb78c47412642fa6dd295774384691a1d9 Dan Kubb dan.kubb@autopilotmarketing.com 30250bfb0eab15776acf44a9492fa6bc2889c141 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/bc25cc5c5140680cb1108e025b7effea463de9eb bc25cc5c5140680cb1108e025b7effea463de9eb 2008-06-25T10:17:29-07:00 2008-06-25T10:17:29-07:00 Simplified uniqueness validation code cdf5dd7e9072a4b2a2ca8af304d45bcb202c2d8b Dan Kubb dan.kubb@autopilotmarketing.com 01b440b27eb5c150f42549bad26d9c327a14d5c5 393eb308f05af391160ede8485f3c21a1cc35c95 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl http://github.com/sam/dm-more/commit/30250bfb0eab15776acf44a9492fa6bc2889c141 30250bfb0eab15776acf44a9492fa6bc2889c141 2008-06-25T02:34:11-07:00 2008-06-25T02:34:11-07:00 Merge branch 'master' of git@github.com:sam/dm-more 40e9c67251aa4fafc15567b1a83aebe2deb01ff5 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl e602a514b011d7d510950414b45ce5b9309c4012 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl http://github.com/sam/dm-more/commit/01b440b27eb5c150f42549bad26d9c327a14d5c5 01b440b27eb5c150f42549bad26d9c327a14d5c5 2008-06-25T02:33:45-07:00 2008-06-25T02:33:45-07:00 Fix option handling for Collection#to_json 35481fa24966fb043342c2c95bc531867c95f73f Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl 7c947dba7b86f46ed8cf34704ac9952a6a08938c Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/393eb308f05af391160ede8485f3c21a1cc35c95 393eb308f05af391160ede8485f3c21a1cc35c95 2008-06-24T16:55:12-07:00 2008-06-24T16:55:12-07:00 Fixed failing DM::Flag specs in dm-types 4c64810b55feba165ec0512f8632da0e301e0c9e Dan Kubb dan.kubb@autopilotmarketing.com 97a0ae5b0dc8a0e38b1d3518bbe1de74080e62ce Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/7c947dba7b86f46ed8cf34704ac9952a6a08938c 7c947dba7b86f46ed8cf34704ac9952a6a08938c 2008-06-24T16:49:26-07:00 2008-06-24T16:49:26-07:00 Updated specs to not mix-in DM::Type into spec namespace 5d3c5ce5bd53370909cb207f2a653cddd50f0b19 Dan Kubb dan.kubb@autopilotmarketing.com ef27ad506787d80131e9fc93814d2b82e5b6fb49 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/97a0ae5b0dc8a0e38b1d3518bbe1de74080e62ce 97a0ae5b0dc8a0e38b1d3518bbe1de74080e62ce 2008-06-24T10:07:18-07:00 2008-06-24T10:07:18-07:00 Explicitly pass in :limit => 1 for now 4e0d8f0eb01975aadde1a2b49a86e7126b0d259e Dan Kubb dan.kubb@autopilotmarketing.com 47b8a82b187f95dfb4702ebd0b99903fcf2daf44 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/ef27ad506787d80131e9fc93814d2b82e5b6fb49 ef27ad506787d80131e9fc93814d2b82e5b6fb49 2008-06-24T10:06:41-07:00 2008-06-24T10:06:41-07:00 Commented out ORDER BY until GROUP BY is added b228244f8e3c632b5b127797c5dd71450fd6d26e Dan Kubb dan.kubb@autopilotmarketing.com e602a514b011d7d510950414b45ce5b9309c4012 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/47b8a82b187f95dfb4702ebd0b99903fcf2daf44 47b8a82b187f95dfb4702ebd0b99903fcf2daf44 2008-06-24T08:57:41-07:00 2008-06-24T08:55:58-07:00 Updated numeric validator to raise if precision and scale are invalid ea62155c04ac75f2762f0fc35017e816d7a5d72c Dan Kubb dan.kubb@autopilotmarketing.com 0e5707a9f32ad32bb9204045ad437a3d47079720 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl http://github.com/sam/dm-more/commit/e602a514b011d7d510950414b45ce5b9309c4012 e602a514b011d7d510950414b45ce5b9309c4012 2008-06-24T02:30:45-07:00 2008-06-24T02:30:45-07:00 Small docu fix 9110f773f035820b1cb58bdac4eb84809bac3ce4 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl 6e50a735990a4b51e8a7fa9e8606313e8a2c91f7 Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl http://github.com/sam/dm-more/commit/0e5707a9f32ad32bb9204045ad437a3d47079720 0e5707a9f32ad32bb9204045ad437a3d47079720 2008-06-24T02:22:16-07:00 2008-06-24T02:20:40-07:00 Add validations for primitive types This allows for catching problems when invalid objects are assigned to an object. This is useful in conjunction with my other commit in dm-core, which makes sure it doesn't bork on those assignments. 3572612bd12dbe3dc43652b3d070907ce4bc377d Dirkjan Bussink dirkjan.bussink@ioroute.ioroute.nl 844a23d42076dcaef3898537a94749787fca5136 somebee sindre@identu.no http://github.com/sam/dm-more/commit/6e50a735990a4b51e8a7fa9e8606313e8a2c91f7 6e50a735990a4b51e8a7fa9e8606313e8a2c91f7 2008-06-24T00:33:21-07:00 2008-06-24T00:33:21-07:00 small fix to nested-set where lack of defined parent-property would throw an error e58dc9c4beaa5a781dfb7d994252b9a5f49cf48b somebee sindre@identu.no 4f3b363d247778621c5811b5bc1b70cdf5057f9f Jonathan Stott jonathan.stott@gmail.com http://github.com/sam/dm-more/commit/844a23d42076dcaef3898537a94749787fca5136 844a23d42076dcaef3898537a94749787fca5136 2008-06-23T06:49:47-07:00 2008-06-23T06:49:47-07:00 Fix for #408 - merb_datamapper now checks if the hash is empty, and if it is, assigns over it. Bug was introduced as a result of: http://github.com/wycats/merb-core/commit/1d41bd31d6acf8e02c07c089559893cd0c8188fb 26e6c7983d5aad82f7493adf1d1e2d956b80de17 Jonathan Stott jonathan.stott@gmail.com 2bc470ec982603df6184c3b910b8000ded544bc8 somebee sindre@identu.no http://github.com/sam/dm-more/commit/4f3b363d247778621c5811b5bc1b70cdf5057f9f 4f3b363d247778621c5811b5bc1b70cdf5057f9f 2008-06-22T06:31:04-07:00 2008-06-22T06:31:04-07:00 removed duplicate method_alias 60696b2d5e42a663534eaee86ae837a7a28e511c somebee sindre@identu.no d96cae6c772962cc307195c0f45db744c6ee035e somebee sindre@identu.no http://github.com/sam/dm-more/commit/2bc470ec982603df6184c3b910b8000ded544bc8 2bc470ec982603df6184c3b910b8000ded544bc8 2008-06-22T06:28:55-07:00 2008-06-22T06:28:55-07:00 fixed up dm-is-tree to follow is :plugin conventions d01e2308023a866e4b7825530cc1e51e0f483eae somebee sindre@identu.no ef725918e2bbe2e0151d9ff3a50221c57813377d somebee sindre@identu.no http://github.com/sam/dm-more/commit/d96cae6c772962cc307195c0f45db744c6ee035e d96cae6c772962cc307195c0f45db744c6ee035e 2008-06-21T13:27:21-07:00 2008-06-21T13:27:21-07:00 sake strip 1cbb66154e2eaaf1f2737fbe45bd745d1ebca6be somebee sindre@identu.no cd25e20720b1cbeb51112047e778e7c9ba784191 somebee sindre@identu.no http://github.com/sam/dm-more/commit/ef725918e2bbe2e0151d9ff3a50221c57813377d ef725918e2bbe2e0151d9ff3a50221c57813377d 2008-06-21T13:27:10-07:00 2008-06-21T13:27:10-07:00 important fix for is-list and nested_set, plus some more scoping stuff for nested_set 0f2c3096753956a00e4f1ef0aad2da9413b1b72d somebee sindre@identu.no bd9fb26596b88f79b0f0b1da09cbd696ff702705 somebee sindre@identu.no http://github.com/sam/dm-more/commit/cd25e20720b1cbeb51112047e778e7c9ba784191 cd25e20720b1cbeb51112047e778e7c9ba784191 2008-06-21T12:56:28-07:00 2008-06-21T12:56:28-07:00 more fixes to nested_set 7abfb9be6284e5f477540483ff275498a094ca75 somebee sindre@identu.no b9160897aac0ac70d4fbe4666c1db9b4324983f9 fa1f676da70810fc824ac4246c9eab6b9dd89b30 somebee sindre@identu.no http://github.com/sam/dm-more/commit/bd9fb26596b88f79b0f0b1da09cbd696ff702705 bd9fb26596b88f79b0f0b1da09cbd696ff702705 2008-06-21T12:40:04-07:00 2008-06-21T12:40:04-07:00 Merge branch 'master' of git@github.com:sam/dm-more cab6f57ec7777d3f4cf85996b1fe53a9acbc6942 somebee sindre@identu.no eb791c554cba1176786392475f77d4aed93b11e2 somebee sindre@identu.no http://github.com/sam/dm-more/commit/b9160897aac0ac70d4fbe4666c1db9b4324983f9 b9160897aac0ac70d4fbe4666c1db9b4324983f9 2008-06-21T12:39:50-07:00 2008-06-21T12:39:50-07:00 some minor improvements / fixes to nested_set, on way to support scoping a8f844747016727a7e7a200205b958fe97018350 somebee sindre@identu.no ff9149187b5b3b0124591ac9d8b6274abe3371a9 somebee sindre@identu.no http://github.com/sam/dm-more/commit/eb791c554cba1176786392475f77d4aed93b11e2 eb791c554cba1176786392475f77d4aed93b11e2 2008-06-21T06:56:10-07:00 2008-06-21T06:56:10-07:00 wrapped all movement in a transaction (but don't do anything on failure yet, awaiting docs) 67a8e514b4c7c0a543cf6f663d6f6584e0ba4206 somebee sindre@identu.no 1fa97508e4fd06a874a8e56ae7a609a793815280 somebee sindre@identu.no http://github.com/sam/dm-more/commit/ff9149187b5b3b0124591ac9d8b6274abe3371a9 ff9149187b5b3b0124591ac9d8b6274abe3371a9 2008-06-21T06:50:41-07:00 2008-06-21T06:50:41-07:00 started adding scope-support in nested_set 29f2d50e62f24ba0127d49b650b0f8565ac3e8e8 somebee sindre@identu.no 9a6c3814a8f445deaef5a695cdbb80c3312c4c2f Wesley Beary monki@geemus.com http://github.com/sam/dm-more/commit/fa1f676da70810fc824ac4246c9eab6b9dd89b30 fa1f676da70810fc824ac4246c9eab6b9dd89b30 2008-06-20T16:47:17-07:00 2008-06-20T16:47:17-07:00 remove failing asserts in the migrations ddd1685352a057379cbef3ea421f735008643748 Wesley Beary monki@geemus.com bdd1d2ce735dc81b8ecc0b1cc3a5567bc356d180 6426cabb8bfbcf1efee0574b201accad7e851dbb Wesley Beary monki@geemus.com http://github.com/sam/dm-more/commit/9a6c3814a8f445deaef5a695cdbb80c3312c4c2f 9a6c3814a8f445deaef5a695cdbb80c3312c4c2f 2008-06-20T15:04:12-07:00 2008-06-20T15:04:12-07:00 Merge branch 'master' of git://github.com/sam/dm-more fea0bfaea374e9687b580f338fa97c3585725174 Wesley Beary monki@geemus.com e95eae671e88aff0640fce5c949c225369e68503 Wesley Beary monki@geemus.com http://github.com/sam/dm-more/commit/bdd1d2ce735dc81b8ecc0b1cc3a5567bc356d180 bdd1d2ce735dc81b8ecc0b1cc3a5567bc356d180 2008-06-20T15:03:44-07:00 2008-06-20T15:03:44-07:00 handle marshall/encode objects so that the typecasting works 462a342130dbf6bda17937855e4fae7c0bac680b Wesley Beary monki@geemus.com d71f8e5ff1e95915d45c714f929dce6f75634f02 Bernerd Schaefer bj.schaefer@gmail.com http://github.com/sam/dm-more/commit/6426cabb8bfbcf1efee0574b201accad7e851dbb 6426cabb8bfbcf1efee0574b201accad7e851dbb 2008-06-20T09:44:54-07:00 2008-06-20T09:44:54-07:00 * Resolved DM::Flag error when dirty_attributes calls dump with original_value of nil. * Added adapter setup (modified from dm-core) to dm-types/spec/spec_helper.rb 489ce5085fc70d9751ff55157b146634f4f6aacf Bernerd Schaefer bj.schaefer@gmail.com a4fcb181a363718e8302cd109fbdc35c90a54032 somebee sindre@identu.no http://github.com/sam/dm-more/commit/1fa97508e4fd06a874a8e56ae7a609a793815280 1fa97508e4fd06a874a8e56ae7a609a793815280 2008-06-20T09:36:55-07:00 2008-06-20T09:36:55-07:00 removed dependency bc6d1b1f5cdb95ef123e63f887f4c241f15bab53 somebee sindre@identu.no a4fcb181a363718e8302cd109fbdc35c90a54032 Bernerd Schaefer bj.schaefer@gmail.com http://github.com/sam/dm-more/commit/d71f8e5ff1e95915d45c714f929dce6f75634f02 d71f8e5ff1e95915d45c714f929dce6f75634f02 2008-06-20T09:07:04-07:00 2008-06-20T09:07:04-07:00 sake strip 02ce77383c0177c02653b5a7b884bbef1c288ca1 Bernerd Schaefer bj.schaefer@gmail.com 24ea50df3543a7b71c25965aae8bf8fb219d21ca somebee sindre@identu.no http://github.com/sam/dm-more/commit/a4fcb181a363718e8302cd109fbdc35c90a54032 a4fcb181a363718e8302cd109fbdc35c90a54032 2008-06-20T07:48:54-07:00 2008-06-20T07:48:54-07:00 sake strip bfc4e1cf6f600f9af8b4d05fc733e34b5eb82f07 somebee sindre@identu.no f8611137be9b801617628ea7c7bdd23aa0eebfae ce6bb7edc96c238037852c21ace326c6514fce2e somebee sindre@identu.no http://github.com/sam/dm-more/commit/24ea50df3543a7b71c25965aae8bf8fb219d21ca 24ea50df3543a7b71c25965aae8bf8fb219d21ca 2008-06-20T07:48:37-07:00 2008-06-20T07:48:37-07:00 Merge branch 'master' of git@github.com:sam/dm-more 92f0ac5fe59e5be02b41de741f316fa07f25dbd1 somebee sindre@identu.no