Merge branch 'master' of github.com:GoogleCloudPlatform/ruby-docs-samples into cloud-sql-flex-updates

Author: remi Taylor

appengine/endpoints/README.md

@@ -22,8 +22,6 @@ Run the application:
 
     $ bundle exec ruby app.rb -p 8080
 
-In your web browser, go to the following address: http://localhost:8080.
-
 ### Using the echo client
 
 With the app running locally, you can execute the simple echo client using:
@@ -104,3 +102,16 @@ Now you can use the client ID to make requests to the API:
         --host https://YOUR-PROJECT-ID.appspot.com \
         --api_key YOUR-API-KEY \
         --client_secrets_file /path/to/client_secrets.json
+
+## Viewing the Endpoints graphs
+
+By using Endpoints, you get access to several metrics that are displayed graphically in the Cloud Console.
+
+To view the Endpoints graphs:
+
+1. Go to the [Endpoints section in Cloud Console](https://console.cloud.google.com/endpoints) of the project you deployed your API to.
+2. Click on your API to view more detailed information about the metrics collected.
+
+## Swagger UI
+
+The Swagger UI is an open source Swagger project that allows you to explore your API through a UI. Find out more about it on the [Swagger site](http://swagger.io/swagger-ui/).

appengine/endpoints/app.rb

@@ -19,24 +19,12 @@
 
 require "base64"
 require "json"
-require "yaml"
 require "sinatra"
 
 before do
   content_type :json
 end
 
-# Shows the index page.
-get "/" do
-  content_type :html
-  send_file "index.html"
-end
-
-# Serves up the Swagger spec for the API.
-get "/api-docs" do
-  YAML.load_file("swagger.yaml").to_json
-end
-
 # Simple echo service.
 post "/echo" do
   message = JSON.parse(request.body.read)["message"]

appengine/endpoints/index.html

@@ -13,22 +13,6 @@
     @app.set :environment, :production
   end
 
-  it "GET / renders home page" do
-    get "/"
-
-    expect(last_response.status).to eq 200
-    expect(last_response.content_type).to eq "text/html;charset=utf-8"
-    expect(last_response.body).to include "Endpoints Sample"
-  end
-
-  it "GET /api-docs renders Swagger specification" do
-    get "/api-docs"
-
-    expect(last_response.status).to eq 200
-    expect(last_response.content_type).to eq "application/json"
-    expect(last_response.body).to include '"title":"Endpoints Example"'
-  end
-
   it "POST /echo renders message from request body" do
     post "/echo", '{"message":"hello from test"}'
 

appengine/endpoints/spec/endpoint_sample_spec.rb

@@ -36,3 +36,4 @@ Commands:
   query       <query>
   query_job   <query>
 ```
+

bigquery/README.md

@@ -0,0 +1,34 @@
+# Copyright 2016 Google, Inc
+#
+# Licensed 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.
+
+# [START bigquery_quickstart]
+# Imports the Google Cloud client library
+require "google/cloud"
+
+# Your Google Cloud Platform project ID
+project_id = "YOUR_PROJECT_ID"
+
+# Instantiates a client
+gcloud   = Google::Cloud.new project_id
+bigquery = gcloud.bigquery
+
+# The name for the new dataset
+dataset_name = "my_new_dataset"
+
+# Creates the new dataset
+dataset = bigquery.create_dataset dataset_name
+
+puts "Dataset #{dataset.dataset_id} created."
+# [END bigquery_quickstart]
+

bigquery/quickstart.rb

@@ -219,7 +219,7 @@ def wait_until times: 5, delay: 1, &condition
         "Importing data from file: #{csv_file.path}\n"
       )
       expect(captured_output).to match(
-        /Waiting for load job to complete: job_\w+/
+        /Waiting for load job to complete: job/
       )
       expect(captured_output).to include "Data imported"
 
@@ -255,7 +255,7 @@ def wait_until times: 5, delay: 1, &condition
         "gs://#{@bucket.name}/bigquery-test.csv"
       )
       expect(captured_output).to match(
-        /Waiting for load job to complete: job_\w+/
+        /Waiting for load job to complete: job/
       )
       expect(captured_output).to include "Data imported"
 
@@ -323,7 +323,7 @@ def wait_until times: 5, delay: 1, &condition
         "gs://#{@bucket.name}/bigquery-test.csv"
       )
       expect(captured_output).to match(
-        /Waiting for extract job to complete: job_\w+/
+        /Waiting for extract job to complete: job/
       )
       expect(captured_output).to include "Data exported"
 

bigquery/spec/bigquery_sample_spec.rb

@@ -0,0 +1,43 @@
+# Copyright 2016 Google, Inc
+#
+# Licensed 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.
+
+require "rspec"
+require "google/cloud"
+
+describe "BigQuery Quickstart" do
+
+  it "creates a new dataset" do
+    gcloud   = Google::Cloud.new ENV["GOOGLE_CLOUD_PROJECT"]
+    bigquery = gcloud.bigquery
+
+    if bigquery.dataset "my_new_dataset"
+      bigquery.dataset("my_new_dataset").delete
+    end
+
+    expect(bigquery.dataset "my_new_dataset").to be nil
+    expect(Google::Cloud).to receive(:new).
+                             with("YOUR_PROJECT_ID").
+                             and_return(gcloud)
+
+    expect {
+      load File.expand_path("../quickstart.rb", __dir__)
+    }.to output(
+      "Dataset my_new_dataset created\.\n"
+    ).to_stdout
+
+    expect(bigquery.dataset "my_new_dataset").not_to be nil
+   end
+
+end
+

bigquery/spec/quickstart_spec.rb

@@ -31,7 +31,7 @@ def create_table project_id:, dataset_id:, table_id:
 end
 
 def list_tables project_id:, dataset_id:
-  # [START list_datasets]
+  # [START list_tables]
   # project_id = "Your Google Cloud project ID"
   # dataset_id = "ID of the dataset to create table in"
 

bigquery/tables.rb

@@ -0,0 +1,43 @@
+# Copyright 2016 Google, Inc
+#
+# Licensed 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.
+
+# [START datastore_quickstart]
+# Imports the Google Cloud client library
+require "google/cloud"
+
+# Your Google Cloud Platform project ID
+project_id = "YOUR_PROJECT_ID"
+
+# Instantiates a client
+gcloud    = Google::Cloud.new project_id
+datastore = gcloud.datastore
+
+# The kind for the new entity
+kind = "Task"
+# The name/ID for the new entity
+name = "sampletask1"
+# The Cloud Datastore key for the new entity
+task_key = datastore.key kind, name
+
+# Prepares the new entity
+task = datastore.entity task_key do |t|
+  t["description"] = "Buy milk"
+end
+
+# Saves the entity
+datastore.save task
+
+puts "Saved #{task.key.name}: #{task['description']}"
+# [END datastore_quickstart]
+