wycats / merb-core fork watch download tarball
public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
merb-core / Commit History feed

05/16/08

Changes to behavior.rb to allow for :controller, :actions and :params 
options to be passed in
startrader (author)
Thu May 15 20:28:58 -0700 2008
michaelklishin (committer)
Fri May 16 15:11:44 -0700 2008
commit  47e48f25a89e065fd1aba6c122e28197daf24f2e
tree    69be000f81503e02b338eaffe2d3dc0a16d0992b
parent  56f5c097e66722e2f47f3ad7b77e01799d507d19 
Implemented Merb::Router::Behavior#match! that is a shortcut for 
match(...).to({}).
michaelklishin (author)
Fri May 16 15:04:21 -0700 2008
commit  56f5c097e66722e2f47f3ad7b77e01799d507d19
tree    4b2b78570396e23d1dc540414ee2badc8f622dc0
parent  c955b78a2881265e296d0be9359a80c4cc05e5c7 
Improve Merb boot diagram.
michaelklishin (author)
Fri May 16 15:02:35 -0700 2008
commit  c955b78a2881265e296d0be9359a80c4cc05e5c7
tree    57f0391537bf5506b43d15197e48e713bce160d3
parent  9d44defce29f7aeb23d8e31745b5fa854a772e76 
Remove WIP spec for Merb::Router::Behavior#redirect.
michaelklishin (author)
Thu May 15 16:56:33 -0700 2008
commit  c7c69e8f6a0bce3a1a4ccce13d334fafd6e24685
tree    6d638e77478822ec3e7f34eb71b5e05d6ffaf6ed
parent  cf690d2521cdfa1d549bbf9ac8d051ed3c2f9140 
Make each subsequent call to use_orm just replace effect of previos.
michaelklishin (author)
Fri May 16 07:15:50 -0700 2008
commit  9d44defce29f7aeb23d8e31745b5fa854a772e76
tree    b63ee4fae7dc5b99d2f89daac93c6eecf652e323
parent  c7c69e8f6a0bce3a1a4ccce13d334fafd6e24685

05/15/08

fix typo in request_spec.rb
ezmobius (author)
Thu May 15 19:27:52 -0700 2008
commit  cf690d2521cdfa1d549bbf9ac8d051ed3c2f9140
tree    e985be38897241f7d30a3cab0f8edcb2eaf50615
parent  151989977c12c9c37bc5fa46163887d6a2ab6c4c 
Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Thu May 15 19:27:22 -0700 2008
commit  151989977c12c9c37bc5fa46163887d6a2ab6c4c
tree    e7fa4cc10795ead30f2b0350c29e42343bcbfd07
parent  5e1941211a2cde5e4d9f18c84251806b373ed49a parent  c903c92bb1fe1054c3f2ad7e7a748d1525300fc8 
Needs to raise here since if the generator scope has more than one ORM the 
geneartors will not work. Comment
hassox (author)
Thu May 15 17:34:34 -0700 2008
commit  c903c92bb1fe1054c3f2ad7e7a748d1525300fc8
tree    a7996f919cdd665fb2a3388051a1203eb95a83f1
parent  c866de0dbafa600248a8a2601785505e5e6ce621 
Log instead of raising when dependencies mechanism this ORM required 
twice.
michaelklishin (author)
Thu May 15 16:51:10 -0700 2008
commit  c866de0dbafa600248a8a2601785505e5e6ce621
tree    e7e4f10741ae070cd6b4f88c8d9cdb54faf1efd6
parent  1f4aa010a15ef24b3d833f6432cd50becf5f9ac3 
Get rid of Kernel#registered_orm?, it is no longer in use.
michaelklishin (author)
Thu May 15 12:44:28 -0700 2008
commit  1f4aa010a15ef24b3d833f6432cd50becf5f9ac3
tree    a7996f919cdd665fb2a3388051a1203eb95a83f1
parent  56cc15ab05301d8ed6f440795aabb43203c7179d 
Make Kernel#registred_orm? use simple include lookup.
michaelklishin (author)
Thu May 15 12:10:03 -0700 2008
commit  56cc15ab05301d8ed6f440795aabb43203c7179d
tree    5e0e066f68e20ea1fe194bc177646ad136ec75fb
parent  420ade64d339c946c148061e86ae5846e3c33d03 
Fix spec and Kernel#registred_orm? conditions bug.
michaelklishin (author)
Thu May 15 11:52:31 -0700 2008
commit  420ade64d339c946c148061e86ae5846e3c33d03
tree    79dd5458110b7f4e8a1caa4455c7a93b96fb9e37
parent  b0f052399c2df3e54db3a7fcc83d7deabfa1535b 
Merge branch 'wycats'
michaelklishin (author)
Thu May 15 11:02:43 -0700 2008
commit  b0f052399c2df3e54db3a7fcc83d7deabfa1535b
tree    0ea9f1356943936c4faf507cbeb7c3ae6193a523
parent  e84822e12967151864f8d3a39e90bc1995b65683 parent  ec7f7f6dbe1461d46ef96dddcbc1e31a32775895

