analytical 1.8.0 → 1.9.0

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.9.0

data/analytical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "1.8.0"
+  s.version = "1.9.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{2010-09-11}
+  s.date = %q{2010-09-29}
   s.description = %q{Gem for managing multiple analytics services in your rails app.}
   s.email = %q{josh@transfs.com}
   s.extra_rdoc_files = [
@@ -75,29 +75,29 @@ Gem::Specification.new do |s|
      "example/test/unit/helpers/page_helper_test.rb",
      "example/vendor/plugins/.gitkeep",
      "lib/analytical.rb",
-     "lib/analytical/adwords.rb",
      "lib/analytical/api.rb",
-     "lib/analytical/base.rb",
      "lib/analytical/bot_detector.rb",
-     "lib/analytical/chartbeat.rb",
-     "lib/analytical/clicky.rb",
-     "lib/analytical/comscore.rb",
-     "lib/analytical/console.rb",
-     "lib/analytical/crazy_egg.rb",
-     "lib/analytical/google.rb",
-     "lib/analytical/hubspot.rb",
-     "lib/analytical/kiss_metrics.rb",
-     "lib/analytical/optimizely.rb",
+     "lib/analytical/modules/adwords.rb",
+     "lib/analytical/modules/base.rb",
+     "lib/analytical/modules/chartbeat.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/hubspot.rb",
+     "lib/analytical/modules/kiss_metrics.rb",
+     "lib/analytical/modules/optimizely.rb",
      "rails/init.rb",
      "spec/analytical/api_spec.rb",
-     "spec/analytical/base_spec.rb",
      "spec/analytical/bot_detector_spec.rb",
-     "spec/analytical/chartbeat_spec.rb",
-     "spec/analytical/clicky_spec.rb",
-     "spec/analytical/comscore_spec.rb",
-     "spec/analytical/google_spec.rb",
-     "spec/analytical/kiss_metrics_spec.rb",
-     "spec/analytical/optimizely_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/optimizely_spec.rb",
      "spec/analytical_spec.rb",
      "spec/config/analytical.yml",
      "spec/spec.opts",
@@ -106,18 +106,18 @@ 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.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Gem for managing multiple analytics services in your rails app.}
   s.test_files = [
     "spec/analytical/api_spec.rb",
-     "spec/analytical/base_spec.rb",
      "spec/analytical/bot_detector_spec.rb",
-     "spec/analytical/chartbeat_spec.rb",
-     "spec/analytical/clicky_spec.rb",
-     "spec/analytical/comscore_spec.rb",
-     "spec/analytical/google_spec.rb",
-     "spec/analytical/kiss_metrics_spec.rb",
-     "spec/analytical/optimizely_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/optimizely_spec.rb",
      "spec/analytical_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -126,7 +126,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= 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/lib/analytical.rb

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

data/lib/analytical/api.rb

@@ -6,8 +6,8 @@ module Analytical
     def initialize(options={})
       @options = options
       @modules = @options[:modules].inject(ActiveSupport::OrderedHash.new) do |h, m|
-        module_options = @options.merge(@options[m] || {}).merge(:parent => self)
-        h[m] = "Analytical::#{m.to_s.camelize}::Api".constantize.new(module_options)
+        module_options = @options.merge(@options[m] || {})
+        h[m] = "Analytical::Modules::#{m.to_s.camelize}".constantize.new(module_options)
         h
       end
     end

data/lib/analytical/{adwords.rb → modules/adwords.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Adwords
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Adwords
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super
@@ -62,10 +62,10 @@ module Analytical
             var google_conversion_value = #{data[:value] || conversion[:value]};
             /* ]]> */
           </script>
-          <script type="text/javascript" src="http://www.googleadservices.com/pagead/conversion.js"></script>
+          <script type="text/javascript" src="#{procotol}://www.googleadservices.com/pagead/conversion.js"></script>
           <noscript>
             <div style="display:inline;">
-            <img height="1" width="1" style="border-style:none;" alt="" src="http://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="#{procotol}://www.googleadservices.com/pagead/conversion/#{conversion[:id]}/?label=#{conversion[:label]}&amp;guid=ON&amp;script=0"/>
             </div>
           </noscript>
           HTML

data/lib/analytical/{base.rb → modules/base.rb}

@@ -1,17 +1,20 @@
 module Analytical
-  module Base
-    module Api
-      attr_reader :tracking_command_location, :parent, :options, :initialized
+  module Modules
+    module Base
+      attr_reader :tracking_command_location, :options, :initialized
       attr_accessor :commands
 
       def initialize(_options={})
         @options = _options
-        @parent = @options[:parent]
         @tracking_command_location = :body_prepend
         @initialized = false
         @commands = []
       end
 
+      def protocol
+        @options[:ssl] ? 'https' : 'http'
+      end
+
       #
       # The core methods that most analytics services implement are listed below.
       # Modules will ignore any calls that they don't respond to, allowing them to

data/lib/analytical/{chartbeat.rb → modules/chartbeat.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Chartbeat
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Chartbeat
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/lib/analytical/{clicky.rb → modules/clicky.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Clicky
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Clicky
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super
@@ -10,8 +10,6 @@ module Analytical
 
       def init_javascript(location)
         init_location(location) do
-          protocol = options[:ssl] ? 'https' : 'http'
-
           js = <<-HTML
           <!-- Analytical Init: Clicky -->
           <script src="#{protocol}://static.getclicky.com/js" type="text/javascript"></script>

data/lib/analytical/{comscore.rb → modules/comscore.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Comscore
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Comscore
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/lib/analytical/{console.rb → modules/console.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Console
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Console
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/lib/analytical/{crazy_egg.rb → modules/crazy_egg.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module CrazyEgg
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class CrazyEgg
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super
@@ -11,7 +11,6 @@ module Analytical
       def init_javascript(location)
         init_location(location) do
           code_url = "#{options[:key][0,4]}/#{options[:key][4,4]}"
-          protocol = options[:ssl] ? 'https' : 'http'
           js = <<-HTML
           <!-- Analytical Init: CrazyEgg -->
           <script type="text/javascript" src="#{protocol}://s3.amazonaws.com/new.cetrk.com/pages/scripts/#{code_url}.js"> </script>

data/lib/analytical/{google.rb → modules/google.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Google
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Google
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/lib/analytical/{hubspot.rb → modules/hubspot.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Hubspot
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Hubspot
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/lib/analytical/{kiss_metrics.rb → modules/kiss_metrics.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module KissMetrics
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class KissMetrics
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/lib/analytical/{optimizely.rb → modules/optimizely.rb}

@@ -1,7 +1,7 @@
 module Analytical
-  module Optimizely
-    class Api
-      include Analytical::Base::Api
+  module Modules
+    class Optimizely
+      include Analytical::Modules::Base
 
       def initialize(options={})
         super

data/spec/analytical/api_spec.rb

@@ -4,8 +4,8 @@ describe "Analytical::Api" do
 
   describe 'on initialization' do
     it 'should construct an api class for each module' do
-      Analytical::Console::Api.should_receive(:new).and_return(@console = mock('console'))
-      Analytical::Google::Api.should_receive(:new).and_return(@google = mock('google'))
+      Analytical::Modules::Console.should_receive(:new).and_return(@console = mock('console'))
+      Analytical::Modules::Google.should_receive(:new).and_return(@google = mock('google'))
       a = Analytical::Api.new :modules=>[:console, :google]
       a.modules.should == {
         :console=>@console,
@@ -13,17 +13,17 @@ describe "Analytical::Api" do
       }
     end
     it 'should pass the ssl option on to the module constructor' do
-      Analytical::Console::Api.should_receive(:new).with(hash_including(:ssl=>true)).and_return(@console = mock('console'))
+      Analytical::Modules::Console.should_receive(:new).with(hash_including(:ssl=>true)).and_return(@console = mock('console'))
       Analytical::Api.new :modules=>[:console], :ssl=>true
     end
   end
 
   describe 'with modules' do
     before(:each) do
-      Analytical::Console::Api.stub!(:new).and_return(@console = mock('console'))
-      Analytical::Google::Api.stub!(:new).and_return(@google = mock('google'))
-      Analytical::Clicky::Api.stub!(:new).and_return(@clicky = mock('clicky'))
-      Analytical::Chartbeat::Api.stub!(:new).and_return(@chartbeat = mock('chartbeat'))
+      Analytical::Modules::Console.stub!(:new).and_return(@console = mock('console'))
+      Analytical::Modules::Google.stub!(:new).and_return(@google = mock('google'))
+      Analytical::Modules::Clicky.stub!(:new).and_return(@clicky = mock('clicky'))
+      Analytical::Modules::Chartbeat.stub!(:new).and_return(@chartbeat = mock('chartbeat'))
 
       @api = Analytical::Api.new :modules=>[:console, :google]
     end

data/spec/analytical/{base_spec.rb → modules/base_spec.rb}

@@ -1,9 +1,24 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe Analytical::Base::Api do
+describe Analytical::Modules::Base do
 
   class BaseApiDummy
-    include Analytical::Base::Api
+    include Analytical::Modules::Base
+  end
+
+  describe '#protocol' do
+    before(:each) do
+      @api = BaseApiDummy.new(:parent=>mock('parent'))
+    end
+    describe 'with :ssl=>true option' do
+      it 'should return https' do
+        @api = BaseApiDummy.new(:parent=>mock('parent'), :ssl=>true)
+        @api.protocol.should == 'https'
+      end
+    end
+    it 'should return http' do
+      @api.protocol.should == 'http'
+    end
   end
 
   describe '#queue' do

data/spec/analytical/{chartbeat_spec.rb → modules/chartbeat_spec.rb}

@@ -1,22 +1,22 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Analytical::Chartbeat::Api" do
+describe "Analytical::Modules::Chartbeat" do
   before(:each) do
     @parent = mock('api', :options=>{:chartbeat=>{:key=>1234, :domain =>'test.com'}})
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Chartbeat::Api.new :parent=>@parent, :key=>1234
+      a = Analytical::Modules::Chartbeat.new :parent=>@parent, :key=>1234
       a.tracking_command_location.should == [:head_prepend, :body_append]
     end
     it 'should set the options' do
-      a = Analytical::Chartbeat::Api.new :parent=>@parent, :key=>12345, :domain =>'abcdef.com'
+      a = Analytical::Modules::Chartbeat.new :parent=>@parent, :key=>12345, :domain =>'abcdef.com'
       a.options.should == {:key=>12345, :domain => 'abcdef.com', :parent=>@parent}
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Chartbeat::Api.new :parent=>@parent, :key=>12345, :domain =>'abcdef.com'
+      @api = Analytical::Modules::Chartbeat.new :parent=>@parent, :key=>12345, :domain =>'abcdef.com'
       @api.init_javascript(:head_prepend).should =~ /_sf_startpt=\(new.Date\(\)\)\.getTime\(\);/
       @api.init_javascript(:head_append).should == ''
       @api.init_javascript(:body_prepend).should == ''

data/spec/analytical/{clicky_spec.rb → modules/clicky_spec.rb}

@@ -1,34 +1,34 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Analytical::Clicky::Api" do
+describe "Analytical::Modules::Clicky" 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::Clicky::Api.new :parent=>@parent, :key=>'abc'
+      a = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abc'
       a.tracking_command_location.should == :body_append
     end
     it 'should set the options' do
-      a = Analytical::Clicky::Api.new :parent=>@parent, :key=>'abc'
+      a = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abc'
       a.options.should == {:key=>'abc', :parent=>@parent}
     end
   end
   describe '#track' do
     it 'should return the tracking javascript' do
-      @api = Analytical::Clicky::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abcdef'
       @api.track('pagename', {:some=>'data'}).should == "clicky.log(\"pagename\");"
     end
   end
   describe '#identify' do
     it 'should return the init code string' do
-      @api = Analytical::Clicky::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abcdef'
       @api.identify('user id', {:a=>'b'}).should =~ /#{Regexp.escape({:id=>'user id', :a=>'b'}.to_json)}/
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Clicky::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abcdef'
       @api.init_javascript(:head_prepend).should == ''
       @api.init_javascript(:head_append).should == ''
       @api.init_javascript(:body_prepend).should == ''            
@@ -37,12 +37,12 @@ describe "Analytical::Clicky::Api" do
     end
     describe 'for an ssl connection' do
       it 'should return the ssl init code' do
-        @api = Analytical::Clicky::Api.new :parent=>@parent, :key=>'abcdef', :ssl=>true
+        @api = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abcdef', :ssl=>true
         @api.init_javascript(:body_append).should =~ /https/
       end
     end
     describe 'with an identify command queued' do
-      @api = Analytical::Clicky::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Clicky.new :parent=>@parent, :key=>'abcdef'
       @api.queue :identify, 'user id', {:email=>'someone@test.com'}
       @api.init_javascript(:body_append).should =~ /"email":\w*"someone@test\.com"/
     end

data/spec/analytical/{comscore_spec.rb → modules/comscore_spec.rb}

@@ -1,22 +1,22 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Analytical::Comscore::Api" do
+describe "Analytical::Modules::Comscore" do
   before(:each) do
     @parent = mock('api', :options=>{:comscore=>{:key=>123}})
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Comscore::Api.new :parent=>@parent, :key=>123
+      a = Analytical::Modules::Comscore.new :parent=>@parent, :key=>123
       a.tracking_command_location.should == :head_append
     end
     it 'should set the options' do
-      a = Analytical::Comscore::Api.new :parent=>@parent, :key=>1234
+      a = Analytical::Modules::Comscore.new :parent=>@parent, :key=>1234
       a.options.should == {:key=>1234, :parent=>@parent}
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Comscore::Api.new :parent=>@parent, :key=>1234
+      @api = Analytical::Modules::Comscore.new :parent=>@parent, :key=>1234
       @api.init_javascript(:head_prepend).should == ''
       @api.init_javascript(:head_append).should =~ /scorecardresearch.com\/beacon.js/
       @api.init_javascript(:head_append).should =~ /1234/

data/spec/analytical/{google_spec.rb → modules/google_spec.rb}

@@ -1,29 +1,29 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Analytical::Google::Api" do
+describe "Analytical::Modules::Google" 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::Google::Api.new :parent=>@parent, :key=>'abc'
+      a = Analytical::Modules::Google.new :parent=>@parent, :key=>'abc'
       a.tracking_command_location.should == :head_append
     end
     it 'should set the options' do
-      a = Analytical::Google::Api.new :parent=>@parent, :key=>'abc'
+      a = Analytical::Modules::Google.new :parent=>@parent, :key=>'abc'
       a.options.should == {:key=>'abc', :parent=>@parent}
     end
   end
   describe '#track' do
     it 'should return the tracking javascript' do
-      @api = Analytical::Google::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Google.new :parent=>@parent, :key=>'abcdef'
       @api.track.should == "_gaq.push(['_trackPageview']);"
       @api.track('pagename', {:some=>'data'}).should ==  "_gaq.push(['_trackPageview', \"pagename\"]);"
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Google::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Google.new :parent=>@parent, :key=>'abcdef'
       @api.init_javascript(:head_prepend).should == ''
       @api.init_javascript(:head_append).should =~ /abcdef/
       @api.init_javascript(:head_append).should =~ /google-analytics.com\/ga.js/

data/spec/analytical/{kiss_metrics_spec.rb → modules/kiss_metrics_spec.rb}

@@ -1,46 +1,46 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Analytical::KissMetrics::Api" do
+describe "Analytical::Modules::KissMetrics" do
   before(:each) do
     @parent = mock('api', :options=>{:google=>{:js_url_key=>'abc'}})
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abc'
+      a = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abc'
       a.tracking_command_location.should == :body_prepend
     end
     it 'should set the options' do
-      a = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abc'
+      a = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abc'
       a.options.should == {:js_url_key=>'abc', :parent=>@parent}
     end
   end
   describe '#identify' do
     it 'should return a js string' do
-      @api = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abcdef'
+      @api = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abcdef'
       @api.identify('id', {:email=>'test@test.com'}).should == "_kmq.push([\"identify\", \"test@test.com\"]);"
     end
   end
   describe '#event' do
     it 'should return a js string' do
-      @api = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abcdef'
+      @api = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abcdef'
       @api.event('Big Deal', {:something=>'good'}).should == "_kmq.push([\"record\", \"Big Deal\", #{{:something=>'good'}.to_json}]);"
     end
   end
   describe '#set' do
     it 'should return a js string' do
-      @api = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abcdef'
+      @api = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abcdef'
       @api.set({:something=>'good', :b=>2}).should == "_kmq.push([\"set\", #{{:something=>'good', :b=>2}.to_json}]);"
     end
   end
   describe '#alias_identity' do
     it 'should return a js string' do
-      @api = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abcdef'
+      @api = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abcdef'
       @api.alias_identity('foo', 'bar').should == "_kmq.push([\"alias\", \"foo\", \"bar\"]);"
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abcdef'
+      @api = Analytical::Modules::KissMetrics.new :parent=>@parent, :js_url_key=>'abcdef'
       @api.init_javascript(:head_prepend).should == ''
       @api.init_javascript(:head_append).should == ''
       @api.init_javascript(:body_prepend).should =~ /i\.kissmetrics\.com/

data/spec/analytical/{optimizely_spec.rb → modules/optimizely_spec.rb}

@@ -1,22 +1,22 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Analytical::Optimizely::Api" do
+describe "Analytical::Modules::Optimizely" do
   before(:each) do
     @parent = mock('api', :options=>{:optimizely=>{:key=>'abc'}})
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Optimizely::Api.new :parent=>@parent, :key=>'abc'
+      a = Analytical::Modules::Optimizely.new :parent=>@parent, :key=>'abc'
       a.tracking_command_location.should == :head_prepend
     end
     it 'should set the options' do
-      a = Analytical::Optimizely::Api.new :parent=>@parent, :key=>'abc'
+      a = Analytical::Modules::Optimizely.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::Optimizely::Api.new :parent=>@parent, :key=>'abcdef'
+      @api = Analytical::Modules::Optimizely.new :parent=>@parent, :key=>'abcdef'
       @api.init_javascript(:head_prepend).should =~ /cdn\.optimizely.com\/js\/abcdef\.js/
       @api.init_javascript(:head_append).should == ''
       @api.init_javascript(:body_prepend).should == ''

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: analytical
 version: !ruby/object:Gem::Version 
-  hash: 55
   prerelease: false
   segments: 
   - 1
-  - 8
+  - 9
   - 0
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Joshua Krall
@@ -17,18 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 -05:00
+date: 2010-09-29 00:00:00 -05: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
@@ -40,11 +37,9 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -118,29 +113,29 @@ files:
 - example/test/unit/helpers/page_helper_test.rb
 - example/vendor/plugins/.gitkeep
 - lib/analytical.rb
-- lib/analytical/adwords.rb
 - lib/analytical/api.rb
-- lib/analytical/base.rb
 - lib/analytical/bot_detector.rb
-- lib/analytical/chartbeat.rb
-- lib/analytical/clicky.rb
-- lib/analytical/comscore.rb
-- lib/analytical/console.rb
-- lib/analytical/crazy_egg.rb
-- lib/analytical/google.rb
-- lib/analytical/hubspot.rb
-- lib/analytical/kiss_metrics.rb
-- lib/analytical/optimizely.rb
+- lib/analytical/modules/adwords.rb
+- lib/analytical/modules/base.rb
+- lib/analytical/modules/chartbeat.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/hubspot.rb
+- lib/analytical/modules/kiss_metrics.rb
+- lib/analytical/modules/optimizely.rb
 - rails/init.rb
 - spec/analytical/api_spec.rb
-- spec/analytical/base_spec.rb
 - spec/analytical/bot_detector_spec.rb
-- spec/analytical/chartbeat_spec.rb
-- spec/analytical/clicky_spec.rb
-- spec/analytical/comscore_spec.rb
-- spec/analytical/google_spec.rb
-- spec/analytical/kiss_metrics_spec.rb
-- spec/analytical/optimizely_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/optimizely_spec.rb
 - spec/analytical_spec.rb
 - spec/config/analytical.yml
 - spec/spec.opts
@@ -155,39 +150,35 @@ 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.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Gem for managing multiple analytics services in your rails app.
 test_files: 
 - spec/analytical/api_spec.rb
-- spec/analytical/base_spec.rb
 - spec/analytical/bot_detector_spec.rb
-- spec/analytical/chartbeat_spec.rb
-- spec/analytical/clicky_spec.rb
-- spec/analytical/comscore_spec.rb
-- spec/analytical/google_spec.rb
-- spec/analytical/kiss_metrics_spec.rb
-- spec/analytical/optimizely_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/optimizely_spec.rb
 - spec/analytical_spec.rb
 - spec/spec_helper.rb