spree_analytics_trackers 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73068544992b2ab73b42d2d9973c61217f2e9006b1eeaf82bb487d0c06694253
-  data.tar.gz: b5487f54f759141810e350a7aabe3c89870a2586d0f79c234c02a9a2f962c96d
+  metadata.gz: c6f1b28e6012acef941df826e5815966db364756eee0ed406993e7ffcfd2f3c8
+  data.tar.gz: a068b460859953446838873b5d89b09099e5567ab06cf65b3a2e7ebfaae4fd6e
 SHA512:
-  metadata.gz: 961549e600a21cb31dad51459269e95f304c2540ad6e4603780a74548e77331507f0ffa9b7e64663915f9ade40107422e105ec4ab3e735b22c269176b7cb0ba6
-  data.tar.gz: bb01db4431806581753611af24c40f6bfe60b9454c063a3907676bbecce138a2c5260a4e52290cecb9c05cb65e448c32056d6d91da7714b7250d7fd3987a4d22
+  metadata.gz: 8179531fa524a7e17aed73f743eeafd961be9d583c54a521b7a9bf1b5a344527e1bb2a447d763ef274bea91cedc6219e5305bc4b987c837d50d3b5ca2e9e1594
+  data.tar.gz: fc3849ab2602836c69f914e2a502650ff67ba842a95e2a6e3f9e0c4622b47cb4b77b1e8a70c03958967954a3fa77969f7bdb0bcbf8f83e3ecdc8c723bd9e3545

data/.travis.yml

@@ -7,9 +7,14 @@ env:
   - DB=postgres
   - DB=mysql
 
+addons:
+  chrome: stable
+  postgresql: 9.4
+
 gemfile:
   - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4_0.gemfile
   - gemfiles/spree_master.gemfile
 
 script:
@@ -17,13 +22,29 @@ script:
   - bundle exec rake spec
 
 rvm:
-  - 2.3.3
-  - 2.4.2
-  - 2.5.2
+  - 2.5.1
+  - 2.4.4
+  - 2.3.8
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/spree_master.gemfile
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/spree_4_0.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/spree_4_0.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/spree_master.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/spree_master.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/spree_3_5.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
+  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
+  - unzip ~/chromedriver_linux64.zip -d ~/
+  - rm ~/chromedriver_linux64.zip
+  - sudo mv -f ~/chromedriver /usr/local/share/
+  - sudo chmod +x /usr/local/share/chromedriver

data/Appraisals

@@ -8,6 +8,13 @@ appraise 'spree-3-7' do
   gem 'spree', '~> 3.7.0'
   gem 'spree_auth_devise', '~> 3.5.0'
   gem 'rails-controller-testing'
+  gem 'sass-rails'
+end
+
+appraise 'spree-4-0' do
+  gem 'spree', '~> 4.0.0.beta'
+  gem 'spree_auth_devise', '~> 4.0.0.rc2'
+  gem 'rails-controller-testing'
 end
 
 appraise 'spree-master' do

data/app/controllers/spree_analytics_trackers/store_controller_decorator.rb

@@ -0,0 +1,11 @@
+module SpreeAnalyticsTrackers
+  module StoreControllerDecorator
+    def self.prepended(base)
+      base.helper Spree::TrackersHelper
+    end
+  end
+end
+
+if defined?(Spree::StoreController)
+  ::Spree::StoreController.prepend(::SpreeAnalyticsTrackers::StoreControllerDecorator)
+end

data/app/helpers/spree/trackers_helper.rb

@@ -9,15 +9,24 @@ module Spree
         brand: product.brand.try(:name),
         price: product.price.to_f,
         currency: product.currency,
-        url: product_url(product),
+        url: product_url(product)
       }.tap do |hash|
-        # This method returns either asset_url (Paperclip) or rails_blob_path (ActiveStorage) to return the specified image(s)
-        if defined?(ActiveStorage) && !Rails.application.config.use_paperclip
-          hash[:image_url] =  request.base_url + Rails.application.routes.url_helpers.rails_blob_path(optional.delete(:image).attachment, only_path: true) if optional[:image]
-        else
-          hash[:image_url] = request.base_url + asset_url(optional.delete(:image).attachment) if optional[:image]
-        end
+        hash[:image_url] = product_for_segment_image_url(hash, optional)
       end.merge(optional).to_json.html_safe
     end
