middleman-piwik 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3122879e4d4141eb7e6b0288a3ce10e635cc8bf9
-  data.tar.gz: 6da7d2178d1409bdd29d64cc6567427741af142e
+  metadata.gz: c343d3b1ac6e7eba2d62839170e0222565b44827
+  data.tar.gz: bd39c647a1ff91312ac76f5f24a9cc34ded48327
 SHA512:
-  metadata.gz: e601679a81108d29308cb0df6ed0b42188ddee44936f90b49265c6137b30b14b58518a856dec893a12879856be0bff44100924b3b57165b7d14cd11f31d56000
-  data.tar.gz: cd93cf85c116357172f52ce755a42d8fd338f5ef249476072983343399882de670a1e59b01553d5938802489473924e0de5c2b26d4c90b8d10c027cde2517e22
+  metadata.gz: 64988735aa3ed0c02bb85c96f9f08fa3a5458edb484e872bedf5eed30047a24f9568acc5088837681893aaa40f1ff05c99269cc4ad41e1cfbfe6a5d86d44f0b3
+  data.tar.gz: e61520f1641afd8e9587f766efeb2655648838d6095b3184e7ae561c8ca9943e8be851e42e085894861cf383d14c12a7a1cbe555460bb156e1cf69a342b84fec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.2.0
+-----
+
+* Add a url option, so we can use piwik installed in another location than the 
+root of the web server.
+
 0.1.1
 -----
 

data/README.md

@@ -12,6 +12,7 @@ Just add `gem "middleman-piwik"` to your existing Gemfile and run `bundle instal
 activate :piwik do |p|
     p.id = 1
     p.domain = 'piwik.example.net'
+    p.url = '/piwik'
 end
 ``` 
 
@@ -19,6 +20,8 @@ id is the id of the site, as given by piwik. Usually, it start at 1.
 
 domain is the domain name of the piwik server. 
 
+url is the url of the piwik installation. By default, it take the root of the website.
+
 ## Helper
 
 The extension adds 3 new helper to Middleman to add the proper javascript and img in your website

data/features/piwik_helpers.feature

@@ -7,11 +7,12 @@ Feature: Piwik helpers for js and img.
       activate :piwik do |f|
         f.id = 3
         f.domain = 'piwik.example.com'
+        f.url = '/piwik2.2/'
       end
       """
     Given the Server is running at "test-app"
     When I go to "/piwik_both.html"
-    Then I should see "piwik.example.com/piwik.php?idsite=3"
+    Then I should see "piwik.example.com/piwik2.2/piwik.php?idsite=3"
     Then I should see "setSiteId"
     Then I should see "noscript"
 
@@ -42,3 +43,31 @@ Feature: Piwik helpers for js and img.
     When I go to "/piwik_js.html"
     Then I should not see "noscript"
     Then I should see 'setSiteId'
+
+  Scenario: Helpers without trailing slash
+    Given a fixture app "test-app"
+    And a file named "config.rb" with:
+      """
+      activate :piwik do |f|
+        f.id = 6
+        f.domain = 'piwik.example.com'
+        f.url = 'piwik2.2'
+      end
+      """
+    Given the Server is running at "test-app"
+    When I go to "/piwik_both.html"
+    Then I should see "piwik.example.com/piwik2.2/piwik.php?idsite=6"
+
+  Scenario: Helpers with extra trailing slash
+    Given a fixture app "test-app"
+    And a file named "config.rb" with:
+      """
+      activate :piwik do |f|
+        f.id = 7
+        f.domain = 'piwik.example.com'
+        f.url = '////piwik2.2////'
+      end
+      """
+    Given the Server is running at "test-app"
+    When I go to "/piwik_both.html"
+    Then I should see "piwik.example.com/piwik2.2/piwik.php?idsite=7"

data/lib/middleman-piwik/extension.rb

@@ -3,15 +3,19 @@ module Middleman
     class PiwikExtension < Extension
       option :id, 1, 'Piwik site id'
       option :domain, 'piwik.example.org', 'Piwik domain'
+      option :url, '', 'Piwik location'
       
       def after_configuration
         app.set :piwik_domain, options.domain
         app.set :piwik_id, options.id
+        url = '/' + options.url + '/'
+        url.sub!(/^\/*/,'/').sub!(/\/*$/,'/')
+        app.set :piwik_url, url
       end
 
       helpers do
         def insert_piwik_tracker_img
-            "<p><img src=\"https://#{piwik_domain}/piwik.php?idsite=#{piwik_id}\" style=\"border:0;\" alt=\"\" /></p>"
+            "<p><img src=\"https://#{piwik_domain}#{piwik_url}piwik.php?idsite=#{piwik_id}\" style=\"border:0;\" alt=\"\" /></p>"
         end
 
         def insert_piwik_tracker_js
@@ -21,7 +25,7 @@ module Middleman
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
         (function() {
-        var u=(("https:" == document.location.protocol) ? "https" : "http") + "://#{piwik_domain}/";
+        var u=(("https:" == document.location.protocol) ? "https" : "http") + "://#{piwik_domain}#{piwik_url}";
         _paq.push(['setTrackerUrl', u+'piwik.php']);
         _paq.push(['setSiteId', #{piwik_id}]);
         var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';

data/lib/middleman-piwik/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Piwik
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: middleman-piwik
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Scherer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Piwik tracker integration for Middleman
@@ -31,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -60,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Piwik tracker integration for Middleman