split-analytics 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37226a44a019f3dfdb48e667631cc012389cc588
-  data.tar.gz: 2dd4cb0f15a3cfa437d8cc003947c91ac38f14c4
+SHA256:
+  metadata.gz: 78147218626221c2bfaeda3b5172d09e8338e790fceb638a7308151405dc9648
+  data.tar.gz: f29e658301c364bc48bf6bd1ff461b1c7cce5c615020693304957f7cce6653c9
 SHA512:
-  metadata.gz: 428b4424100c1285bf16814e04911c0514d1336cbacd731c5fb24c3bb0e29adea3938e013d622f8286d2e4460142f57e8f1ee21680e1a4d1e10c2cfd80266e39
-  data.tar.gz: f044584b79505ca14a492881bdc6797e0f0b0158407d474f21a175cd3333b53955bb176558006abde7e646d609701587b8ecf90dd6de6966180b8b71c76d4975
+  metadata.gz: 2a579209e8040b7e2f6eb003fe93efa4b29d936dd01568febfd2c435b51ccf4713b4284baba0c317838da522b3d80fbf185635d59e985a6ac4dbab17d81bf766
+  data.tar.gz: 3a3f1f0656cb0bd7e97601dc9844e4549659ddfd2f8b5670cecdf5a5193cd61b7ebf8e1f318bb81258713deef5cf1f54d3b2b4b51932dc15fe5dfa662df153ee

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: split-analytics
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - '3.0'
+          # - 3.1
+
+    services:
+      redis:
+        image: redis
+        ports: ['6379:6379']
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: Install dependencies
+      run: bundle install
+
+    - name: Display Ruby version
+      run: ruby -v
+
+    - name: Test
+      run: bundle exec rspec --backtrace

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at andrewnez@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -0,0 +1,20 @@
+# Contributing
+
+Source hosted at [GitHub](http://github.com/splitrb/split-analytics).
+Report Issues/Feature requests on [GitHub Issues](http://github.com/splitrb/split-analytics/issues).
+
+Please follow the [Code of Conduct](CODE_OF_CONDUCT.md).
+
+## Note on Patches/Pull Requests
+
+ * Fork the project.
+ * Make your feature addition or bug fix.
+ * Add tests for it. This is important so I don't break it in a
+   future version unintentionally.
+ * Commit, do not mess with rakefile, version, or history.
+   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+ * Send me a pull request. Bonus points for topic branches.
+
+## Testing
+
+Tests can be ran with `rake spec`.`

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Andrew Nesbitt
+Copyright (c) 2015-2018 Andrew Nesbitt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -4,4 +4,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new('spec')
 
-task :default => :spec
+task default: :spec

data/Readme.md

@@ -1,21 +1,23 @@
 # [Split Analytics](http://libraries.io/rubygems/split-analytics)
 
-An extension to [Split](http://github.com/splitrb/split) to push test data to google analytics.
+> 📊 An extension to [Split](http://github.com/splitrb/split) to push test data to Google Analytics
 
 [![Build Status](https://secure.travis-ci.org/splitrb/split-analytics.svg?branch=master)](http://travis-ci.org/andrew/split-analytics)
 [![Gem Version](https://badge.fury.io/rb/split-analytics.svg)](http://badge.fury.io/rb/split-analytics)
 [![Dependency Status](https://gemnasium.com/splitrb/split-analytics.svg)](https://gemnasium.com/andrew/split-analytics)
 
-## Requirements
+## Install
+
+### Requirements
 
 The split gem and its dependencies.
 
-## Setup
+### Setup
 
 If you are using bundler add split to your Gemfile:
 
 ```ruby
-gem 'split-analytics', :require => 'split/analytics'
+gem 'split-analytics', require: 'split/analytics'
 ```
 
 Then run:
@@ -43,13 +45,13 @@ Use in your application layout template
 erb example:
 
 ```erb
-<%= tracking_code(:account => 'UA-12345-6') %>
+<%= tracking_code(account: 'UA-12345-6') %>
 ```
 
 haml example:
 
 ```haml
-= tracking_code(:account => 'UA-12345-6')
+= tracking_code(account: 'UA-12345-6')
 ```
 
 ### With Tracking Methods
@@ -58,23 +60,23 @@ See [Google Analytics Tracking Methods](https://developers.google.com/analytics/
 
 ```ruby
 tracker_methods = {
-  :setDomainName => "example.com", # String argument
-  :setAllowLinker => true, # Boolean argument
-  :require => ['inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js'] # Array argument (will be splattered)
-  :clearOrganic => "" # No argument
+  setDomainName: "example.com", # String argument
+  setAllowLinker: true, # Boolean argument
+  require: ['inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js'] # Array argument (will be splattered)
+  clearOrganic: "" # No argument
 }
 ```
 
 erb example:
 
 ```erb
-<%= tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods) %>
+<%= tracking_code(account: 'UA-12345-6', tracker_methods: tracker_methods) %>
 ```
 
 haml example:
 
 ```haml
-= tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
+= tracking_code(account: 'UA-12345-6', tracker_methods: tracker_methods)
 ```
 ### Other Tracking URLs
 
@@ -83,21 +85,21 @@ You can use other Tracking URLs with the option tracker_url and ssl_tracker_url.
 erb example:
 
 ```erb
-<%= 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(account: 'UA-12345-6', tracker_url: 'stats.g.doubleclick.net/dc.js', ssl_tracker_url: 'stats.g.doubleclick.net/dc.js') %>
 ```
 
 haml example:
 
 ```haml
-= 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(account: 'UA-12345-6', tracker_url: 'stats.g.doubleclick.net/dc.js', ssl_tracker_url: 'stats.g.doubleclick.net/dc.js')
 ```
 
-## Development
+## Contributing
 
 Source hosted at [GitHub](http://github.com/splitrb/split-analytics).
 Report Issues/Feature requests on [GitHub Issues](http://github.com/splitrb/split-analytics/issues).
 
-Tests can be ran with `rake spec`
+Please follow the [Code of Conduct](CODE_OF_CONDUCT.md).
 
 ### Note on Patches/Pull Requests
 
@@ -109,6 +111,10 @@ Tests can be ran with `rake spec`
    (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
  * Send me a pull request. Bonus points for topic branches.
 
-## Copyright
+### Testing
+
+Tests can be ran with `rake spec`.
+
+## License
 
-Copyright (c) 2015 Andrew Nesbitt. See LICENSE for details.
+Copyright (c) 2015-2018 Andrew Nesbitt. See [LICENSE](LICENSE) for details.

data/lib/split/analytics/version.rb

@@ -1,5 +1,5 @@
 module Split
   module Analytics
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/lib/split/analytics.rb

@@ -31,10 +31,10 @@ module Split
     end
 
     def custom_variables
-      return nil if session.nil?
+      return nil if ab_user.nil?
       arr = []
 
-      session.each_with_index do |h, i|
+      ab_user.active_experiments.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")

data/spec/analytics_spec.rb

@@ -13,21 +13,20 @@ describe Split::Analytics do
       setAllowLinker: true, # Boolean argument
       clearOrganic: '' # No argument
     }
-    tracking_code = tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
+    tracking_code = tracking_code(account: 'UA-12345-6', tracker_methods: tracker_methods)
     expect(tracking_code).to eql(%Q{        <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
     first_alt = ab_test('link_colour', 'red', 'blue')
-
-    expect(session).to eql({'link_colour' => first_alt})
+    expect(ab_user.active_experiments).to eql({'link_colour' => first_alt})
 
     tracking_code = tracking_code(account: 'UA-12345-6')
     expect(tracking_code).to eql(%Q{        <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 = 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(%Q{        <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,15 +5,37 @@ require 'split/helper'
 require 'split/analytics'
 require 'ostruct'
 
-def session
-  @ab_user ||= {}
-end
+module GlobalSharedContext
+  extend RSpec::SharedContext
+  let(:ab_user){ Split::User.new(double(session: {})) }
 
-RSpec.configure do |config|
-  config.order = 'random'
-  config.before(:each) do
+  before(:each) do
     Split.configuration = Split::Configuration.new
+    Split.redis = Redis.new(db: 10)
     Split.redis.flushall
-    @ab_user = {}
+    @ab_user = ab_user
+    params = nil
   end
 end
+
+RSpec.configure do |config|
+  config.order = 'random'
+  config.include GlobalSharedContext
+end
+
+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')
+  @request ||= begin
+    r = OpenStruct.new
+    r.user_agent = ua
+    r.ip = '192.168.1.1'
+    r
+  end
+end

data/split-analytics.gemspec

@@ -5,7 +5,7 @@ require 'split/analytics/version'
 Gem::Specification.new do |gem|
   gem.authors       = ['Andrew Nesbitt']
   gem.email         = ['andrewnez@gmail.com']
-  gem.summary       = 'Split extension to push test data to google analytics'
+  gem.summary       = 'Split extension to push test data to Google Analytics'
   gem.homepage      = 'https://github.com/splitrb/split-analytics'
   gem.license       = 'MIT'
 
@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Split::Analytics::VERSION
 
-  gem.add_dependency('split', '>= 1.0.0')
+  gem.add_dependency('split', '>= 3.0.0')
 
   gem.add_development_dependency('rspec', '~> 3.1')
-  gem.add_development_dependency('rake', '~> 10.4')
+  gem.add_development_dependency('rake', '~> 13.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: split-analytics
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: split
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,23 +44,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-description: 
+        version: '13.0'
+description:
 email:
 - andrewnez@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - Rakefile
@@ -74,7 +77,7 @@ homepage: https://github.com/splitrb/split-analytics
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,11 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: Split extension to push test data to google analytics
+summary: Split extension to push test data to Google Analytics
 test_files:
 - spec/analytics_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

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