mitamirri 0.13.8 → 2.0.8

data/spec/{lib/session_report_spec.rb → models/traffic_explorer_report_spec.rb}

@@ -1,28 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'mitamirri'
 
-describe "SessionReport" do
+describe "TrafficExplorerReport" do
 
-  before :all do
+  before :each do
     @args = {
       :site => 'www.foo.com',
       :time_period => 'past 3 months',
       :action_kind => 'clickthrough',
       :visit_kind => 'search'
     }
-    TrackableSession.stubs(:search).returns([])
-    @report = Mitamirri::SessionReport.new(@args)
+    @report = TrafficExplorerReport.new(@args)
     @report.stubs(:total_bounces).returns(5)
     @report.stubs(:total_clickthroughs).returns(10)
     @report.stubs(:total_conversions).returns(20)
-    @report.stubs(:total_direct_visits).returns(10)
     @report.stubs(:total_duration).returns(18000.0)
     @report.stubs(:total_new_visits).returns(20)
-    @report.stubs(:total_organic_visits).returns(30)
     @report.stubs(:total_pageviews).returns(100)
-    @report.stubs(:total_ppc_visits).returns(10)
     @report.stubs(:total_return_visits).returns(90)
-    @report.stubs(:total_search_visits).returns(30)
     @report.stubs(:total_visits).returns(100)
     @report.stubs(:total_conversions).returns(20)
   end
@@ -58,10 +53,6 @@ describe "SessionReport" do
     @report.conversion_rate.should == "20.0%"
   end
   
-  it 'calculates the total direct visits percentage' do
-    @report.total_direct_visits_percentage.should == "10.0%"
-  end
-  
   it 'calculates the total new visits percentage' do
     @report.total_new_visits_percentage.should == "20.0%"
   end
@@ -70,38 +61,30 @@ describe "SessionReport" do
     @report.total_return_visits_percentage.should == "90.0%"
   end
   
-  it 'calculates the total organic visits percentage' do
-    @report.total_organic_visits_percentage.should == "30.0%"
-  end
-  
-  it 'calculates the total ppc visits percentage' do
-    @report.total_ppc_visits_percentage.should == "10.0%"
-  end
-  
   it 'creates a KeywordStat object from arguments' do
-    _stat = Mitamirri::SessionReport::KeywordStat.new(:keyword => 'foo', :count => 3)
+    _stat = KeywordStat.new(:keyword => 'foo', :count => 3)
     _stat.count.should == 3
     _stat.keyword.should == 'foo'
   end
   
   it 'creates a ReferrerStat object from arguments' do
-    _stat = Mitamirri::SessionReport::ReferrerStat.new(:referrer => 'www.foo.com', :count => 3)
+    _stat = ReferrerStat.new(:referrer => 'www.foo.com', :count => 3)
     _stat.count.should == 3
     _stat.referrer.should == 'www.foo.com'
   end
   
   it 'creates a Visit object from arguments' do
-    _visit = Mitamirri::SessionReport::Visit.new(:kind => 'search', :date => Time.zone.now.to_s(:concise), :stats => [])
+    _visit = Visit.new(:kind => 'search', :date => Time.zone.now.to_s(:concise), :stats => [])
     _visit.kind.should == "search"
     _visit.date.should == Time.zone.now.to_s(:concise)
     _visit.stats.should == []
   end
   
   it 'creates a VisitStat object from arguments' do
-    _stat = Mitamirri::SessionReport::VisitStat.new(:date => Time.zone.now, :visits => 3)
+    _stat = VisitStat.new(:date => Time.zone.now, :visits => 3)
     _stat.visits.should == 3
     _stat.date.to_s(:concise).should == Time.zone.now.to_s(:concise)
-    _stat.short_date.should == Time.zone.now.to_s(:month_year)
+    _stat.short_date.should == Time.zone.now.to_s(:concise)
   end
   
 end

data/spec/spec_helper.rb

@@ -1,32 +1,12 @@
-require File.dirname(__FILE__) + "/custom_matchers"  
-
-
 ENV["RAILS_ENV"] ||= 'test'
-require "config/environment" unless defined?(RAILS_ROOT)
-require 'spec/rails'
-
-pwd = File.dirname(__FILE__)
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{pwd}/support/**/*.rb"].each {|f| require f}
-
-Spec::Runner.configure do |config|
-  config.include(CustomMatcher)  
-end
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require File.expand_path(File.dirname(__FILE__) + "/blueprints")
 
