Author: lindner
Date: Sat May 24 07:25:04 2008
New Revision: 659827
URL: http://svn.apache.org/viewvc?rev=659827&view=rev
Log:
Implement SHINDIG-305, add HAS_APP to the model
Also fix up a few small issues for SHINDIG-280, mainly alphabetizing
methods and fields
Modified:
incubator/shindig/trunk/features/opensocial-reference/enum.js
incubator/shindig/trunk/features/opensocial-reference/person.js
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
incubator/shindig/trunk/php/src/socialdata/opensocial/model/Enum.php
incubator/shindig/trunk/php/src/socialdata/opensocial/model/Person.php
Modified: incubator/shindig/trunk/features/opensocial-reference/enum.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-reference/enum.js?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-reference/enum.js (original)
+++ incubator/shindig/trunk/features/opensocial-reference/enum.js Sat May 24
07:25:04 2008
@@ -178,26 +178,25 @@
/**
* @static
* @class
- * The enum keys used by the networkPresence field.
+ * The enum keys used by the NetworkPresence field.
* <p><b>See also:</b>
* <a href="opensocial.Person.Field.html">
- * opensocial.Person.Field.NetworkPresence</a>
+ * opensocial.Person.Field.Presence</a>
* </p>
*
- * @name opensocial.Enum.NetworkPresence
+ * @name opensocial.Enum.Presence
*/
-opensocial.Enum.NetworkPresence = {
- /** @member opensocial.Enum.NetworkPresence */
+opensocial.Enum.Presence = {
+ /** @member opensocial.Enum.Presence */
AWAY : 'AWAY',
- /** @member opensocial.Enum.NetworkPresence */
+ /** @member opensocial.Enum.Presence */
CHAT : 'CHAT',
- /** @member opensocial.Enum.NetworkPresence */
+ /** @member opensocial.Enum.Presence */
DND : 'DND',
- /** @member opensocial.Enum.NetworkPresence */
+ /** @member opensocial.Enum.Presence */
OFFLINE : 'OFFLINE',
- /** @member opensocial.Enum.NetworkPresence */
+ /** @member opensocial.Enum.Presence */
ONLINE : 'ONLINE',
- /** @member opensocial.Enum.NetworkPresence */
+ /** @member opensocial.Enum.Presence */
XA : 'XA'
};
-
Modified: incubator/shindig/trunk/features/opensocial-reference/person.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-reference/person.js?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-reference/person.js (original)
+++ incubator/shindig/trunk/features/opensocial-reference/person.js Sat May 24
07:25:04 2008
@@ -466,7 +466,24 @@
*
* @member opensocial.Person.Field
*/
- POLITICAL_VIEWS : 'politicalViews'
+ POLITICAL_VIEWS : 'politicalViews',
+
+ /**
+ * A boolean indicating whether the person has used the current app.
+ *
+ * @member opensocial.Person.Field
+ */
+ HAS_APP : 'hasApp',
+
+ /**
+ * Person's current network status. Specified as an Enum with the enum's
+ * key referencing opensocial.Enum.Presence.
+ * Not supported by all containers.
+ *
+ * @member opensocial.Person.Field
+ */
+ NETWORK_PRESENCE : 'networkPresence'
+
};
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Sat May 24 07:25:04 2008
@@ -45,6 +45,7 @@
FOOD("food"),
GENDER("gender"),
HAPPIEST_WHEN("happiestWhen"),
+ HAS_APP("hasApp"),
HEROES("heroes"),
HUMOR("humor"),
ID("id"),
@@ -58,6 +59,7 @@
MOVIES("movies"),
MUSIC("music"),
NAME("name"),
+ NETWORKPRESENCE("networkPresence"),
NICKNAME("nickname"),
PETS("pets"),
PHONE_NUMBERS("phoneNumbers"),
@@ -81,8 +83,7 @@
TURN_OFFS("turnOffs"),
TURN_ONS("turnOns"),
TV_SHOWS("tvShows"),
- URLS("urls"),
- NETWORKPRESENCE("networkPresence");
+ URLS("urls");
private final String jsonString;
@@ -113,6 +114,7 @@
private List<String> food;
private Enum<Enum.Gender> gender;
private String happiestWhen;
+ private Boolean hasApp;
private List<String> heroes;
private String humor;
private String id;
@@ -126,6 +128,7 @@
private List<String> movies;
private List<String> music;
private Name name;
+ private Enum<Enum.NetworkPresence> networkPresence;
private String nickname;
private String pets;
private List<Phone> phoneNumbers;
@@ -150,7 +153,6 @@
private List<String> turnOns;
private List<String> tvShows;
private List<Url> urls;
- private Enum<Enum.NetworkPresence> networkPresence;
// Note: Not in the opensocial js person object directly
private boolean isOwner = false;
@@ -297,6 +299,14 @@
this.happiestWhen = happiestWhen;
}
+ public Boolean getHasApp() {
+ return hasApp;
+ }
+
+ public void setHasApp(Boolean hasApp) {
+ this.hasApp = hasApp;
+ }
+
public List<String> getHeroes() {
return heroes;
}
@@ -401,6 +411,14 @@
this.name = name;
}
+ public Enum<Enum.NetworkPresence> getNetworkPresence() {
+ return networkPresence;
+ }
+
+ public void setNetworkPresence(Enum<Enum.NetworkPresence> networkPresence) {
+ this.networkPresence = networkPresence;
+ }
+
public String getNickname() {
return nickname;
}
@@ -593,14 +611,6 @@
this.urls = urls;
}
- public Enum<Enum.NetworkPresence> getNetworkPresence() {
- return networkPresence;
- }
-
- public void setNetworkPresence(Enum<Enum.NetworkPresence> networkPresence) {
- this.networkPresence = networkPresence;
- }
-
public boolean getIsOwner() {
return isOwner;
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Sat May 24 07:25:04 2008
@@ -84,6 +84,7 @@
johnDoe.setFood(newList("gruel"));
johnDoe.setGender(new Enum<Enum.Gender>(Enum.Gender.MALE));
johnDoe.setHappiestWhen("puppies");
+ johnDoe.setHasApp(true);
johnDoe.setHeroes(newList("the moon"));
johnDoe.setHumor("not so good");
johnDoe.setInterests(newList("kites"));
@@ -95,6 +96,8 @@
johnDoe.setLookingFor("jane doe");
johnDoe.setMovies(newList("movies"));
johnDoe.setMusic(newList("music"));
+ johnDoe.setNetworkPresence(new Enum<Enum.NetworkPresence>(
+ Enum.NetworkPresence.DND));
johnDoe.setNickname("johnny boy");
johnDoe.setPets("simple doe");
johnDoe.setPhoneNumbers(newList(new Phone("+33H000000000", "home")));
@@ -119,8 +122,6 @@
johnDoe.setTurnOns(newList("on"));
johnDoe.setTvShows(newList("no tv"));
johnDoe.setUrls(newList(new Url("where", "are", "you")));
- johnDoe.setNetworkPresence(new Enum<Enum.NetworkPresence>(
- Enum.NetworkPresence.DND));
// setup Jane Doe
@@ -313,4 +314,4 @@
return new ResponseItem<Activity>(ResponseError.BAD_REQUEST, "", null);
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/RestfulJsonPeopleTest.java
Sat May 24 07:25:04 2008
@@ -100,6 +100,7 @@
assertEnumField(result, johnDoe.getGender(), Person.Field.GENDER);
assertStringField(result, johnDoe.getHappiestWhen(),
Person.Field.HAPPIEST_WHEN);
+ assertBooleanField(result, johnDoe.getHasApp(), Person.Field.HAS_APP);
assertStringListField(result, johnDoe.getHeroes(), Person.Field.HEROES);
assertStringField(result, johnDoe.getHumor(), Person.Field.HUMOR);
assertStringField(result, johnDoe.getId(), Person.Field.ID);
@@ -122,6 +123,8 @@
result.getJSONObject(Person.Field.NAME.toString()).getString(
Name.Field.UNSTRUCTURED.toString()));
+ assertEnumField(result, johnDoe.getNetworkPresence(),
+ Person.Field.NETWORKPRESENCE);
assertStringField(result, johnDoe.getNickname(), Person.Field.NICKNAME);
assertStringField(result, johnDoe.getPets(), Person.Field.PETS);
@@ -161,8 +164,11 @@
Person.Field.TURN_OFFS);
assertStringListField(result, johnDoe.getTurnOns(), Person.Field.TURN_ONS);
assertStringListField(result, johnDoe.getTvShows(), Person.Field.TV_SHOWS);
- assertEnumField(result, johnDoe.getNetworkPresence(),
- Person.Field.NETWORKPRESENCE);
+ }
+
+ private void assertBooleanField(JSONObject result, Boolean expected,
+ Person.Field field) throws JSONException {
+ assertEquals(expected, result.getBoolean(field.toString()));
}
private void assertStringField(JSONObject result, String expected,
Modified: incubator/shindig/trunk/php/src/socialdata/opensocial/model/Enum.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialdata/opensocial/model/Enum.php?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialdata/opensocial/model/Enum.php
(original)
+++ incubator/shindig/trunk/php/src/socialdata/opensocial/model/Enum.php Sat
May 24 07:25:04 2008
@@ -102,9 +102,9 @@
}
/**
- * public Enum for opensocial.Enum.Smoker
+ * public Enum for opensocial.Enum.Presence
*/
-class EnumNetworkPresence extends Enum {
+class EnumPresence extends Enum {
public $values = array(
'AWAY' => "Away",
'CHAT' => "Chat",
Modified: incubator/shindig/trunk/php/src/socialdata/opensocial/model/Person.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialdata/opensocial/model/Person.php?rev=659827&r1=659826&r2=659827&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialdata/opensocial/model/Person.php
(original)
+++ incubator/shindig/trunk/php/src/socialdata/opensocial/model/Person.php Sat
May 24 07:25:04 2008
@@ -40,6 +40,7 @@
public $food;
public $gender;
public $happiestWhen;
+ public $hasApp;
public $heroes;
public $humor;
public $id;
@@ -52,6 +53,7 @@
public $movies;
public $music;
public $name;
+ public $networkPresence;
public $nickname;
public $pets;
public $phoneNumbers;
@@ -76,7 +78,6 @@
public $turnOns;
public $tvShows;
public $urls;
- public $networkPresence;
// Note: Not in the opensocial js person object directly
public $isOwner = false;
@@ -268,6 +269,16 @@
$this->heroes = $heroes;
}
+ public function getHasApp()
+ {
+ return $this->hasApp;
+ }
+
+ public function setHasApp($hasApp)
+ {
+ $this->hasApp = $hasApp;
+ }
+
public function getHumor()
{
return $this->humor;
@@ -378,6 +389,16 @@
$this->name = $name;
}
+ public function getNetworkPresence()
+ {
+ return $this->networkPresence;
+ }
+
+ public function setNetworkPresence($networkPresence)
+ {
+ $this->networkPresence = $networkPresence;
+ }
+
public function getNickname()
{
return $this->nickname;
@@ -618,15 +639,6 @@
$this->urls = $urls;
}
- public function getNetworkPresence()
- {
- return $this->networkPresence;
- }
-
- public function setNetworkPresence($networkPresence)
- {
- $this->networkPresence = $networkPresence;
- }
public function getIsOwner()
{
