analytical 2.1.0 → 2.2.0

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/analytical.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Krall", "Nathan Phelps", "Adam Anderson"]
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
      "spec/analytical/api_spec.rb",
      "spec/analytical/bot_detector_spec.rb",
      "spec/analytical/command_store_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",
@@ -117,6 +118,7 @@ Gem::Specification.new do |s|
     "spec/analytical/api_spec.rb",
      "spec/analytical/bot_detector_spec.rb",
      "spec/analytical/command_store_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",

data/lib/analytical/modules/adwords.rb

@@ -13,13 +13,13 @@ module Analytical
           @initializing = true
           html = "<!-- Analytical Init: Google Adwords -->\n"
           event_commands = []
-          @commands.each do |c|
+          @command_store.commands.each do |c|
             if c[0] == :event
               event_commands << event(*c[1..-1])
             end
           end
           html += event_commands.join("\n")
-          @commands = @commands.delete_if {|c| c[0] == :event }
+          @command_store.commands = @command_store.commands.delete_if {|c| c[0] == :event }
           @initializing = false
 
           html
@@ -62,10 +62,10 @@ module Analytical
             var google_conversion_value = #{data[:value] || conversion[:value]};
             /* ]]> */
           </script>
-          <script type="text/javascript" src="#{procotol}://www.googleadservices.com/pagead/conversion.js"></script>
+          <script type="text/javascript" src="#{protocol}://www.googleadservices.com/pagead/conversion.js"></script>
           <noscript>
             <div style="display:inline;">
-            <img height="1" width="1" style="border-style:none;" alt="" src="#{procotol}://www.googleadservices.com/pagead/conversion/#{conversion[:id]}/?label=#{conversion[:label]}&amp;guid=ON&amp;script=0"/>
+            <img height="1" width="1" style="border-style:none;" alt="" src="#{protocol}://www.googleadservices.com/pagead/conversion/#{conversion[:id]}/?label=#{conversion[:label]}&amp;guid=ON&amp;script=0"/>
             </div>
           </noscript>
           HTML

data/spec/analytical/modules/adwords_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "Analytical::Modules::Adwords" do
+  before(:each) do
+    @parent = mock('api', :options=>{:google=>{:key=>'abc'}})
+  end
+  describe 'on initialize' do
+    it 'should set the command_location' do
+      a = Analytical::Modules::Adwords.new :parent=>@parent, :key=>'abc'
+      a.tracking_command_location.should == :body_append
+    end
+    it 'should set the options' do
+      a = Analytical::Modules::Adwords.new :parent=>@parent, :key=>'abc'
+      a.options.should == {:key=>'abc', :parent=>@parent}
+    end
+  end
+  describe '#event' do
+    it 'should return an empty string' do
+      @api = Analytical::Modules::Adwords.new :parent=>@parent, :key=>'abcdef'
+      @api.event('Nothing', {:some=>'data'}).should == ''
+    end
+  end
+  describe '#init_javascript' do
+    describe 'when a matching conversion event is not found' do
+      it 'should return the event js' do
+        @api = Analytical::Modules::Adwords.new :parent=>@parent, :key=>'abcdef'
+        @api.queue :event, 'Nothing', {:some=>'data'}
+        @api.init_javascript(:body_append).should.should =~ /<!-- No Adwords Conversion for: Nothing -->/
+      end
+    end
+    describe 'for a given conversion event' do
+      before(:each) do
+        @api = Analytical::Modules::Adwords.new :parent=>@parent, :key=>'abcdef', :'TheBigEvent'=>{
+          :id=>'55555',
+          :language=>'en',
+          :format=>'2',
+          :color=>'ffffff',
+          :label=>'abcdef',
+          :value=>'0',
+        }
+      end
+      it 'should return the event js' do
+        @api.queue :event, 'TheBigEvent'
+        body_append = @api.init_javascript(:body_append).should
+        body_append.should =~ /google_conversion_id = 55555/m
+        body_append.should =~ /google_conversion_language = "en";/m
+        body_append.should =~ /google_conversion_format = "2";/m
+        body_append.should =~ /google_conversion_color = "ffffff";/m
+        body_append.should =~ /google_conversion_label = "abcdef";/m
+        body_append.should =~ /google_conversion_value = 0;/m
+        body_append.should =~ /http:\/\/www.googleadservices.com\/pagead\/conversion.js/m
+      end
+      describe 'with a custom value' do
+        it 'should return the event js' do
+          @api.queue :event, 'TheBigEvent', :value=>666.66
+          body_append = @api.init_javascript(:body_append).should
+          body_append.should =~ /google_conversion_value = 666.66;/m
+        end
+      end
+      describe 'for https' do
+        it 'should return the event js' do
+          @api = Analytical::Modules::Adwords.new :parent=>@parent, :key=>'abcdef', :ssl=>true, :'TheBigEvent'=>{
+            :id=>'55555',
+            :language=>'en',
+            :format=>'2',
+            :color=>'ffffff',
+            :label=>'abcdef',
+            :value=>'0',
+          }
+          @api.queue :event, 'TheBigEvent'
+          @api.init_javascript(:body_append).should =~ /https:\/\/www.googleadservices.com\/pagead\/conversion.js/
+        end
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Joshua Krall
@@ -133,6 +133,7 @@ files:
 - spec/analytical/api_spec.rb
 - spec/analytical/bot_detector_spec.rb
 - spec/analytical/command_store_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
@@ -179,6 +180,7 @@ test_files:
 - spec/analytical/api_spec.rb
 - spec/analytical/bot_detector_spec.rb
 - spec/analytical/command_store_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