Merge pull request #7 from RecastAI/develop

Add processing_language and sentiment

Author: mandre42

src/apis/resources/Conversation.php

@@ -21,9 +21,11 @@ public function __construct($token, $responseBody)
     $this->next_actions = $responseBody->next_actions;
     $this->memory = $responseBody->memory;
     $this->entities = $responseBody->entities;
+    $this->sentiment = $responseBody->sentiment;
     $this->intents = $responseBody->intents;
     $this->conversation_token = $responseBody->conversation_token;
     $this->language = $responseBody->language;
+    $this->processing_language = $responseBody->processing_language;
     $this->version = $responseBody->version;
     $this->timestamp = $responseBody->timestamp;
     $this->status = $responseBody->status;
@@ -83,6 +85,49 @@ public function nextActions()
     return ($this->nextActions ? $this->nextActions : []);
   }
 
+  /**
+  * SENTIMENT HELPERS
+  * Returns whether or not the response sentiment corresponds to the checked one
+  * @return {boolean}: true or false
+  */
+
+  public function isPositive()
+  {
+    return ($this->sentiment === \RecastAI\Constants::SENTIMENT_POSITIVE);
+  }
+
+  /**
+  * @return bool
+  */
+  public function isNeutral()
+  {
+    return ($this->sentiment === \RecastAI\Constants::SENTIMENT_NEUTRAL);
+  }
+
+  /**
+  * @return bool
+  */
+  public function isNegative()
+  {
+    return ($this->sentiment === \RecastAI\Constants::SENTIMENT_NEGATIVE);
+  }
+
+  /**
+  * @return bool
+  */
+  public function isVPositive()
+  {
+    return ($this->sentiment === \RecastAI\Constants::SENTIMENT_VPOSITIVE);
+  }
+
+  /**
+  * @return bool
+  */
+  public function isVNegative()
+  {
+    return ($this->sentiment === \RecastAI\Constants::SENTIMENT_VNEGATIVE);
+  }
+
   /**
   * Returns the memory matching the alias
   * or all the memory if no alias provided

src/apis/resources/Response.php

@@ -31,6 +31,7 @@ public function __construct($response) {
     }
 
     $this->language = $response->language;
+    $this->processing_language = $response->processing_language;
     $this->version = $response->version;
     $this->timestamp = $response->timestamp;
     $this->status = $response->status;

tests/ConversationTest.php

@@ -30,6 +30,9 @@ public function testConversationClassAttributes()
         $this->assertEquals($conversation->action, $result->results->action);
         $this->assertEquals($conversation->nextActions, $result->results->next_actions);
         $this->assertEquals($conversation->memory, $result->results->memory);
+        $this->assertEquals($conversation->language, $result->results->language);
+        $this->assertEquals($conversation->processing_language, $result->results->processing_language);
+        $this->assertEquals($conversation->sentiment, $result->results->sentiment);
     }
 
     public function testResponseClassMethods()
@@ -45,5 +48,10 @@ public function testResponseClassMethods()
         $this->assertEquals($conversation->joinedReplies('\n'), join('\n', $result->results->replies));
         $this->assertEquals($conversation->memory(), $result->results->memory);
         $this->assertEquals($conversation->memory('loc'), $result->results->memory->loc);
+        $this->assertEquals($conversation->isVPositive(), false);
+        $this->assertEquals($conversation->isPositive(), false);
+        $this->assertEquals($conversation->isNeutral(), true);
+        $this->assertEquals($conversation->isNegative(), false);
+        $this->assertEquals($conversation->isVNegative(), false);
     }
 }

tests/ResponseTest.php

@@ -33,6 +33,7 @@ public function testResponseClassAttributes()
         $this->assertEquals($response->source, $result->results->{'source'});
         $this->assertEquals($response->sentiment, $result->results->{'sentiment'});
         $this->assertEquals($response->language, $result->results->{'language'});
+        $this->assertEquals($response->processing_language, $result->results->{'processing_language'});
         $this->assertEquals($response->version, $result->results->{'version'});
         $this->assertEquals($response->timestamp, $result->results->{'timestamp'});
         $this->assertEquals($count, 4);

tests/data/Converse.json

@@ -5,6 +5,7 @@
       "Salut",
       "Need location please"
     ],
+    "sentiment": "neutral",
     "action": {
       "slug": "greetings",
       "done": true,
@@ -29,6 +30,7 @@
     ],
     "conversation_token": "f6362f5ded83031d42c2d02d954359f9",
     "language": "en",
+    "processing_language": "en",
     "timestamp": "2016-10-05T12:07:30.907Z",
     "status": 200
   },

tests/data/Request.json

@@ -45,6 +45,7 @@
       ]
     },
     "language": "en",
+    "processing_language": "en",
     "version": "2.0.0",
     "timestamp": "2016-07-10T23:17:59+02:00",
     "status": 200