-# Helper methods
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-Spec::Matchers.define :equal_the_set do |_array_2|
-  match do |_array_1|
-    (_array_1 - _array_2).size == 0
-  end
-  failure_message_for_should do |_array_1|
-    "expected the sets to be the same (differences: #{(_array_1 - _array_2).inspect})"
-  end
-  failure_message_for_should_not do |_array_1|
-    "expected the sets to be different"
-  end
-  description do 
-    "expected a two arrays to contain the same elements in any order"
-  end
+RSpec.configure do |config|
+  config.mock_with :mocha
 end

data/{lib/mitamirri/tasks.rb → tasks/mitamirri.rake}

@@ -1,12 +1,11 @@
-# require 'mitamirri/tasks' to add tasks to the host application.
-
 namespace :mitamirri do
 
-  desc "Sync migrations and other files from Mitamirri."
+  desc "Sync files from Mitamirri."
   task :install do
     dir = Gem.searcher.find('mitamirri').full_gem_path 
-    system "rsync -ruv #{dir}/public/stylesheets public/"
-    system "rsync -ruv #{dir}/config/initializers/database.rb config/initializers/"
+    system "rsync -ruv #{dir}/public/stylesheets/mitamirri.css public/stylesheets/"
+    system "rsync -ruv #{dir}/public/stylesheets/mitamirri_print.css public/stylesheets/"
+    system "rsync -ruv #{dir}/public/images/menu_icons public/images"
     puts
     puts "Mitamarri file sync complete."
     puts "Run rake mitamirri:override to install local views and controllers to override default behaviour."
@@ -17,8 +16,8 @@ namespace :mitamirri do
   task :override do
     dir = Gem.searcher.find('mitamirri').full_gem_path 
     system "rsync -ruv #{dir}/app/controllers/trackable_actions_controller.rb app/controllers/"
-    system "rsync -ruv #{dir}/app/controllers/trackable_sessions_controller.rb app/controllers/"
-    system "rsync -ruv #{dir}/app/views/trackable_sessions app/views/"
+    system "rsync -ruv #{dir}/app/controllers/admin app/controllers/"
+    system "rsync -ruv #{dir}/app/views/admin/tracking app/views/admin/"
     puts
     puts "Mitamarri views and controllers copied and ready to override."
     puts

metadata

@@ -1,26 +1,166 @@
 --- !ruby/object:Gem::Specification 
 name: mitamirri
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
+  - 2
   - 0
-  - 13
   - 8
-  version: 0.13.8
+  version: 2.0.8
 platform: ruby
 authors: 
-- Corey Ehmke
+- Bantik
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
-description: View and action tracking for Rails 2.x.
-email: corey@seologic.com
+date: 2011-07-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bantik-user-agent
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: geokit
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: pdfkit
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: scaffold_logic
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: seer
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: SystemTimer
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+description: Mitamirri is a Rails engine designed to be a drop-in substitute for (or companion to) Google Analytics that enables standard analytics tracking in addition to tracking of custom client-side events.
+email: rod@seologic.com
 executables: []
 
 extensions: []
@@ -29,101 +169,200 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- Capfile
+- Gemfile
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/admin/tracking/reports_controller.rb
+- app/controllers/admin/tracking/trackable_sessions_controller.rb
 - app/controllers/application_controller.rb
 - app/controllers/trackable_actions_controller.rb
-- app/controllers/trackable_sessions_controller.rb
 - app/helpers/application_helper.rb
+- app/helpers/layout_helper.rb
+- app/models/content_report.rb
+- app/models/content_stat.rb
+- app/models/destination.rb
+- app/models/intersite_traffic_report.rb
+- app/models/keyword_stat.rb
+- app/models/lead.rb
+- app/models/lead_stat.rb
+- app/models/leads_report.rb
+- app/models/location_stat.rb
+- app/models/referrer_stat.rb
+- app/models/report.rb
+- app/models/stat_base.rb
 - app/models/trackable_action.rb
+- app/models/trackable_base.rb
 - app/models/trackable_location.rb
 - app/models/trackable_session.rb
 - app/models/trackable_stat.rb
