analytical 1.5.0 → 1.6.0

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/analytical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Krall", "Nathan Phelps"]
-  s.date = %q{2010-08-27}
+  s.date = %q{2010-09-10}
   s.description = %q{Gem for managing multiple analytics services in your rails app.}
   s.email = %q{josh@transfs.com}
   s.extra_rdoc_files = [
@@ -106,7 +106,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",
@@ -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::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/lib/analytical/adwords.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :body_append
       end

data/lib/analytical/api.rb

@@ -6,7 +6,8 @@ module Analytical
     def initialize(options={})
       @options = options
       @modules = @options[:modules].inject(ActiveSupport::OrderedHash.new) do |h, m|
-        h[m] = "Analytical::#{m.to_s.camelize}::Api".constantize.new(self, @options[m] || {})
+        module_options = @options.merge(@options[m] || {}).merge(:parent => self)
+        h[m] = "Analytical::#{m.to_s.camelize}::Api".constantize.new(module_options)
         h
       end
     end
@@ -58,7 +59,7 @@ module Analytical
     end
 
     alias_method :head_javascript, :head_append_javascript
-    
+
     def body_prepend_javascript
       [init_javascript(:body_prepend), tracking_javascript(:body_prepend)].delete_if{|s| s.blank?}.join("\n")
     end

data/lib/analytical/base.rb

@@ -4,9 +4,9 @@ module Analytical
       attr_reader :tracking_command_location, :parent, :options, :initialized
       attr_accessor :commands
 
-      def initialize(_parent, _options={})
-        @parent = _parent
+      def initialize(_options={})
         @options = _options
+        @parent = @options[:parent]
         @tracking_command_location = :body_prepend
         @initialized = false
         @commands = []

data/lib/analytical/chartbeat.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = [:head_prepend, :body_append]
       end

data/lib/analytical/clicky.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :body_append
       end

data/lib/analytical/comscore.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :head_append
       end

data/lib/analytical/console.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :body_append
       end

data/lib/analytical/crazy_egg.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :body_append
       end

data/lib/analytical/google.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :head_append
       end

data/lib/analytical/hubspot.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :body_append
       end

data/lib/analytical/kiss_metrics.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :body_prepend
       end

data/lib/analytical/optimizely.rb

@@ -3,7 +3,7 @@ module Analytical
     class Api
       include Analytical::Base::Api
 
-      def initialize(parent, options={})
+      def initialize(options={})
         super
         @tracking_command_location = :head_prepend
       end

data/spec/analytical/api_spec.rb

@@ -12,6 +12,10 @@ describe "Analytical::Api" do
         :google=>@google,
       }
     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::Api.new :modules=>[:console], :ssl=>true
+    end
   end
 
   describe 'with modules' do

data/spec/analytical/base_spec.rb

@@ -8,7 +8,7 @@ describe Analytical::Base::Api do
   
   describe '#queue' do
     before(:each) do
-      @api = BaseApiDummy.new(mock('parent'))
+      @api = BaseApiDummy.new(:parent=>mock('parent'))
       @api.commands = [:a, :b, :c]
     end
     describe 'with an identify command' do
@@ -27,7 +27,7 @@ describe Analytical::Base::Api do
 
   describe '#process_queued_commands' do
     before(:each) do
-      @api = BaseApiDummy.new(mock('parent'))
+      @api = BaseApiDummy.new(:parent=>mock('parent'))
       @api.commands = [[:a, 1, 2, 3], [:b, {:some=>:args}]]
       @api.stub!(:a).and_return('a')
       @api.stub!(:b).and_return('b')      
@@ -48,7 +48,7 @@ describe Analytical::Base::Api do
 
   describe '#init_location?' do
     before(:each) do
-      @api = BaseApiDummy.new(mock('parent'))
+      @api = BaseApiDummy.new(:parent=>mock('parent'))
       @api.instance_variable_set '@tracking_command_location', :my_location
     end
     describe 'when the command location matches the init location' do
@@ -65,7 +65,7 @@ describe Analytical::Base::Api do
 
   describe '#init_location' do
     before(:each) do
-      @api = BaseApiDummy.new(mock('parent'))
+      @api = BaseApiDummy.new(:parent=>mock('parent'))
     end
     it 'should check for the init_location' do
       @api.should_receive(:init_location?).with(:some_location).and_return(false)

data/spec/analytical/chartbeat_spec.rb

@@ -6,29 +6,29 @@ describe "Analytical::Chartbeat::Api" do
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Chartbeat::Api.new @parent, {:key=>1234}
+      a = Analytical::Chartbeat::Api.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, {:key=>12345, :domain =>'abcdef.com'}
-      a.options.should == {:key=>12345, :domain => 'abcdef.com'}
+      a = Analytical::Chartbeat::Api.new :parent=>@parent, :key=>12345, :domain =>'abcdef.com'
+      a.options.should == {:key=>12345, :domain => 'abcdef.com', :parent=>@parent}
     end
   end
   describe '#track' do
     it 'should return the tracking javascript' do
-      @api = Analytical::Chartbeat::Api.new @parent, {:key=>12345}
+      @api = Analytical::Chartbeat::Api.new :parent=>@parent, :key=>12345
       @api.track.should == ''
     end
   end
   describe '#identify' do
     it 'should return an empty string' do
-      @api = Analytical::Chartbeat::Api.new @parent, {:key=>12345}
+      @api = Analytical::Chartbeat::Api.new :parent=>@parent, :key=>12345
       @api.identify('nothing', {:matters=>'at all'}).should == ''
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Chartbeat::Api.new @parent, {:key=>12345, :domain =>'abcdef.com'}
+      @api = Analytical::Chartbeat::Api.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

