You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by lr...@apache.org on 2009/05/01 08:27:13 UTC
svn commit: r770547 [1/2] - in /incubator/shindig/trunk: config/ features/
features/bin/ features/src/main/javascript/features/
features/src/main/javascript/features/core/
features/src/main/javascript/features/osapi.activities/
features/src/main/javasc...
Author: lryan
Date: Fri May 1 06:27:11 2009
New Revision: 770547
URL: http://svn.apache.org/viewvc?rev=770547&view=rev
Log:
Applying metadata driven osapi implementation patch contributed by Bob Evans.
Changes include:
- osapi methods dynamically generated by introspecting JSON-RPC system.listMethods on available endpoints declared in
container config
- Simplified command line JSUnit test runner
- Moved gadget APIs endpoints to /gadgets/api/rpc and /gadgets/api/rest
Added:
incubator/shindig/trunk/features/bin/README
incubator/shindig/trunk/features/bin/Rhino_License
incubator/shindig/trunk/features/src/main/javascript/features/osapi/batch.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi/jsonrequest.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi/osapi.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi/peoplehelpers.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi/util.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi/
incubator/shindig/trunk/features/src/test/javascript/features/osapi/activitiestest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi/appdatatest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi/batchtest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi/osapitest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi/peopletest.js
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RpcServiceFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RpcServiceLookup.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RpcServiceLookupTest.java
Removed:
incubator/shindig/trunk/features/src/main/javascript/features/osapi.activities/activities.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi.activities/feature.xml
incubator/shindig/trunk/features/src/main/javascript/features/osapi.appdata/appdata.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi.appdata/feature.xml
incubator/shindig/trunk/features/src/main/javascript/features/osapi.base/batch.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi.base/feature.xml
incubator/shindig/trunk/features/src/main/javascript/features/osapi.base/jsonrequest.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi.base/makerequest.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi.base/util.js
incubator/shindig/trunk/features/src/main/javascript/features/osapi.people/feature.xml
incubator/shindig/trunk/features/src/main/javascript/features/osapi.people/people.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi.activities/activitiestest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi.appdata/appdatatest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi.base/batchtest.js
incubator/shindig/trunk/features/src/test/javascript/features/osapi.people/peopletest.js
incubator/shindig/trunk/java/server/src/test/resources/endtoend/osapi/makeRequestTest.xml
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/features/bin/runner.sh
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/features/src/main/javascript/features/core/util.js
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
incubator/shindig/trunk/features/src/main/javascript/features/osapi.ui/feature.xml
incubator/shindig/trunk/features/src/main/javascript/features/osapi/feature.xml
incubator/shindig/trunk/features/src/test/javascript/features/alltests.js
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
incubator/shindig/trunk/java/server/src/test/resources/endtoend/osapi/activitiesTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/osapi/appdataTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/osapi/batchTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/osapi/peopleTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/osapi/personTest.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialHelloWorld.xml
incubator/shindig/trunk/site/src/site/xdoc/developers/features/index.xml
Modified: incubator/shindig/trunk/config/container.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Fri May 1 06:27:11 2009
@@ -141,10 +141,8 @@
"activity" : ["id", "title"]
}
},
- "osapi.base" : {
- // Use EL when available.
- "rpcUrl" : "http://%host%/social"
+ "osapi" : {
+ // The endpoints to query for available JSONRPC/REST services
+ "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
}
-
-
}}
Added: incubator/shindig/trunk/features/bin/README
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/bin/README?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/bin/README (added)
+++ incubator/shindig/trunk/features/bin/README Fri May 1 06:27:11 2009
@@ -0,0 +1,16 @@
+The Rhino js.jar version in this directory is
+
+Rhino 1.7 release 1 2008 03 06
+
+The runner.sh script will run the javascript unit tests configured in src/test/javascript/features/alltests.js.
+
+It should be launched from the feature root directory,
+
+bin/runner.sh
+
+You should modify this to add your tests to it.
+
+It should be cleaned up to run all tests, but works for the osapi tests at the moment. The problem is that the alltests.js, which is an example from the jsunit site, is not recognizing all the AllTests_Suite.
+
+
+
Added: incubator/shindig/trunk/features/bin/Rhino_License
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/bin/Rhino_License?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/bin/Rhino_License (added)
+++ incubator/shindig/trunk/features/bin/Rhino_License Fri May 1 06:27:11 2009
@@ -0,0 +1,512 @@
+For the most up-to-date version see: https://developer.mozilla.org/en/Rhino_License
+
+Reproduced here for convenience as of 3/31/2009.
+================================================================================================
+The majority of the source code for Rhino is available under a MPL 1.1/GPL 2.0 license. (Included below)
+
+License for portions of the Rhino debugger
+Additionally, some files (currently the contents of toolsrc/org/mozilla/javascript/tools/debugger/treetable/) are available under the following license:
+
+ * Copyright 1997, 1998 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Sun Microsystems nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+ MOZILLA PUBLIC LICENSE
+ Version 1.1
+
+ ---------------
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method, process,
+ and apparatus claims, in any patent Licensable by grantor.
+
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ For legal entities, "You" includes any entity which controls, is
+ controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect,
+ to cause the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty percent
+ (50%) of the outstanding shares or beneficial ownership of such
+ entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: 1) for code that You delete from the Original Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, each Contributor
+ hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor, to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof) either on an
+ unmodified basis, with other Modifications, as Covered Code
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: 1) Modifications made by that
+ Contributor (or portions thereof); and 2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first makes Commercial Use of
+ the Covered Code.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: 1) for any code that Contributor has deleted from the
+ Contributor Version; 2) separate from the Contributor Version;
+ 3) for infringements caused by: i) third party modifications of
+ Contributor Version or ii) the combination of Modifications made
+ by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. However, You
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear than
+ any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty,
+ support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under a license of Your choice, which may
+ contain terms different from this License, provided that You are in
+ compliance with the terms of this License and that the license for the
+ Executable version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version under a different
+ license You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial
+ Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such
+ terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description
+ must be included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. Except to the
+ extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to
+ understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+ WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+ THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" and "commercial computer software documentation," as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed by
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys' fees and
+ expenses. The application of the United Nations Convention on
+ Contracts for the International Sale of Goods is expressly excluded.
+ Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this
+ License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly,
+ out of its utilization of rights under this License and You agree to
+ work with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is ______________________________________.
+
+ The Initial Developer of the Original Code is ________________________.
+ Portions created by ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+
+ Contributor(s): ______________________________________.
+
+ Alternatively, the contents of this file may be used under the terms
+ of the _____ license (the "[___] License"), in which case the
+ provisions of [______] License are applicable instead of those
+ above. If you wish to allow use of your version of this file only
+ under the terms of the [____] License and not to allow others to use
+ your version of this file under the MPL, indicate your decision by
+ deleting the provisions above and replace them with the notice and
+ other provisions required by the [___] License. If you do not delete
+ the provisions above, a recipient may use your version of this file
+ under either the MPL or the [___] License."
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
+
+
+
Modified: incubator/shindig/trunk/features/bin/runner.sh
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/bin/runner.sh?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/bin/runner.sh (original)
+++ incubator/shindig/trunk/features/bin/runner.sh Fri May 1 06:27:11 2009
@@ -3,4 +3,4 @@
# This script is designed to be run from the features module root directory.
# It's very simple; feel free to make it more robust.
-java -cp ./bin/js.jar org.mozilla.javascript.tools.shell.Main src/test/javascript/features/alltests.js BatchTest ActivitiesTest PeopleTest AppdataTest
+java -cp ./bin/js.jar org.mozilla.javascript.tools.shell.Main src/test/javascript/features/alltests.js BatchTest ActivitiesTest PeopleTest AppdataTest OsapiTest
Modified: incubator/shindig/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Fri May 1 06:27:11 2009
@@ -63,6 +63,13 @@
<groupId>de.berlios.jsunit</groupId>
<artifactId>jsunit-maven2-plugin</artifactId>
<version>1.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R1</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>net.sf.alchim</groupId>
@@ -98,8 +105,8 @@
<source>i18n/numberformat.js</source>
<source>setprefs/setprefs.js</source>
<source>views/views.js</source>
- <source>opensocial-data-context/datacontext.js</source>
<source>xmlutil/xmlutil.js</source>
+ <source>opensocial-data-context/datacontext.js</source>
<source>opensocial-data/data.js</source>
<source>opensocial-reference/opensocial.js</source>
<source>opensocial-reference/activity.js</source>
@@ -126,15 +133,13 @@
<source>opensocial-base/jsonactivity.js</source>
<source>opensocial-base/jsonperson.js</source>
<source>opensocial-jsonrpc/jsonrpccontainer.js</source>
- <source>osapi.activities/activities.js</source>
- <source>osapi.appdata/appdata.js</source>
- <source>osapi.base/batch.js</source>
- <source>osapi.base/jsonrequest.js</source>
- <source>osapi.base/makerequest.js</source>
- <source>osapi.base/util.js</source>
- <source>osapi.people/people.js</source>
+ <source>osapi/osapi.js</source>
+ <source>osapi/peoplehelpers.js</source>
+ <source>osapi/batch.js</source>
+ <source>osapi/jsonrequest.js</source>
+ <source>osapi/util.js</source>
<source>../../../../src/test/javascript/lib/testutils.js</source>
- <source>oauthpopup/oauthpopup.js</source>
+ <source>oauthpopup/oauthpopup.js</source>
</sources>
<testSourceDirectory>${basedir}/src/test/javascript/features</testSourceDirectory>
<testSuites>
Modified: incubator/shindig/trunk/features/src/main/javascript/features/core/util.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/core/util.js?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/core/util.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/core/util.js Fri May 1 06:27:11 2009
@@ -53,6 +53,7 @@
var parameters = null;
var features = {};
+ var services = {};
var onLoadHandlers = [];
// Maps code points to the value to replace them with.
@@ -206,6 +207,18 @@
hasFeature : function (feature) {
return typeof features[feature] !== "undefined";
},
+
+ /**
+ * Returns the list of services supported by the server
+ * serving this gadget.
+ *
+ * @return {Object} List of Services that enumerate their methods
+ *
+ * @member gadgets.util
+ */
+ getServices : function () {
+ return services;
+ },
/**
* Registers an onload handler.
Modified: incubator/shindig/trunk/features/src/main/javascript/features/features.txt
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/features.txt?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/features.txt (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/features.txt Fri May 1 06:27:11 2009
@@ -23,10 +23,6 @@
features/opensocial-templates/feature.xml
features/pubsub/feature.xml
features/osapi/feature.xml
-features/osapi.activities/feature.xml
-features/osapi.appdata/feature.xml
-features/osapi.base/feature.xml
-features/osapi.people/feature.xml
features/osapi.ui/feature.xml
features/rpc/feature.xml
features/setprefs/feature.xml
Modified: incubator/shindig/trunk/features/src/main/javascript/features/osapi.ui/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi.ui/feature.xml?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi.ui/feature.xml (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi.ui/feature.xml Fri May 1 06:27:11 2009
@@ -19,7 +19,7 @@
-->
<feature>
<name>osapi.ui</name>
- <dependency>osapi.base</dependency>
+ <dependency>core.io</dependency>
<dependency>rpc</dependency>
<gadget>
<script src="ui.js"></script>
Added: incubator/shindig/trunk/features/src/main/javascript/features/osapi/batch.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi/batch.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi/batch.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi/batch.js Fri May 1 06:27:11 2009
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+var osapi = osapi || {};
+
+/**
+ * It is common to batch requests together to make them more efficient.
+ *
+ * Note: the container config specified endpoints at which services are to be found.
+ * When creating a batch, the calls are split out into separate requests based on the
+ * endpoint, as it may get sent to a different server on the backend.
+ */
+osapi.newBatch = function() {
+
+ /*
+ * Latch that waits for the batch of json requests and each makeRequest call to finish before
+ * calling the user callback with the responseMap.
+ * Note, this makes the makeRequest calls happen in parallel, but changes the order of those calls
+ * luckily everything in a batch is keyed instead of requiring ordering.
+ */
+ var newCountdownLatch = function(count, userCallback) {
+ var responseMap = {};
+
+ var leftTodo = function() {
+ var done = false;
+ return {
+ down : function() {
+ if (!done) {
+ count--;
+ if (count === 0) {
+ done = true;
+ userCallback(responseMap);
+ }
+ }
+ }
+ };
+ }();
+
+ /**
+ * Countdown call when a request is done.
+ */
+ var finishNonProxiedRequest = function(results) {
+ for (var result in results) if (results.hasOwnProperty(result)) {
+ responseMap[result] = results[result];
+ // TODO does this copy errors over as well.
+ }
+ leftTodo.down();
+ };
+
+
+ return {
+ finishedJsonRequest : finishNonProxiedRequest
+ };
+ };
+
+ /**
+ * Handle empty calls properly (asynchronously) to prevent browser hiccups
+ */
+ var callbackAsyncAndEmpty = function(userCallback) {
+ window.setTimeout(function() {
+ userCallback({ data : {}});
+ },
+ 0);
+ };
+
+ var each = function(arr, fn) {
+ for (var i in arr) if (arr.hasOwnProperty(i)) {
+ fn.apply(null, [arr[i]]);
+ }
+ };
+
+ var length = function(arr) {
+ var len = 0;
+ each(arr, function() { len++;});
+ return len;
+ }
+
+ /**
+ * takes the list of requests to execute in this call,
+ * @param {object} jsonRequests the collection of requests, by endpoint
+ * @param {function} json the json generator function for a batch
+ * @param {function} getDataFromResult the result processor, getDataFromResult
+ * @param {object} The countdown latch which the batch is synchronized on before calling the
+ * user callback
+ */
+ var executeJsonRequests = function(jsonRequests, json, getDataFromResult, countDownLatch) {
+ for (var endpoint in jsonRequests) if (jsonRequests.hasOwnProperty(endpoint)) {
+ var jsonGenerator = function() {
+ var ep = endpoint;
+ return json(ep);
+ };
+ var getDataFromResultForEndpoint = function(response) {
+ var ep = endpoint;
+ return getDataFromResult(ep, response);
+ }
+ osapi.newBatchJsonRequest(jsonGenerator, getDataFromResultForEndpoint, endpoint).execute(
+ function(results) {
+ countDownLatch.finishedJsonRequest(results);
+ });
+ }
+ };
+
+ return function() {
+ var that = {};
+
+ var jsonRequests = {};
+
+ /**
+ * Create a new request in the batch
+ * @param {string} key id for the request
+ * @param {object} request the opensocial request object
+ */
+ var add = function(key, request) {
+ var endpoint = request.endpoint;
+ var existingRequestsAtEndpoint = jsonRequests[endpoint] || [];
+ existingRequestsAtEndpoint.push({key : key, request : request});
+ jsonRequests[endpoint] = existingRequestsAtEndpoint;
+ return that;
+ };
+
+ /**
+ * Json generator function that generates the batch's post body.
+ * @param {string} endpoint Server-specified endpoint for rpc calls
+ */
+ var json = function(endpoint) {
+ var jsonParams = [];
+ for (var i = 0; i < jsonRequests[endpoint].length; i++) {
+ var request = jsonRequests[endpoint][i];
+ var requestJson = request.request.json()[0]; // single requests make a json array by default
+ requestJson.id = request.key;
+ jsonParams.push(requestJson);
+ }
+ return jsonParams;
+ };
+
+ /**
+ * Post processor for the batch call.
+ * Essentially, this function just makes error handling
+ * work as expected, but also puts items back into the response
+ * according to the key by which they were added.
+ * @param {string} endpoint Server specified endpoint used to retrieve result
+ * @param { object} result the response from the server
+ *
+ */
+ var getDataFromResult = function(endpoint, result) {
+ var responseMap = {};
+ var jsonRequestsForEndpoint = jsonRequests[endpoint];
+ var data = result.data; // the json array
+ for (var k = 0; k < jsonRequestsForEndpoint.length; k++) {
+ var response = data[k];
+ if (response.error) {
+ var error = { error : { code : osapi.translateHttpError("Error "
+ + response.error['code']),
+ message : response.error.message }};
+ responseMap[response.id] = error;
+ osapi.setGlobalError(responseMap, error.error);
+ } else {
+ if (response.id !== jsonRequestsForEndpoint[k].key) {
+ throw "Response Id doesn't match request key";
+ } else {
+ if (response.data.list) { // array result
+ responseMap[response.id] = response.data.list;
+ } else { //single result
+ responseMap[response.id] = response.data;
+ }
+ }
+ }
+ }
+ return responseMap;
+ };
+
+ /**
+ * Creates a countdown latch that will ultimately call the usercallback,
+ * and then executes the jsonRequests.
+ * @param {function} userCallback function to call when batch is done
+ */
+ var executeRequests = function(userCallback) {
+ var jsonRequestLength = length(jsonRequests);
+ var countDownLatch = newCountdownLatch(jsonRequestLength, userCallback);
+ if (jsonRequestLength > 0) {
+ executeJsonRequests(jsonRequests, json, getDataFromResult, countDownLatch);
+ }
+ };
+
+ /**
+ * Call to make a batch execute its requests.
+ * @param {Function} userCallback the callback to the gadget where results are passed.
+ */
+ var execute = function(userCallback) {
+ if (length(jsonRequests) == 0) {
+ callbackAsyncAndEmpty(userCallback);
+ } else {
+ executeRequests(userCallback);
+ }
+ };
+
+ that.execute = execute;
+ that.add = add;
+ return that;
+ };
+}();
+
Modified: incubator/shindig/trunk/features/src/main/javascript/features/osapi/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi/feature.xml?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi/feature.xml (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi/feature.xml Fri May 1 06:27:11 2009
@@ -19,7 +19,13 @@
-->
<feature>
<name>osapi</name>
- <dependency>osapi.activities</dependency>
- <dependency>osapi.appdata</dependency>
- <dependency>osapi.people</dependency>
+ <dependency>core.io</dependency>
+ <dependency>osapi.ui</dependency>
+ <gadget>
+ <script src="batch.js"></script>
+ <script src="jsonrequest.js"></script>
+ <script src="util.js"></script>
+ <script src="osapi.js"></script>
+ <script src="peoplehelpers.js"></script>
+ </gadget>
</feature>
Added: incubator/shindig/trunk/features/src/main/javascript/features/osapi/jsonrequest.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi/jsonrequest.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi/jsonrequest.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi/jsonrequest.js Fri May 1 06:27:11 2009
@@ -0,0 +1,197 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+/*
+<!--
+Required config:
+-->
+*/
+var osapi = osapi || {};
+
+
+/**
+ * The bare mechanism for creating json opensocial requests.
+ * The various known services, activities, appdata, people, and batch, are
+ * wrappers over this call.
+ */
+(function() {
+
+ var config = {};
+ /**
+ * @param {Object} configuration Configuration settings
+ * @private
+ */
+ function init (configuration) {
+ config = configuration["osapi"];
+ }
+
+ var requiredConfig = {
+ };
+
+ gadgets.config.register("osapi", requiredConfig, init);
+
+ var JSON_CONTENT_TYPE = "application/json";
+ var JSON_REQUEST_CONTENT_TYPE = "JSON";
+
+ var requestBody = function(json) {
+ return {
+ "CONTENT_TYPE" : JSON_REQUEST_CONTENT_TYPE,
+ "METHOD" : "POST",
+ "AUTHORIZATION" : "SIGNED",
+ "POST_DATA" : gadgets.json.stringify(json)
+ };
+ };
+
+ var url = function(endpoint) {
+ var baseUrl = endpoint.replace("%host%", document.location.host);
+ var token = shindig.auth.getSecurityToken();
+ if (token) {
+ baseUrl += "?st=";
+ baseUrl += encodeURIComponent(token);
+ }
+ return baseUrl;
+ };
+
+ var generateErrorResponse = function(result) {
+ var globalErrorCode = osapi.translateHttpError(result.errors[0]
+ || result.data.error) || 'internalError';
+
+ // Populate each response(request?) item with the GlobalError.
+ var errorResponseMap = {};
+ osapi.setGlobalError(errorResponseMap, { code : globalErrorCode});
+// for (var i = 0; i < result.data.length; i++) {
+// errorResponseMap[result.data[i].id] = { error : globalErrorCode };
+// }
+ return errorResponseMap;
+ };
+
+ var makeResponseProcessor = function(resultProcessor, userCallback) {
+ return function(result) {
+ if (result.errors[0]) {
+ userCallback(generateErrorResponse(result));
+ } else {
+ userCallback(resultProcessor(result));
+ }
+ };
+ };
+
+ var defaultUserId = '@viewer';
+ var defaultGroupId = '@self';
+ var defaultCount = 20;
+
+ var getDataFromResult = function(result) {
+ var jsonArray = result.data;
+ if (jsonArray[0].error) {
+ return { error : { code : osapi.translateHttpError("Error "+ jsonArray[0].error.code),
+ message : jsonArray[0].error.message}};
+ } else if (jsonArray[0].data.list) {
+ return jsonArray[0].data.list;
+ } else {
+ return jsonArray[0].data;
+ }
+ };
+
+ var renamePropertyInObject = function(obj, originalName, newName, defaultValue) {
+ if (obj[originalName]) {
+ obj[newName] = obj[originalName];
+ delete obj[originalName];
+ } else if (defaultValue) {
+ obj[newName] = defaultValue;
+ }
+ };
+
+ var ensureUserId = function(options) {
+ if (options.userId) {
+ options.userId = (options.userId.constructor === Array) ?
+ options.userId : [options.userId];
+ } else {
+ options.userId = [defaultUserId];
+ }
+ };
+
+ var ensureGroupId = function(options) {
+ options.groupId = options.groupId || defaultGroupId;
+ };
+
+ /**
+ * JsonRequest is an array of json params.
+ */
+ var makeJsonRequest = function(method, params) {
+ ensureUserId(params);
+ ensureGroupId(params);
+ var jsonParams = { method : method};
+ jsonParams['params'] = params;
+ return [jsonParams];
+ };
+
+ /**
+ * Generates the execute method for the batch or specific json rpc request
+ * @returns {Function} returns a function that takes a userCallback function
+ * where results will be returned from the call.
+ */
+ var makeExecuteFn = function(jsonGenerator, responseProcessor, endpoint) {
+ return function(userCallback) {
+ userCallback = userCallback || function() {};
+ var json = jsonGenerator();
+ if (json.length == 0) {
+ window.setTimeout(function() {
+ makeResponseProcessor(responseProcessor, userCallback)({errors : []});
+ },
+ 0);
+ } else {
+ gadgets.io.makeNonProxiedRequest(url(endpoint),
+ makeResponseProcessor(responseProcessor, userCallback),
+ requestBody(json),
+ JSON_CONTENT_TYPE);
+ }
+ };
+ };
+
+ /**
+ * Call to execute a jsonrpc request.
+ * @param {Function} jsonGenerator the function to produce the specific request's json params
+ * @param {object.<JSON>} The JSON object of parameters for the specific request
+ */
+ var singleRequest = function(method, params, endpoint) {
+ params = params || {};
+ var jsonGenerator = function() { return makeJsonRequest(method, params); };
+ var execute = makeExecuteFn(jsonGenerator, getDataFromResult, endpoint);
+ var endpoint = endpoint;
+ return {
+ endpoint : endpoint,
+ json : jsonGenerator,
+ execute : execute
+ };
+ };
+
+ /**
+ * Call to execute a jsonrpc request.
+ * @param {Function} jsonGenerator the function to produce the specific request's json params
+ * @param {Function} resultDataProcessor the function to process the results for the
+ * particular json request.
+ */
+ var batchRequest = function(jsonGenerator, resultDataProcessor, endpoint) {
+ var execute = makeExecuteFn(jsonGenerator, resultDataProcessor, endpoint);
+
+ return {
+ execute : execute
+ };
+ };
+
+ osapi.newJsonRequest = singleRequest;
+ osapi.newBatchJsonRequest = batchRequest;
+})();
Added: incubator/shindig/trunk/features/src/main/javascript/features/osapi/osapi.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi/osapi.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi/osapi.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi/osapi.js Fri May 1 06:27:11 2009
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+var osapi = osapi || {};
+(function() {
+
+ var buildRequestFunction = function(serviceName, methodName, endpointName) {
+ osapi[serviceName][methodName] = function(params) {
+ params = params || {};
+ method = ""+serviceName+"."+methodName;
+ return osapi.newJsonRequest(method, params, endpointName);
+ };
+ };
+
+ /**
+ * @param {Object} configuration Configuration settings
+ * @private
+ */
+ osapi.init = function(config) {
+ var services = config["osapi.services"];
+ if (services) {
+ for (var endpointName in services) if (services.hasOwnProperty(endpointName)) {
+ var endpoint = services[endpointName];
+ for (var i=0; i < endpoint.length; i++) {
+ var serviceMethod = endpoint[i];
+ var serviceMethodArray = serviceMethod.split(".");
+ var serviceName = serviceMethodArray[0];
+ var methodName = serviceMethodArray[1];
+ osapi[serviceName] = osapi[serviceName] || {};
+ buildRequestFunction(serviceName, methodName, endpointName);
+ }
+ }
+ }
+ };
+
+ gadgets.config.register("osapi.services", {}, osapi.init);
+})();
Added: incubator/shindig/trunk/features/src/main/javascript/features/osapi/peoplehelpers.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi/peoplehelpers.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi/peoplehelpers.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi/peoplehelpers.js Fri May 1 06:27:11 2009
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+/**
+ * Service to retrieve People via JSON RPC opensocial calls.
+ */
+gadgets.config.register("osapi.services", {}, function() {
+
+ // No point defining these if osapi.people.get doesnt exist
+ if (osapi && osapi.people && osapi.people.get) {
+ /**
+ * Helper functions to get People.
+ * Options specifies parameters to the call as outlined in the
+ * JSON RPC Opensocial Spec
+ * http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/rpc-protocol
+ * @param {object.<JSON>} The JSON object of parameters for the specific request
+ */
+ /**
+ * Function to get Viewer profile.
+ * Options specifies parameters to the call as outlined in the
+ * JSON RPC Opensocial Spec
+ * http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/rpc-protocol
+ * @param {object.<JSON>} The JSON object of parameters for the specific request
+ */
+ osapi.people.getViewer = function(options) {
+ options = options || {};
+ options.userId = "@viewer";
+ options.groupId = "@self";
+ return osapi.people.get(options);
+ };
+
+ /**
+ * Function to get Viewer's friends' profiles.
+ * Options specifies parameters to the call as outlined in the
+ * JSON RPC Opensocial Spec
+ * http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/rpc-protocol
+ * @param {object.<JSON>} The JSON object of parameters for the specific request
+ */
+ osapi.people.getViewerFriends = function(options) {
+ options = options || {};
+ options.userId = "@viewer";
+ options.groupId = "@friends";
+ return osapi.people.get(options);
+ };
+
+ /**
+ * Function to get Owner profile.
+ * Options specifies parameters to the call as outlined in the
+ * JSON RPC Opensocial Spec
+ * http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/rpc-protocol
+ * @param {object.<JSON>} The JSON object of parameters for the specific request
+ */
+ osapi.people.getOwner = function(options) {
+ options = options || {};
+ options.userId = "@owner";
+ options.groupId = "@self";
+ return osapi.people.get(options);
+ };
+
+ /**
+ * Function to get Owner's friends' profiles.
+ * Options specifies parameters to the call as outlined in the
+ * JSON RPC Opensocial Spec
+ * http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/rpc-protocol
+ * @param {object.<JSON>} The JSON object of parameters for the specific request
+ */
+ osapi.people.getOwnerFriends = function(options) {
+ options = options || {};
+ options.userId = "@owner";
+ options.groupId = "@friends";
+ return osapi.people.get(options);
+ };
+ }
+});
Added: incubator/shindig/trunk/features/src/main/javascript/features/osapi/util.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/osapi/util.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/osapi/util.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/osapi/util.js Fri May 1 06:27:11 2009
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+var osapi = osapi || {};
+
+/**
+ * Set an error property on the responseMap object
+ * @param responseMap results returned to a gadget
+ * @param error the particular error object to set
+ */
+osapi.setGlobalError = function(responseMap, error) {
+ if (!responseMap['error']) {
+ if (error === undefined) {
+ responseMap['error'] = "Some requests in the batch had errors";
+ } else {
+ responseMap['error'] = error;
+ }
+ }
+};
+
+/**
+ * Turns an http error code into an opensocial error
+ * @param httpError
+ */
+osapi.translateHttpError = function(httpError) {
+ if (httpError == "Error 501") {
+ return 'notImplemented';
+ } else if (httpError == "Error 401") {
+ return 'unauthorized';
+ } else if (httpError == "Error 403") {
+ return 'forbidden';
+ } else if (httpError == "Error 400") {
+ return 'badRequest';
+ } else if (httpError == "Error 500") {
+ return 'internalError';
+ } else if (httpError == "Error 404") {
+ return 'badRequest';
+ } else if (httpError == "Error 417") {
+ return 'limitExceeded';
+ }
+};
+
+
+
+
Modified: incubator/shindig/trunk/features/src/test/javascript/features/alltests.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/test/javascript/features/alltests.js?rev=770547&r1=770546&r2=770547&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/test/javascript/features/alltests.js (original)
+++ incubator/shindig/trunk/features/src/test/javascript/features/alltests.js Fri May 1 06:27:11 2009
@@ -65,15 +65,12 @@
eval(JsUtil.prototype.include(srcDir + '/opensocial-reference/url.js'));
eval(JsUtil.prototype.include(srcDir + '/opensocial-base/jsonactivity.js'));
eval(JsUtil.prototype.include(srcDir + '/opensocial-base/jsonperson.js'));
- eval(JsUtil.prototype.include(srcDir + '/opensocial-rest/restfulcontainer.js'));
eval(JsUtil.prototype.include(srcDir + '/opensocial-jsonrpc/jsonrpccontainer.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.base/batch.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.base/jsonrequest.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.base/makerequest.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.base/util.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.people/people.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.activities/activities.js'));
- eval(JsUtil.prototype.include(srcDir + '/osapi.appdata/appdata.js'));
+ eval(JsUtil.prototype.include(srcDir + '/osapi/batch.js'));
+ eval(JsUtil.prototype.include(srcDir + '/osapi/jsonrequest.js'));
+ eval(JsUtil.prototype.include(srcDir + '/osapi/util.js'));
+ eval(JsUtil.prototype.include(srcDir + '/osapi/osapi.js'));
+ eval(JsUtil.prototype.include(srcDir + '/osapi/peoplehelpers.js'));
eval(JsUtil.prototype.include(testToolsDir + "/JsUnit.js"));
eval(JsUtil.prototype.include(testSrcDir + "/core/authtest.js"));
eval(JsUtil.prototype.include(testSrcDir + "/core/config-test.js"));
@@ -89,10 +86,11 @@
eval(JsUtil.prototype.include(testSrcDir + "/opensocial-templates/template_test.js"));
eval(JsUtil.prototype.include(testSrcDir + "/opensocial-templates/util_test.js"));
eval(JsUtil.prototype.include(testToolsDir + '/testutils.js'));
- eval(JsUtil.prototype.include(testSrcDir + "/osapi.people/peopletest.js"));
- eval(JsUtil.prototype.include(testSrcDir + "/osapi.activities/activitiestest.js"));
- eval(JsUtil.prototype.include(testSrcDir + "/osapi.appdata/appdatatest.js"));
- eval(JsUtil.prototype.include(testSrcDir + "/osapi.base/batchtest.js"));
+ eval(JsUtil.prototype.include(testSrcDir + "/osapi/peopletest.js"));
+ eval(JsUtil.prototype.include(testSrcDir + "/osapi/osapitest.js"));
+ eval(JsUtil.prototype.include(testSrcDir + "/osapi/activitiestest.js"));
+ eval(JsUtil.prototype.include(testSrcDir + "/osapi/appdatatest.js"));
+ eval(JsUtil.prototype.include(testSrcDir + "/osapi/batchtest.js"));
eval(JsUtil.prototype.include(testSrcDir + "/views/urltemplatetest.js"));
}
@@ -115,6 +113,7 @@
AllTests.prototype = new TestSuite();
AllTests.prototype.suite = AllTests_suite;
+AllTests.glue();
var args;
if (this.WScript) {
Added: incubator/shindig/trunk/features/src/test/javascript/features/osapi/activitiestest.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/test/javascript/features/osapi/activitiestest.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/test/javascript/features/osapi/activitiestest.js (added)
+++ incubator/shindig/trunk/features/src/test/javascript/features/osapi/activitiestest.js Fri May 1 06:27:11 2009
@@ -0,0 +1,234 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+function ActivitiesTest(name) {
+ TestCase.call(this, name);
+};
+
+ActivitiesTest.inherits(TestCase);
+
+ActivitiesTest.prototype.setUp = function() {
+ shindig = shindig || {};
+ shindig.auth = {};
+ shindig.auth.getSecurityToken = function() {
+ return 'dsjk452487sdf7sdf865%&^*&^8cjhsdf';
+ };
+
+ gadgets.config.init({ "osapi.services" : {
+ "http://%host%/social/rpc" : ["system.listMethods", "people.get", "activities.get",
+ "activities.create", "appdata.get", "appdata.update", "appdata.delete"] }
+ });
+
+};
+
+ActivitiesTest.prototype.tearDown = function() {
+ shindig.auth = undefined;
+};
+
+ActivitiesTest.prototype.testJsonBuilding = function() {
+ var getFn = osapi.activities.get({ userId : '@viewer', groupId : '@self'});
+ this.assertRequestPropertiesForService(getFn);
+
+ var expectedJson = [{ method : 'activities.get',
+ params : {
+ groupId : '@self',
+ userId : ['@viewer'],
+ }
+ }];
+ this.assertEquals('Json for request params should match', expectedJson, getFn.json());
+
+ var argsInCallToMakeNonProxiedRequest;
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+
+ gadgets.io.makeNonProxiedRequest = function(url, callback, params, contentType) {
+ argsInCallToMakeNonProxiedRequest = { url : url,
+ callback :callback,
+ params :params,
+ contentType : contentType};
+ };
+
+ getFn.execute(function() {});
+ this.assertArgsToMakeNonProxiedRequest(argsInCallToMakeNonProxiedRequest, expectedJson);
+ } finally {
+ gadgets.io.makeNonProxiedRequest = oldMakeRequest;
+ }
+};
+
+ActivitiesTest.prototype.testGetViewerActivities = function() {
+ var that = this;
+ var getVieweractivitiesFn = osapi.activities.get({ userId : '@viewer', groupId : '@self'});
+ this.assertRequestPropertiesForService(getVieweractivitiesFn);
+
+ var expectedJson = [{ method : "activities.get",
+ params : { userId : ['@viewer'],
+ groupId : '@self'
+ }
+ }];
+ this.assertEquals("Json for request params should match", expectedJson,
+ getVieweractivitiesFn.json());
+
+ var mockActivityResult = { data :
+ [{data:
+ {list:
+ [{title:"yellow",userId:"john.doe",id:"1",body:"what a color!"}],
+ totalResults :1, startIndex:0}}],
+ errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ that.assertEquals("Should have one entry", 1, response.length);
+ that.assertEquals("Should match title of activity", "yellow", response[0].title);
+ });
+
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockActivityResult);
+ };
+ getVieweractivitiesFn.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+};
+
+ActivitiesTest.prototype.testGetEmptyActivitiesUsesDefaults = function() {
+ var that = this;
+ var getVieweractivitiesFn = osapi.activities.get();
+ this.assertRequestPropertiesForService(getVieweractivitiesFn);
+
+ var expectedJson = [{ method : "activities.get",
+ params : { userId : ['@viewer'],
+ groupId : '@self'
+ }
+ }];
+ this.assertEquals("Json for request params should match", expectedJson,
+ getVieweractivitiesFn.json());
+
+ var mockActivityResult = { data :
+ [{data:
+ {list:
+ [{title:"yellow",userId:"john.doe",id:"1",body:"what a color!"}],
+ totalResults :1, startIndex:0}}],
+ errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ that.assertEquals("Should have one entry", 1, response.length);
+ that.assertEquals("Should match title of activity", "yellow", response[0].title);
+ });
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockActivityResult);
+ };
+ getVieweractivitiesFn.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+};
+
+ActivitiesTest.prototype.testGetViewerFriendsActivities = function() {
+ var that = this;
+ var getViewerFriendActivitiesFn = osapi.activities.get({ userId : '@viewer',
+ groupId : '@friends'});
+ this.assertRequestPropertiesForService(getViewerFriendActivitiesFn);
+
+ var expectedJson = [{ method : "activities.get",
+ params : { userId : ['@viewer'],
+ groupId : '@friends'}
+ }];
+ this.assertEquals("Json for request params should match", expectedJson,
+ getViewerFriendActivitiesFn.json());
+
+ var mockActivitiesResult = { data :
+ [{data:
+ {list:
+ [{title:"yellow",userId:"john.doe",id:"1",body:"what a color!"},
+ {title:"Your New Activity",id:"1234396143857", body:"Blah Blah"}],
+ totalResults:2,startIndex:0}}],
+ errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ that.assertEquals("Should have two activities", 2, response.length);
+ that.assertEquals("Should match title of activity", "yellow", response[0].title);
+ that.assertEquals("Should match title of activity", "Your New Activity", response[1].title);
+ });
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockActivitiesResult);
+ };
+ getViewerFriendActivitiesFn.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+};
+
+ActivitiesTest.prototype.testCreateActivity = function() {
+ var that = this;
+ var createActivityFn = osapi.activities.create({ userId : '@viewer',
+ activity : { title : "New Activity", body : "Blah blah blah." }});
+ this.assertRequestPropertiesForService(createActivityFn);
+
+ var expectedJson = [{ method : "activities.create",
+ params : { userId : ['@viewer'],
+ groupId : '@self',
+ activity : { title : "New Activity", body : "Blah blah blah."}}
+ }];
+ this.assertEquals("Json for request params should match", expectedJson,
+ createActivityFn.json());
+
+ var mockActivityResult = { data : [{data: {}}], errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ that.assertEquals("Should have no activities", undefined, response.length);
+ });
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockActivityResult);
+ };
+ createActivityFn.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+
+};
+
+
+function ActivitiesTestSuite() {
+ TestSuite.call(this, 'ActivitiesTestSuite');
+ this.addTestSuite(ActivitiesTest);
+}
+
+ActivitiesTestSuite.inherits(TestSuite);
Added: incubator/shindig/trunk/features/src/test/javascript/features/osapi/appdatatest.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/test/javascript/features/osapi/appdatatest.js?rev=770547&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/test/javascript/features/osapi/appdatatest.js (added)
+++ incubator/shindig/trunk/features/src/test/javascript/features/osapi/appdatatest.js Fri May 1 06:27:11 2009
@@ -0,0 +1,190 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+function AppdataTest(name) {
+ TestCase.call(this, name);
+};
+
+AppdataTest.inherits(TestCase);
+
+AppdataTest.prototype.setUp = function() {
+ shindig = shindig || {};
+ shindig.auth = {};
+ shindig.auth.getSecurityToken = function() {
+ return 'dsjk452487sdf7sdf865%&^*&^8cjhsdf';
+ };
+
+ gadgets.config.init({ "osapi.services" : {
+ "http://%host%/social/rpc" : ["system.listMethods", "people.get", "activities.get",
+ "activities.create", "appdata.get", "appdata.update", "appdata.delete"] }
+ });
+
+};
+
+AppdataTest.prototype.tearDown = function() {
+ shindig.auth = undefined;
+};
+
+AppdataTest.prototype.testJsonBuilding = function() {
+ var getFn = osapi.appdata.get({ userId : '@viewer', fields : ['nonexistent']});
+ this.assertRequestPropertiesForService(getFn);
+
+ var expectedJson = [{ method : 'appdata.get',
+ params : {
+ groupId : '@self',
+ userId : ['@viewer'],
+ fields : ['nonexistent']
+ }
+ }];
+ this.assertEquals('Json for request params should match', expectedJson, getFn.json());
+
+ var argsInCallToMakeNonProxiedRequest;
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+
+ gadgets.io.makeNonProxiedRequest = function(url, callback, params, contentType) {
+ argsInCallToMakeNonProxiedRequest = { url : url, callback : callback, params : params,
+ contentType : contentType};
+ };
+
+ getFn.execute(function() {});
+ this.assertArgsToMakeNonProxiedRequest(argsInCallToMakeNonProxiedRequest, expectedJson);
+ } finally {
+ gadgets.io.makeNonProxiedRequest = oldMakeRequest;
+ }
+};
+
+AppdataTest.prototype.testGetAppdata = function() {
+ var that = this;
+ var getAppdata = osapi.appdata.get({ userId : '@viewer', fields : ['gift']});
+ this.assertRequestPropertiesForService(getAppdata);
+
+ var expectedJson = [{ method : "appdata.get",
+ params : { userId : ['@viewer'],
+ groupId : '@self',
+ fields : ['gift']}
+ }];
+ this.assertEquals("Json for request params should match", expectedJson, getAppdata.json());
+
+ var mockActivityResult = { data :
+ [{data:
+ {"john.doe":{"gift":"Ferrari"}}}],
+ errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ var entry = response["john.doe"];
+ that.assertTrue("Should have an entry for userid", entry)
+ that.assertEquals("Should match appdata set", 'Ferrari', entry["gift"]);
+ });
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockActivityResult);
+ };
+ getAppdata.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+};
+
+AppdataTest.prototype.testDeleteAppdata = function() {
+ var that = this;
+ var getAppdata = osapi.appdata["delete"]({ userId : '@viewer', fields : ['gift']});
+ this.assertRequestPropertiesForService(getAppdata);
+
+ var expectedJson = [{ method : "appdata.delete",
+ params : { userId : ['@viewer'],
+ groupId : '@self',
+ fields : ['gift']}
+ }];
+ this.assertEquals("Json for request params should match", expectedJson, getAppdata.json());
+
+ var mockAppdataResult = { data :
+ [{data:
+ {}}],
+ errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ that.assertEquals("Should have no appdata", undefined, response.length);
+ });
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockAppdataResult);
+ };
+ getAppdata.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+
+};
+
+AppdataTest.prototype.testUpdate = function() {
+ var that = this;
+ var createActivityFn = osapi.appdata.update({ userId : '@viewer',
+ data: {gifts: 'Ferrari'}});
+ this.assertRequestPropertiesForService(createActivityFn);
+
+ var expectedJson = [{ method : "appdata.update",
+ params : {
+ groupId : '@self',
+ userId : ['@viewer'],
+ data: {gifts: 'Ferrari'}
+ }
+ }];
+ this.assertEquals("Json for request params should match", expectedJson, createActivityFn.json());
+
+ var mockActivityResult = { data :
+ [{data:
+ {}}],
+ errors : []};
+
+ var inspectableCallback = makeInspectableCallback(function (response) {
+ that.assertTrue("callback from execute should have gotten a response", response);
+ that.assertFalse("should not be an error in callback response", response.error);
+ that.assertEquals("Should have no appdata", undefined, response.length);
+ });
+
+ var oldMakeRequest = gadgets.io.makeNonProxiedRequest;
+ try {
+ gadgets.io.makeNonProxiedRequest = function(url, callback2, params, contentType) {
+ callback2(mockActivityResult);
+ };
+ createActivityFn.execute(inspectableCallback.callback);
+ this.assertTrue("should have called the callback", inspectableCallback.wasCalled());
+ } finally {
+ gadgets.io.makeNonProxiedHttpRequest = oldMakeRequest;
+ }
+
+};
+
+
+function AppdataTestSuite() {
+ TestSuite.call(this, 'AppdataTestSuite');
+ this.addTestSuite(AppdataTest);
+}
+
+AppdataTestSuite.inherits(TestSuite);