workarea-google_analytics 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca843aa749daf4ee89e4cc4584e0439f5928e1577d27c64ed72eba13f48caa5
-  data.tar.gz: 99ec473ad9acfd98becfed72f6af78495df7342f847b4b6340808fceebd4df90
+  metadata.gz: b3b2732c59098561a87d64fcaa5b282c327e729c3bf26f64ff8ba0d252b6e286
+  data.tar.gz: 7274c3cc842cf545257bfce7fbbd012559b6c0dffaa515e83e079e2dbbda6f37
 SHA512:
-  metadata.gz: d10d98ad3456003e96aee4906b9e7fd4ba0b5a0da2bebc6912081adae4f8f31529dea145ea5d94ce71fdfb5436705aa48797771c85bf89428ab3c461b7975909
-  data.tar.gz: 1cec12e197be3021adb2c95c336f3079438886b50ee5aa83748868f20f826a674ad38d009f94396a54846f758b49524fce8fc4cd283314076b09944219b56a11
+  metadata.gz: e9a26aa2b74b54a05541671fcc8cd7dd48d5763013d78008cf32d19e6aff4d7602f539c6b08ca36edbc022f550235d34d90d1fa67a6af743cd2188c881649ca6
+  data.tar.gz: f8e156793f7fa1a48c41e766f70d7cd2022d8f8f7ab6db78eaccf0ea29e81750b8fdc1e776d35fdb7a19b021e780e9c0739948c33711d6d75fdc1f07a4bf6bcc

data/.eslintrc.json

@@ -0,0 +1,35 @@
+{
+    "extends": "eslint:recommended",
+    "rules": {
+      "semi": ["error", "always"],
+      "eqeqeq": ["error", "always"]
+    },
+    "globals": {
+      "window": true,
+      "document": true,
+      "WORKAREA": true,
+      "$": true,
+      "jQuery": true,
+      "_": true,
+      "feature": true,
+      "JST": true,
+      "Turbolinks": true,
+      "I18n": true,
+      "Chart": true,
+      "Dropzone": true,
+      "strftime": true,
+      "Waypoint": true,
+      "wysihtml": true,
+      "LocalTime": true,
+      "describe": true,
+      "after": true,
+      "afterEach": true,
+      "before": true,
+      "beforeEach": true,
+      "it": true,
+      "expect": true,
+      "sinon": true,
+      "fixture": true,
+      "chai": true
+    }
+}

data/.github/workflows/ci.yml

@@ -0,0 +1,57 @@
+name: CI
+on: [push]
+
+jobs:
+  static_analysis:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: workarea-commerce/ci/bundler-audit@v1
+    - uses: workarea-commerce/ci/rubocop@v1
+    - uses: workarea-commerce/ci/eslint@v1
+      with:
+        args: '**/*.js'
+
+  admin_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:admin
+
+  core_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:core
+
+  storefront_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:storefront
+
+  plugins_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:plugins

data/.gitignore

@@ -13,4 +13,4 @@ node_modules
 test/reports
 package.json
 yarn.lock
-.rubocop-http*
+.rubocop-http*

data/.rubocop.yml

@@ -0,0 +1,3 @@
+inherit_from:
+  - https://raw.githubusercontent.com/workarea-commerce/workarea/master/.rubocop.yml
+

data/.stylelintrc.json

@@ -0,0 +1,8 @@
+{
+  "extends": "stylelint-config-recommended-scss",
+  "rules": {
+    "block-no-empty": null,
+    "no-descending-specificity": null,
+    "property-no-unknown": [true, { "ignoreProperties": ["mso-hide"] }]
+  }
+}

data/CHANGELOG.md

@@ -1,18 +1,3 @@
-Workarea Google Analytics 2.1.6 (2020-02-04)
---------------------------------------------------------------------------------
-
-*   Don't Call Google Analytics Until It's Defined
-
-    Instead of seeing whether the app is in the test environment, check
-    whether the `ga()` function is present before sending any calls to it.
-    This prevents a JS error that occurs when the
-    `config.google_analytics_tracking_id` is missing.
-
-    GOOGLEANALYTICS-4
-    Tom Scott
-
-
-
 Workarea Google Analytics 2.1.5 (2019-08-21)
 --------------------------------------------------------------------------------
 

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
-git_source(:github) { |repo| "git@github.com:#{repo}.git" }
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem 'workarea', github: 'workarea-commerce/workarea', branch: 'v3.5-stable'
+gem 'workarea', github: 'workarea-commerce/workarea'