+
+    private
+
+    # This method returns either asset_url (Paperclip) or rails_blob_path (ActiveStorage) to return the specified image(s)
+    def product_for_segment_image_url(hash, optional)
+      return unless optional[:image]
+
+      # Spree 4.0 dropped Paperclip support
+      if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('4.0.0.alpha') || (defined?(ActiveStorage) && !Rails.application.config.use_paperclip)
+        request.base_url + Rails.application.routes.url_helpers.rails_blob_path(optional.delete(:image).attachment, only_path: true)
+      else
+        request.base_url + asset_url(optional.delete(:image).attachment)
+      end
+    end
   end
 end

data/app/models/spree_analytics_trackers/user_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeAnalyticsTrackers
+  module UserDecorator
+    def analytics_id
+      id
+    end
+  end
+end
+
+::Spree.user_class.prepend(::SpreeAnalyticsTrackers::UserDecorator)

data/app/overrides/add_analytics_to_admin_sidebar.rb

@@ -1,9 +1,8 @@
 if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.5.0')
   Deface::Override.new(
     virtual_path: 'spree/admin/shared/sub_menu/_configuration',
-    name: 'add_analytics_to_admin_configurations_sidebar_menu',
+    name: 'add_analytics_to_admin_sidebar',
     insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]',
-    original: '72f6a33afb2627a467ae458d42991ab0ce4cc6df',
-    text: '<%= configurations_sidebar_menu_item(Spree.t(:analytics_trackers), spree.admin_trackers_path) if can? :manage, Spree::Tracker %>'
+    partial: 'spree/admin/shared/analytics_sidebar_menu'
   )
 end

data/app/views/spree/admin/shared/_analytics_sidebar_menu.html.erb

@@ -1,5 +1,3 @@
-<% if can? :admin, Spree::Tracker %>
-  <ul class="nav nav-sidebar">
-    <%= tab :analytic_trackers, url: spree.admin_trackers_path, icon: 'tasks' %>
-  </ul>
-<% end %>
+<%= configurations_sidebar_menu_item(
+    Spree.t(:analytics), spree.admin_trackers_path
+  ) if can? :manage, Spree::Config %>

data/app/views/spree/admin/trackers/_form.html.erb

@@ -1,12 +1,12 @@
 <div data-hook="admin_tracker_form_fields" class="row">
-  <div class="col-xs-12 col-md-4" data-hook="analytics_engine">
+  <div class="col-12 col-lg-6" data-hook="analytics_engine">
     <%= f.field_container :engine, class: ["form-group"], "data-hook" => "analytics_engine" do %>
       <%= f.label :engine, Spree.t(:analytics_engine) %>
       <%= f.select :engine, Spree::Tracker.engines.keys.sort.map { |k| [k.humanize, k] }, {}, { class: 'select2' } %>
       <%= f.error_message_on :engine %>
     <% end %>
   </div>
-  <div class="col-xs-12 col-md-8">
+  <div class="col-12 col-lg-6">
     <div data-hook="active" class="form-group">
       <%= label_tag nil, Spree.t(:active) %>
       <div class="radio">
@@ -23,14 +23,14 @@
       </div>
     </div>
   </div>
-  <div class="col-xs-12 col-md-4" data-hook="analytics_id">
+  <div class="col-12 col-lg-6" data-hook="analytics_id">
     <%= f.field_container :analytics_id, class: ["form-group"], "data-hook" => "analytics_id" do %>
       <%= f.label :analytics_id, Spree.t(:google_analytics_id) %>
       <%= f.text_field :analytics_id, class: 'form-control' %>
       <%= f.error_message_on :analytics_id %>
     <% end %>
   </div>
-  <div data-hook="additional_tracker_fields"></div>
-</div>
-<div data-hook="admin_tracker_form_fields" class="row">
+  <div class="col-12 col-lg-6" data-hook="additional_tracker_fields"></div>
 </div>
+
+<div data-hook="admin_tracker_form_fields" class="row"></div>

data/app/views/spree/admin/trackers/index.html.erb

@@ -8,12 +8,6 @@
 
 <% if @trackers.any? %>
   <table class="table">