+- app/models/traffic_explorer_report.rb
+- app/models/traffic_summary_report.rb
+- app/models/user_agent_stat.rb
+- app/models/visit.rb
+- app/models/visit_stat.rb
+- app/models/visitor.rb
+- app/models/visitor_profile_report.rb
+- app/views/admin/tracking/reports/_content.html.erb
+- app/views/admin/tracking/reports/_conversion_rate.html.erb
+- app/views/admin/tracking/reports/_criteria.html.erb
+- app/views/admin/tracking/reports/_entrance_pages.html.erb
+- app/views/admin/tracking/reports/_exit_pages.html.erb
+- app/views/admin/tracking/reports/_explorer_criteria.html.erb
+- app/views/admin/tracking/reports/_explorer_summary.html.erb
+- app/views/admin/tracking/reports/_intersite_destinations.html.erb
+- app/views/admin/tracking/reports/_intersite_referrals.html.erb
+- app/views/admin/tracking/reports/_leads.html.erb
+- app/views/admin/tracking/reports/_locations.html.erb
+- app/views/admin/tracking/reports/_recent_visits.html.erb
+- app/views/admin/tracking/reports/_referring_keywords.html.erb
+- app/views/admin/tracking/reports/_referring_sites.html.erb
+- app/views/admin/tracking/reports/_traffic_summary.html.erb
+- app/views/admin/tracking/reports/_user_agents.html.erb
+- app/views/admin/tracking/reports/_visits_by_kind.html.erb
+- app/views/admin/tracking/reports/content.html.erb
+- app/views/admin/tracking/reports/explorer.html.erb
+- app/views/admin/tracking/reports/index.html.erb
+- app/views/admin/tracking/reports/intersite.html.erb
+- app/views/admin/tracking/reports/leads.html.erb
+- app/views/admin/tracking/reports/summary.html.erb
+- app/views/admin/tracking/reports/visitor_profile.html.erb
+- app/views/admin/tracking/trackable_sessions/show.html.erb
 - app/views/layouts/application.html.erb
-- app/views/trackable_sessions/_keywords_graph.html.erb
-- app/views/trackable_sessions/_print_buttons.html.erb
-- app/views/trackable_sessions/_sessions.html.erb
-- app/views/trackable_sessions/_top_referrers.html.erb
-- app/views/trackable_sessions/_traffic_summary_all.html.erb
-- app/views/trackable_sessions/_traffic_summary_by_kind.html.erb
-- app/views/trackable_sessions/_visits_graph.html.erb
-- app/views/trackable_sessions/content.html.erb
-- app/views/trackable_sessions/explorer.html.erb
-- app/views/trackable_sessions/export.xls.erb
-- app/views/trackable_sessions/index.html.erb
-- app/views/trackable_sessions/intersite.html.erb
-- app/views/trackable_sessions/leads.html.erb
-- app/views/trackable_sessions/show.html.erb
-- app/views/trackable_sessions/visitor_profile.html.erb
+- config.ru
+- config/application.rb
 - config/boot.rb
-- config/database.yml
+- config/cucumber.yml
+- config/deploy.rb
 - config/environment.rb
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
-- config/initializers/backtrace_silencers.rb
-- config/initializers/database.rb
-- config/initializers/inflections.rb
-- config/initializers/mime_types.rb
-- config/initializers/new_rails_defaults.rb
+- config/initializers/formats.rb
+- config/initializers/metric_fu.rb
+- config/initializers/secret_token.rb
 - config/initializers/session_store.rb
 - config/locales/en.yml
+- config/mongoid.yml
 - config/routes.rb
-- db/development.sqlite3
-- db/migrate/20100810173533_create_trackable_sessions.rb
-- db/migrate/20100810173605_create_trackable_actions.rb
-- db/test.sqlite3
-- doc/README_FOR_APP
+- features/access_reports.feature
+- features/step_definitions/reports_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
+- features/support/paths.rb
+- features/traffic_summary_report.feature
 - init.rb
 - lib/mitamirri.rb
-- lib/mitamirri/content_report.rb
+- lib/mitamirri/engine.rb
 - lib/mitamirri/helper.rb
-- lib/mitamirri/intersite_traffic_report.rb
-- lib/mitamirri/leads_report.rb
-- lib/mitamirri/session_report.rb
-- lib/mitamirri/stat_report.rb
-- lib/mitamirri/tasks.rb
-- lib/mitamirri/visitor_profile_report.rb
-- log/development.log
-- log/production.log
-- log/server.log
-- log/test.log
+- lib/mitamirri/railtie.rb
+- lib/tasks/cucumber.rake
+- lib/tasks/rcov.rake
 - mitamirri.gemspec
