ebf1531725a1fe078a9d85a23d84129d3b95bb01 Michael D'Auria michael.dauria@gmail.com http://github.com/wycats/merb-core/commit/b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4 b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4 2008-06-04T20:41:29-07:00 2008-06-03T18:56:24-07:00 properly set the session_id_key Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 02f46c47eb23e5ef024ae70cc116f228f07c00f3 Ezra Zygmuntowicz ez@engineyard.com 5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43 Paul Boone paulboone@mindbucket.com http://github.com/wycats/merb-core/commit/ebf1531725a1fe078a9d85a23d84129d3b95bb01 ebf1531725a1fe078a9d85a23d84129d3b95bb01 2008-06-04T20:35:13-07:00 2008-06-03T15:55:09-07:00 added 2 specs for multipart formdata: (1) for checking request with IO, (2) for testing GET with content_type not erroring on multipart/form-data absence; fixed error with multipart/form-data absence. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> ef39cfabee595c8623efee40f09698d31efec05b Ezra Zygmuntowicz ez@engineyard.com 15ea15f954cc915349f501e7f240fbe24d6b54b8 132b469322456c3dd918a1daaaf5046acd65c309 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43 5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43 2008-06-02T23:30:10-07:00 2008-06-02T23:30:10-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Fix README for merb-gen app foo cc841a26c41dae874ef1962f9a7f0bdd19a09e72 Yehuda Katz wycats@gmail.com 0f6704030f272f3b242d5b21c619ecc56bcee8d6 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/15ea15f954cc915349f501e7f240fbe24d6b54b8 15ea15f954cc915349f501e7f240fbe24d6b54b8 2008-06-02T23:29:58-07:00 2008-06-02T23:29:58-07:00 Made Class a lot more sane. 5bad842fade6a514174a9581009bd9d7b4c86ec0 Yehuda Katz wycats@gmail.com adc1922f7199fc721141cb54550248ca928371ad 0f6704030f272f3b242d5b21c619ecc56bcee8d6 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/132b469322456c3dd918a1daaaf5046acd65c309 132b469322456c3dd918a1daaaf5046acd65c309 2008-06-02T22:38:28-07:00 2008-06-02T22:38:28-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Do not duplicate work Merb::Template.template_extensions does in Templates bootloader. Make exception message when Merb cannot find template explain what it was Fixed 2 problems with multipart form upload after application is deployed to Tomcat via warble: (1) The @body object in this environment is an IO object, not a StringIO, so doesn't have a size method, and (2) 'tempfile' needs to be explicitly required. made only and except uglier and faster Preserve order parse query, respect query string override in test request Added partial counter and yielding for collections Remove occasionly committed *.rbc files. Ignore *.rbc created by Rubinius compiler. Remove occasionly committed *.rbc files. Ignore *.rbc created by Rubinius compiler. e69ef49916c63909b353b7cc9f84f7ee93ad8eaa Michael D. Ivey ivey@gweezlebur.com d9ab75d1528d1b7d1395ac9293086c7141044e06 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/adc1922f7199fc721141cb54550248ca928371ad adc1922f7199fc721141cb54550248ca928371ad 2008-06-02T22:37:48-07:00 2008-06-02T22:37:48-07:00 Fix README for merb-gen app foo 4988fadc7a4a9c4d088d6f7d8244c9120ab7e72b Michael D. Ivey ivey@gweezlebur.com dff256a6d0ea79acbcd8a95fc3676e27defec2b5 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0f6704030f272f3b242d5b21c619ecc56bcee8d6 0f6704030f272f3b242d5b21c619ecc56bcee8d6 2008-06-02T02:08:40-07:00 2008-06-02T02:08:40-07:00 Do not duplicate work Merb::Template.template_extensions does in Templates bootloader. bd6d12f4e2f2287497ca0456087342b2a46a30c2 Michael S. Klishin michael@novemberain.com e1619deca5caa7b1d90ab4abfd8f4db7620da537 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/dff256a6d0ea79acbcd8a95fc3676e27defec2b5 dff256a6d0ea79acbcd8a95fc3676e27defec2b5 2008-06-02T02:06:23-07:00 2008-06-02T02:06:23-07:00 Make exception message when Merb cannot find template explain what it was looking for (and what's the content type). bcca6d7b8008edbb1a4f40f09cf59002e47d55f2 Michael S. Klishin michael@novemberain.com 815ba9785955942596f5f3db378f60e42ecc29cd 2d452bf4731f398c54d98b0a364f2a64c98fc7f8 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/e1619deca5caa7b1d90ab4abfd8f4db7620da537 e1619deca5caa7b1d90ab4abfd8f4db7620da537 2008-06-01T23:39:57-07:00 2008-06-01T23:39:57-07:00 Merge branch 'patches' * patches: Preserve order parse query, respect query string override in test request Added partial counter and yielding for collections Remove occasionly committed *.rbc files. Ignore *.rbc created by Rubinius compiler. ebe2692a8cd86d529abb5a6e08d67951ade14590 Michael S. Klishin michael@novemberain.com 34b0ccb9db639ed27e6f1158eb712e0c2a8e234c Paul Boone paulboone@mindbucket.com http://github.com/wycats/merb-core/commit/815ba9785955942596f5f3db378f60e42ecc29cd 815ba9785955942596f5f3db378f60e42ecc29cd 2008-06-01T23:38:13-07:00 2008-05-31T08:22:07-07:00 Fixed 2 problems with multipart form upload after application is deployed to Tomcat via warble: (1) The @body object in this environment is an IO object, not a StringIO, so doesn't have a size method, and (2) 'tempfile' needs to be explicitly required. Signed-off-by: Michael S. Klishin <michael@novemberain.com> c3b75b559f54479b4cdc7a640feddebfbd6c8845 Michael S. Klishin michael@novemberain.com a70ee65be080740f0f0cbdb08ebfc608596004c6 Grant Hollingworth grant@antiflux.org http://github.com/wycats/merb-core/commit/34b0ccb9db639ed27e6f1158eb712e0c2a8e234c 34b0ccb9db639ed27e6f1158eb712e0c2a8e234c 2008-06-01T23:24:49-07:00 2008-05-29T17:46:44-07:00 made only and except uglier and faster Calling include? for every key in a long list is hideously slow. Signed-off-by: Michael S. Klishin <michael@novemberain.com> d3146cb4df6701b93918ee238e8ade9cff18af1a Michael S. Klishin michael@novemberain.com 00d97c9cd437a76755a76a712c8e66228556ec3c d9ab75d1528d1b7d1395ac9293086c7141044e06 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a70ee65be080740f0f0cbdb08ebfc608596004c6 a70ee65be080740f0f0cbdb08ebfc608596004c6 2008-06-01T23:22:18-07:00 2008-06-01T23:22:18-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Send the route into the controller Add Merb::Request.browser_method_workarounds Revert ca92bdfc89afda04cbb4fd3d3e5848648cc0b326 Refactored Merb::BootLoader::LoadClasses.reload into an additional remove_file method for other usage Fixed some failing specs Added rake :audit namespace to list routes, controllers and actions abc95f894b2e25c43e172fb0a80b116701054508 Michael S. Klishin michael@novemberain.com a5326c7f47aba67b1aa6b9a73c3670e40fcf26df Ben Chiu bchiu@yahoo.com http://github.com/wycats/merb-core/commit/2d452bf4731f398c54d98b0a364f2a64c98fc7f8 2d452bf4731f398c54d98b0a364f2a64c98fc7f8 2008-06-01T23:21:43-07:00 2008-05-23T14:12:54-07:00 Preserve order parse query, respect query string override in test request * added option 'preserve_order' to query_parse. retaining order of args is necessary to generate cache urls that nginx/apache can match. * allow params_to_query_string to accept Dictionary and respect order of args * Test::RequestHelper.dispatch_to method creates QUERY_STRING env variable from params and overwrites passed-in value. this behaviour does not match live environment. it also makes it impossible to generate consistent cache keys from query. this tests if QUERY_STRING exists before overwriting it. Signed-off-by: Michael S. Klishin <michael@novemberain.com> c6b925aee2481c0d4d74069d12525c21585ea676 Michael S. Klishin michael@novemberain.com ac28d632c53ed717a8d01b7d21dd3ec2b06a2268 Matthew Windwer matt@reframeit.local http://github.com/wycats/merb-core/commit/a5326c7f47aba67b1aa6b9a73c3670e40fcf26df a5326c7f47aba67b1aa6b9a73c3670e40fcf26df 2008-06-01T23:21:42-07:00 2008-05-19T17:14:15-07:00 Added partial counter and yielding for collections This makes the local variables +partial_counter+ and +partial_size+ available inside of a partial that is handling a collection. Also adds support for yielding to each item in a collection. Signed-off-by: Michael S. Klishin <michael@novemberain.com> c561fe69e260d6ff42962c157cc19cfe900690bd Michael S. Klishin michael@novemberain.com 87b34bd77ec6ab8c30159f5c0e8b21baa4f31282 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ac28d632c53ed717a8d01b7d21dd3ec2b06a2268 ac28d632c53ed717a8d01b7d21dd3ec2b06a2268 2008-06-01T23:21:42-07:00 2008-05-29T18:36:59-07:00 Remove occasionly committed *.rbc files. abc95f894b2e25c43e172fb0a80b116701054508 Michael S. Klishin michael@novemberain.com d9ab75d1528d1b7d1395ac9293086c7141044e06 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/87b34bd77ec6ab8c30159f5c0e8b21baa4f31282 87b34bd77ec6ab8c30159f5c0e8b21baa4f31282 2008-06-01T23:21:42-07:00 2008-05-29T18:34:49-07:00 Ignore *.rbc created by Rubinius compiler. 30bd62f8ffc1791af20a0f7e14ea6b260a7b72fb Michael S. Klishin michael@novemberain.com 6783d96631527106d784d4014efb34ba99000afd Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/d9ab75d1528d1b7d1395ac9293086c7141044e06 d9ab75d1528d1b7d1395ac9293086c7141044e06 2008-06-01T21:07:36-07:00 2008-06-01T21:07:36-07:00 Send the route into the controller 3c3864e83c5913a06ec345a7e1578f845cfe92f4 Michael D. Ivey ivey@gweezlebur.com 1cbab3fcfdd999f69358718827e22ba1ff1a7847 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/6783d96631527106d784d4014efb34ba99000afd 6783d96631527106d784d4014efb34ba99000afd 2008-06-01T20:50:43-07:00 2008-06-01T20:50:43-07:00 Add Merb::Request.browser_method_workarounds Most web browsers can't send PUT or DELETE requests, so any Strings stored in this array will be used as paramaters to find the real method. Common examples are _method and fb_sig_request_method Also, added a BootLoader::Defaults to put _method in by default. 14bae8b08c7eb1f45fcf97edd6140bc09a1134e3 Michael D. Ivey ivey@gweezlebur.com 16557ccab579c36697dd452333d55cc8e4042612 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/1cbab3fcfdd999f69358718827e22ba1ff1a7847 1cbab3fcfdd999f69358718827e22ba1ff1a7847 2008-06-01T20:30:06-07:00 2008-06-01T20:30:06-07:00 Revert ca92bdfc89afda04cbb4fd3d3e5848648cc0b326 845acc3e18f77cf315ba19803f1398e66bdbc281 Michael D. Ivey ivey@gweezlebur.com 5ca4076fc9f11b238f324b7c9c552d3a994bed76 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/16557ccab579c36697dd452333d55cc8e4042612 16557ccab579c36697dd452333d55cc8e4042612 2008-05-31T02:30:23-07:00 2008-05-31T02:30:23-07:00 Refactored Merb::BootLoader::LoadClasses.reload into an additional remove_file method for other usage b0e65d3842b389f295beab6a6b7ab8a70f523c7e Fabien Franzen info@atelierfabien.be d33348f0c9997ce5d4c31262cd627f34159b436e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/5ca4076fc9f11b238f324b7c9c552d3a994bed76 5ca4076fc9f11b238f324b7c9c552d3a994bed76 2008-05-30T11:07:34-07:00 2008-05-30T11:07:34-07:00 Fixed some failing specs ad507c1eed4f795ee3da1436c6c14af31aa1e8ea Fabien Franzen info@atelierfabien.be 894c7be2c25c29b6a260f6473a80c420fe55b161 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/d33348f0c9997ce5d4c31262cd627f34159b436e d33348f0c9997ce5d4c31262cd627f34159b436e 2008-05-30T10:02:32-07:00 2008-05-30T10:02:32-07:00 Added rake :audit namespace to list routes, controllers and actions Use these tasks to inspect your application. Be suspicious of any actions that are actually just exposed public methods and shouldn't be callable as actions. Use hide_action :the_method to fix these. rake audit:routes - all routes rake audit:controllers - all controllers, by their abstract class rake audit:actions - all controllers and their actions (or use CONTROLLER=Foo,Bar) f047e0bc5f63f3dc71cedf9a7c3c4a0286a44ad3 Fabien Franzen info@atelierfabien.be c32518b3f5f00c98e09da369a08b394280fa51ba Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/00d97c9cd437a76755a76a712c8e66228556ec3c 00d97c9cd437a76755a76a712c8e66228556ec3c 2008-05-29T18:36:59-07:00 2008-05-29T18:36:59-07:00 Remove occasionly committed *.rbc files. 8d155207224bd9f482419f997977c22057eb3221 Michael S. Klishin michael@novemberain.com 894c7be2c25c29b6a260f6473a80c420fe55b161 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c32518b3f5f00c98e09da369a08b394280fa51ba c32518b3f5f00c98e09da369a08b394280fa51ba 2008-05-29T18:34:49-07:00 2008-05-29T18:34:49-07:00 Ignore *.rbc created by Rubinius compiler. a800b89cabcfb4b9744ca320bf5e58c27b70fb2d Michael S. Klishin michael@novemberain.com bcbfed86b735f867d86c08407591ac87734841a5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/894c7be2c25c29b6a260f6473a80c420fe55b161 894c7be2c25c29b6a260f6473a80c420fe55b161 2008-05-29T17:41:58-07:00 2008-05-29T17:41:58-07:00 Make obj.full_const_get more robust 3f6df855f9f56a3de34f07386d371d686e1c3f2e Yehuda Katz wycats@gmail.com 9699aaacde38a0e0f77253c9792c3802fbe4304d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/bcbfed86b735f867d86c08407591ac87734841a5 bcbfed86b735f867d86c08407591ac87734841a5 2008-05-27T13:23:03-07:00 2008-05-27T13:23:03-07:00 forgot to comment out the text 9ab37834a1f576ab9a9ca0e08f5b3c2935e853f0 Ezra Zygmuntowicz ez@engineyard.com d9af8e9aa0fc30af4f563ec2dd26279bb5b19c71 b5b270f14c58f832fbfefa2c38775d9c05e872a5 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/9699aaacde38a0e0f77253c9792c3802fbe4304d 9699aaacde38a0e0f77253c9792c3802fbe4304d 2008-05-27T13:14:13-07:00 2008-05-27T13:14:13-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 23fbef3e0d739bff20ae08d586a15238a15c06ee Ezra Zygmuntowicz ez@engineyard.com 65e786bd0e791467c2e2c0128f3fa1b6edeec749 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/d9af8e9aa0fc30af4f563ec2dd26279bb5b19c71 d9af8e9aa0fc30af4f563ec2dd26279bb5b19c71 2008-05-27T13:13:38-07:00 2008-05-27T13:13:38-07:00 added DHH copyright notice to conre_ext/class.rb e5bc50ed67b47e34d68e739b1a31956e54348b0e Ezra Zygmuntowicz ez@engineyard.com 14999ffc159f654e7a27d61ee55436613e8e166d Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b5b270f14c58f832fbfefa2c38775d9c05e872a5 b5b270f14c58f832fbfefa2c38775d9c05e872a5 2008-05-27T06:56:03-07:00 2008-05-27T06:56:03-07:00 Better usage of merb_rake_helper.rb e64de46aa76d2289937b26641d42320bd5b7b887 Fabien Franzen info@atelierfabien.be b8d1a0098a5513caa23a860a8d627f1af87ca09d Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/14999ffc159f654e7a27d61ee55436613e8e166d 14999ffc159f654e7a27d61ee55436613e8e166d 2008-05-27T06:13:04-07:00 2008-05-27T06:13:04-07:00 Added tasks/merb_rake_helper.rb - removed it from merb-more 138fc8dea6101ee5bc918c47efa9f323dd05f0ed Fabien Franzen info@atelierfabien.be