Commit Graph

212 Commits

Author SHA1 Message Date
Bharat Mediratta
434d351b2f Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/models/item.php
2010-01-16 00:15:23 -08:00
Bharat Mediratta
00c73a4b07 Revert "Fix for ticket #978. Don't reset the original property as part of the save processing, because that will overwrite the original values with all the new values. The problem with the original approach is that when changed event handlers used ->original(), it had already been reset as part of the save processing. Went back and forth on either leaving this alone and forcing callers to save the original prior to calling the save function, but there were a few event handlers that used ->original(). This seemed the easier change. So to reset the original you need to call reload() or clear(). There is now an optional parameter on the reload to only reload the original."
This reverts commit daeaca110d.
2010-01-15 23:53:43 -08:00
Bharat Mediratta
916da15cbb Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-15 13:36:16 -08:00
Tim Almdal
daeaca110d Fix for ticket #978. Don't reset the original property as part of the save processing, because that will overwrite the original values with all the new values. The problem with the original approach is that when changed event handlers used ->original(), it had already been reset as part of the save processing. Went back and forth on either leaving this alone and forcing callers to save the original prior to calling the save function, but there were a few event handlers that used ->original(). This seemed the easier change. So to reset the original you need to call reload() or clear(). There is now an optional parameter on the reload to only reload the original. 2010-01-13 11:27:09 -08:00
Bharat Mediratta
8fa9ba636b Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-10 10:19:46 -08:00
Tim Almdal
a11bf29507 Fix for ticket #972 and more. In Kohana 2.4, ORM::delete_all ignores any where
clauses and deletes all the entries in the table unless an array of id's are
passed as the parameter.  This fix used the Database_builder to specify any where
conditions. Thanks psvo for find the first one. :-)
2010-01-09 23:57:16 -08:00
Bharat Mediratta
c711bf1b1f Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2010-01-07 10:41:19 -08:00
Tim Almdal
188f418a54 Correct the controller_auth_data golden file to reflect that the csrf is not longer considered dirty in the logout controller. 2010-01-06 11:42:44 -08:00
Bharat Mediratta
0e3327bca7 Simplify the REST API code. Here's what I did:
1) Simplify gallery_rest to return flat models, no children and do no
   validation for now.
2) Flatten the REST replies and use HTTP codes to indicate
   success/failure instead of additional status messages.
3) Use the message and error code support in the base Exception class,
   instead of brewing our own in Rest_Exception.
4) Get rid of rest::success() and rest::fail() -- we only need
   rest::reply() since all failures are covered by throwing an
   exception.
5) Get rid of /rest/access_key and just use /rest for authentication.
6) Inline and simplify rest::normalize_request since we only use it once
7) Change rest::set_active_user to succeed or throw an exception
8) Extract Rest_Exception::sendHeaders into rest::send_headers()

Here's what's currently broken:
1) Data validation.  There currently is none
2) Logging.  That's gone too
3) image block and tag code is broken
4) Tests are broken
5) No movie support
2010-01-03 20:30:35 -08:00
Tim Almdal
64e5efd57b Add rest_controller::__call to the authorized controller methods 2010-01-02 17:09:40 -08:00
Tim Almdal
07f8e256cf Clean up gallery_rest helper test 2010-01-02 16:22:03 -08:00
Bharat Mediratta
11f6a3d1eb Merge branch 'master' of git@github.com:gallery/gallery3 2010-01-02 15:49:17 -08:00
Bharat Mediratta
bad83900ae Fix two issues with change_album_test()
1) We do support changing the name.
2) Choose a random name to avoid conflicts.
2010-01-02 15:48:58 -08:00
Tim Almdal
d4ad81e657 Correct unexpected error in gallery_rest_put_album_no_path_test 2010-01-02 15:04:43 -08:00
Bharat Mediratta
7369c68ddd Ignore modules/gallery/views/kohana/error.php -- we're required to have that name by Kohana_404_Exception. 2010-01-02 14:47:59 -08:00
Bharat Mediratta
3ceb0d57ba Update the expected response after modifying an album to match the
change I made in 20bd09ff00
2010-01-02 14:37:51 -08:00
Bharat Mediratta
7c03644777 Update the expected response after modifying an album to match the
change I made in 20bd09ff00
2010-01-02 14:33:31 -08:00
Tim Almdal
28597ba533 Correct file structure tests, Have the tests delete the userid they create so as not to impact other tests. 2010-01-02 14:31:59 -08:00
Bharat Mediratta
183e65210a Verified and updated. 2010-01-02 14:00:28 -08:00
Bharat Mediratta
8e4c48837c Verified and updated. 2010-01-02 13:56:01 -08:00
Bharat Mediratta
14b0ab08b4 Update the expected response after modifying an album to match the
change I made in 20bd09ff00
2010-01-02 13:53:01 -08:00
Bharat Mediratta
4ab2400d18 Add a cache buster to the resize and file urls. This fixes ticket 2010-01-02 13:47:28 -08:00
Tim Almdal
ee1a032e4d Merge branch 'master' into talmdal_dev 2009-12-31 18:32:24 -08:00
Bharat Mediratta
a018e6235f Modify Forge to accept multiple hidden params (this was broken by an
API change in K24).
2009-12-31 15:49:43 -08:00
Tim Almdal
732047e9c3 Create helper functions to create a test user, an album or image. Don't create the test objects in the setup, but do it in each test. 2009-12-31 09:56:41 -08:00
Tim Almdal
11792a12bb 1) Remove the rest::not_found method and replace it with "throw new Kohana_404_Exception
2) Don't use the input path to lookup the item via relative_path_cache.  Instead use url::get_item_from_uri method.
2009-12-30 17:08:01 -08:00
Tim Almdal
bccb6fc021 Clean up validation the check for duplicate names or slugs, finish converting the rest API to Kohana 2.4 2009-12-27 08:32:12 -08:00
Tim Almdal
3060a6f662 Merge branch 'master' into talmdal_dev
Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
2009-12-26 11:24:50 -08:00
Tim Almdal
4268889fbf Update the gallery_rest handlers test to pass the path in as an array in the request arguments property instead of the path property. 2009-12-24 19:24:22 -08:00
Tim Almdal
d622d1aa4f Updated the unit tests to match the current API
Corrected a problem identified with the unit tests... failed if the path was empty on PUT.
2009-12-23 09:32:32 -08:00
Bharat Mediratta
0bc92614d3 Checkpoint 2009-12-22 16:48:18 -08:00
Bharat Mediratta
6601bb29d9 Update. 2009-12-22 16:25:31 -08:00
Bharat Mediratta
a6da027aad The default value for $offset should always be null (according to the
new K24 ORM).

