analytical 3.0.8 → 3.0.9

data/lib/analytical/api.rb

@@ -73,11 +73,11 @@ module Analytical
       ]
 
       if options[:javascript_helpers]
-        if ::Rails::VERSION::MAJOR >= 3 && ::Rails::VERSION::MINOR >= 1  # Rails 3.1 lets us override views in engines
+        if ::Rails::VERSION =~ /^3\.1/  # Rails 3.1 lets us override views in engines
           js << options[:controller].send(:render_to_string, :partial=>'analytical_javascript') if options[:controller]
         else # All other rails
           _partial_path = Pathname.new(__FILE__).dirname.join('..', '..', 'app/views/application', '_analytical_javascript.html.erb').to_s
-          js << options[:controller].send(:render_to_string, :partial=>_partial_path) if options[:controller]
+          js << options[:controller].send(:render_to_string, :file=>_partial_path, :layout=>false) if options[:controller]
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytical
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 0
-  - 8
-  version: 3.0.8
+  - 9
+  version: 3.0.9
 platform: ruby
 authors: 
 - Joshua Krall
@@ -22,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -05:00
+date: 2011-10-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -243,69 +243,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .rspec
-- .rvmrc
-- Gemfile
-- Gemfile.lock
-- Guardfile
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- analytical.gemspec
 - app/views/application/_analytical_javascript.html.erb
-- example/.gitignore
-- example/Gemfile
-- example/Gemfile.lock
-- example/README
-- example/Rakefile
-- example/app/controllers/application_controller.rb
-- example/app/controllers/page_controller.rb
-- example/app/helpers/application_helper.rb
-- example/app/helpers/page_helper.rb
-- example/app/views/layouts/application.html.erb
-- example/app/views/page/index.html.erb
-- example/app/views/page/test_a.html.erb
-- example/app/views/page/test_b.html.erb
-- example/config.ru
-- example/config/analytical.yml
-- example/config/application.rb
-- example/config/boot.rb
-- example/config/database.yml
-- example/config/environment.rb
-- example/config/environments/development.rb
-- example/config/environments/production.rb
-- example/config/environments/test.rb
-- example/config/initializers/backtrace_silencers.rb
-- example/config/initializers/inflections.rb
-- example/config/initializers/mime_types.rb
-- example/config/initializers/secret_token.rb
-- example/config/initializers/session_store.rb
-- example/config/locales/en.yml
-- example/config/routes.rb
-- example/db/seeds.rb
-- example/doc/README_FOR_APP
-- example/lib/tasks/.gitkeep
-- example/public/404.html
-- example/public/422.html
-- example/public/500.html
-- example/public/favicon.ico
-- example/public/images/rails.png
-- example/public/javascripts/application.js
-- example/public/javascripts/controls.js
-- example/public/javascripts/dragdrop.js
-- example/public/javascripts/effects.js
-- example/public/javascripts/prototype.js
-- example/public/javascripts/rails.js
-- example/public/robots.txt
-- example/public/stylesheets/.gitkeep
-- example/script/rails
-- example/test/functional/page_controller_test.rb
-- example/test/performance/browsing_test.rb
-- example/test/test_helper.rb
-- example/test/unit/helpers/page_helper_test.rb
-- example/vendor/plugins/.gitkeep
 - lib/analytical.rb
 - lib/analytical/api.rb
 - lib/analytical/bot_detector.rb
@@ -333,26 +271,8 @@ files:
 - lib/analytical/rails/engine.rb
 - lib/analytical/session_command_store.rb
 - rails/init.rb
-- spec/analytical/api_spec.rb
-- spec/analytical/bot_detector_spec.rb
-- spec/analytical/command_store_spec.rb
-- spec/analytical/modules/adroll_spec.rb
-- spec/analytical/modules/adwords_spec.rb
-- spec/analytical/modules/base_spec.rb
-- spec/analytical/modules/chartbeat_spec.rb
-- spec/analytical/modules/clicky_spec.rb
-- spec/analytical/modules/comscore_spec.rb
-- spec/analytical/modules/google_spec.rb
-- spec/analytical/modules/kiss_metrics_spec.rb
-- spec/analytical/modules/mixpanel_spec.rb
-- spec/analytical/modules/optimizely_spec.rb
-- spec/analytical/modules/quantcast.rb
-- spec/analytical/modules/reinvigorate_spec.rb
-- spec/analytical/session_command_store_spec.rb
-- spec/analytical_spec.rb
-- spec/config/analytical.yml
-- spec/spec.opts
-- spec/spec_helper.rb
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/jkrall/analytical
 licenses: []

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.rspec

@@ -1,2 +0,0 @@
---colour
-

data/.rvmrc

