analytical 2.11.0 → 3.0.6

data/.rspec

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

data/.rvmrc

@@ -0,0 +1,8 @@
+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,12 +1,18 @@
 source :rubygems
 
-group :development do
+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 'rspec', '1.3'
   gem 'diff-lcs'
-  gem 'rails', '~> 2.3'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-fsevent'
   gem 'growl'
-end
+end

data/Gemfile.lock

@@ -1,18 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.11)
-      actionpack (= 2.3.11)
-    actionpack (2.3.11)
-      activesupport (= 2.3.11)
-      rack (~> 1.1.0)
-    activerecord (2.3.11)
-      activesupport (= 2.3.11)
-    activeresource (2.3.11)
-      activesupport (= 2.3.11)
-    activesupport (2.3.11)
+    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)
@@ -20,37 +41,78 @@ GEM
       thor (~> 0.14.6)
     guard-rspec (0.2.0)
       guard (>= 0.2.2)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    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)
-    rack (1.1.2)
-    rails (2.3.11)
-      actionmailer (= 2.3.11)
-      actionpack (= 2.3.11)
-      activerecord (= 2.3.11)
-      activeresource (= 2.3.11)
-      activesupport (= 2.3.11)
-      rake (>= 0.8.3)
-    rake (0.8.7)
+    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)
-    rspec (1.3.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 (~> 2.3)
+  rails (= 3.0.9)
   rb-fsevent
-  rspec (= 1.3)
+  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/README.rdoc

@@ -22,14 +22,21 @@ Service implementations include:
 
 Add the following to your controllers:
 
-    analytical :modules=>[:console, :google, :clicky]
+    analytical
 
 Add a configuration file (config/analytical.yml) to declare your API keys, like so:
 
-   google:
-     key: UA-5555555-5
-   clicky:
-     key: 55555
+   production:
+     google:
+       key: UA-5555555-5
+     clicky:
+       key: 55555
+
+You can add different configurations for different environments. 
+
+By default, all the declared analytics modules are loaded. You can override this behavior in the controller.
+
+    analytical :modules=>[:console, :google, :clicky]
 
 Then, in your template files, you'll want to add the analytical helper methods for initializing the tracking javascript:
 
@@ -60,9 +67,22 @@ You can sprinkle the track() and event() tracking methods throughout your views
     analytical.track '/a/really/nice/url'
     analytical.event 'Some Awesome Event', :with=>:data
 
-By default, Analytical will be disabled in all environments except 'production'... and it will enable the Console module only.  To change this behavior, you can pass a Proc/lambda to the :disable_if option, as well as specify the :development_modules that you want to use:
+It's possible to conditionally disable analytics by specifying a `disable_if` method.
+
+    analytical :disable_if => lambda{ |controller| controller.i_can_haz_tracking? }
+
+Analytical also provides the ability to filter your active modules dynamically:
+
+    analytical :filter_modules => lambda{ |controller, modules|
+      controller.use_google_analytics? ? modules : modules - [:google]
+    }
+
+This can be useful for enabling the console logger optionally in your app, based on a request parameter:
+
+    :filter_modules => lambda { |controller, modules|
+      controller.use_console_logger? ? [:console] : modules
+    }
 
-    analytical :modules=>[:google], :development_modules=>[], :disable_if=>lambda{ |controller| controller.i_can_haz_tracking? }
 
 == Adding new modules
 
@@ -83,6 +103,21 @@ This will store the queued commands in the user session, clearing them out when
 ... in your controller.  After a redirect, the corresponding track() call will be emitted in the next request made by the client.
 NOTE:  This is new and somewhat experimental, and could cause problems if you store large amounts of data in the session.  (there is a 4k limit to session data)
 
+== Javascript tracking/event commands
+
+Sometimes you want to trigger an analytics track/event via javascript.  Analytical now provides a solution for this by default.  Appended to your <head> is a simple javascript object that will contain "instantaneous" versions of the tracking commands for each of your modules.
+
+You call these analytical commands like this:
+
+    <script type="text/javascript">Analytical.track('/some/url');</script>
+    <script type="text/javascript">Analytical.event('A javascript event', {with: 'data'});</script>
+
+When you call these commands, it will pass the track/event name & data on to each of the modules.  (Take a look at the simple javascript helpers in your <head> for more information.)
+
+To disable this functionality, use
+
+    analytical :javascript_helpers => false
+
 
 == Note on Patches/Pull Requests
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     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"]
+    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
@@ -17,17 +17,9 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:rcov)
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-2.11.0
+3.0.6

