diff --git a/models/stat.rb b/models/stat.rb index 71b80831..687997ee 100644 --- a/models/stat.rb +++ b/models/stat.rb @@ -85,6 +85,7 @@ class Stat < Sequel::Model stat.id ].first +=begin site_log[:referrers].each do |referrer, views| stat_referrer = StatReferrer.create_or_get site_log[:id], referrer DB['update stat_referrers set views=views+? where site_id=?', views, site_log[:id]].first @@ -101,6 +102,7 @@ class Stat < Sequel::Model next if site_path.nil? DB['update stat_paths set views=views+? where id=?', views, site_path.id].first end +=end end end diff --git a/tests/stat_tests.rb b/tests/stat_tests.rb index 49450fc1..4216d39e 100644 --- a/tests/stat_tests.rb +++ b/tests/stat_tests.rb @@ -36,8 +36,8 @@ describe 'stats' do Stat.parse_logfiles STAT_LOGS_PATH @site.stats.first.bandwidth.must_equal 612917*2 - @site.stat_referrers.first.url.must_equal 'http://derp.com' - @site.stat_locations.first.city_name.must_equal 'Menlo Park' + #@site.stat_referrers.first.url.must_equal 'http://derp.com' + #@site.stat_locations.first.city_name.must_equal 'Menlo Park' end it 'deals with spaces in referrer' do @@ -112,23 +112,24 @@ describe 'stats' do stat.hits.must_equal 4 stat.views.must_equal 2 stat.bandwidth.must_equal 20_000 - @site_one.stat_referrers.count.must_equal 1 - stat_referrer = @site_one.stat_referrers.first - stat_referrer.url.must_equal 'http://example.com' - stat_referrer.created_at.must_equal @time.to_date - stat_referrer.views.must_equal 2 - @site_one.stat_paths.length.must_equal 1 - stat_path = @site_one.stat_paths.first - stat_path.name.must_equal '/' - stat_path.views.must_equal 4 + #@site_one.stat_referrers.count.must_equal 1 + #stat_referrer = @site_one.stat_referrers.first + #stat_referrer.url.must_equal 'http://example.com' + #stat_referrer.created_at.must_equal @time.to_date + #stat_referrer.views.must_equal 2 - @site_one.stat_locations.length.must_equal 2 - stat_location = @site_one.stat_locations.first - stat_location.country_code2.must_equal 'US' - stat_location.region_name.must_equal 'CA' - stat_location.city_name.must_equal 'Menlo Park' - stat_location.views.must_equal 1 + #@site_one.stat_paths.length.must_equal 1 + #stat_path = @site_one.stat_paths.first + #stat_path.name.must_equal '/' + #stat_path.views.must_equal 4 + + #@site_one.stat_locations.length.must_equal 2 + #stat_location = @site_one.stat_locations.first + #stat_location.country_code2.must_equal 'US' + #stat_location.region_name.must_equal 'CA' + #stat_location.city_name.must_equal 'Menlo Park' + #stat_location.views.must_equal 1 @site_two.reload @site_two.hits.must_equal 3 @@ -137,15 +138,15 @@ describe 'stats' do stat.hits.must_equal 3 stat.views.must_equal 3 stat.bandwidth.must_equal 15_000 - @site_two.stat_referrers.count.must_equal 2 - stat_referrer = @site_two.stat_referrers.first - stat_referrer.url.must_equal 'http://example.com' - stat_referrer.views.must_equal 2 + #@site_two.stat_referrers.count.must_equal 2 + #stat_referrer = @site_two.stat_referrers.first + #stat_referrer.url.must_equal 'http://example.com' + #stat_referrer.views.must_equal 2 - stat_paths = @site_two.stat_paths - stat_paths.length.must_equal 2 - stat_paths.first.name.must_equal '/' - stat_paths.last.name.must_equal '/derp.html' + #stat_paths = @site_two.stat_paths + #stat_paths.length.must_equal 2 + #stat_paths.first.name.must_equal '/' + #stat_paths.last.name.must_equal '/derp.html' # [geoip.city('67.180.75.140'), geoip.city('172.56.16.152')] end diff --git a/views/site/stats.erb b/views/site/stats.erb index c907cdd4..9247efe9 100644 --- a/views/site/stats.erb +++ b/views/site/stats.erb @@ -18,8 +18,10 @@