Moved services to a JSON list.

Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.

app/presenters/statistics_presenter.rb

@@ -4,7 +4,8 @@ class StatisticsPresenter
     result = {
       'name' => AppConfig.settings.pod_name,
       'version' => AppConfig.version_string,
-      'registrations_open' => AppConfig.settings.enable_registrations
+      'registrations_open' => AppConfig.settings.enable_registrations,
+      'services' => []
     }
     if AppConfig.privacy.statistics.user_counts?
       result['total_users'] = User.count
@@ -17,8 +18,11 @@ class StatisticsPresenter
     if AppConfig.privacy.statistics.comment_counts?
       result['local_comments'] = self.local_comments
     end
-    Configuration::KNOWN_SERVICES.each do |service, options|
-      result[service.to_s] = AppConfig["services.#{service}.enable"]
+    result["services"] = Configuration::KNOWN_SERVICES.select {|service| AppConfig["services.#{service}.enable"]}.map(&:to_s)
+    if AppConfig.privacy.statistics.deprecated_format?
+      Configuration::KNOWN_SERVICES.each do |service, options|
+        result[service.to_s] = AppConfig["services.#{service}.enable"]
+      end
     end
 
     result

config/defaults.yml

@@ -53,6 +53,7 @@ defaults:
       user_counts: false
       post_counts: false
       comment_counts: false
+      deprecated_format: true
   settings:
     pod_name: 'diaspora*'
     enable_registrations: true

config/diaspora.yml.example

@@ -210,6 +210,9 @@ configuration: ## Section
       #post_counts: true
       #comment_counts: true
 
+      ## Also show old services block (enabled by default)
+      #deprecated_format: false
+  
   ## General settings
   settings: ## Section
   

spec/presenters/statistics_presenter_spec.rb

@@ -17,6 +17,7 @@ describe StatisticsPresenter do
       AppConfig.privacy.statistics.user_counts = false
       AppConfig.privacy.statistics.post_counts = false
       AppConfig.privacy.statistics.comment_counts = false
+      AppConfig.privacy.statistics.deprecated_format = false
     end
 
     it 'provides generic pod data in json' do
@@ -24,10 +25,7 @@ describe StatisticsPresenter do
         "name" => AppConfig.settings.pod_name,
         "version" => AppConfig.version_string,
         "registrations_open" => AppConfig.settings.enable_registrations,
-        "facebook" => true,
-        "twitter" => false,
-        "tumblr" => false,
-        "wordpress" => false,
+        "services"=> ["facebook",]
       })
     end
 
@@ -36,6 +34,7 @@ describe StatisticsPresenter do
         AppConfig.privacy.statistics.user_counts = true
         AppConfig.privacy.statistics.post_counts = true
         AppConfig.privacy.statistics.comment_counts = true
+        AppConfig.privacy.statistics.deprecated_format = true
         AppConfig.services = {
           "facebook" => {"enable" => true},
           "twitter" => {"enable" => true},
@@ -54,6 +53,7 @@ describe StatisticsPresenter do
           "active_users_monthly" => User.monthly_actives.count,
           "local_posts" => @presenter.local_posts,
           "local_comments" => @presenter.local_comments,
+          "services" => ["twitter","facebook"],
           "facebook" => true,
           "twitter" => true,
           "tumblr" => false,