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

Service have been added to /statistics.json

Browse source 
Services have been added to /statistics.json

tidying up

edits
This commit is contained in:
damzcodes 2014-08-12 17:11:36 +01:00
parent 0127852936
commit de069962b3
2 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/presenters/statistics_presenter.rb
View file

@ -17,9 +17,15 @@ class StatisticsPresenter
if AppConfig.privacy.statistics.comment_counts? if AppConfig.privacy.statistics.comment_counts?
result['local_comments'] = self.local_comments result['local_comments'] = self.local_comments
end end
AppConfig.services.each do |service, options|
result[service] = options ? !!options["enable"] : false
end
result result
end end
def local_posts def local_posts
Post.where(:type => "StatusMessage").joins(:author).where("owner_id IS NOT null").count Post.where(:type => "StatusMessage").joins(:author).where("owner_id IS NOT null").count
end end

50
spec/presenters/statistics_presenter_spec.rb
View file

@ -18,29 +18,45 @@ describe StatisticsPresenter do
AppConfig.privacy.statistics.user_counts = false AppConfig.privacy.statistics.user_counts = false
AppConfig.privacy.statistics.post_counts = false AppConfig.privacy.statistics.post_counts = false
AppConfig.privacy.statistics.comment_counts = false AppConfig.privacy.statistics.comment_counts = false
@presenter.as_json.should == { AppConfig.services = {"facebook" => nil}
"name" => AppConfig.settings.pod_name,
"version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations
}
end
it 'provides generic pod data and counts in json' do
AppConfig.privacy.statistics.user_counts = true
AppConfig.privacy.statistics.post_counts = true
AppConfig.privacy.statistics.comment_counts = true
@presenter.as_json.should == { @presenter.as_json.should == {
"name" => AppConfig.settings.pod_name, "name" => AppConfig.settings.pod_name,
"version" => AppConfig.version_string, "version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations, "registrations_open" => AppConfig.settings.enable_registrations,
"total_users" => User.count, "facebook" => false
"active_users_halfyear" => User.halfyear_actives.count,
"active_users_monthly" => User.monthly_actives.count,
"local_posts" => @presenter.local_posts,
"local_comments" => @presenter.local_comments
} }
end end
context 'when services are enabled' do
before do
AppConfig.privacy.statistics.user_counts = true
AppConfig.privacy.statistics.post_counts = true
AppConfig.privacy.statistics.comment_counts = true
AppConfig.services = {
"facebook" => {"enable" => true},
"twitter" => {"enable" => true},
"wordpress" => {"enable" => false},
"tumblr" => {"enable" => false}
}
end
it 'provides generic pod data and counts in json' do
@presenter.as_json.should == {
"name" => AppConfig.settings.pod_name,
"version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations,
"total_users" => User.count,
"active_users_halfyear" => User.halfyear_actives.count,
"active_users_monthly" => User.monthly_actives.count,
"local_posts" => @presenter.local_posts,
"local_comments" => @presenter.local_comments,
"facebook" => true,
"twitter" => true,
"tumblr" => false,
"wordpress" => false
}
end
end
end end