Merge pull request #73 from GoogleCloudPlatform/gce-datastore

Convert compute engine to datastore.

4-auth/config/application.rb

@@ -17,6 +17,7 @@
 
 # Pick the frameworks you want:
 require "active_model/railtie"
+require "active_record/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
@@ -28,5 +29,8 @@
 module Bookshelf
   class Application < Rails::Application
     config.x.settings = Rails.application.config_for :settings
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end

6-task-queueing/app/jobs/lookup_book_details_job.rb

@@ -1,3 +1,16 @@
+# Copyright 2015, 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 lookup_books]
 require "google/apis/books_v1"
 
@@ -56,4 +69,3 @@ def perform book
   end
 end
 # [END book_lookup]
-

6-task-queueing/config/initializers/fog_cloud_storage.rb

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if Rails.env.test? || ! File.file?(Rails.root.join "config", "cloud_storage.yml")
+if Rails.env.test?
 
   Fog.mock!
   FogStorage = Fog::Storage.new(

7-compute-engine/.gitignore

@@ -12,7 +12,6 @@
 # limitations under the License.
 
 /.bundle
-/log/*
 /tmp
 /public/assets/
 config/database.yml

7-compute-engine/Gemfile

@@ -15,12 +15,11 @@ source "https://rubygems.org"
 
 gem "rails"
 gem "jquery-rails"
-gem "mysql2"
 gem "fog"
 gem "omniauth"
 gem "omniauth-google-oauth2"
 gem "unicorn"
-gem "gcloud"
+gem "google-cloud"
 gem "google-api-client"
 gem "resque"
 
@@ -30,5 +29,4 @@ group :test do
   gem "rspec-rails"
   gem "rack-test"
   gem "capybara"
-  gem "sqlite3"
 end

7-compute-engine/Gemfile.lock

@@ -37,13 +37,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.3)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
-    beefcake (1.1.0)
     builder (3.2.2)
     capybara (2.7.1)
       addressable
@@ -57,7 +53,6 @@ GEM
     digest-crc (0.4.1)
     erubis (2.7.0)
     excon (0.49.0)
-    extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fission (0.5.0)
@@ -190,27 +185,107 @@ GEM
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
-    gcloud (0.8.2)
-      beefcake (~> 1.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.8.3)
-      grpc (~> 0.13.1)
-      mime-types (~> 2.4)
-      zonefile (~> 1.04)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    google-api-client (0.8.6)
-      activesupport (>= 3.2)
+    google-api-client (0.9.20)
       addressable (~> 2.3)
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
-    google-protobuf (3.0.0.alpha.5.0.5.1)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+    google-cloud (0.22.0)
+      google-cloud-bigquery (~> 0.21.0)
+      google-cloud-datastore (~> 0.21.0)
+      google-cloud-dns (~> 0.21.0)
+      google-cloud-error_reporting (~> 0.21.0)
+      google-cloud-language (~> 0.22.0)
+      google-cloud-logging (~> 0.21.0)
+      google-cloud-monitoring (~> 0.21.0)
+      google-cloud-pubsub (~> 0.21.0)
+      google-cloud-resource_manager (~> 0.21.0)
+      google-cloud-speech (~> 0.21.0)
+      google-cloud-storage (~> 0.21.0)
+      google-cloud-translate (~> 0.22.0)
+      google-cloud-vision (~> 0.21.0)
+    google-cloud-bigquery (0.21.0)
+      google-api-client (~> 0.9.11)
+      google-cloud-core (~> 0.21.0)
+    google-cloud-core (0.21.0)
+    google-cloud-datastore (0.21.0)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+    google-cloud-dns (0.21.0)
+      google-api-client (~> 0.9.11)
+      google-cloud-core (~> 0.21.0)
+      zonefile (~> 1.04)
+    google-cloud-error_reporting (0.21.2)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+    google-cloud-language (0.22.0)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+    google-cloud-logging (0.21.2)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+      orderedhash (= 0.0.6)
+    google-cloud-monitoring (0.21.0)
+      google-gax (~> 0.6.0)
+      googleapis-common-protos (~> 1.3.1)
+      googleauth (~> 0.5.1)
+      grpc (~> 1.0)
+    google-cloud-pubsub (0.21.0)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+      grpc-google-iam-v1 (~> 0.6.8)
+    google-cloud-resource_manager (0.21.0)
+      google-api-client (~> 0.9.11)
+      google-cloud-core (~> 0.21.0)
+    google-cloud-speech (0.21.0)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+    google-cloud-storage (0.21.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.9.11)
+      google-cloud-core (~> 0.21.0)
+    google-cloud-translate (0.22.1)
+      google-cloud-core (~> 0.21.0)
+      googleauth (~> 0.5.1)
+    google-cloud-vision (0.21.1)
+      google-cloud-core (~> 0.21.0)
+      google-gax (~> 0.6.0)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos (~> 1.3)
+      grpc (~> 1.0)
+    google-gax (0.6.0)
+      googleapis-common-protos (~> 1.3.1)
+      googleauth (~> 0.5.1)
+      grpc (~> 1.0)
+      rly (~> 0.2.3)
+    google-protobuf (3.0.2)
+    googleapis-common-protos (1.3.4)
+      google-protobuf (~> 3.0)
+      grpc (~> 1.0)
     googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
@@ -219,10 +294,16 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (0.13.1)
-      google-protobuf (~> 3.0.0.alpha.5.0.3)
+    grpc (1.0.1)
+      google-protobuf (~> 3.0.2)
       googleauth (~> 0.5.1)
+    grpc-google-iam-v1 (0.6.8)
+      googleapis-common-protos (~> 1.3.1)
+      googleauth (~> 0.5.1)
+      grpc (~> 1.0)
     hashie (3.4.4)
+    httpclient (2.8.2.4)
+    hurley (0.2)
     i18n (0.7.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
@@ -231,10 +312,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
-    jwt (1.5.4)
+    jwt (1.5.6)
     kgio (2.10.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
     little-plugger (1.1.4)
     logging (2.1.0)
       little-plugger (~> 1.1)
@@ -243,15 +322,14 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    memoist (0.14.0)
+    memoist (0.15.0)
     mime-types (2.99.1)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.1)
     mono_logger (1.1.0)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.4.4)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     oauth2 (1.0.0)
@@ -271,7 +349,9 @@ GEM
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
+    orderedhash (0.0.6)
     os (0.9.6)
+    public_suffix (2.0.4)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -310,13 +390,16 @@ GEM
     redis (3.3.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
+    representable (2.3.0)
+      uber (~> 0.0.7)
     resque (1.26.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    retriable (1.4.1)
+    retriable (2.1.0)
+    rly (0.2.3)
     rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
@@ -334,7 +417,7 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    signet (0.7.2)
+    signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (~> 1.5)
@@ -350,13 +433,13 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
     trollop (2.1.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    uber (0.0.15)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -373,18 +456,16 @@ PLATFORMS
 DEPENDENCIES
   capybara
   fog
-  gcloud
   google-api-client
+  google-cloud
   jquery-rails
-  mysql2
   omniauth
   omniauth-google-oauth2
   rack-test
   rails
   resque
   rspec-rails
-  sqlite3
   unicorn
 
 BUNDLED WITH
-   1.11.2
+   1.13.6