split-analytics 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c137bdda5d58e5be423f480171b8db9a33ca43b
-  data.tar.gz: c2a14e14b278cccfd05b8173439eb30c1d45be2c
+  metadata.gz: ae9c0830e8d0f8a173d397c71c090971e1584cf2
+  data.tar.gz: 3fff2e89f8c222d0973d2c24ec6070c452ef9277
 SHA512:
-  metadata.gz: 75686f802c2e7089d5fa8b0653c7a063c90cf3cfb9058d58fcff56a981a3d0c26eb58bd0a84d7fd15601b7c4711ccc33991b8fbd1a18a63d80f933eaddece03c
-  data.tar.gz: d0a2ed6631741fc21ba09282f92524060e27cf98a0581dbe2b005d61e18a6ee7c82971c8ff7c3e117f09e6c8e53fc096a73acf4a04de6b3fc7e532d222d6ba29
+  metadata.gz: aa31c9bd3443748b92677377ca8f29e6868f1b78c51e7a4677ac2375e06412c83a76f94f496aba0a94d06f820d3fd6dc166240774923b2f33b862a425f9a3d60
+  data.tar.gz: 2f4bd0c27bfdd1cc8141ba93b77d38ee254e8c8b4ff0c065da6848149115fb24ed89607807cf7b4029df9b71b2193d01a2cefaaeed6c2374939120170919773a

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.1.5
+
+services:
+   - redis-server
+cache: bundler
+sudo: false

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Andrew Nesbitt
+Copyright (c) 2015 Andrew Nesbitt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{Readme.mdown → Readme.md}

@@ -107,4 +107,4 @@ Tests can be ran with `rake spec`
 
 ## Copyright
 
-Copyright (c) 2013 Andrew Nesbitt. See LICENSE for details.
+Copyright (c) 2015 Andrew Nesbitt. See LICENSE for details.

data/lib/split/analytics.rb

@@ -1,8 +1,8 @@
-require "split/helper"
+require 'split/helper'
 
 module Split
   module Analytics
-    def tracking_code(options={})
+    def tracking_code(options = {})
       # needs more options: http://code.google.com/apis/analytics/docs/gaJS/gaJSApi.html
       account = options.delete(:account)
       tracker_url = options.delete(:tracker_url)
@@ -26,15 +26,15 @@ module Split
           })();
         </script>
       EOF
-      code = raw(code)if defined?(raw)
+      code = raw(code) if defined?(raw)
       code
     end
 
     def custom_variables
-      return nil if session[:split].nil?
+      return nil if ab_user.nil?
       arr = []
-      session[:split].each_with_index do |h,i|
-        arr << "_gaq.push(['_setCustomVar', #{i+1}, '#{h[0]}', '#{h[1]}', 1]);"
+      ab_user.each_with_index do |h, i|
+        arr << "_gaq.push(['_setCustomVar', #{i + 1}, '#{h[0]}', '#{h[1]}', 1]);"
       end
       arr.reverse[0..4].reverse.join("\n")
     end
@@ -44,7 +44,7 @@ module Split
       def insert_tracker_methods(tracker_methods)
         return nil if tracker_methods.nil?
         arr = []
-        tracker_methods.each do |k,v|
+        tracker_methods.each do |k, v|
           if v.class == String && v.empty?
             # No argument tracker method
             arr << "_gaq.push(['" + "_" + "#{k}']);"
@@ -52,17 +52,17 @@ module Split
             case v
             when String
               # String argument tracker method
-              arr << "_gaq.push(['" + "_" + "#{k}', '#{v}']);"
+              arr << "_gaq.push(['" + '_' + "#{k}', '#{v}']);"
             when TrueClass
               # Boolean argument tracker method
-              arr << "_gaq.push(['" + "_" + "#{k}', #{v}]);"
+              arr << "_gaq.push(['" + '_' + "#{k}', #{v}]);"
             when FalseClass
               # Boolean argument tracker method
-              arr << "_gaq.push(['" + "_" + "#{k}', #{v}]);"
+              arr << "_gaq.push(['" + '_' + "#{k}', #{v}]);"
             when Array
               # Array argument tracker method
               values = v.map { |value| "'#{value}'" }.join(', ')
-              arr << "_gaq.push(['" + "_" + "#{k}', #{values}]);"
+              arr << "_gaq.push(['" + '_' + "#{k}', #{values}]);"
             end
           end
         end
@@ -80,4 +80,4 @@ if defined?(Rails)
     ActionController::Base.send :include, Split::Analytics
     ActionController::Base.helper Split::Analytics
   end
-end
+end

data/lib/split/analytics/version.rb

@@ -1,5 +1,5 @@
 module Split
   module Analytics
-    VERSION = "0.4.0"
+    VERSION = '1.0.0'
   end
 end

data/spec/analytics_spec.rb

@@ -2,33 +2,30 @@ require 'spec_helper'
 
 describe Split::Analytics do
   include Split::Helper