data/analytical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "2.11.0"
+  s.version = "3.0.6"
 
   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"]
-  s.date = %q{2011-06-30}
+  s.authors = ["Joshua Krall", "Nathan Phelps", "Adam Anderson", "Kevin Menard", "Ablyamitov Ablyamit", "Kurt Werle", "Olivier Lauzon", "Daniel Doubrovkine"]
+  s.date = %q{2011-08-08}
   s.description = %q{Gem for managing multiple analytics services in your rails app.}
   s.email = %q{josh@feefighters.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "Guardfile",
@@ -26,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "analytical.gemspec",
+    "app/views/application/_analytical_javascript.html.erb",
     "example/.gitignore",
     "example/Gemfile",
     "example/Gemfile.lock",
@@ -100,6 +103,8 @@ Gem::Specification.new do |s|
     "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",
@@ -116,6 +121,7 @@ Gem::Specification.new do |s|
     "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",
@@ -124,37 +130,54 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/jkrall/analytical}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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<rspec>, ["= 1.3"])
       s.add_development_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["~> 2.3"])
       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<rspec>, ["= 1.3"])
       s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 2.3"])
       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<rspec>, ["= 1.3"])
     s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 2.3"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])

data/app/views/application/_analytical_javascript.html.erb

@@ -0,0 +1,11 @@
+<script type="text/javascript">
+var Analytical = {
+  track: function(page) {
+<%= raw analytical.now.track('__PAGE__').gsub(/"__PAGE__"/,'page') %>
+  },
+  event: function(name, data) {
+    if (typeof data === 'undefined') { data = {}; }
+<%= raw analytical.now.event('__EVENT__', {}).gsub(/"__EVENT__"/,'name').gsub(/"?\{\}"?/,'data') %>
+  }
+};
+</script>

data/lib/analytical.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__)+'/analytical/rails/engine'
 require File.dirname(__FILE__)+'/analytical/modules/base'
 Dir.glob(File.dirname(__FILE__)+'/analytical/**/*.rb').each do |f|
   require f
@@ -5,53 +6,63 @@ end
 
 module Analytical
 
-  # any method placed here will apply to ActionController::Base
   def analytical(options={})
-    send :include, InstanceMethods
-    send :include, Analytical::BotDetector
-    helper_method :analytical
-    class_inheritable_accessor :analytical_options
-
-    self.analytical_options = options.reverse_merge({
-      :modules=>[],
-      :development_modules=>[:console],
-      :disable_if=>Proc.new { !Rails.env.production? },
-    })
-
-    config_options = {}
-    File.open("#{Rails.root}/config/analytical.yml") do |f|
-      config_options = YAML::load(ERB.new(f.read).result).symbolize_keys
-      config_options.each do |k,v|
-        config_options[k] = v.symbolize_keys
-      end
-    end if File.exists?("#{Rails.root}/config/analytical.yml")
+    self.analytical_options = options
+
+    config_options = { :modules => [] }
+    File.open("#{::Rails.root}/config/analytical.yml") do |f|
+      file_options = YAML::load(ERB.new(f.read).result).symbolize_keys
+      env = (::Rails.env || :production).to_sym
+      file_options = file_options[env] if file_options.has_key?(env)
+      file_options.each do |k, v|
+        config_options[k.to_sym] = v.symbolize_keys
+        config_options[:modules] << k.to_sym unless options && options[:modules]
+      end if file_options
+    end if File.exists?("#{::Rails.root}/config/analytical.yml")
 
     self.analytical_options = self.analytical_options.reverse_merge config_options
   end
 
   module InstanceMethods
-    # any method placed here will apply to instances
-
     def analytical
       @analytical ||= begin
         options = self.class.analytical_options.merge({
           :ssl => request.ssl?,
           :controller => self,
         })
-        if options[:disable_if].call(self)
-          options[:modules] = options[:development_modules]
+        if options[:disable_if] && options[:disable_if].call(self)
+          options[:modules] = []
         end
         options[:session] = session if options[:use_session_store]
         if analytical_is_robot?(request.user_agent)
           options[:modules] = []
         end
