nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove old service keys in statistics.json

Browse source
This commit is contained in:
fla 2015-06-13 11:03:47 +02:00
parent b0de3925aa
commit 7f6609d17b
2 changed files with 4 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/presenters/statistics_presenter.rb
View file

@ -8,8 +8,6 @@ class StatisticsPresenter
base_data.merge(user_counts) base_data.merge(user_counts)
.merge(post_counts) .merge(post_counts)
.merge(comment_counts) .merge(comment_counts)
.merge(all_services)
.merge(legacy_services) # Remove in 0.6
end end
def base_data def base_data
@ -95,28 +93,10 @@ class StatisticsPresenter
.count .count
end end
def all_services_helper
result = {}
Configuration::KNOWN_SERVICES.each {|service, options|
result[service.to_s] = AppConfig.show_service?(service, nil)
}
result
end
def all_services
@all_services ||= all_services_helper
end
def available_services def available_services
Configuration::KNOWN_SERVICES.select {|service| Configuration::KNOWN_SERVICES.select {|service|
AppConfig.show_service?(service, nil) AppConfig.show_service?(service, nil)
}.map(&:to_s) }.map(&:to_s)
end end
def legacy_services
Configuration::KNOWN_SERVICES.each_with_object({}) {|service, result|
result[service.to_s] = AppConfig.show_service?(service, nil)
}
end
end end

24
spec/presenters/statistics_presenter_spec.rb
View file

@ -25,11 +25,7 @@ describe StatisticsPresenter do
"network" => "Diaspora", "network" => "Diaspora",
"version" => AppConfig.version_string, "version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations?, "registrations_open" => AppConfig.settings.enable_registrations?,
"services" => ["facebook"], "services" => ["facebook"]
"facebook" => true,
"tumblr" => false,
"twitter" => false,
"wordpress" => false
) )
end end
@ -55,11 +51,7 @@ describe StatisticsPresenter do
"network" => "Diaspora", "network" => "Diaspora",
"version" => AppConfig.version_string, "version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations?, "registrations_open" => AppConfig.settings.enable_registrations?,
"services" => %w(twitter facebook), "services" => %w(twitter facebook)
"facebook" => true,
"twitter" => true,
"tumblr" => false,
"wordpress" => false
) )
end end
end end
@ -89,11 +81,7 @@ describe StatisticsPresenter do
"network" => "Diaspora", "network" => "Diaspora",
"version" => AppConfig.version_string, "version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations?, "registrations_open" => AppConfig.settings.enable_registrations?,
"services" => ["twitter"], "services" => ["twitter"]
"facebook" => false,
"twitter" => true,
"tumblr" => false,
"wordpress" => false
) )
end end
end end
@ -116,11 +104,7 @@ describe StatisticsPresenter do
"active_users_monthly" => User.monthly_actives.count, "active_users_monthly" => User.monthly_actives.count,
"local_posts" => @presenter.local_posts, "local_posts" => @presenter.local_posts,
"local_comments" => @presenter.local_comments, "local_comments" => @presenter.local_comments,
"services" => ["facebook"], "services" => ["facebook"]
"facebook" => true,
"twitter" => false,
"tumblr" => false,
"wordpress" => false
) )
end end
end end