-  it "should generate valid analytics javascript" do
-    tracking_code = tracking_code(:account => 'UA-12345-6')
-    tracking_code.should eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+  it 'should generate valid analytics javascript' do
+    tracking_code = tracking_code(account: 'UA-12345-6')
+    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
   end
 
-  it "should generate valid analytics javascript with arbitrary tracker object methods" do
+  it 'should generate valid analytics javascript with arbitrary tracker object methods' do
     tracker_methods = {
-      :setDomainName => "example.com", # String argument
-      :setAllowLinker => true, # Boolean argument
-      :clearOrganic => "" # No argument
+      setDomainName: 'example.com', # String argument
+      setAllowLinker: true, # Boolean argument
+      clearOrganic: '' # No argument
     }
     tracking_code = tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
-    tracking_code.should eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          _gaq.push(['_setDomainName', 'example.com']);\n_gaq.push(['_setAllowLinker', true]);\n_gaq.push(['_clearOrganic']);\n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          _gaq.push(['_setDomainName', 'example.com']);\n_gaq.push(['_setAllowLinker', true]);\n_gaq.push(['_clearOrganic']);\n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
   end
 
-  it "should add custom variables for every test the user is involved in" do
+  it 'should add custom variables for every test the user is involved in' do
     first_alt = ab_test('link_colour', 'red', 'blue')
-    second_alt = ab_test('link_text', 'Join', 'Signup')
 
-    session[:split].should eql({'link_colour' => first_alt,'link_text' => second_alt})
-
-    tracking_code = tracking_code(:account => 'UA-12345-6')
-    tracking_code.should eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          _gaq.push(['_setCustomVar', 1, 'link_colour', '#{first_alt}', 1]);\n_gaq.push(['_setCustomVar', 2, 'link_text', '#{second_alt}', 1]);\n\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+    tracking_code = tracking_code(account: 'UA-12345-6')
+    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          _gaq.push(['_setCustomVar', 1, 'link_colour', '#{first_alt}', 1]);\n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
   end
 
-  it "uses doubleclick as tracker url" do
-    tracking_code = tracking_code(:account => 'UA-12345-6', :tracker_url => 'stats.g.doubleclick.net/dc.js', :ssl_tracker_url => 'stats.g.doubleclick.net/dc.js')
-    tracking_code.should eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://stats.g.doubleclick.net/dc.js' : 'http://stats.g.doubleclick.net/dc.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+  it 'uses doubleclick as tracker url' do
+    tracking_code = tracking_code(account: 'UA-12345-6', tracker_url: 'stats.g.doubleclick.net/dc.js', :ssl_tracker_url => 'stats.g.doubleclick.net/dc.js')
+    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://stats.g.doubleclick.net/dc.js' : 'http://stats.g.doubleclick.net/dc.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
   end
 end

data/spec/spec_helper.rb

@@ -5,17 +5,11 @@ require 'split/helper'
 require 'split/analytics'
 require 'ostruct'
 
-def session
-  @session ||= {}
-end
-
-def params
-  @params ||= {}
-end
-
-def request(ua = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; de-de) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27')
-  r = OpenStruct.new
-  r.user_agent = ua
-  r.ip = '192.168.1.1'
-  @request ||= r
+RSpec.configure do |config|
+  config.order = 'random'
+  config.before(:each) do
+    Split.configuration = Split::Configuration.new
+    Split.redis.flushall
+    @ab_user = {}
+  end
 end

data/split-analytics.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "split/analytics/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'split/analytics/version'
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Andrew Nesbitt"]
-  gem.email         = ["andrewnez@gmail.com"]
-  gem.summary       = %q{Split extension to push test data to google analytics}
-  gem.homepage      = "https://github.com/andrew/split-analytics"
+  gem.authors       = ['Andrew Nesbitt']
+  gem.email         = ['andrewnez@gmail.com']
+  gem.summary       = 'Split extension to push test data to google analytics'
+  gem.homepage      = 'https://github.com/andrew/split-analytics'
   gem.license       = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "split-analytics"
+  gem.name          = 'split-analytics'
   gem.require_paths = ['lib']
   gem.version       = Split::Analytics::VERSION
 
-  gem.add_dependency(%q<split>, [">=  0.3.0"])
+  gem.add_dependency('split', '>= 1.0.0')
 
-  # Development Dependencies
-  gem.add_development_dependency(%q<rspec>, ["~>  2.14"])
+  gem.add_development_dependency('rspec', '~> 3.1')
+  gem.add_development_dependency('rake', '~> 10.4')
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: split-analytics
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: split
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 description: 
 email:
 - andrewnez@gmail.com
@@ -45,11 +59,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - Rakefile
-- Readme.mdown
+- Readme.md
 - lib/split/analytics.rb
 - lib/split/analytics/version.rb
 - spec/analytics_spec.rb
@@ -65,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Split extension to push test data to google analytics