jekyll-analytics 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b409ff39cfbd5b49df05e30ce2b0a7e928eaf5
-  data.tar.gz: 2db63505cd4beef74da2141e440cd5f528c463bc
+  metadata.gz: fa278f726aee0536eacff0f2487449e187afe53b
+  data.tar.gz: b6ed0d3b81297098cf07da24450df5b588052f25
 SHA512:
-  metadata.gz: 72c4284cf709792fe366982228c754febb2e9eddfdb260dd9e753e1e4d73fc56aa8e9954cc17fbab04a0ee4c022702192c9218403913f4c043e4c240796ede56
-  data.tar.gz: a964c7e8f8bc0b37722f458220770a837d53cca1fbac3378752b6df2eb5a668efe153efbac5e7e0a6eb4f7baa143cad2920158babeb4ba21d18c37aff738e88d
+  metadata.gz: af81e55d2d2b3f57ba8d365bb04fc0f795c4407e480111f58ff2ca5ec82f6f63859176aa90ff9a9304cca39c012a4a4065a3c55bc818a8282c73353a21b3cefe
+  data.tar.gz: 0bd95ae21095cb470b5d52932c0acfa811605c40ee011c1954e367fbfeeb2cb5445974caf0a08ca7b4b3669c9c9f1f9fad46a7c27fa60740d2ad476d45460047

data/lib/analytics/GoogleAnalytics.rb

@@ -1,6 +1,4 @@
-require_relative 'Analytics'
-
-class GoogleAnalytics < Analytics
+class GoogleAnalytics 
     #source: https://developers.google.com/analytics/devguides/collection/analyticsjs/
     SETUP_CODE = """
     <!-- Google Analytics -->
@@ -15,31 +13,31 @@ class GoogleAnalytics < Analytics
     <!-- End Google Analytics -->
     """
 
-    ID_REGEX = /^UA-\d+-\d+$/    
+    ID_RE = /^UA-\d+-\d+$/    
 
     INITIALIZE_CODE = "ga('create', '%s', 'auto');"
     PAGEVIEW_CODE = "ga('send', 'pageview');"
     ANONYMIZE_IP_CODE = "ga('set', 'anonymizeIp', %s);"
-    
-    @@commands = nil
-    
-    def initialize(config)
-        if !(ID_REGEX.match(config["id"]))
+
+
+   def initialize(config)
+        if !(ID_RE.match(config["id"]))
             raise ArgumentError, 'Invalid Google analytics key. Id must look like UA-XXXXXX-Y'
         end
 
-        @@commands = []
-        @@commands.push(INITIALIZE_CODE % config["id"])
-        @@commands.push(PAGEVIEW_CODE)
-        self._get_other_commands(config)
+        @commands = []
+        @commands.push(INITIALIZE_CODE % config["id"])
+        @commands.push(PAGEVIEW_CODE)
+        _get_other_commands(config)
     end
 
     def render()
-        return SETUP_CODE % @@commands.join("\n\t")
+        return SETUP_CODE % @commands.join("\n\t")
     end
 
+    private
+
     def _get_other_commands(config)
-        @@commands.push(ANONYMIZE_IP_CODE % config.fetch(:anonymizeIp, false))
+        @commands.push(ANONYMIZE_IP_CODE % config.fetch(:anonymizeIp, false))
     end
-
 end

data/lib/analytics/Piwik.rb

@@ -0,0 +1,43 @@
+class Piwik
+    SETUP_CODE = """
+    <!-- Piwik -->
+    <script type=\"text/javascript\">
+    var _paq = _paq || [];
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+    var u=\"%{url}\";
+    _paq.push(['setTrackerUrl', u+'/piwik.php']);
+    _paq.push(['setSiteId', '%{siteId}']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+    })();
+    </script>
+    <!-- End Piwik Code -->
+    """
+
+
+    # domain name (characters separated by a dot), optional port, optional URI path, no slash
+    DOMAINPATH_RE = /^(([^.\/?#@:]+\.)*[^.\/?#@:]+)+(:[0-9]+)?(\/[^\/?#@:]+)*$/
+
+    # numeric ID
+    SITEID_RE = /^\d+$/
+
+    def initialize(config)
+        
+        if !(DOMAINPATH_RE.match(config['url']))
+            raise ArgumentError, 'Invalid url. Must be a domain name, optionally followed by an URI path, no trailing slash (e.g. piwik.example.com or my.piwik.server/path)'
+        end
+
+        if !(SITEID_RE.match(config['siteId']))
+            raise ArgumentError, 'Invalid site id. Must be a number.'
+        end
+        
+        @config = Hash[config.map{ |k, v| [k.to_sym, v.to_s] }]
+
+    end
+
+    def render
+        return SETUP_CODE % @config
+    end
+end

data/lib/jekyll-analytics.rb

@@ -1,14 +1,18 @@
-require_relative 'analytics/GoogleAnalytics'
+Dir[File.dirname(__FILE__) + '/analytics/*.rb'].each {|file| require file[0..-4] }
+
+CONFIG_KEY = "jekyll_analytics"
 
 def inject(site)
   if ENV['JEKYLL_ENV']
-    config = site.site.config["jekyll_analytics"]["ga"]
-    analytics_object = GoogleAnalytics.new(config)
-    site.output = site.output.gsub(/(?=<\/head>)/i, analytics_object.render())
+    site.site.config[CONFIG_KEY].keys().each{ |a|
+      analyzerClass = Module.const_get(a)
+      config = site.site.config[CONFIG_KEY][a]
+      analytics_object = analyzerClass.new(config)
+      site.output = site.output.gsub(/(?=<\/head>)/i, analytics_object.render())
+    }
   end
 end
 
-
 Jekyll::Hooks.register :pages, :post_render do |page|
   inject(page)
 end

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Hendrik Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies: []
-description: Plugin to easily add web analytics to your jekyll site
+description: Plugin to easily add web analytics to your jekyll site without modifying
+  your templates
 email: ''
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/analytics/Analytics.rb
 - lib/analytics/GoogleAnalytics.rb
+- lib/analytics/Piwik.rb
 - lib/jekyll-analytics.rb
 homepage: https://github.com/hendrik91/jekyll-analytics
 licenses:

data/lib/analytics/Analytics.rb

@@ -1,9 +0,0 @@
-class Analytics
-    def initialize(config)
-        raise NotImplementedError, "Implement this method in a child class"
-    end
-
-    def render()
-        raise NotImplementedError, "Implement this method in a child class"
-    end
-end