.gitignore lib/statwhore/connection.rb lib/statwhore/google/feedburner.rb spec/fixtures/analytics_account_find_all.html spec/fixtures/analytics_profile_find_all.html spec/fixtures/dashboard_report_webgroup.xml spec/spec.opts spec/spec_helper.rb spec/statwhore_google_analytics_account_spec.rb spec/statwhore_google_analytics_profile_spec.rb spec/statwhore_google_analytics_spec.rb @@ -1,2 +1,3 @@ +* 0.0.3 - updated to new google api and switched to rspec * 0.0.2 - switched to googlebase for google auth and requests * 0.0.1 - initial relase \ No newline at end of file History.txt @@ -6,19 +6,26 @@ Rakefile config/hoe.rb config/requirements.rb lib/statwhore.rb +lib/statwhore/connection.rb +lib/statwhore/google.rb +lib/statwhore/google/analytics.rb +lib/statwhore/google/analytics/account.rb +lib/statwhore/google/analytics/profile.rb +lib/statwhore/google/feedburner.rb lib/statwhore/version.rb log/debug.log script/destroy script/generate script/txt2html setup.rb +spec/fixtures/analytics_account_find_all.html +spec/fixtures/analytics_profile_find_all.html +spec/fixtures/dashboard_report_webgroup.xml +spec/spec.opts +spec/spec_helper.rb +spec/statwhore_google_analytics_account_spec.rb +spec/statwhore_google_analytics_profile_spec.rb +spec/statwhore_google_analytics_spec.rb tasks/deployment.rake tasks/environment.rake tasks/website.rake -test/test_helper.rb -test/test_statwhore.rb -website/index.html -website/index.txt -website/javascripts/rounded_corners_lite.inc.js -website/stylesheets/screen.css -website/template.rhtml Manifest.txt @@ -11,4 +11,5 @@ require 'active_support' gem 'googlebase', '>= 0.2.0' require 'google/base' -require 'statwhore/google' \ No newline at end of file +require File.dirname(__FILE__) + '/statwhore/google' +require File.dirname(__FILE__) + '/statwhore/connection' \ No newline at end of file lib/statwhore.rb @@ -1 +1,2 @@ -require 'statwhore/google/analytics' \ No newline at end of file +require File.dirname(__FILE__) + '/google/analytics' +require File.dirname(__FILE__) + '/google/feedburner' \ No newline at end of file lib/statwhore/google.rb @@ -1,46 +1,15 @@ -require 'statwhore/google/analytics/account' -require 'statwhore/google/analytics/profile' +require File.dirname(__FILE__) + '/analytics/account' +require File.dirname(__FILE__) + '/analytics/profile' module Statwhore module Google module Analytics - USERAGENT = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.1) Gecko/20060111 Firefox/1.5.0.1' - - FORMAT_PDF = '0' - FORMAT_XML = '1' - FORMAT_CSV = '2' - FORMAT_TABSEPERATED = '3' - - FILTER_DONT_MATCH = '1' - FILTER_MATCH = '2' - - SORT_DESC = '1' - SORT_ASC = '2' - - LANGUAGE_ENGLISH_US = 'en-US' - LANGUAGE_ENGLISH_GB = 'en-GB' - LANGUAGE_GERMAN = 'de-DE' - LANGUAGE_FRENCH = 'fr-FR' - LANGUAGE_ITALIAN = 'it-IT' - LANGUAGE_SPANISH = 'es-ES' - LANGUAGE_DUTCH = 'nl-NL' - LANGUAGE_JAPANESE = 'ja-JP' - LANGUAGE_PORTUGUESE_BRAZIL = 'pt-BR' - LANGUAGE_DANISH = 'da-DK' - LANGUAGE_FINISH = 'fi-FI' - LANGUAGE_NORWEGIAN = 'no-NO' - LANGUAGE_SWEDISH = 'sv-SE' - LANGUAGE_CHINESE_1 = 'zh-TW' - LANGUAGE_CHINESE_2 = 'zh-CN' - LANGUAGE_KOREAN = 'ko-KR' - LANGUAGE_RUSSIAN = 'ru-RU' - - VALID_REPORTS = %w[ - Dashboard - VisitorsOverview - VisitorsMapOverlay - VisitorsNewVsReturning - ].map { |r| r += 'Report' } + FORMAT_PDF = '0' + FORMAT_XML = '1' + FORMAT_CSV = '2' + FORMAT_TAB = '3' + + VALID_REPORTS = %w[ Dashboard ] class InvalidCredentials < Exception; end end lib/statwhore/google/analytics.rb @@ -12,7 +12,7 @@ module Statwhore end def self.find(account_id, profile_id) - find_all(account_id).select { |p| p.profile_id.to_s == profile_id.to_s }.first + find_all(account_id).detect { |p| p.profile_id.to_s == profile_id.to_s } end attr_accessor :account_id, :name, :profile_id @@ -24,50 +24,45 @@ module Statwhore @profile_id = attrs[:profile_id] if attrs.has_key?(:profile_id) end - def summaries(options={}) - doc = Hpricot.XML(get_report(options)) - (doc/:ItemSummary).inject([]) do |sums, is| - sums << OpenStruct.new( - :id => is['id'], - :name => is.at('Message').inner_html, - :value => is.at('SummaryValue').inner_html - ) - sums - end - end - - # start/stop: Ymd format - def get_report(options={}) + def report(options={}) options.reverse_merge!({ - :report => 'DashboardReport', - :format => FORMAT_XML, - :start => Time.now.utc - 7.days, - :stop => Time.now.utc, - :filter => nil, - :filter_mode => FILTER_MATCH, - :sort_column => 2, - :sort_order => SORT_DESC + :report => 'Dashboard', + :from => Time.now.utc - 7.days, + :to => Time.now.utc, + :tab => 0, + :format => FORMAT_XML, + :compute => 'average', + :view => 0 }) - - options[:start] = ensure_datetime_in_google_format(options[:start]) - options[:stop] = ensure_datetime_in_google_format(options[:stop]) + options[:from] = ensure_datetime_in_google_format(options[:from]) + options[:to] = ensure_datetime_in_google_format(options[:to]) params = { - 'id' => profile_id, - 'rpt' => options[:report], - 'fmt' => options[:format], - 'pdr' => "#{options[:start]}-#{options[:stop]}", - 'cmp' => 'average', - 'fd' => options[:filter], - 'ft' => options[:filter_mode], - 'sf' => options[:sort_column], - 'sb' => options[:sort_order] + :pdr => "#{options[:from]}-#{options[:to]}", + :rpt => "#{options[:report]}Report", + :cmp => options[:compute], + :fmt => options[:format], + :view => options[:view], + :tab => options[:tab], + :id => profile_id, } - - qs = params.inject('') { |str, h| str << "#{h[0]}=#{h[1]}&" } - self.class.request("/analytics/reporting/export?#{qs}") + self.class.get("https://google.com/analytics/reporting/export", :query_hash => params) end - + + def pageviews(options={}) + response = report(options.merge({:report => 'Dashboard'})) + doc = Hpricot::XML(response) + pageviews = (doc/:ItemSummary).detect { |summary| summary.at('Message').inner_html == 'Pageviews' } + pageviews && pageviews.at('SummaryValue') ? pageviews.at('SummaryValue').inner_html.gsub(/\D/, '').to_i : 0 + end + + def visits(options={}) + response = report(options.merge({:report => 'Dashboard'})) + doc = Hpricot::XML(response) + pageviews = (doc/:ItemSummary).detect { |summary| summary.at('Message').inner_html == 'Visits' } + pageviews && pageviews.at('SummaryValue') ? pageviews.at('SummaryValue').inner_html.gsub(/\D/, '').to_i : 0 + end + # takes a Date, Time or String def ensure_datetime_in_google_format(time) time.is_a?(Time) || time.is_a?(Date) ? time.strftime('%Y%m%d') : time lib/statwhore/google/analytics/profile.rb @@ -2,7 +2,7 @@ module Statwhore #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 0 - TINY = 2 + TINY = 3 STRING = [MAJOR, MINOR, TINY].join('.') end lib/statwhore/version.rb test/fixtures/html/analytics_home.html test/fixtures/xml/visitors_overview_report.xml test/test_helper.rb test/test_statwhore.rb test/test_statwhore_google_analytics_account.rb test/test_statwhore_google_analytics_profile.rb 3b2b388a58710c1b17b383d2cf0fd50d69cef981 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/statwhore/commit/23919fa1c909044ea76ef90e98a270b903fd6cf5 23919fa1c909044ea76ef90e98a270b903fd6cf5 2008-03-08T09:40:48-08:00 2008-03-08T09:40:48-08:00 switched to rspec, got it working with analytics api changes and added beginnings of feedburner management wrapper 5a7032d5730e0549ee5d3e07ab8891f98b64f40a John Nunemaker nunemaker@gmail.com