3e8a8934b62aaa5453a97b8150b0ab3877580e0c cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15 David James djwonk@collectiveinsight.net http://github.com/wycats/merb-core/commit/75f71027c5f023eebb91023845f06262cb16a880 75f71027c5f023eebb91023845f06262cb16a880

2008-06-11T10:52:54-07:00

Merge branch 'master' of git://github.com/wycats/merb-core * 'master' of git://github.com/wycats/merb-core: (192 commits) siiiiiigh. Revert partial counter and yielding. Remove some duplication For crying out loud. Refactor display. WARNING: This commit might not be stable. I need to add a bunch more specs for display before I feel confident. Make the TemplateNotFound error read better. Slight refactor of _get_layout. Fix _template_for so it's actually readable uhhhhhhhh... Added Merb::Router.reset! and Merb::Router.capture Speedup Route URL generation Start work on fixing contaminated cousins bug. Changed controller inheritance of _template_root Added the ability to use full/absolute template paths for render, display and partial views This cannot be tested this way. It needs to be tested as a public spec (testing it privately here was a cop-out and fails when I fixed up the way dependency works). Allows passage of query string via env["QUERY_STRING"] in tests. [#358 state:resolved] Handles use of dependency after BootLoading. [#360 state:resolved] properly set the session_id_key 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. Made Class a lot more sane. Fix README for merb-gen app foo ... cc4fa07242559e1e20f49ba4422e51a48626916f David James djwonk@collectiveinsight.net ce9a7f1e77fcb633db0f936467a77d2fdf687437 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15 cd7bacb9c7eb105ecf84c01fb56bcc8af29b5c15

2008-06-10T22:10:21-07:00

siiiiiigh. 54b19a7e19801348f42fa9d863038d13222b21e6 Yehuda Katz wycats@gmail.com a09128eac56b9333324692a2ddf2be688c33de85 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ce9a7f1e77fcb633db0f936467a77d2fdf687437 ce9a7f1e77fcb633db0f936467a77d2fdf687437

2008-06-10T21:58:45-07:00

Revert partial counter and yielding. f73adff0bffce1cdbe493a99ca4ecba9b685889e Yehuda Katz wycats@gmail.com 384287b21dc6fdac927b088c2aa6647e461532b9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a09128eac56b9333324692a2ddf2be688c33de85 a09128eac56b9333324692a2ddf2be688c33de85

2008-06-10T21:54:56-07:00

Remove some duplication 73ea997b0e8ac0a45b80ea2778fb255a830e8290 Yehuda Katz wycats@gmail.com 995f4f670e8a212af676bd9736f1a2c4b4cb2161 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/384287b21dc6fdac927b088c2aa6647e461532b9 384287b21dc6fdac927b088c2aa6647e461532b9

2008-06-10T21:39:58-07:00

For crying out loud. 052ad67ac570ff30bae7d353e73cf317912d8e15 Yehuda Katz wycats@gmail.com c1ce863d84641e1748a388a959fd409b7c244916 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/995f4f670e8a212af676bd9736f1a2c4b4cb2161 995f4f670e8a212af676bd9736f1a2c4b4cb2161

2008-06-10T20:28:48-07:00

Refactor display. WARNING: This commit might not be stable. I need to add a bunch more specs for display before I feel confident. 72e1a7b41f8b65628961169b663856a80b2cffc8 Yehuda Katz wycats@gmail.com 85bea5d84311e6dcf642180683bfaf53a5c27402 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/c1ce863d84641e1748a388a959fd409b7c244916 c1ce863d84641e1748a388a959fd409b7c244916

2008-06-10T19:52:40-07:00

Make the TemplateNotFound error read better. Slight refactor of _get_layout. 7c90070b6e7335f2c0917a61703a680ad3a1a792 Yehuda Katz wycats@gmail.com 0e36b591f46eaecdba168f03b36b87388eb5cfa3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/85bea5d84311e6dcf642180683bfaf53a5c27402 85bea5d84311e6dcf642180683bfaf53a5c27402

2008-06-10T19:30:07-07:00

Fix _template_for so it's actually readable 436f302eb5a66db6025e6adb2a58ccf6c60b41de Yehuda Katz wycats@gmail.com e8c05531659c45f918f17b7627886bf3e9a40556 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0e36b591f46eaecdba168f03b36b87388eb5cfa3 0e36b591f46eaecdba168f03b36b87388eb5cfa3

2008-06-10T17:00:27-07:00

