174b32f5bcac25a4259b7727d194b31a2473d5b0 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/2fc4927fb57755f50c25a79dbd0749112b60aebb 2fc4927fb57755f50c25a79dbd0749112b60aebb 2008-02-13T14:30:34-08:00 2008-02-13T14:30:34-08:00 [merb_rspec] Fix for simple story generation. 3765568c6d94075077689dd74d456943d92f84ce Ben Burkert ben@benburkert.com 79e53638d25bd9e3b135c5e318fed2a38d2fa90b 87ffb13c98f051a54b6d99e9c17eb28cbd0d2fb5 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/174b32f5bcac25a4259b7727d194b31a2473d5b0 174b32f5bcac25a4259b7727d194b31a2473d5b0 2008-02-13T14:27:14-08:00 2008-02-13T14:27:14-08:00 Merge branch 'master' of git://github.com/wycats/merb-plugins into rspec_and_test_unit 7af749efcbf47b2f6e6e23387d331d1403cc0eb2 Ben Burkert ben@benburkert.com d9ba4979d6090f951657f99172513ae4e28599e1 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-plugins/commit/87ffb13c98f051a54b6d99e9c17eb28cbd0d2fb5 87ffb13c98f051a54b6d99e9c17eb28cbd0d2fb5 2008-02-13T13:49:25-08:00 2008-02-13T13:49:25-08:00 options_for_select and options_from_collection_for_select no longer rely on returning() Thanks Robert Evans 172b5bbc32724f98d1d4da0e2033e4a5fa0e001e Michael D. Ivey ivey@gweezlebur.com c8af8f46c714062e6eeb5cc7685fe03ccfbaacc6 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/79e53638d25bd9e3b135c5e318fed2a38d2fa90b 79e53638d25bd9e3b135c5e318fed2a38d2fa90b 2008-02-13T13:43:25-08:00 2008-02-13T13:43:25-08:00 moved Merb::Test::Rspec module inside the environment check 306be0e75028b33d424c313f65fc79ab6c767cc5 Ben Burkert ben@benburkert.com d117d44f2bb866dbd926affa3a6f7e6863bb23ba Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/c8af8f46c714062e6eeb5cc7685fe03ccfbaacc6 c8af8f46c714062e6eeb5cc7685fe03ccfbaacc6 2008-02-13T13:38:53-08:00 2008-02-13T13:38:53-08:00 moved Merb::Test::Rspec module inside the environment check ce3aa90973cd11ddffbf4d7185966138041164dc Ben Burkert ben@benburkert.com 32059594837d39eeb2f629413c6ebf2b96ebb79b Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/d117d44f2bb866dbd926affa3a6f7e6863bb23ba d117d44f2bb866dbd926affa3a6f7e6863bb23ba 2008-02-13T12:55:23-08:00 2008-02-13T12:55:23-08:00 including hassox's changes for rspec stories c08b1ad3973be28b1c6b4ee571fc63519bf687b5 Ben Burkert ben@benburkert.com 65d5cb5ee7848e020f9807d05c6e778a85c8f3db d9ba4979d6090f951657f99172513ae4e28599e1 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/32059594837d39eeb2f629413c6ebf2b96ebb79b 32059594837d39eeb2f629413c6ebf2b96ebb79b 2008-02-12T22:47:22-08:00 2008-02-12T22:47:22-08:00 Merge branch 'master' of git://github.com/wycats/merb-plugins into rspec_and_test_unit 162f72deabc6f9cfd1e92bbe5a6337fed48d90b6 Ben Burkert ben@benburkert.com 4be93b0879b2f026e7c70a6fb3e125501cb95f73 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/65d5cb5ee7848e020f9807d05c6e778a85c8f3db 65d5cb5ee7848e020f9807d05c6e778a85c8f3db 2008-02-12T22:47:12-08:00 2008-02-12T22:47:12-08:00 starting specs for hpricot asserts 76f5b8e294087b3828c42c1c0b89566cef2182c5 Ben Burkert ben@benburkert.com 41d0db49129de29ff3264fc927c37e389e2be757 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/4be93b0879b2f026e7c70a6fb3e125501cb95f73 4be93b0879b2f026e7c70a6fb3e125501cb95f73 2008-02-12T22:46:20-08:00 2008-02-12T22:46:20-08:00 added specs for HasTag matcher e1fa9d6a58ecc06130d4e987cf7a68a94eea4173 Ben Burkert ben@benburkert.com 08262d2beff98c5ab9da9b9802246f6a0be18302 Nickolas Means nick@heliumsyndicate.com http://github.com/wycats/merb-plugins/commit/d9ba4979d6090f951657f99172513ae4e28599e1 d9ba4979d6090f951657f99172513ae4e28599e1 2008-02-12T22:18:15-08:00 2008-02-12T13:34:40-08:00 Fixes NoMethodError: undefined method `gmtime' for 1209600:Fixnum" encountered when using datamapper session store. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> 35dd52e4e21262b942d678d6e77479151a7b89a3 Michael D. Ivey ivey@gweezlebur.com 5cb8c6751cd592db0af66e1b220e46e330340d22 Nickolas Means nick@heliumsyndicate.com http://github.com/wycats/merb-plugins/commit/08262d2beff98c5ab9da9b9802246f6a0be18302 08262d2beff98c5ab9da9b9802246f6a0be18302 2008-02-12T22:17:26-08:00 2008-02-12T13:25:34-08:00 Fixes MySQL session table creation error This removes the :serial => true property on the 'sessions' table definition, removing the AUTOINCREMENT segment of the raw SQL. Table generation is now functional. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> fc23dc0c388596b40095c15848d9f69b3c1c7728 Michael D. Ivey ivey@gweezlebur.com ae35179793fcb8ee01a3f824b42bba02a454783e Sergei Zimakov zimakov@gmail.com http://github.com/wycats/merb-plugins/commit/5cb8c6751cd592db0af66e1b220e46e330340d22 5cb8c6751cd592db0af66e1b220e46e330340d22 2008-02-12T22:15:48-08:00 2008-02-12T20:11:10-08:00 - added :id attribute generation for radio_group_control and text_area_control - labels now can be on any side of field (ruled by :label => {:align => :right}) - right-aligned labels for radios and checkboxes by default Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> deb06ae15494652a93e31d0af35ef5281f813883 Michael D. Ivey ivey@gweezlebur.com 3e1b3455b08102d8def4aae83c0f500837e17f0b Sergei Zimakov zimakov@gmail.com http://github.com/wycats/merb-plugins/commit/ae35179793fcb8ee01a3f824b42bba02a454783e ae35179793fcb8ee01a3f824b42bba02a454783e 2008-02-12T22:13:54-08:00 2008-02-11T01:53:19-08:00 Radio button input element uses 'checked' attribute (not 'selected') Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> c11eb2f9836b42f70f8cb8b7a59e8491c1c0568d Michael D. Ivey ivey@gweezlebur.com f45cf32f5b2008edd48ac39371829e47555ccb18 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/41d0db49129de29ff3264fc927c37e389e2be757 41d0db49129de29ff3264fc927c37e389e2be757 2008-02-12T21:28:04-08:00 2008-02-12T21:28:04-08:00 readded rspec_generators for stories. 1d2ff437d263cc4ff824572070e44b9f973acc17 Ben Burkert ben@benburkert.com 2c1ce36a1b702d70300457c5b18df012679891fb Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/f45cf32f5b2008edd48ac39371829e47555ccb18 f45cf32f5b2008edd48ac39371829e47555ccb18 2008-02-12T12:15:27-08:00 2008-02-12T12:15:27-08:00 Specs for controller asserts. TODO: hpricot asserts. b723b95866b4ebe2c0444a970c799ab007f985dd Ben Burkert ben@benburkert.com 3b2c7b506a72a1edf962f0f3d1545107b42a509f Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/2c1ce36a1b702d70300457c5b18df012679891fb 2c1ce36a1b702d70300457c5b18df012679891fb 2008-02-12T11:10:04-08:00 2008-02-12T11:10:04-08:00 Specs for the controller matchers. TODO: markup matchers 13b116939caf2ed7c39a37a6960eed1772484d5a Ben Burkert ben@benburkert.com 3e1b3455b08102d8def4aae83c0f500837e17f0b Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/3b2c7b506a72a1edf962f0f3d1545107b42a509f 3b2c7b506a72a1edf962f0f3d1545107b42a509f 2008-02-10T18:55:29-08:00 2008-02-10T18:55:29-08:00 Initial import of merb_rspec and merb_test_unit 7e90304e253289c98dd0c07e17ab444b78693adc Ben Burkert ben@benburkert.com 99656605879b5543e8ccec1a3044ee4a1874b785 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-plugins/commit/3e1b3455b08102d8def4aae83c0f500837e17f0b 3e1b3455b08102d8def4aae83c0f500837e17f0b 2008-02-10T00:21:04-08:00 2008-02-10T00:21:04-08:00 Update merb_datamapper plugin sessions to work properly [afrench] 563e8920cbecf4d9ac88ea276713a3279c0b6dd8 Ezra Zygmuntowicz ez@engineyard.com fe34d3f06f4d83d8fe2bd8f50e2c9c6dd5c300db Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/99656605879b5543e8ccec1a3044ee4a1874b785 99656605879b5543e8ccec1a3044ee4a1874b785 2008-02-08T19:52:01-08:00 2008-02-08T19:52:01-08:00 [merb_activerecord] Fixes a bug in resource_controller using action args ee488def6711f0fd9cba23720383330903819a07 Daniel Neighman has.sox@gmail.com c4e5cdc26621d77f889ba29131c79b088b4694d7 550cec95cc4209fc531a7c13f60e406406a7324e Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/fe34d3f06f4d83d8fe2bd8f50e2c9c6dd5c300db fe34d3f06f4d83d8fe2bd8f50e2c9c6dd5c300db 2008-02-07T23:06:43-08:00 2008-02-07T23:06:43-08:00 Merge branch 'generators' 1c2e8d71ffa99cd2f97c1896260ec02dda332fc5 Daniel Neighman has.sox@gmail.com edf0c14efc1f90ed3b88a5ba6b1de84c8e6a7074 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-plugins/commit/c4e5cdc26621d77f889ba29131c79b088b4694d7 c4e5cdc26621d77f889ba29131c79b088b4694d7 2008-02-07T11:02:14-08:00 2008-02-07T11:02:14-08:00 remove jerbivore plugin for now 203b32b876856952b18353d67ed6c68dff971fcd Ezra Zygmuntowicz ez@engineyard.com eddcb2803d07003118f1815d8308472919ee6155 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-plugins/commit/edf0c14efc1f90ed3b88a5ba6b1de84c8e6a7074 edf0c14efc1f90ed3b88a5ba6b1de84c8e6a7074 2008-02-07T02:15:45-08:00 2008-02-07T02:15:45-08:00 Add to merb helpers, tag helpers and erubis helpers 3c25b79b11c82e79f70f8f5ceb5db74886af60d8 Ezra Zygmuntowicz ez@engineyard.com ed14694b1350483cbeb411adc1a6f7ba742fa104 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/550cec95cc4209fc531a7c13f60e406406a7324e 550cec95cc4209fc531a7c13f60e406406a7324e 2008-02-06T02:20:03-08:00 2008-02-06T02:20:03-08:00 ORM generators all functional with new merb-gen command. 6be3f6a557d1ab627096cafa9d1cb5f2abc4aff2 Daniel Neighman has.sox@gmail.com 62fcf7e3d77726f2e2252f950baa82952f9f0b7f ed14694b1350483cbeb411adc1a6f7ba742fa104 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/eddcb2803d07003118f1815d8308472919ee6155 eddcb2803d07003118f1815d8308472919ee6155 2008-02-05T22:13:48-08:00 2008-02-05T22:13:48-08:00 Merge branch 'generators' 362343fb3954fcec259e8306015eaa5bfae9cdd6 Daniel Neighman has.sox@gmail.com 83938f7936daa83355fd8fd60c60ca24c9919902 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/ed14694b1350483cbeb411adc1a6f7ba742fa104 ed14694b1350483cbeb411adc1a6f7ba742fa104 2008-02-05T22:12:25-08:00 2008-02-05T22:12:25-08:00 [merb_sequel] Sessions and rake file working for sequel 48f2368fae088cbc2d10b7fcd5d1e805386a0a78 Daniel Neighman has.sox@gmail.com 83938f7936daa83355fd8fd60c60ca24c9919902 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-plugins/commit/62fcf7e3d77726f2e2252f950baa82952f9f0b7f 62fcf7e3d77726f2e2252f950baa82952f9f0b7f 2008-02-05T12:31:26-08:00 2008-02-05T12:31:26-08:00 fix rakefile d4bad3bf0d81c76452d4d648d768d2370661b8d3 Ezra Zygmuntowicz ez@engineyard.com 64fd9dfa61cd87be370223cc746a00730eb35dc0 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/83938f7936daa83355fd8fd60c60ca24c9919902 83938f7936daa83355fd8fd60c60ca24c9919902 2008-02-05T06:29:37-08:00 2008-02-05T06:29:37-08:00 [merb_sequel] Adds generators for 0.9 704067d20b323abd66036e8eaa665724253ad6e3 Daniel Neighman has.sox@gmail.com 407c3e478f8b8d196fb763c199101416bf7eb665 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/64fd9dfa61cd87be370223cc746a00730eb35dc0 64fd9dfa61cd87be370223cc746a00730eb35dc0 2008-02-05T05:27:46-08:00 2008-02-05T05:27:46-08:00 [merb_datamapper] Adds support for 0.9 sessions 991167a73cd773cfe5f38b0620695a4f49b02646 Daniel Neighman has.sox@gmail.com 25de7198ebeeb4b75af75aa2c36ff26bf1643f72 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/407c3e478f8b8d196fb763c199101416bf7eb665 407c3e478f8b8d196fb763c199101416bf7eb665 2008-02-05T04:00:16-08:00 2008-02-05T04:00:16-08:00 [merb_datamapper] Changed the loading code for the plugin 9895380a70ce394ca0c00d20c1558344a1e0afc0 Daniel Neighman has.sox@gmail.com cc7bc84d64ad2e625229e03949945efbb7c7d681 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-plugins/commit/25de7198ebeeb4b75af75aa2c36ff26bf1643f72 25de7198ebeeb4b75af75aa2c36ff26bf1643f72 2008-02-05T03:55:46-08:00 2008-02-05T03:55:46-08:00 Update the resource generator to use merb-gen 6a5b480d99c4c458e8c91510dbfbcfb7c828fcc5 Daniel Neighman has.sox@gmail.com