eff_matomo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bfc083e6ab2c763fc43de34312df80afa28ecda126fa70260181413ba4dc275
-  data.tar.gz: 81445c6e62b6e2edd081fc72fd190003c145d87272444654026fdddddb475b5e
+  metadata.gz: d0f5b9b6c1622f1a82e57fe91150c994d1d57ae7a8de6065a9ff0fd88270da07
+  data.tar.gz: 14296b4c803bf9de66d973e9600c2056be23eb809a0102ee49e352c356c8398f
 SHA512:
-  metadata.gz: bbe42d9ce30ae00aba2f6c4f21556fb2dad50bb926905577ae7e862ace1e53a853e24afaac7449453e7284927a66abaf910b3e81986ad2e6af3fdab8f6eab897
-  data.tar.gz: 3a001f1dda9e08aa0402a05bd66d4d7e106152711ae22912396c635acc15f41b2a974f7d0db74066f0673818b8c82311a74f4f6f72c5a476f160cf47756cf366
+  metadata.gz: 5345b9422957311b1ff545419a8e2ad77e1b94e7a1919ce7b47aa4efc2ffd98848073123e92ad235c372e25067681d3fcbdc9b6204b20504586d5c7ef6ab9d19
+  data.tar.gz: 6bbb7991f745609bfc6bea23e4caf0efba75477464c6f2f10fd7cdfe8c435675cd28ad380212fae423f81adba0ee909c72d2ba30f418fad9d2b30eb1e31d05b3

data/Gemfile.lock

@@ -1,29 +1,33 @@
 PATH
   remote: .
   specs:
-    eff_matomo (0.2.1)
+    eff_matomo (0.2.3)
       activesupport
       httparty
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     hashdiff (0.3.7)
-    httparty (0.16.2)
+    httparty (0.16.4)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.1.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
     minitest (5.11.3)
     multi_xml (0.6.0)
     public_suffix (3.0.3)

data/README.md

@@ -30,6 +30,8 @@ This gem reads two environment variables:
 
 Add `<%= matomo_tracking_embed %>` to the footer of your application layout template.
 
+`{action_name = [NAME]}` can be passed to set the action name manually. Otherwise, eff_matomo will attempt to use a `page_title` helper or else omit the action name.
+
 ### Displaying Matomo data
 
 This gem provides allows users to import site usage data from Matomo to display in their application. It currently supports two types of data:

data/lib/matomo.rb

@@ -8,7 +8,7 @@ module Matomo
   class Referrer
     attr_accessor :label, :visits
 
-    def initialize(params)
+    def initialize(params = {})
       @label = params["label"]
       @visits = params["nb_visits"] || 0
       @actions = params["nb_actions"] || 0
@@ -16,6 +16,7 @@ module Matomo
 
     def actions_per_visit
       return 0 unless @actions and @visits
+      return 0 if @visits == 0
       (@actions/@visits.to_f).round(1)
     end
 
@@ -37,7 +38,7 @@ module Matomo
   class Page
     attr_accessor :hits, :visits, :path
 
-    def initialize(path, params)
+    def initialize(path, params = {})
       @path = path
       @label = params["label"]
       @hits = params["nb_hits"] || 0

data/lib/matomo/version.rb

@@ -1,3 +1,3 @@
 module Matomo
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/matomo/view_helpers.rb

@@ -1,23 +1,31 @@
 module Matomo
   module ViewHelpers
-    def matomo_tracking_url
-      "#{Matomo.base_url}/js/?" + {
-        idsite: Matomo.site_id,
-        rec: 1,
-        action_name: page_title,
-        url: request.original_url
-      }.to_param
-    end
-
-    def matomo_tracking_embed
+    def matomo_tracking_embed(opts = {})
       content_tag(:div, id: "anon-stats") do
         content_tag(:noscript) do
-          tag(:img, src: matomo_tracking_url, style: "border:0", alt: "")
+          tag(:img, src: matomo_tracking_url(opts), style: "border:0", alt: "")
         end +
         javascript_tag do
-          "document.getElementById('anon-stats').innerHTML = '<img src=\"#{matomo_tracking_url}\"?urlref=' + encodeURIComponent(document.referrer) + 'style=\"border:0\" alt=\"\" />';".html_safe
+          "document.getElementById('anon-stats').innerHTML = '<img src=\"#{matomo_tracking_url(opts)}\"?urlref=' + encodeURIComponent(document.referrer) + 'style=\"border:0\" alt=\"\" />';".html_safe
         end
       end
     end
+
+    def matomo_tracking_url(opts = {})
+      "#{Matomo.base_url}/js/?" + {
+        idsite: Matomo.site_id,
+        rec: 1,
+        action_name: action_name_or_default(opts[:action_name]),
+        url: request.original_url
+      }.compact.to_param
+    end
+
+    private
+
+    def action_name_or_default(name)
+      return name unless name.nil?
+      return page_title if defined?(page_title)
+      return nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eff_matomo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - vivian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport