analytical 3.0.6 → 3.0.7

data/VERSION

@@ -1 +1 @@
-3.0.6
+3.0.7

data/analytical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analytical}
-  s.version = "3.0.6"
+  s.version = "3.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Krall", "Nathan Phelps", "Adam Anderson", "Kevin Menard", "Ablyamitov Ablyamit", "Kurt Werle", "Olivier Lauzon", "Daniel Doubrovkine"]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-09-09}
   s.description = %q{Gem for managing multiple analytics services in your rails app.}
   s.email = %q{josh@feefighters.com}
   s.extra_rdoc_files = [

data/lib/analytical.rb

@@ -15,8 +15,14 @@ module Analytical
       env = (::Rails.env || :production).to_sym
       file_options = file_options[env] if file_options.has_key?(env)
       file_options.each do |k, v|
-        config_options[k.to_sym] = v.symbolize_keys
-        config_options[:modules] << k.to_sym unless options && options[:modules]
+        if v.respond_to?(:symbolize_keys)
+          # module configuration
+          config_options[k.to_sym] = v.symbolize_keys
+          config_options[:modules] << k.to_sym unless options && options[:modules]
+        else
+          # regular option
+          config_options[k.to_sym] = v
+        end
       end if file_options
     end if File.exists?("#{::Rails.root}/config/analytical.yml")
 
@@ -38,7 +44,7 @@ module Analytical
           options[:modules] = []
         end
         options[:modules] = options[:filter_modules].call(self, options[:modules]) if options[:filter_modules]
-        options[:javascript_helpers] ||= true
+        options[:javascript_helpers] ||= true if options[:javascript_helpers].nil?
         Analytical::Api.new options
       end
     end

data/lib/analytical/api.rb

@@ -76,7 +76,7 @@ module Analytical
         if ::Rails::VERSION::MAJOR >= 3 && ::Rails::VERSION::MINOR >= 1  # Rails 3.1 lets us override views in engines
           js << options[:controller].send(:render_to_string, :partial=>'analytical_javascript') if options[:controller]
         else # All other rails
-          _partial_path = Pathname.new(__FILE__).dirname.join('..', '..', 'app/views/application', 'analytical_javascript.html.erb').to_s
+          _partial_path = Pathname.new(__FILE__).dirname.join('..', '..', 'app/views/application', '_analytical_javascript.html.erb').to_s
           js << options[:controller].send(:render_to_string, :partial=>_partial_path) if options[:controller]
         end
       end
@@ -128,4 +128,4 @@ module Analytical
 
   end
 
-end
+end

data/lib/analytical/modules/clicky.rb

@@ -55,4 +55,4 @@ module Analytical
 
     end
   end
-end
+end

data/spec/analytical/api_spec.rb

@@ -111,6 +111,16 @@ describe "Analytical::Api" do
           @google.should_receive(:init_javascript).with(:head_append).and_return('google_a')
           @api.head_append_javascript.should == "console_agoogle_a"
         end
+        it 'should render an existing template for Rails 3.0' do
+          @api.options[:javascript_helpers] = true
+          (@api.options[:controller] ||= Object.new).stub!(:render_to_string) { |param| param[:partial] }
+          File.exist?(@api.head_append_javascript).should be_true
+        end
+        it 'should not render an existing template if javascript_helpers is false' do
+          @api.options[:javascript_helpers] = false
+          (@api.options[:controller] ||= Object.new).should_not_receive(:render_to_string)
+          @api.head_append_javascript.should be_blank
+        end
       end
       
       describe '#body_prepend_javascript' do

data/spec/analytical/modules/clicky_spec.rb

@@ -35,12 +35,6 @@ describe "Analytical::Modules::Clicky" do
       @api.init_javascript(:body_append).should =~ /static.getclicky.com\/js/
       @api.init_javascript(:body_append).should =~ /abcdef/      
     end
-    describe 'for an ssl connection' do
-      it 'should return the ssl init code' do
-        @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::Modules::Clicky.new :parent=>@parent, :key=>'abcdef'
       @api.queue :identify, 'user id', {:email=>'someone@test.com'}

data/spec/analytical_spec.rb

@@ -25,6 +25,16 @@ describe "Analytical" do
       DummyForInit.analytical
       d = DummyForInit.new.analytical
       d.options[:modules].sort_by { |m| m.to_s }.should == [:chartbeat, :clicky, :google, :kiss_metrics]
+      d.options[:true_option].should be_true
+      d.options[:false_option].should be_false
+      d.options[:string_option].should == "string"
+    end
+
+    it 'should preserve :javascript_helpers option' do
+      options = { :javascript_helpers => false, :modules => [] }
+      DummyForInit.analytical options
+      a = DummyForInit.new.analytical
+      a.options[:javascript_helpers].should be_false
     end
 
     it 'should use the supplied options' do

data/spec/config/analytical.yml

@@ -1,4 +1,8 @@
 test:
+  javascript_helpers: true
+  false_option: false
+  true_option: true
+  string_option: "string"
   google:
     key: google_12345
   clicky:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytical
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 0
-  - 6
-  version: 3.0.6
+  - 7
+  version: 3.0.7
 platform: ruby
 authors: 
 - Joshua Krall
@@ -22,11 +22,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -05:00
+date: 2011-09-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -37,12 +39,12 @@ dependencies:
         - 0
         - 9
         version: 3.0.9
-  requirement: *id001
-  type: :development
-  prerelease: false
+  version_requirements: *id001
   name: rails
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,12 +53,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  type: :development
-  prerelease: false
+  version_requirements: *id002
   name: activesupport
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +67,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  type: :development
-  prerelease: false
+  version_requirements: *id003
   name: activemodel
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -81,12 +83,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id004
-  type: :development
-  prerelease: false
+  version_requirements: *id004
   name: rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -97,12 +99,12 @@ dependencies:
         - 6
         - 4
         version: 2.6.4
-  requirement: *id005
-  type: :development
-  prerelease: false
+  version_requirements: *id005
   name: rspec-core
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -113,12 +115,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id006
-  type: :development
-  prerelease: false
+  version_requirements: *id006
   name: rspec-expectations
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -129,12 +131,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id007
-  type: :development
-  prerelease: false
+  version_requirements: *id007
   name: rspec-mocks
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -145,12 +147,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id008
-  type: :development
-  prerelease: false
+  version_requirements: *id008
   name: rspec-rails
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,12 +161,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-  type: :development
-  prerelease: false
+  version_requirements: *id009
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,12 +175,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-  type: :development
-  prerelease: false
+  version_requirements: *id010
   name: diff-lcs
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,12 +189,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
-  type: :development
-  prerelease: false
+  version_requirements: *id011
   name: guard
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -201,12 +203,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
-  type: :development
-  prerelease: false
+  version_requirements: *id012
   name: guard-rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -215,12 +217,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
-  type: :development
-  prerelease: false
+  version_requirements: *id013
   name: rb-fsevent
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -229,9 +231,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
-  type: :development
-  prerelease: false
+  version_requirements: *id014
   name: growl
 description: Gem for managing multiple analytics services in your rails app.
 email: josh@feefighters.com