@@ -1,8 +0,0 @@
-export RUBYOPT="rubygems"
-export RUBYLIB="."
-rvm ruby-1.8.7-p174@analytical
-
-# Install bundler if it doesn't already exist
-# if ! command -v bundle > /dev/null ; then
-#  gem install bundler
-# fi

data/Gemfile

@@ -1,18 +0,0 @@
-source :rubygems
-
-group :development, :test do
-  gem 'rails', '3.0.9'
-  gem 'activesupport'
-  gem 'activemodel'
-  gem 'rspec', '2.6.0'
-  gem 'rspec-core', '2.6.4'
-  gem 'rspec-expectations', '2.6.0'
-  gem 'rspec-mocks', '2.6.0'
-  gem 'rspec-rails', '2.6.0'
-  gem 'jeweler'
-  gem 'diff-lcs'
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'rb-fsevent'
-  gem 'growl'
-end

data/Gemfile.lock

@@ -1,118 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
-    configuration (1.2.0)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    growl (1.0.3)
-    guard (0.3.0)
-      open_gem (~> 1.4.2)
-      thor (~> 0.14.6)
-    guard-rspec (0.2.0)
-      guard (>= 0.2.2)
-    i18n (0.5.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    open_gem (1.4.2)
-      launchy (~> 0.3.5)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
-      bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rb-fsevent (0.4.0)
-    rdoc (3.6.1)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel
-  activesupport
-  diff-lcs
-  growl
-  guard
-  guard-rspec
-  jeweler
-  rails (= 3.0.9)
-  rb-fsevent
-  rspec (= 2.6.0)
-  rspec-core (= 2.6.4)
-  rspec-expectations (= 2.6.0)
-  rspec-mocks (= 2.6.0)
-  rspec-rails (= 2.6.0)

data/Guardfile

@@ -1,8 +0,0 @@
-# A sample Guardfile
-# More info at http://github.com/guard/guard#readme
-
-guard 'rspec', :version => 1 do
-  watch(/^spec\/(.*)_spec.rb/)
-  watch(/^spec\/spec_helper.rb/)                        { "spec" }
-  watch(/^lib\/(.*)\.rb/)                               { |m| "spec/lib/#{m[1]}_spec.rb" }
-end

data/Rakefile

@@ -1,34 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "analytical"
-    gem.summary = %Q{Gem for managing multiple analytics services in your rails app.}
-    gem.description = %Q{Gem for managing multiple analytics services in your rails app.}
-    gem.email = "josh@feefighters.com"
-    gem.homepage = "http://github.com/jkrall/analytical"
-    gem.authors = ["Joshua Krall", "Nathan Phelps", "Adam Anderson", "Kevin Menard", "Ablyamitov Ablyamit", "Kurt Werle", "Olivier Lauzon", "Daniel Doubrovkine"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-RSpec::Core::RakeTask.new(:rcov)
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "analytical #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-3.0.8

data/analytical.gemspec

@@ -1,187 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{analytical}
-  s.version = "3.0.8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joshua Krall", "Nathan Phelps", "Adam Anderson", "Kevin Menard", "Ablyamitov Ablyamit", "Kurt Werle", "Olivier Lauzon", "Daniel Doubrovkine"]
-  s.date = %q{2011-09-27}
-  s.description = %q{Gem for managing multiple analytics services in your rails app.}
-  s.email = %q{josh@feefighters.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "Guardfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "analytical.gemspec",
-    "app/views/application/_analytical_javascript.html.erb",
-    "example/.gitignore",
-    "example/Gemfile",
-    "example/Gemfile.lock",
-    "example/README",
-    "example/Rakefile",
-    "example/app/controllers/application_controller.rb",
-    "example/app/controllers/page_controller.rb",
-    "example/app/helpers/application_helper.rb",
-    "example/app/helpers/page_helper.rb",
-    "example/app/views/layouts/application.html.erb",
-    "example/app/views/page/index.html.erb",
-    "example/app/views/page/test_a.html.erb",
-    "example/app/views/page/test_b.html.erb",
-    "example/config.ru",
-    "example/config/analytical.yml",
-    "example/config/application.rb",
-    "example/config/boot.rb",
-    "example/config/database.yml",
-    "example/config/environment.rb",
-    "example/config/environments/development.rb",
-    "example/config/environments/production.rb",
-    "example/config/environments/test.rb",
-    "example/config/initializers/backtrace_silencers.rb",
-    "example/config/initializers/inflections.rb",
-    "example/config/initializers/mime_types.rb",
-    "example/config/initializers/secret_token.rb",
-    "example/config/initializers/session_store.rb",
-    "example/config/locales/en.yml",
-    "example/config/routes.rb",
-    "example/db/seeds.rb",
-    "example/doc/README_FOR_APP",
-    "example/lib/tasks/.gitkeep",
-    "example/public/404.html",
-    "example/public/422.html",
-    "example/public/500.html",
-    "example/public/favicon.ico",
-    "example/public/images/rails.png",
-    "example/public/javascripts/application.js",
-    "example/public/javascripts/controls.js",
-    "example/public/javascripts/dragdrop.js",
-    "example/public/javascripts/effects.js",
-    "example/public/javascripts/prototype.js",
-    "example/public/javascripts/rails.js",
-    "example/public/robots.txt",
-    "example/public/stylesheets/.gitkeep",
-    "example/script/rails",
-    "example/test/functional/page_controller_test.rb",
-    "example/test/performance/browsing_test.rb",
-    "example/test/test_helper.rb",
-    "example/test/unit/helpers/page_helper_test.rb",
-    "example/vendor/plugins/.gitkeep",
-    "lib/analytical.rb",
-    "lib/analytical/api.rb",
-    "lib/analytical/bot_detector.rb",
-    "lib/analytical/command_store.rb",
-    "lib/analytical/modules/adroll.rb",
-    "lib/analytical/modules/adwords.rb",
-    "lib/analytical/modules/base.rb",
-    "lib/analytical/modules/chartbeat.rb",
-    "lib/analytical/modules/click_tale.rb",
-    "lib/analytical/modules/clicky.rb",
-    "lib/analytical/modules/comscore.rb",
-    "lib/analytical/modules/console.rb",
-    "lib/analytical/modules/crazy_egg.rb",
-    "lib/analytical/modules/google.rb",
-    "lib/analytical/modules/google_optimizer.rb",
-    "lib/analytical/modules/hubspot.rb",
-    "lib/analytical/modules/kiss_metrics.rb",
-    "lib/analytical/modules/loopfuse.rb",
-    "lib/analytical/modules/microsoft_ads.rb",
-    "lib/analytical/modules/mixpanel.rb",
-    "lib/analytical/modules/optimizely.rb",
-    "lib/analytical/modules/performancing.rb",
-    "lib/analytical/modules/quantcast.rb",
-    "lib/analytical/modules/reinvigorate.rb",
-    "lib/analytical/rails/engine.rb",
-    "lib/analytical/session_command_store.rb",
-    "rails/init.rb",
-    "spec/analytical/api_spec.rb",
-    "spec/analytical/bot_detector_spec.rb",
-    "spec/analytical/command_store_spec.rb",
-    "spec/analytical/modules/adroll_spec.rb",
-    "spec/analytical/modules/adwords_spec.rb",
-    "spec/analytical/modules/base_spec.rb",
-    "spec/analytical/modules/chartbeat_spec.rb",
-    "spec/analytical/modules/clicky_spec.rb",
-    "spec/analytical/modules/comscore_spec.rb",
-    "spec/analytical/modules/google_spec.rb",
-    "spec/analytical/modules/kiss_metrics_spec.rb",
-    "spec/analytical/modules/mixpanel_spec.rb",
-    "spec/analytical/modules/optimizely_spec.rb",
-    "spec/analytical/modules/quantcast.rb",
-    "spec/analytical/modules/reinvigorate_spec.rb",
-    "spec/analytical/session_command_store_spec.rb",
-    "spec/analytical_spec.rb",
-    "spec/config/analytical.yml",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/jkrall/analytical}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Gem for managing multiple analytics services in your rails app.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rails>, ["= 3.0.9"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<activemodel>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["= 2.6.0"])
-      s.add_development_dependency(%q<rspec-core>, ["= 2.6.4"])
-      s.add_development_dependency(%q<rspec-expectations>, ["= 2.6.0"])
-      s.add_development_dependency(%q<rspec-mocks>, ["= 2.6.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["= 2.6.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_development_dependency(%q<guard>, [">= 0"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
-      s.add_development_dependency(%q<growl>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, ["= 3.0.9"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<activemodel>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["= 2.6.0"])
-      s.add_dependency(%q<rspec-core>, ["= 2.6.4"])
-      s.add_dependency(%q<rspec-expectations>, ["= 2.6.0"])
-      s.add_dependency(%q<rspec-mocks>, ["= 2.6.0"])
-      s.add_dependency(%q<rspec-rails>, ["= 2.6.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<guard>, [">= 0"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<rb-fsevent>, [">= 0"])
-      s.add_dependency(%q<growl>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, ["= 3.0.9"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<activemodel>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["= 2.6.0"])
-    s.add_dependency(%q<rspec-core>, ["= 2.6.4"])
-    s.add_dependency(%q<rspec-expectations>, ["= 2.6.0"])
-    s.add_dependency(%q<rspec-mocks>, ["= 2.6.0"])
-    s.add_dependency(%q<rspec-rails>, ["= 2.6.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<guard>, [">= 0"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<rb-fsevent>, [">= 0"])
-    s.add_dependency(%q<growl>, [">= 0"])
-  end
-end
-