uhhhhhhhh... 90fc8765e50963e7ac4d7d0c6e8064b30a16fe5c Yehuda Katz wycats@gmail.com 74d24639f8d7158d4b5ba2457596fbc3dad90c56 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/e8c05531659c45f918f17b7627886bf3e9a40556 e8c05531659c45f918f17b7627886bf3e9a40556

2008-06-09T01:40:33-07:00

Added Merb::Router.reset! and Merb::Router.capture 58d06c4e3d2611057804ffea0fb3562a38d8057b Fabien Franzen info@atelierfabien.be 3e987bed134802163340ee7da750076d969ee887 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/74d24639f8d7158d4b5ba2457596fbc3dad90c56 74d24639f8d7158d4b5ba2457596fbc3dad90c56

2008-06-08T11:53:57-07:00

Speedup Route URL generation A lot of time is lost on URL generation calling regexp? on each route. This memoizes both the list of ancestors, and the result from regexp? It also makes Behavior#ancestors public so Route doesn't have to use send() to sneak behind the wall. e132be36c1d0840cec104d9ffc521c50d8d34b34 Michael D. Ivey ivey@gweezlebur.com b80e5fe892b44569159a33ac87b2a2b70f45e24b d5d3c349d4ea30cffd268a6b2bb6ddcb1589ed83 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/3e987bed134802163340ee7da750076d969ee887 3e987bed134802163340ee7da750076d969ee887

2008-06-08T11:35:27-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Changed controller inheritance of _template_root Added the ability to use full/absolute template paths for render, display and partial views c44940718baa6ad283e9ae59efbb7c80712099fb Yehuda Katz wycats@gmail.com 9e62f4197a42c80d49d42a75730cb24c60364c9a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/b80e5fe892b44569159a33ac87b2a2b70f45e24b b80e5fe892b44569159a33ac87b2a2b70f45e24b

2008-06-08T11:35:19-07:00

Start work on fixing contaminated cousins bug. 3fffe49e7d958809b7b8a2d316e86adc3d679fb2 Yehuda Katz wycats@gmail.com f5c19f588f9e7d354aa3bfda01816cfa503868df Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/d5d3c349d4ea30cffd268a6b2bb6ddcb1589ed83 d5d3c349d4ea30cffd268a6b2bb6ddcb1589ed83

2008-06-08T07:42:08-07:00

Changed controller inheritance of _template_root 61d3ccdf75892c68bd3d08b5b0c1b36604ecdd58 Fabien Franzen info@atelierfabien.be 9e62f4197a42c80d49d42a75730cb24c60364c9a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/f5c19f588f9e7d354aa3bfda01816cfa503868df f5c19f588f9e7d354aa3bfda01816cfa503868df

2008-06-08T04:28:36-07:00

Added the ability to use full/absolute template paths for render, display and partial views 22d933db6a690a9998a7239603991241fe1bee77 Fabien Franzen info@atelierfabien.be 30d55e9bcf10d3d396b2887b72803e9dd02e0765 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9e62f4197a42c80d49d42a75730cb24c60364c9a 9e62f4197a42c80d49d42a75730cb24c60364c9a

2008-06-05T19:14:42-07:00

This cannot be tested this way. It needs to be tested as a public spec (testing it privately here was a cop-out and fails when I fixed up the way dependency works). 2abed221d9fe004343be629b0c61fd61bb90dd50 Yehuda Katz wycats@gmail.com 29b9b1c84b558c870896431db7688c943760e20e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/30d55e9bcf10d3d396b2887b72803e9dd02e0765 30d55e9bcf10d3d396b2887b72803e9dd02e0765

2008-06-05T17:26:46-07:00

Allows passage of query string via env["QUERY_STRING"] in tests. [#358 state:resolved] 97a6e90349197dcd5e858b534f4b916efe6836c5 Yehuda Katz wycats@gmail.com 4d6aeea5b3751b7db0aead50369e32a3847a65bf b3fa33a6e565fcbbca03b64b8ff2d066a9ec60c4 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/29b9b1c84b558c870896431db7688c943760e20e 29b9b1c84b558c870896431db7688c943760e20e

2008-06-05T17:10:45-07:00

Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: properly set the session_id_key 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. 771ebe76128bd1b6b4affa50713e0cef34621927 Yehuda Katz wycats@gmail.com 5e5afec3ac1daf0eb5520bb8cb7688dc016cfb43 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/4d6aeea5b3751b7db0aead50369e32a3847a65bf 4d6aeea5b3751b7db0aead50369e32a3847a65bf

2008-06-05T17:10:35-07:00

Handles use of dependency after BootLoading. [#360 state:resolved] 3b9d41885b575028d30c8875529519a2774c54fd Yehuda Katz wycats@gmail.com 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

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

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

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

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

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

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

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