Fix up a bad where tuple in the test.
2009-12-22 16:22:24 -08:00
Bharat Mediratta
71e154b674 Use a Database_Expression to handle the MAX() function. 2009-12-22 16:13:08 -08:00
Bharat Mediratta
fda4227bb1 Latest K24 does not automatically add an id attribute to every form
element with the same value as the name.  Yay!  That was a weird and
unexpected behavior.
2009-12-22 14:00:52 -08:00
Bharat Mediratta
ca293db214 Don't rely on implicit object -> id conversion, that doesn't work with K24's Database_Builder::where() 2009-12-22 13:57:49 -08:00
Bharat Mediratta
9c5df1d31b Fix preambles, and fix the File_Structure_Test to be more lenient
because of preamble variation in K24.
2009-12-21 19:59:44 -08:00
Bharat Mediratta
e0dc520648 Updated for recent K24 Forge changes. 2009-12-21 17:26:24 -08:00
Bharat Mediratta
cc4d7c672c Update database tests for K24. Use a mock database that we load
through the framework so that we're properly testing the
Database_Builder, it's a lot cleaner than what we had before.
2009-12-21 15:47:11 -08:00
Bharat Mediratta
e1f43ad403 Updated for K24 2009-12-21 12:22:19 -08:00
Bharat Mediratta
5df1dc135b Fix some bugs in the cache database driver, and update the tests for K24. 2009-12-21 12:13:25 -08:00
Bharat Mediratta
bfcd99f3f2 Updated for K24 2009-12-21 11:30:34 -08:00
Bharat Mediratta
a22aa4ab05 Forgot to rename the file when I renamed the class. 2009-12-21 11:29:28 -08:00
Bharat Mediratta
0736cf203b In Kohana 2.4, ORM no longer does the find_all() call for us when we
retrieve related ORMs.  If we tack a find_all() on the end, it breaks
the User_Definition interface so create User_Model::groups() and
Groups_Model::users() as glue.
2009-12-17 21:32:53 -08:00
Tim Almdal
22e813d0be Updates the the interface based on actually using it. 2009-12-15 10:57:10 -08:00
Tim Almdal
d521faf63d Add the REST delete processing for albums/photos/movies 2009-12-09 16:04:08 -08:00
Tim Almdal
dfc556e8a6 Implement the RESTful interface for albums/photos/movies 2009-12-09 12:06:45 -08:00
Tim Almdal
367f2218f6 Use the relative url cache to look up resources instead of the relative path. This allows us to forego the extension as part of the REST url. As well, urls are consistent between normal usage and rest usage. 2009-12-09 08:41:38 -08:00
Tim Almdal
9319f37c4f Correct the error message when the item is not found; remove the check for no request_key (access_token) as athat is treated as public permissions 2009-12-08 23:27:43 -08:00
Tim Almdal
6fd04069ae Add another error handler "not found" to the rest API.
Implement the get_album rest request handler.
2009-12-08 12:50:13 -08:00