data/README.md

@@ -30,22 +30,7 @@ bundle
 Configuration
 --------------------------------------------------------------------------------
 
-To integrate your Workarea application with Google Analytics you need configure your host application with your Google Analytics tracking ID.
-
-You should use application secrets to do this. Add the following to your `config/secrets.yml` file
-
-```yaml
-google_analytics:
-  :tracking_id: UA-2499240-11
-```
-
-Then in workarea.rb add the following config:
-
-```ruby
-Workarea.configure do |config|
-  config.google_analytics_tracking_id = Rails.application.secrets.google_analytics[:tracking_id]
-end
-```
+To integrate your Workarea application with Google Analytics you need configure your host application with your Google Analytics tracking ID in the "Analytics" section on the configuration page within the admin UI.
 
 Shared Payloads
 --------------------------------------------------------------------------------

data/Rakefile

@@ -16,12 +16,13 @@ desc "Release version #{Workarea::GoogleAnalytics::VERSION} of the gem"
 task :release do
   host = "https://#{ENV['BUNDLE_GEMS__WEBLINC__COM']}@gems.weblinc.com"
 
-  Rake::Task['workarea:changelog'].execute
-  system 'git add CHANGELOG.md'
-  system 'git commit -m "Update CHANGELOG"'
+  #Rake::Task['workarea:changelog'].execute
+  #system 'git add CHANGELOG.md'
+  #system 'git commit -m "Update CHANGELOG"'
+  #system 'git push origin HEAD'
 
   system "git tag -a v#{Workarea::GoogleAnalytics::VERSION} -m 'Tagging #{Workarea::GoogleAnalytics::VERSION}'"
-  system 'git push origin HEAD --follow-tags'
+  system 'git push --tags'
 
   system 'gem build workarea-google_analytics.gemspec'
   system "gem push workarea-google_analytics-#{Workarea::GoogleAnalytics::VERSION}.gem"

data/app/assets/javascripts/workarea/storefront/google_analytics/modules/adapter.js

@@ -13,7 +13,7 @@ WORKAREA.analytics.registerAdapter('googleAnalytics', function () {
                 console.log(arguments);
             }
 
-            if (!WORKAREA.environment.isTest && !_.isUndefined(window.ga)) {
+            if (!WORKAREA.environment.isTest) {
               ga.apply(ga, arguments);
             }
         };

data/app/views/workarea/storefront/analytics/_google_analytics.html.haml

@@ -1,6 +1,7 @@
-%meta{ property: 'ga-tracking-id', content: Workarea.config.google_analytics_tracking_id }
-:javascript
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+- if Workarea.config.google_analytics_tracking_id.present?
+  %meta{ property: 'ga-tracking-id', content: Workarea.config.google_analytics_tracking_id }
+  :javascript
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');

data/config/initializers/fields.rb

@@ -0,0 +1,8 @@
+Workarea::Configuration.define_fields do
+  fieldset 'Analytics', namespaced: false do
+    field 'Google Analytics Tracking ID',
+      type: :string,
+      default: 'TODO',
+      description: 'Tracking id to use for tracking google analytics.'
+  end
+end

data/lib/workarea/google_analytics/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module GoogleAnalytics
-    VERSION = '2.1.6'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
+Rails.application.config.session_store :cookie_store, key: '_dummy_session', expire_after: 30.minutes

data/workarea-google_analytics.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'workarea', '~> 3.x'
+  s.add_dependency 'workarea', '~> 3.x', '>= 3.5.x'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-google_analytics
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.x
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.x
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.x
 description: Provides Google Analytics Enhanced Ecommerce integration for the Workarea
   Commerce Platform.
 email:
@@ -33,11 +39,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".eslintrc.json"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation-request.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".stylelintrc.json"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -50,7 +60,7 @@ files:
 - app/views/workarea/storefront/analytics/_google_analytics.html.haml
 - bin/rails
 - config/initializers/appends.rb
-- config/initializers/configuration.rb
+- config/initializers/fields.rb
 - config/routes.rb
 - lib/tasks/google_analytics_tasks.rake
 - lib/workarea/google_analytics.rb

data/config/initializers/configuration.rb

@@ -1 +0,0 @@
-Workarea.config.google_analytics_tracking_id = 'TODO'