+        options[:modules] = options[:filter_modules].call(self, options[:modules]) if options[:filter_modules]
+        options[:javascript_helpers] ||= true
         Analytical::Api.new options
       end
     end
   end
 
+  module HelperMethods
+    def analytical
+      controller.analytical
+    end
+  end
+
 end
 
 if defined?(ActionController::Base)
-  ActionController::Base.extend Analytical
+  ActionController::Base.class_eval do
+    extend Analytical
+    include Analytical::InstanceMethods
+    include Analytical::BotDetector
+    helper Analytical::HelperMethods
+
+    if ::Rails::VERSION::MAJOR < 3
+      class_inheritable_accessor :analytical_options
+    else
+      class_attribute :analytical_options
+    end
+  end
 end

data/lib/analytical/api.rb

@@ -48,7 +48,7 @@ module Analytical
       def method_missing(method, *args, &block)
         @parent.modules.values.collect do |m|
           m.send(method, *args) if m.respond_to?(method)
-        end.compact.join("\n")
+        end.delete_if{|c| c.blank?}.join("\n")
       end
     end
 
@@ -67,7 +67,21 @@ module Analytical
     end
 
     def head_append_javascript
-      [init_javascript(:head_append), tracking_javascript(:head_append)].delete_if{|s| s.blank?}.join("\n")
+      js = [
+        init_javascript(:head_append),
+        tracking_javascript(:head_append),
+      ]
+
+      if options[:javascript_helpers]
+        if ::Rails::VERSION::MAJOR >= 3 && ::Rails::VERSION::MINOR >= 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]
+        end
+      end
+
+      js.delete_if{|s| s.blank?}.join("\n")
     end
 
     alias_method :head_javascript, :head_append_javascript
@@ -103,7 +117,7 @@ module Analytical
     def init_javascript(location)
       @modules.values.collect do |m|
         m.init_javascript(location) if m.respond_to?(:init_javascript)
-      end.compact.join("\n")
+      end.delete_if{|c| c.blank?}.join
     end
 
     def available_modules

data/lib/analytical/modules/clicky.rb

@@ -12,9 +12,18 @@ module Analytical
         init_location(location) do
           js = <<-HTML
           <!-- Analytical Init: Clicky -->