@@ -6,29 +6,29 @@ describe "Analytical::Clicky::Api" do
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Clicky::Api.new @parent, {:key=>'abc'}
+      a = Analytical::Clicky::Api.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, {:key=>'abc'}
-      a.options.should == {:key=>'abc'}
+      a = Analytical::Clicky::Api.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, {:key=>'abcdef'}
+      @api = Analytical::Clicky::Api.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, {:key=>'abcdef'}
+      @api = Analytical::Clicky::Api.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, {:key=>'abcdef'}
+      @api = Analytical::Clicky::Api.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, {:key=>'abcdef', :ssl=>true}
+        @api = Analytical::Clicky::Api.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, {:key=>'abcdef'}
+      @api = Analytical::Clicky::Api.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

@@ -6,31 +6,31 @@ describe "Analytical::Comscore::Api" do
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Comscore::Api.new @parent, {:key=>123}
+      a = Analytical::Comscore::Api.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, {:key=>1234}
-      a.options.should == {:key=>1234}
+      a = Analytical::Comscore::Api.new :parent=>@parent, :key=>1234
+      a.options.should == {:key=>1234, :parent=>@parent}
     end
   end
   describe '#track' do
     it 'should return the tracking javascript' do
-      @api = Analytical::Comscore::Api.new @parent, {:key=>123}
+      @api = Analytical::Comscore::Api.new :parent=>@parent, :key=>123
       @api.track('pagename', {:some=>'data'}).should == ''
     end
   end
 
   describe '#identify' do
     it 'should return an empty string' do
-      @api = Analytical::Comscore::Api.new @parent, {:key=>123}
+      @api = Analytical::Comscore::Api.new :parent=>@parent, :key=>123
       @api.identify('nothing', {:matters=>'at all'}).should == ''
     end
   end
 
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Comscore::Api.new @parent, {:key=>1234}
+      @api = Analytical::Comscore::Api.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

@@ -6,30 +6,30 @@ describe "Analytical::Google::Api" do
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Google::Api.new @parent, {:key=>'abc'}
+      a = Analytical::Google::Api.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, {:key=>'abc'}
-      a.options.should == {:key=>'abc'}
+      a = Analytical::Google::Api.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, {:key=>'abcdef'}
+      @api = Analytical::Google::Api.new :parent=>@parent, :key=>'abcdef'
       @api.track.should == "_gaq.push(['_trackPageview']);"
       @api.track('pagename', {:some=>'data'}).should ==  "_gaq.push(['_trackPageview', \"pagename\"]);"
     end
   end
   describe '#identify' do
     it 'should return an empty string' do
-      @api = Analytical::Google::Api.new @parent, {:key=>'abcdef'}
+      @api = Analytical::Google::Api.new :parent=>@parent, :key=>'abcdef'
       @api.identify('nothing', {:matters=>'at all'}).should == ''
     end
   end
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Google::Api.new @parent, {:key=>'abcdef'}
+      @api = Analytical::Google::Api.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

@@ -6,41 +6,41 @@ describe "Analytical::KissMetrics::Api" do
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::KissMetrics::Api.new @parent, {:js_url_key=>'abc'}
+      a = Analytical::KissMetrics::Api.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, {:js_url_key=>'abc'}
-      a.options.should == {:js_url_key=>'abc'}
+      a = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abc'
+      a.options.should == {:js_url_key=>'abc', :parent=>@parent}
     end
   end
   describe '#track' do
     it 'should return the tracking javascript' do
-      @api = Analytical::KissMetrics::Api.new @parent, {:js_url_key=>'abcdef'}
+      @api = Analytical::KissMetrics::Api.new :parent=>@parent, :js_url_key=>'abcdef'
       @api.track('pagename', {:some=>'data'}).should == ''
     end
   end
   describe '#identify' do
     it 'should return a js string' do
-      @api = Analytical::KissMetrics::Api.new @parent, {:js_url_key=>'abcdef'}
+      @api = Analytical::KissMetrics::Api.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, {:js_url_key=>'abcdef'}
+      @api = Analytical::KissMetrics::Api.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, {:js_url_key=>'abcdef'}
+      @api = Analytical::KissMetrics::Api.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 '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::KissMetrics::Api.new @parent, {:js_url_key=>'abcdef'}
+      @api = Analytical::KissMetrics::Api.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

@@ -6,31 +6,31 @@ describe "Analytical::Optimizely::Api" do
   end
   describe 'on initialize' do
     it 'should set the command_location' do
-      a = Analytical::Optimizely::Api.new @parent, {:key=>'abc'}
+      a = Analytical::Optimizely::Api.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, {:key=>'abc'}
-      a.options.should == {:key=>'abc'}
+      a = Analytical::Optimizely::Api.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::Optimizely::Api.new @parent, {:key=>'abcdef'}
+      @api = Analytical::Optimizely::Api.new :parent=>@parent, :key=>'abcdef'
       @api.track('pagename', {:some=>'data'}).should == ''
     end
   end
 
   describe '#identify' do
     it 'should return an empty string' do
-      @api = Analytical::Optimizely::Api.new @parent, {:key=>'abcdef'}
+      @api = Analytical::Optimizely::Api.new :parent=>@parent, :key=>'abcdef'
       @api.identify('nothing', {:matters=>'at all'}).should == ''
     end
   end
 
   describe '#init_javascript' do
     it 'should return the init javascript' do
-      @api = Analytical::Optimizely::Api.new @parent, {:key=>'abcdef'}
+      @api = Analytical::Optimizely::Api.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,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytical
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Joshua Krall
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -05:00
+date: 2010-09-10 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
@@ -36,9 +39,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"
@@ -149,23 +154,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.