analytical 2.3.0 → 2.4.0

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/analytical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Krall", "Nathan Phelps", "Adam Anderson"]
-  s.date = %q{2011-01-12}
+  s.date = %q{2011-01-24}
   s.description = %q{Gem for managing multiple analytics services in your rails app.}
   s.email = %q{josh@transfs.com}
   s.extra_rdoc_files = [
@@ -89,6 +89,7 @@ Gem::Specification.new do |s|
      "lib/analytical/modules/google.rb",
      "lib/analytical/modules/hubspot.rb",
      "lib/analytical/modules/kiss_metrics.rb",
+     "lib/analytical/modules/microsoft_ads.rb",
      "lib/analytical/modules/mixpanel.rb",
      "lib/analytical/modules/optimizely.rb",
      "lib/analytical/session_command_store.rb",
@@ -114,7 +115,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jkrall/analytical}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gem for managing multiple analytics services in your rails app.}
   s.test_files = [
     "spec/analytical/api_spec.rb",
@@ -138,7 +139,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else

data/example/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
-  remote: /Users/krall/Programming/analytical
+  remote: ..
   specs:
-    analytical (1.8.0)
+    analytical (2.3.0)
       activesupport
-      json
 
 GEM
   remote: http://rubygems.org/
@@ -41,7 +40,6 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.4.1)
-    json (1.4.6)
     mail (2.2.5)
       activesupport (>= 2.3.6)
       mime-types

data/example/app/controllers/application_controller.rb

@@ -2,5 +2,5 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   layout 'application'
 
-  analytical :modules=>[:console, :google, :clicky], :disable_if=>lambda{false}, :use_session_store=>true
+  analytical :modules=>[:console, :google, :clicky], :disable_if=>lambda{|controller| false}, :use_session_store=>true
 end

data/lib/analytical/modules/base.rb

@@ -42,6 +42,7 @@ module Analytical
       # def init_javascript(location)
 
       def queue(*args)
+        return if @options[:ignore_duplicates] && @command_store.include?(args)
         if args.first==:identify
           @command_store.unshift args
         else

data/lib/analytical/modules/microsoft_ads.rb

@@ -0,0 +1,58 @@
+module Analytical
+  module Modules
+    class Adwords
+      include Analytical::Modules::Base
+
+      def initialize(options={})
+        super
+        @tracking_command_location = :body_append
+      end
+
+      def init_javascript(location)
+        init_location(location) do
+          @initializing = true
+          html = "<!-- Analytical Init: Microsoft Ads -->\n"
+          event_commands = []
+          @command_store.commands.each do |c|
+            if c[0] == :event
+              event_commands << event(*c[1..-1])
+            end
+          end
+          html += event_commands.join("\n")
+          @command_store.commands = @command_store.commands.delete_if {|c| c[0] == :event }
+          @initializing = false
+
+          html
+        end
+      end
+
+      #
+      # Define conversion events in analytical.yml like:
+      #
+      # microsoft_ads:
+      #   'Some Event':
+      #     id: 55555555-6666-7777-8888-111111111111
+      def event(name, *args)
+        return '' unless @initializing
+
+        data = args.first || {}
+        if conversion = options[name.to_sym]
+          conversion.symbolize_keys!
+          js = <<-HTML
+          <script type="text/javascript">if (!window.mstag) mstag = {loadTag : function(){},time : (new Date()).getTime()};</script>
+          <script id="mstag_tops" type="text/javascript" src="//flex.atdmt.com/mstag/site/#{conversion[:id]}/mstag.js"></script>
+          <script type="text/javascript"> mstag.loadTag("conversion", {cp:"5050",dedup:"1"})</script>
+          <noscript>
+            <iframe src="//flex.atdmt.com/mstag/tag/#{conversion[:id]}/conversion.html?cp=5050&dedup=1" frameborder="0" scrolling="no" width="1" height="1" style="visibility:hidden; display:none"></iframe>
+          </noscript>
+          HTML
+          js
+        else
+          "<!-- No Microsoft Ads Conversion for: #{name} -->"
+        end
+      end
+
+    end
+  end
+end
+

data/spec/analytical/modules/base_spec.rb

@@ -38,6 +38,19 @@ describe Analytical::Modules::Base do
         @api.command_store.commands.should == [:a, :b, :c, [:other, {:some=>:args}]]
       end
     end
+    describe 'ignoring duplicates' do
+      before(:each) do
+        @api = BaseApiDummy.new(:parent=>mock('parent'), :ignore_duplicates=>true)
+        @api.command_store.commands = [[:a]]
+      end
+      it 'should store only unique commands' do
+        @api.queue :other, {:some=>:args}
+        @api.queue :a
+        @api.queue :other, {:some=>:args}
+        @api.queue :b
+        @api.command_store.commands.should == [[:a], [:other, {:some=>:args}], [:b]]
+      end
+    end
   end
 
   describe '#process_queued_commands' do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytical
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Joshua Krall
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -06:00
+date: 2011-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -37,9 +40,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -127,6 +132,7 @@ files:
 - lib/analytical/modules/google.rb
 - lib/analytical/modules/hubspot.rb
 - lib/analytical/modules/kiss_metrics.rb
+- lib/analytical/modules/microsoft_ads.rb
 - lib/analytical/modules/mixpanel.rb
 - lib/analytical/modules/optimizely.rb
 - lib/analytical/session_command_store.rb
@@ -158,23 +164,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gem for managing multiple analytics services in your rails app.