+- public/404.html
+- public/422.html
+- public/500.html
+- public/favicon.ico
+- public/images/icons/add.png
+- public/images/icons/collapsed.gif
+- public/images/icons/delete.png
+- public/images/icons/drag.png
+- public/images/icons/edit.png
+- public/images/icons/expanded.gif
+- public/images/icons/help_icon.png
+- public/images/icons/link_icon.png
+- public/images/icons/move.png
+- public/images/icons/move_white.png
+- public/images/icons/note.png
+- public/images/icons/note_white.png
+- public/images/icons/notification_icon_sprite.png
+- public/images/icons/spinner.gif
+- public/images/icons/view.png
+- public/images/icons/warning.png
+- public/images/icons/warning_2.png
+- public/images/icons/warning_box.png
+- public/images/icons/warning_icon.png
+- public/images/icons/warning_white.png
+- public/images/layout/arrow_asc.png
+- public/images/layout/arrow_desc.png
+- public/images/layout/back.png
+- public/images/layout/black_bar.png
+- public/images/layout/branding.png
+- public/images/layout/breadcrumb_bg.png
+- public/images/layout/button_bg.png
+- public/images/layout/content_left_bg.png
+- public/images/layout/content_right_bg.png
+- public/images/layout/footer_bg.png
+- public/images/layout/h1_bg.png
+- public/images/layout/h2_bg.png
+- public/images/layout/h2_bg_for_table.png
+- public/images/layout/header_bg_grey.png
+- public/images/layout/header_bg_purple.png
+- public/images/layout/legend_bg.png
+- public/images/layout/menu_box_bg.png
+- public/images/layout/shadow_border.png
+- public/images/layout/shadow_border_2.png
+- public/images/layout/shadow_border_3.png
+- public/images/layout/shadow_border_4.png
+- public/images/layout/tab.png
+- public/images/layout/tab_active.png
+- public/images/layout/table_header.png
+- public/images/layout/text_field_bg.jpg
+- public/images/layout/text_field_error_bg.png
+- public/images/layout/th_bg.png
+- public/images/layout/th_bg_selected.png
+- public/images/menu_icons/content_report.png
+- public/images/menu_icons/content_report_on.png
+- public/images/menu_icons/funnel.png
+- public/images/menu_icons/funnel_on.png
+- public/images/menu_icons/intersite_traffic.png
+- public/images/menu_icons/intersite_traffic_on.png
+- public/images/menu_icons/leads.png
+- public/images/menu_icons/leads_on.png
+- public/images/menu_icons/traffic_explorer.png
+- public/images/menu_icons/traffic_explorer_on.png
+- public/images/menu_icons/traffic_summary.png
+- public/images/menu_icons/traffic_summary_on.png
+- public/images/menu_icons/visitor_profile.png
+- public/images/menu_icons/visitor_profile_on.png
+- public/index.html
+- public/javascripts/application.js
+- public/javascripts/controls.js
+- public/javascripts/dragdrop.js
+- public/javascripts/effects.js
+- public/javascripts/prototype.js
+- public/javascripts/rails.js
+- public/robots.txt
+- public/stylesheets/.gitkeep
+- public/stylesheets/application.css
+- public/stylesheets/core.css
+- public/stylesheets/core_ie.css
+- public/stylesheets/csshover3.htc
 - public/stylesheets/mitamirri.css
-- script/about
-- script/console
-- script/dbconsole
-- script/destroy
-- script/generate
-- script/performance/benchmarker
-- script/performance/profiler
-- script/plugin
-- script/runner
-- script/server
-- spec/controllers/trackable_actions_controller_spec.rb
-- spec/controllers/trackable_sessions_controller_spec.rb
-- spec/custom_matchers.rb
+- public/stylesheets/mitamirri_print.css
+- script/cucumber
+- script/rails
+- spec/blueprints.rb
 - spec/helpers/application_helper_spec.rb
-- spec/lib/content_report_spec.rb
-- spec/lib/intersite_traffic_report_spec.rb
-- spec/lib/leads_report_spec.rb
-- spec/lib/session_report_spec.rb
-- spec/lib/stat_report_spec.rb
+- spec/models/content_report_spec.rb
+- spec/models/intersite_traffic_report_spec.rb
+- spec/models/leads_report_spec.rb
+- spec/models/location_stat_spec.rb
 - spec/models/trackable_action_spec.rb
+- spec/models/trackable_base_spec.rb
 - spec/models/trackable_session_spec.rb
-- spec/rcov.opts
-- spec/schema.rb
-- spec/spec.opts
+- spec/models/traffic_explorer_report_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/Bantik/mitamarri
+- tasks/mitamirri.rake
+- vendor/plugins/.gitkeep
+homepage: http://github.com/ivanoblomov/mitamirri
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -147,9 +386,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: View and action tracking for Rails 2.x.
+summary: Analytics for Rails 3 applications.
 test_files: []