Reverting Rails 5 update on 2-cloud-datastore

Frank Natividad · Frank Natividad · commit a14b3d2a4270 · 2016-11-15T13:53:33.000-08:00
diff --git a/2-cloud-datastore/Gemfile b/2-cloud-datastore/Gemfile
@@ -14,7 +14,7 @@
 # [START dependencies]
 source "https://rubygems.org"
 
-gem "rails"
+gem "rails", "4.2.6"
 gem "google-cloud"
 # [END dependencies]
 gem "jquery-rails"
diff --git a/2-cloud-datastore/Gemfile.lock b/2-cloud-datastore/Gemfile.lock
@@ -1,46 +1,44 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
-      globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
+      globalid (>= 0.3.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (6.0.3)
     builder (3.2.2)
     capybara (2.10.1)
       addressable
@@ -67,19 +65,19 @@ GEM
       mime-types (>= 1.6)
       representable (~> 2.3.0)
       retriable (~> 2.0)
-    google-cloud (0.21.1)
+    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.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.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)
@@ -101,7 +99,7 @@ GEM
       google-protobuf (~> 3.0)
       googleapis-common-protos (~> 1.3)
       grpc (~> 1.0)
-    google-cloud-language (0.21.0)
+    google-cloud-language (0.22.0)
       google-cloud-core (~> 0.21.0)
       google-gax (~> 0.6.0)
       google-protobuf (~> 3.0)
@@ -139,8 +137,7 @@ GEM
       digest-crc (~> 0.4)
       google-api-client (~> 0.9.11)
       google-cloud-core (~> 0.21.0)
-    google-cloud-translate (0.21.0)
-      google-api-client (~> 0.9.11)
+    google-cloud-translate (0.22.0)
       google-cloud-core (~> 0.21.0)
     google-cloud-vision (0.21.1)
       google-cloud-core (~> 0.21.0)
@@ -179,6 +176,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.3)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.1.0)
@@ -189,15 +187,13 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     memoist (0.15.0)
-    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     orderedhash (0.0.6)
@@ -207,30 +203,31 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     public_suffix (2.0.4)
-    rack (2.0.1)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
+      railties (= 4.2.6)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      method_source
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.3.0)
@@ -290,7 +287,7 @@ DEPENDENCIES
   jquery-rails
   poltergeist
   rack-test
-  rails
+  rails (= 4.2.6)
   rspec-rails
   tzinfo-data
 
diff --git a/2-cloud-datastore/app/controllers/books_controller.rb b/2-cloud-datastore/app/controllers/books_controller.rb
@@ -56,7 +56,7 @@ def destroy
   end
   # [END destroy]
 
-  before_action :convert_published_on_to_date
+  before_filter :convert_published_on_to_date
 
   # [START create]
   def create
diff --git a/2-cloud-datastore/config/environments/development.rb b/2-cloud-datastore/config/environments/development.rb
@@ -29,7 +29,7 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  config.public_file_server.enabled = true
+  config.serve_static_files = true
   config.assets.debug = true
   config.assets.digest = true
   config.assets.raise_runtime_errors = true
diff --git a/2-cloud-datastore/config/environments/production.rb b/2-cloud-datastore/config/environments/production.rb
@@ -35,7 +35,7 @@
 
   # Serve static files from the `/public` folder by default.
   # Consider using a CDN for better performance
-  config.public_file_server.enabled = true
+  config.serve_static_files = true
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
diff --git a/2-cloud-datastore/config/environments/test.rb b/2-cloud-datastore/config/environments/test.rb
@@ -26,8 +26,8 @@
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.public_file_server.enabled = true
-  config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
+  config.serve_static_files = true
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
