@@ -152,13 +152,9 @@ module Rubaidh # :nodoc: @@default_account = nil cattr_accessor :default_account - @@request_accounts = [] - cattr_accessor :request_accounts + @@additional_accounts = [] + cattr_accessor :additional_accounts - def self.add_request_account(account) - @@request_accounts << account - end - # Return true if the Google Analytics system is enabled and configured # correctly for the specified format def self.enabled?(format) @@ -167,7 +163,7 @@ module Rubaidh # :nodoc: end def self.accounts(request) - [ default_account, request.google_analytics_account ].compact + [ default_account, request.google_analytics_account, *additional_accounts ].compact end def self.collect_accounts_code(request, legacy = false) lib/rubaidh/google_analytics.rb @@ -7,6 +7,7 @@ RAILS_ENV = 'test' class TestMixin class MockRequest attr_accessor :format + include Rubaidh::GoogleAnalyticsAccountSupport end class MockResponse attr_accessor :body @@ -137,6 +138,16 @@ class GoogleAnalyticsTest < Test::Unit::TestCase assert_nil(Rubaidh::GoogleAnalytics.override_trackpageview) end + # test additional_accounts + def test_accounts_use_additional_accounts + request = TestMixin.new.request + + account = Rubaidh::GoogleAnalytics.new('another') + Rubaidh::GoogleAnalytics.additional_accounts << account + + assert_equal(true, Rubaidh::GoogleAnalytics.accounts(request).include?(account)) + end + # Test the before_filter method does what we expect by subsituting the body tags and inserting # some google code for us automagically. def test_add_google_analytics_code test/google_analytics_test.rb f3663a12bad3b4ba7e7c96c80ecd3477484775fd Alban Peignier alban.peignier@free.fr http://github.com/albanpeignier/google_analytics/commit/3fc51f5ce977bd74fe1b27eec719e1210414f406 3fc51f5ce977bd74fe1b27eec719e1210414f406 2009-06-09T09:19:03-07:00 2009-06-09T09:19:03-07:00 Add additional accounts support 972c4dd212216ae063c0a1f2259e2c67aafc2d18 Alban Peignier alban.peignier@free.fr