-    <colgroup>
-      <col style="width: 30%">
-      <col style="width: 40%">
-      <col style="width: 15%">
-      <col style="width: 15%">
-    </colgroup>
     <thead>
       <tr data-hook="admin_trackers_index_headers">
         <th><%= Spree.t(:google_analytics_id) %></th>
@@ -27,7 +21,9 @@
         <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows">
           <td><%= tracker.analytics_id %></td>
           <td><%= tracker.engine.humanize %></td>
-          <td class="text-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="text-center">
+            <%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+          </td>
           <td class="actions text-right">
             <%= link_to_edit(tracker, no_text: true) if can? :edit, tracker %>
             <%= link_to_delete(tracker, no_text: true) if can? :delete, tracker %>
@@ -37,7 +33,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alert alert-warning">
+  <div class="alert alert-info">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Tracker)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Tracker %>!
   </div>

data/gemfiles/spree_3_7.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "spree", "~> 3.7.0"
 gem "spree_auth_devise", "~> 3.5.0"
 gem "rails-controller-testing"
+gem "sass-rails"
 
 gemspec path: "../"

data/gemfiles/spree_4_0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 4.0.0.beta"
+gem "spree_auth_devise", "~> 4.0.0.rc2"
+gem "rails-controller-testing"
+
+gemspec path: "../"

data/lib/spree_analytics_trackers/version.rb

@@ -9,8 +9,8 @@ module SpreeAnalyticsTrackers
 
   module VERSION
     MAJOR = 1
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/spree_analytics_trackers.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_extension'
+  s.add_dependency 'deface', '~> 1.0'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'capybara'
@@ -40,5 +41,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3', '~> 1.3.6'
+  s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_analytics_trackers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Spark Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -64,6 +64,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -264,16 +278,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: 'Supports Google Analytics '
 email: we@sparksolutions.co
 executables: []
@@ -289,13 +303,10 @@ files:
 - README.md
 - Rakefile
 - app/controllers/spree/admin/trackers_controller.rb
-- app/controllers/spree/store_controller_decorator.rb
+- app/controllers/spree_analytics_trackers/store_controller_decorator.rb
 - app/helpers/spree/trackers_helper.rb
-- app/models/spree/line_item_decorator.rb
-- app/models/spree/order_decorator.rb
-- app/models/spree/product_decorator.rb
 - app/models/spree/tracker.rb
-- app/models/spree/user_decorator.rb
+- app/models/spree_analytics_trackers/user_decorator.rb
 - app/overrides/add_analytics_to_admin_sidebar.rb
 - app/overrides/add_cart_viewed_to_orders_edit.rb
 - app/overrides/add_checkout_step_viewed_to_checkout_edit.rb
@@ -334,6 +345,7 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/spree_3_5.gemfile
 - gemfiles/spree_3_7.gemfile
+- gemfiles/spree_4_0.gemfile
 - gemfiles/spree_master.gemfile
 - lib/generators/spree_analytics_trackers/install/install_generator.rb
 - lib/spree_analytics_trackers.rb

data/app/controllers/spree/store_controller_decorator.rb

@@ -1,5 +0,0 @@
-if defined?(Spree::StoreController)
-  Spree::StoreController.class_eval do
-    helper Spree::TrackersHelper
-  end
-end

data/app/models/spree/line_item_decorator.rb

@@ -1,6 +0,0 @@
-if Gem.loaded_specs['spree_core'].version < Gem::Version.create('3.2.0')
-  Spree::LineItem.class_eval do
-    delegate :brand, :category, to: :product
-    delegate :options_text, to: :variant
-  end
-end

data/app/models/spree/order_decorator.rb

@@ -1,7 +0,0 @@
-if Gem.loaded_specs['spree_core'].version < Gem::Version.create('3.3.0')
-  Spree::Order.class_eval do
-    def promo_code
-      promotions.pluck(:code).compact.first
-    end
-  end
-end

data/app/models/spree/product_decorator.rb

@@ -1,11 +0,0 @@
-if Gem.loaded_specs['spree_core'].version < Gem::Version.create('3.2.0')
-  Spree::Product.class_eval do
-    def category
-      taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) })
-    end
-
-    def brand
-      taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_brands_name) })
-    end
-  end
-end

data/app/models/spree/user_decorator.rb

@@ -1,5 +0,0 @@
-Spree.user_class.class_eval do
-  def analytics_id
-    id
-  end
-end