05/14/08

Fix a typo.
michaelklishin (author)
Wed May 14 21:24:31 -0700 2008
commit  ec7f7f6dbe1461d46ef96dddcbc1e31a32775895
tree    7a0d9f3dfe56b57d8f6542e47b254d847d7fce4e
parent  7dbe4704dddb7472f6a997279884478fc5d613f0 
Fixed erronous documentation in Merb::Router::Behavior
startrader (author)
Wed May 14 20:11:27 -0700 2008
michaelklishin (committer)
Wed May 14 21:22:07 -0700 2008
commit  7dbe4704dddb7472f6a997279884478fc5d613f0
tree    dafd11eff11b681790f85297ee05122584355a22
parent  3d0c6563f267d8910f9b03a3fbc562095da2f44e 
Merge branch 'wycats'
michaelklishin (author)
Wed May 14 18:31:42 -0700 2008
commit  e84822e12967151864f8d3a39e90bc1995b65683
tree    83a8ac1426917417b275e38d754b7ddd0ca7f37c
parent  4b520c316dc381c2627cc46af6d1d975ff8fbc76 parent  3d0c6563f267d8910f9b03a3fbc562095da2f44e 
Working on Behaviour#redirect feature: stashing changes.
michaelklishin (author)
Wed May 14 18:31:06 -0700 2008
commit  4b520c316dc381c2627cc46af6d1d975ff8fbc76
tree    b6595e702f780013741e6643711f24188ec6dc77
parent  b74e507f76bf7775e860d2cd47c9ff736d79c868 
Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Wed May 14 17:34:25 -0700 2008
commit  5e1941211a2cde5e4d9f18c84251806b373ed49a
tree    23f938798bc64952075770760508d7abf4d10573
parent  085ce9721f52c9a56556341611f8ee943f5913ef parent  3d0c6563f267d8910f9b03a3fbc562095da2f44e 
update callable_actions to exclude any methods beggining with an 
_underscope
ezmobius (author)
Wed May 14 17:34:14 -0700 2008
commit  085ce9721f52c9a56556341611f8ee943f5913ef
tree    75918f5c10879c33b1a1c1c2cc1a9bec7ebf7bce
parent  5259c13979a8cd3c7e232dc01dde91bafc9af9a1 
Adds template-checking code to branch where :with option is specified in 
partials.
nanodeath (author)
Wed May 14 12:57:22 -0700 2008
michaelklishin (committer)
Wed May 14 13:37:33 -0700 2008
commit  3d0c6563f267d8910f9b03a3fbc562095da2f44e
tree    90d5682ee45d163e79c26e938f538eae3b853346
parent  5a8b976b1912323f15df55d7db38c7e673f1ae7c 
Add two notes on layout method versus :layout option of render method.
michaelklishin (author)
Wed May 14 09:37:58 -0700 2008
commit  5a8b976b1912323f15df55d7db38c7e673f1ae7c
tree    698ee40f2c0247fe1eeaf8d5601bed727e9d90a8
parent  f8e06dfdee95b75e52f6dbb69bb4bfaa4e779ef1 
Forget to add template for added spec example.
michaelklishin (author)
Wed May 14 09:33:33 -0700 2008
commit  f8e06dfdee95b75e52f6dbb69bb4bfaa4e779ef1
tree    ba6d0e7c9355ef6be1933044ac446839717dd41c
parent  995ea9a755a0e3522aaf38af83eb3272ddb38ad7 
Add spec example for render :layout => false that overrides layout.
michaelklishin (author)
Wed May 14 09:32:31 -0700 2008
commit  995ea9a755a0e3522aaf38af83eb3272ddb38ad7
tree    bd23418a1b13c5a5dd874ca3a19a1ba6987a6f6d
parent  b8c2dd2f976afa946aa78dc6c797d6b0e70f3f20 
More sweet empty lines management in controller fixtures.
michaelklishin (author)
Wed May 14 09:14:55 -0700 2008
commit  b8c2dd2f976afa946aa78dc6c797d6b0e70f3f20
tree    bb4cf2f72b18fcd271ecd8b659cade4f26ae96b6
parent  646f3af5ed6d3b168596d613bf66ce93838d2ea7 
Clean up empty lines in fixture controller.
michaelklishin (author)
Wed May 14 09:12:34 -0700 2008
commit  646f3af5ed6d3b168596d613bf66ce93838d2ea7
tree    aa51cf6f62a72c377bcda9d82a20a8601eb28414
parent  cc54416cc2de5256c5a76257694759325e376b6c 
Fix _template_for documentation: content type does not default to nil.
michaelklishin (author)
Wed May 14 08:46:48 -0700 2008
commit  cc54416cc2de5256c5a76257694759325e376b6c
tree    63fd823d2f4d48de81496c701a578272c8c90af2
parent  c0a94672d09aa05dcc805d15f60e7ddbbd73374f 
Update render method documentation, we support :layout => false.
michaelklishin (author)
Wed May 14 06:29:03 -0700 2008
commit  c0a94672d09aa05dcc805d15f60e7ddbbd73374f
tree    cb59b13bef7d006fa0626aa62f98f98230211756
parent  bc7337652538067e59bbd266eb131c3c473c9422 
JSON objects that do not inflate to hashes should populate 
params[:inflated_object] (Ticket #316)
adamhjk (author)
Tue May 13 23:18:01 -0700 2008
michaelklishin (committer)
Wed May 14 06:03:59 -0700 2008
commit  bc7337652538067e59bbd266eb131c3c473c9422
tree    8840c648846f16da5f16640059c3b24520ccb14d
parent  c24824616c2ceaa7e7eaa513a710253f0b89e9fd 
Merge branch 'master' of git@github.com:wycats/merb-core
michaelklishin (author)
Wed May 14 05:59:58 -0700 2008
commit  c24824616c2ceaa7e7eaa513a710253f0b89e9fd
tree    9d8ad434ddb4b8471da6a59f0e70e144049c0c99
parent  c605c1df882272fa2d99f80e8b3df6c46bf1a2f3 parent  5259c13979a8cd3c7e232dc01dde91bafc9af9a1

05/13/08

update new rack middleware machinery to be more merb style in the 
bootloader
ezmobius (author)
Tue May 13 18:24:00 -0700 2008
commit  5259c13979a8cd3c7e232dc01dde91bafc9af9a1
tree    9d8ad434ddb4b8471da6a59f0e70e144049c0c99
parent  78ae5652ecce8f6f6bf09e5608f3aa394ab638be