-          <script src="#{protocol}://static.getclicky.com/js" type="text/javascript"></script>
-          <script type="text/javascript">clicky.init('#{@options[:key]}');</script>
-          <noscript><p><img alt="Clicky" width="1" height="1" src="#{protocol}://in.getclicky.com/#{@options[:key]}ns.gif" /></p></noscript>
+          <script type="text/javascript">
+            var clicky_site_ids = clicky_site_ids || [];
+            clicky_site_ids.push(#{@options[:key]});
+            (function() {
+              var s = document.createElement('script');
+              s.type = 'text/javascript';
+              s.async = true;
+              s.src = '//static.getclicky.com/js';
+              ( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
+            })();
+          </script>
+          <noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/#{@options[:key]}ns.gif" /></p></noscript>
           HTML
 
           identify_commands = []

data/lib/analytical/modules/console.rb

@@ -74,7 +74,7 @@ module Analytical
       end
 
       def check_for_console(data)
-        "if(typeof(console) !== 'undefined' && console != null) { #{data} }"
+        "if(typeof(console) !== 'undefined' && console != null) { \n#{data} }"
       end
 
     end

data/lib/analytical/modules/google.rb

@@ -34,8 +34,9 @@ module Analytical
       end
       
       def event(name, *args)
-        data = args.first || nil
-        data_string = data ? ", '#{data.to_json}'" : ""
+        data = args.first || {}
+        data = data[:value] if data.is_a?(Hash)
+        data_string = !data.nil? ? ", #{data}" : ""
         "_gaq.push(['_trackEvent', \"Event\", \"#{name}\"" + data_string + "]);"
       end
       

data/lib/analytical/modules/reinvigorate.rb

@@ -0,0 +1,48 @@
+module Analytical
+  module Modules
+    class Reinvigorate
+      include Analytical::Modules::Base
+
+      def initialize(options={})
+        super
+        @tracking_command_location = :body_append
+      end
+
+      def init_javascript(location)
+        init_location(location) do
+          js = <<-HTML
+          <!-- Analytical Init: Reinvigorate -->
+          <script type="text/javascript">
+            document.write(unescape("%3Cscript src='" + (("https:" == document.location.protocol) ? "https://ssl-" : "http://")
+            + "include.reinvigorate.net/re_.js' type='text/javascript'%3E%3C/script%3E"));
+          </script>
+          HTML
+          js
+        end
+      end
+
+      def identify(id, *args)
+        data = args.first || {}
+        "var re_name_tag = \"#{id}\";"
+      end
+
+      def context(data)
+        return '' if data.blank?
+        if data[:email]
+          "var re_context_tag = \"mailto:#{data[:email]}\";"
+        elsif data[:url]
+          "var re_context_tag = \"http://#{data[:url]}\";"
+        else
+          "var re_context_tag = \"#{data.first.last}\";"
+        end
+      end
+
+      def track(data, *args)
+        "try {
+          reinvigorate.track(\"#{options[:key]}\");
+        } catch(err) {}"
+      end
+
+    end
+  end
+end

data/lib/analytical/rails/engine.rb

@@ -0,0 +1,9 @@
+if defined?(::Rails::Engine)
+  module Analytical
+    module Rails
+      class Engine < ::Rails::Engine
+        # auto wire
+      end
+    end
+  end
+end

data/spec/analytical/api_spec.rb

@@ -101,7 +101,7 @@ describe "Analytical::Api" do
         it 'should return the javascript' do
           @console.should_receive(:init_javascript).with(:head_prepend).and_return('console_a')
           @google.should_receive(:init_javascript).with(:head_prepend).and_return('google_a')
-          @api.head_prepend_javascript.should == "console_a\ngoogle_a"
+          @api.head_prepend_javascript.should == "console_agoogle_a"
         end
       end
 
@@ -109,7 +109,7 @@ describe "Analytical::Api" do
         it 'should return the javascript' do
           @console.should_receive(:init_javascript).with(:head_append).and_return('console_a')
           @google.should_receive(:init_javascript).with(:head_append).and_return('google_a')
-          @api.head_append_javascript.should == "console_a\ngoogle_a"
+          @api.head_append_javascript.should == "console_agoogle_a"
         end
       end
       
@@ -117,14 +117,14 @@ describe "Analytical::Api" do
         it 'should return the javascript' do
           @console.should_receive(:init_javascript).with(:body_prepend).and_return('console_b')
           @google.should_receive(:init_javascript).with(:body_prepend).and_return('google_b')
-          @api.body_prepend_javascript.should == "console_b\ngoogle_b"
+          @api.body_prepend_javascript.should == "console_bgoogle_b"
         end
       end
       describe '#body_append_javascript' do
         it 'should return the javascript' do
           @console.should_receive(:init_javascript).with(:body_append).and_return('console_c')
           @google.should_receive(:init_javascript).with(:body_append).and_return('google_c')
-          @api.body_append_javascript.should == "console_c\ngoogle_c"
+          @api.body_append_javascript.should == "console_cgoogle_c"
         end
       end
       describe 'with stored commands' do
@@ -145,7 +145,7 @@ describe "Analytical::Api" do
           it 'should return the javascript' do
             @console.should_receive(:init_javascript).with(:body_prepend).and_return('console_b')
             @google.should_receive(:init_javascript).with(:body_prepend).and_return('google_b')
-            @api.body_prepend_javascript.should == "console_b\ngoogle_b\n<script type='text/javascript'>\nconsole track called\ngoogle track called\n</script>"
+            @api.body_prepend_javascript.should == "console_bgoogle_b\n<script type='text/javascript'>\nconsole track called\ngoogle track called\n</script>"
           end
         end
       end

data/spec/analytical/modules/google_spec.rb

@@ -27,10 +27,19 @@ describe "Analytical::Modules::Google" do
       @api.event('pagename').should ==  "_gaq.push(['_trackEvent', \"Event\", \"pagename\"]);"
     end
     
-    it 'should include any passed in data' do
+    it 'should include data value' do
       @api = Analytical::Modules::Google.new :parent=>@parent, :key=>'abcdef'
-      @api.event('pagename', {:some=>'data',:more=>'info'}).should ==  "_gaq.push(['_trackEvent', \"Event\", \"pagename\", '#{ {:some=>'data',:more=>'info'}.to_json }']);"
+      @api.event('pagename', {:value=>555, :more=>'info'}).should ==  "_gaq.push(['_trackEvent', \"Event\", \"pagename\", 555]);"
     end
+    it 'should not include data if there is no value' do
+      @api = Analytical::Modules::Google.new :parent=>@parent, :key=>'abcdef'
+      @api.event('pagename', {:more=>'info'}).should ==  "_gaq.push(['_trackEvent', \"Event\", \"pagename\"]);"
+    end
+    it 'should not include data if it is not a hash' do
+      @api = Analytical::Modules::Google.new :parent=>@parent, :key=>'abcdef'
+      @api.event('pagename', 555).should ==  "_gaq.push(['_trackEvent', \"Event\", \"pagename\", 555]);"
+    end
+
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do

data/spec/analytical/modules/reinvigorate_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "Analytical::Modules::Reinvigorate" do
+
+  before(:each) do
+    @parent = mock('api', :options=>{:reinvigorate=>{:key=>'abc'}})
+  end
+
+  describe 'on initialize' do
+
+    it 'should set the command_location' do
+      a = Analytical::Modules::Reinvigorate.new :parent=>@parent, :key=>'abc'
+      a.tracking_command_location.should == :body_append
+    end
+
+    it 'should set the options' do
+      a = Analytical::Modules::Reinvigorate.new :parent=>@parent, :key=>'abc'
+      a.options.should == {:key=>'abc', :parent=>@parent}
+    end
+
+  end
+
+  describe '#init_javascript' do
+
+    it 'should return the init javascript' do
+      @api = Analytical::Modules::Reinvigorate.new :parent=>@parent, :key=>'abcdef'
+      @api.init_javascript(:head_prepend).should == ''
+      @api.init_javascript(:head_append).should == ''
+      @api.init_javascript(:body_prepend).should == ''
+      @api.init_javascript(:body_append).should =~ /reinvigorate/
+    end
+
+  end
+
+end

data/spec/analytical_spec.rb

@@ -2,39 +2,53 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'ostruct'
 
 describe "Analytical" do
-  before(:each) do
-    rails_env = mock('rails environment', :'production?'=>true, :'development?'=>false)
-    Rails.stub!(:env).and_return(rails_env)
-    File.stub!(:'exists?').and_return(false)
-  end
-
   describe 'on initialization' do
     class DummyForInit
       extend Analytical
+      include Analytical::InstanceMethods
+      include Analytical::BotDetector
+      if ::Rails::VERSION::MAJOR < 3
+        class_inheritable_accessor :analytical_options
+      else
+        class_attribute :analytical_options
+      end
+
       def self.helper_method(*a); end
       def request
-        Spec::Mocks::Mock.new 'request', 
+        RSpec::Mocks::Mock.new 'request', 
           :'ssl?'=>true, 
           :user_agent=>'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 GTB7.0'
       end
     end
 
-    it 'should have the default options' do
+    it 'should have the options from analytical.yml' do
       DummyForInit.analytical
       d = DummyForInit.new.analytical
-      d.options[:modules].should == []
-      d.options[:development_modules].should == [:console]
-      d.options[:disable_if].call.should be_false
+      d.options[:modules].sort_by { |m| m.to_s }.should == [:chartbeat, :clicky, :google, :kiss_metrics]
     end
 
     it 'should use the supplied options' do
       DummyForInit.analytical :modules=>[:google]
       d = DummyForInit.new.analytical
       d.options[:modules].should == [:google]
-      d.options[:development_modules].should == [:console]
-      d.options[:disable_if].call.should be_false
     end
     
+    describe 'conditionally disabled' do
+      it 'should set the modules to []' do
+        DummyForInit.analytical :disable_if => lambda { |x| true }
+        d = DummyForInit.new
+        d.analytical.options[:modules].should == []        
+      end
+    end
+
+    describe 'with filtered modules' do
+      it 'should set the modules to []' do
+        DummyForInit.analytical :filter_modules => lambda { |x, modules| modules - [:clicky] }
+        d = DummyForInit.new
+        d.analytical.options[:modules].include?(:clicky).should be_false
+      end
+    end
+
     describe 'with a robot request' do
       it 'should set the modules to []' do
         DummyForInit.analytical
@@ -53,6 +67,11 @@ describe "Analytical" do
       DummyForInit.analytical_options[:chartbeat].should == {:key=>'chartbeat_12345', :domain => 'your.domain.com'}
     end
 
+    it 'should allow for module-specific controller overrides' do
+      DummyForInit.analytical :google=>{:key=>'override_google_key'}
+      DummyForInit.analytical_options[:google].should == {:key=>'override_google_key'}
+    end
+
     describe 'in production mode' do
       before(:each) do
         Rails.env.stub!(:production?).and_return(true)
@@ -64,7 +83,7 @@ describe "Analytical" do
       end
     end
 
-    describe 'in development mode' do
+    describe 'in non-production mode' do
       before(:each) do
         Rails.env.stub!(:production?).and_return(false)
       end
@@ -74,6 +93,16 @@ describe "Analytical" do
       end
     end
 
+    describe 'in development mode' do
+      before(:each) do
+        Rails.stub!(:env).and_return(:development)
+      end
+      it 'should start with no modules' do
+        DummyForInit.analytical
+        DummyForInit.new.analytical.options[:modules] = []
+      end
+    end
+
   end
 
 end

data/spec/config/analytical.yml

@@ -1,9 +1,15 @@
-google:
-  key: google_12345
-clicky:
-  key: clicky_12345
-kiss_metrics:
-  key: kiss_metrics_12345
-chartbeat:
-  key: chartbeat_12345
-  domain: your.domain.com
+test:
+  google:
+    key: google_12345
+  clicky:
+    key: clicky_12345
+  kiss_metrics:
+    key: kiss_metrics_12345
+  chartbeat:
+    key: chartbeat_12345
+    domain: your.domain.com
+
+production:
+
+development:
+

data/spec/spec_helper.rb

@@ -1,19 +1,22 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+
+ENV["RAILS_ENV"] ||= 'test'
+
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/json'
 require 'action_view'
-require 'spec'
-require 'spec/autorun'
-
-require 'analytical'
+require 'active_model'
+require 'action_controller'
+require 'rails'
+require 'rspec/rails'
 
-Spec::Runner.configure do |config|
-end
-
-module Rails
-  def self.root
-    File.dirname(__FILE__)
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.expect_with :rspec
+  config.before do
+    Rails.stub(:root).and_return(Pathname.new(__FILE__).dirname)
   end
 end
+
+require 'analytical'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytical
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
-  - 2
-  - 11
+  - 3
   - 0
-  version: 2.11.0
+  - 6
+  version: 3.0.6
 platform: ruby
 authors: 
 - Joshua Krall
@@ -17,46 +17,45 @@ authors:
 - Ablyamitov Ablyamit
 - Kurt Werle
 - Olivier Lauzon
+- Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -05:00
+date: 2011-08-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 9
+        version: 3.0.9
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: rspec
+  name: rails
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 1
-        - 3
-        version: "1.3"
+        - 0
+        version: "0"
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: diff-lcs
+  name: activesupport
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,26 +66,91 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: rails
+  name: activemodel
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 23
         segments: 
         - 2
-        - 3
-        version: "2.3"
+        - 6
+        - 0
+        version: 2.6.0
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: guard
+  name: rspec
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 6
+        - 4
+        version: 2.6.4
+  requirement: *id005
+  type: :development
+  prerelease: false
+  name: rspec-core
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  requirement: *id006
+  type: :development
+  prerelease: false
+  name: rspec-expectations
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  requirement: *id007
+  type: :development
+  prerelease: false
+  name: rspec-mocks
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  requirement: *id008
+  type: :development
+  prerelease: false
+  name: rspec-rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +159,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: *id009
   type: :development
   prerelease: false
-  name: guard-rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,12 +173,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id010
+  type: :development
+  prerelease: false
+  name: diff-lcs
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
   type: :development
   prerelease: false
-  name: rb-fsevent
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: guard
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,12 +201,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  requirement: *id012
+  type: :development
+  prerelease: false
+  name: guard-rspec
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
   type: :development
   prerelease: false
-  name: growl
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rb-fsevent
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,7 +229,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id014
+  type: :development
+  prerelease: false
+  name: growl
 description: Gem for managing multiple analytics services in your rails app.
 email: josh@feefighters.com
 executables: []
@@ -149,6 +244,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .rspec
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -157,6 +254,7 @@ files:
 - Rakefile
 - VERSION
 - analytical.gemspec
+- app/views/application/_analytical_javascript.html.erb
 - example/.gitignore
 - example/Gemfile
 - example/Gemfile.lock
@@ -231,6 +329,8 @@ files:
 - 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
@@ -247,6 +347,7 @@ files:
 - 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
@@ -282,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Gem for managing multiple analytics services in your rails app.