Add gcs example to language

language/api/composer.json

@@ -1,17 +1,21 @@
 {
     "require": {
-        "google/cloud": "0.8",
+        "google/cloud": "0.9",
         "symfony/console": "^3.0"
     },
     "autoload": {
         "psr-4": {
             "Google\\Cloud\\Samples\\Language\\": "src/"
         },
         "files": [
+            "src/functions/analyze_all.php",
+            "src/functions/analyze_all_from_file.php",
             "src/functions/analyze_entities.php",
-            "src/functions/analyze_everything.php",
+            "src/functions/analyze_entities_from_file.php",
             "src/functions/analyze_sentiment.php",
+            "src/functions/analyze_sentiment_from_file.php",
             "src/functions/analyze_syntax.php",
+            "src/functions/analyze_syntax_from_file.php",
             "src/functions/print_annotation.php"
         ]
     }

language/api/language.php

@@ -2,15 +2,15 @@
 
 require __DIR__ . '/vendor/autoload.php';
 
-use Google\Cloud\Samples\Language\AnalyzeEntitiesCommand;
-use Google\Cloud\Samples\Language\AnalyzeEverythingCommand;
-use Google\Cloud\Samples\Language\AnalyzeSentimentCommand;
-use Google\Cloud\Samples\Language\AnalyzeSyntaxCommand;
+use Google\Cloud\Samples\Language\AllCommand;
+use Google\Cloud\Samples\Language\EntitiesCommand;
+use Google\Cloud\Samples\Language\SentimentCommand;
+use Google\Cloud\Samples\Language\SyntaxCommand;
 use Symfony\Component\Console\Application;
 
 $application = new Application();
-$application->add(new AnalyzeEntitiesCommand());
-$application->add(new AnalyzeEverythingCommand());
-$application->add(new AnalyzeSentimentCommand());
-$application->add(new AnalyzeSyntaxCommand());
+$application->add(new AllCommand());
+$application->add(new EntitiesCommand());
+$application->add(new SentimentCommand());
+$application->add(new SyntaxCommand());
 $application->run();

language/api/src/AnalyzeEverythingCommand.php → language/api/src/AllCommand.php

@@ -23,36 +23,44 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command line utility to transcribe.
+ * Command line utility for the Natural Language APIs.
  *
- * Usage: php speech.php transcribe
+ * Usage: php language.php all TEXT
  */
-class AnalyzeEverythingCommand extends Command
+class AllCommand extends Command
 {
     protected function configure()
     {
         $this
-            ->setName('everything')
-            ->setDescription('Analyze some natural language text.')
+            ->setName('all')
+            ->setDescription('Analyze syntax, sentiment and entities in text.')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command analyzes text using the Google Cloud Natural Language API.
 
     <info>php %command.full_name% Text to analyze.</info>
 
+    <info>php %command.full_name% gs://my_bucket/file_with_text.txt</info>
+
 EOF
             )
             ->addArgument(
-                'text',
+                'content',
                 InputArgument::IS_ARRAY | InputArgument::REQUIRED,
-                'Text to analyze'
+                'Text or path to Cloud Storage file'
             )
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $text = implode(" ", $input->getArgument('text'));
-        $result = analyze_everything($text);
+        $content = implode(' ', (array) $input->getArgument('content'));
+        // Regex to match a Cloud Storage path as the first argument
+        // e.g "gs://my-bucket/file_with_text.txt"
+        if (preg_match('/^gs:\/\/([a-z0-9\._\-]+)\/(\S+)$/', $content, $matches)) {
+            $result = analyze_all_from_file($matches[1], $matches[2]);
+        } else {
+            $result = analyze_all($content);
+        }
         print_annotation($result);
     }
 }

language/api/src/AnalyzeEntitiesCommand.php → language/api/src/EntitiesCommand.php

@@ -23,36 +23,44 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command line utility to transcribe.
+ * Command line utility for the Natural Language APIs.
  *
- * Usage: php speech.php transcribe
+ * Usage: php language.php entities TEXT
  */
-class AnalyzeEntitiesCommand extends Command
+class EntitiesCommand extends Command
 {
     protected function configure()
     {
         $this
             ->setName('entities')
-            ->setDescription('Analyze some natural language text.')
+            ->setDescription('Analyze entities in text.')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command analyzes text using the Google Cloud Natural Language API.
 
     <info>php %command.full_name% Text to analyze.</info>
 
+    <info>php %command.full_name% gs://my_bucket/file_with_text.txt</info>
+
 EOF
             )
             ->addArgument(
-                'text',
+                'content',
                 InputArgument::IS_ARRAY | InputArgument::REQUIRED,
-                'Text to analyze'
+                'Text or path to Cloud Storage file'
             )
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $text = implode(" ", $input->getArgument('text'));
-        $result = analyze_entities($text);
+        $content = implode(' ', (array) $input->getArgument('content'));
+        // Regex to match a Cloud Storage path as the first argument
+        // e.g "gs://my-bucket/file_with_text.txt"
+        if (preg_match('/^gs:\/\/([a-z0-9\._\-]+)\/(\S+)$/', $content, $matches)) {
+            $result = analyze_entities_from_file($matches[1], $matches[2]);
+        } else {
+            $result = analyze_entities($content);
+        }
         print_annotation($result);
     }
 }

language/api/src/AnalyzeSentimentCommand.php → language/api/src/SentimentCommand.php

@@ -23,36 +23,45 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command line utility to transcribe.
+ * Command line utility for the Natural Language APIs.
  *
- * Usage: php speech.php transcribe
+ * Usage: php language.php sentiment TEXT
  */
-class AnalyzeSentimentCommand extends Command
+class SentimentCommand extends Command
 {
     protected function configure()
     {
         $this
             ->setName('sentiment')
-            ->setDescription('Analyze some natural language text.')
+            ->setDescription('Analyze sentiment in text.')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command analyzes text using the Google Cloud Natural Language API.
 
     <info>php %command.full_name% Text to analyze.</info>
 
+    <info>php %command.full_name% gs://my_bucket/file_with_text.txt</info>
+
 EOF
             )
             ->addArgument(
-                'text',
+                'content',
                 InputArgument::IS_ARRAY | InputArgument::REQUIRED,
-                'Text to analyze'
+                'Text or path to Cloud Storage file'
             )
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $text = implode(" ", $input->getArgument('text'));
-        $result = analyze_sentiment($text);
+        $content = implode(' ', (array) $input->getArgument('content'));
+        // Regex to match a Cloud Storage path as the first argument
+        // e.g "gs://my-bucket/file_with_text.txt"
+        if (preg_match('/^gs:\/\/([a-z0-9\._\-]+)\/(\S+)$/', $content, $matches)) {
+            $result = analyze_sentiment_from_file($matches[1], $matches[2]);
+        } else {
+            $result = analyze_sentiment($content);
+        }
+
         print_annotation($result);
     }
 }