From b6e4305c3bca4c673996d0af9db0f4cfbf50215e Mon Sep 17 00:00:00 2001
From: Yoshiyuki Hirano <yhirano@me.com>
Date: Tue, 6 Nov 2018 23:20:56 +0900
Subject: Add JSON support to rails properties route
 (`/rails/info/properties`).

Added json format, like this:

    {
      "Rails version": "6.0.0.alpha",
      "Ruby version": "2.5.1-p57 (x86_64-darwin17)",
      "RubyGems version": "2.7.6",
      "Rack version": "2.0.6",
      "JavaScript Runtime": "Node.js (V8)",
      "Middleware": ["Rack::Sendfile", "ActionDispatch::Static", "ActionDispatch::Executor", "ActiveSupport::Cache::Strategy::LocalCache::Middleware", "Rack::Runtime", "Rack::MethodOverride", "ActionDispatch::RequestId", "ActionDispatch::RemoteIp", "Sprockets::Rails::QuietAssets", "Rails::Rack::Logger", "ActionDispatch::ShowExceptions", "WebConsole::Middleware", "ActionDispatch::DebugExceptions", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", "ActiveRecord::Migration::CheckPending", "ActionDispatch::Cookies", "ActionDispatch::Session::CookieStore", "ActionDispatch::Flash", "ActionDispatch::ContentSecurityPolicy::Middleware", "Rack::Head", "Rack::ConditionalGet", "Rack::ETag", "Rack::TempfileReaper"],
      "Application root": "/path/to/app",
      "Environment": "development",
      "Database adapter": "sqlite3",
      "Database schema version": 0
    }
---
 railties/CHANGELOG.md                       |  6 ++++++
 railties/lib/rails/info.rb                  |  4 ++++
 railties/lib/rails/info_controller.rb       | 12 ++++++++++--
 railties/test/rails_info_controller_test.rb |  5 +++++
 railties/test/rails_info_test.rb            | 12 ++++++++++++
 5 files changed, 37 insertions(+), 2 deletions(-)

(limited to 'railties')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f94b67a0ac..65dccbb3be 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Add JSON support to rails properties route (`/rails/info/properties`).
+
+    Now, `Rails::Info` properties may be accessed in JSON format at `/rails/info/properties.json`.
+
+    *Yoshiyuki Hirano*
+
 *   Use Ids instead of memory addresses when displaying references in scaffold views.
 
     Fixes #29200.
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index 3df36efc4c..b8173c8d11 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -54,6 +54,10 @@ module Rails
           table << "</table>"
         end
       end
+
+      def to_json
+        Hash[properties].to_json
+      end
     end
 
     # The Rails version.
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index b4f4a5922a..50fe176946 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -14,8 +14,16 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
   end
 
   def properties
-    @info = Rails::Info.to_html
-    @page_title = "Properties"
+    respond_to do |format|
+      format.html do
+        @info = Rails::Info.to_html
+        @page_title = "Properties"
+      end
+
+      format.json do
+        render json: Rails::Info.to_json
+      end
+    end
   end
 
   def routes
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 878a238f8d..6ab68f8333 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -50,6 +50,11 @@ class InfoControllerTest < ActionController::TestCase
     assert_select "table"
   end
 
+  test "info controller renders json with properties" do
+    get :properties, format: :json
+    assert_equal Rails::Info.to_json, response.body
+  end
+
   test "info controller renders with routes" do
     get :routes
     assert_response :success
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 50522c1be6..d167a86e56 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -43,6 +43,18 @@ class InfoTest < ActiveSupport::TestCase
     end
   end
 
+  def test_json_includes_middleware
+    Rails::Info.module_eval do
+      property "Middleware", ["Rack::Lock", "Rack::Static"]
+    end
+
+    hash = JSON.parse(Rails::Info.to_json)
+    assert_includes hash.keys, "Middleware"
+    properties.value_for("Middleware").each do |value|
+      assert_includes hash["Middleware"], value
+    end
+  end
+
   private
     def properties
       Rails::Info.properties
-- 
cgit v1.2.3