analytical 0.15.0 → 0.16.0

data/VERSION

@@ -1 +1 @@
-0.15.0
+0.16.0

data/analytical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "0.15.0"
+  s.version = "0.16.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Krall"]
-  s.date = %q{2010-06-16}
+  s.date = %q{2010-06-17}
   s.description = %q{Gem for managing multiple analytics services in your rails app.}
   s.email = %q{josh@transfs.com}
   s.extra_rdoc_files = [

data/lib/analytical.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__)+'/analytical/base'
 Dir.glob(File.dirname(__FILE__)+'/analytical/*.rb').each do |f|
   require f
 end

data/lib/analytical/adwords.rb

@@ -9,7 +9,21 @@ module Analytical
       end
 
       def init_javascript(location)
-        return ''
+        return '' unless location==:body_append
+
+        @initializing = true
+        html = "<!-- Analytical Init: Google Adwords -->\n"
+        event_commands = []
+        @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 }
+        @initializing = false
+
+        html
       end
 
       #
@@ -32,11 +46,12 @@ module Analytical
       #     value: 0
       #
       def event(name, *args)
+        return '' unless @initializing
+
         data = args.first || {}
-        html = ''
-        if conversion = options[name]
-          html = <<-HTML
-          <!-- Google Code for PPC Landing Page Conversion Page -->
+        if conversion = options[name.to_sym]
+          conversion.symbolize_keys!
+          js = <<-HTML
           <script type="text/javascript">
             /* <![CDATA[ */
             var google_conversion_id = #{conversion[:id]};
@@ -54,8 +69,10 @@ module Analytical
             </div>
           </noscript>
           HTML
+          js
+        else
+          "<!-- No Adwords Conversion for: #{name} -->"
         end
-        html
       end
 
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 15
+  - 16
   - 0
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Joshua Krall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -05:00
+date: 2010-06-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency