simple-piwik 0.5.2 → 0.5.3

data/LICENSE

@@ -1,20 +1,4 @@
-Copyright (c) 2009 mihael
+No-Copyright (c) 
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+You have all the Copyright. This code is yours.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,28 +1,30 @@
 = simple-piwik
 
-A client for the Piwik API. 
-
-* http://github.com/mihael/simple-piwik
-
-== DESCRIPTION:
-
-Provides simple access to the Piwik API.
-
-== FEATURES NO PROBLEMS
-
-== SYNOPSIS:
+A client for the Piwik API compatible with Rails 3.x
 
   require 'rubygems'
   require 'piwik'
-  site = Piwik::Site.load(1, 'http://your.piwi.install', 'some_auth_key')
-  => #<Piwik::Site:0xb74bf994 @name="Example.com", @config={:auth_token=>"some_auth_key", :piwik_url=>"http://your.piwi.install"}, @id=1, @main_url="http://www.example.com", @created_at=Tue Jul 15 18:55:40 -0300 2008>
+  Piwik.auth_token = "i need to configure simple-piwik with my auth_token here"
+  Piwik.piwik_url = "http://piwik.mypiwikdomain.org"
+  site = Piwik::Site.load(1)
+  => #<Piwik::Site:0xb36ax935 @name="Examples.com", @config={:auth_token=>"my_auth_key", :piwik_url=>"http://piwik.mypiwikdomain.org"}, @id=1, @main_url="http://www.examples.com", @created_at=Thu Oct 20 22:55:42 +0100 2023>
   site.pageviews(:month, Date.today)
-  => 88
+  => 3002378
+  user = Piwik::User.load(1, 'http://piwik.mypiwikdomain.org', 'my_auth_key')
+  => #<Piwik::User:0xa108ac955 @login="Examples.com", @config={:auth_token=>"my_auth_key", :piwik_url=>"http://piwik.mypiwikdomain.org"}, @id=1, @main_url="http://www.examples.com", @created_at=Thu Oct 20 22:55:43 -0100 2023>
+
+Configuring with initializer config/initializers/simple-piwik.rb :
   
-  user = Piwik::User.load(1, 'http://your.piwi.install', 'some_auth_key')
-  => #<Piwik::User:0xb66bf544 @login="Example.com", @config={:auth_token=>"some_auth_key", :piwik_url=>"http://your.piwi.install"}, @id=1, @main_url="http://www.example.com", @created_at=Tue Jul 15 18:55:40 -0300 2008>
+  if Rails.env.production? 
+    Piwik.piwik_url  = "http://piwik.mypiwikdomain.org"
+    Piwik.auth_token = "2ad590308b1efa590a9a43ad86d3ac1s"
+  elsif Rails.env.development?
+    #this is currently set to the same as production
+    Piwik.piwik_url  = "http://piwik.mypiwikdomain.org"
+    Piwik.auth_token = "2ad590308b1efa590a9a43ad86d3ac1s"
+  end
 
-Piwik website (http://piwik.org) 
+Piwik website (http://piwik.org)
 
 Piwik API reference (http://dev.piwik.org/trac/wiki/API/Reference)
 
@@ -42,7 +44,3 @@ activesupport, rest-client, json
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2011 mihael. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/piwik/base.rb

@@ -67,7 +67,7 @@ EOF
     # <tt>Piwik::ApiError</tt> exception with the error message returned by Piwik 
     # in case it receives an error.
     def self.call(method, params={}, piwik_url=nil, auth_token=nil)
-      raise MissingConfiguration, "Please edit ~/.piwik to include your piwik url and auth_key" if piwik_url.nil? || auth_token.nil?
+      raise MissingConfiguration, "Please edit #{config_file} to include your piwik url and auth_token or configure Piwik.piwik_url and Piwik.auth_token before use" if piwik_url.nil? || auth_token.nil?
       url = "#{piwik_url}/?module=API&format=json&method=#{method}"
       url << "&token_auth=#{auth_token}" unless auth_token.nil?
       params.each { |k, v| url << "&#{k}=#{CGI.escape(v.to_s)}" }
@@ -98,7 +98,7 @@ EOF
           end
           temp_config.each { |k,v| config[k.to_sym] = v } if temp_config
         end
-        raise MissingConfiguration, "Please edit #{config_file} to include piwik url and auth_key" if config[:piwik_url] == nil || config[:auth_token] == nil
+        raise MissingConfiguration, "Please edit #{config_file} to include piwik url and auth_token or configure Piwik.piwik_url and Piwik.auth_token before use" if config[:piwik_url] == nil || config[:auth_token] == nil
         #cache settings
         Piwik.piwik_url = config[:piwik_url]
         Piwik.auth_token = config[:auth_token]

data/lib/piwik/trackable.rb

@@ -57,23 +57,23 @@ module Piwik
     @@use_async = false
     cattr_accessor :use_async
     
-    #at point of starting up a rails project Rails.root points to nil, and this config loading breakes a rails app
-    @@url = Piwik::Base.load_config[:piwik_url]
-    cattr_accessor :url
-    
     @@environments = ["production","development"]
     cattr_accessor :environments
 
     @@formats = [:html, :all]
     cattr_accessor :formats
 
+    def self.url
+      Piwik.piwik_url
+    end
+
 =begin rdoc
   Checks whether the model can be tracked using piwik by checking for a piwik_id and domain fields.
   This is a pretty specific use case, a more generic application tracking solution is available here:
   https://github.com/Achillefs/piwik_analytics/ (this file is actually swiped from that plugin)
 =end
     def self.enabled?(format)
-      raise Piwik::MissingConfiguration if url.blank?
+      raise Piwik::MissingConfiguration if self.url.blank?
       environments.include?(Rails.env) && formats.include?(format.to_sym)
     end
   end

data/simple-piwik.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple-piwik}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{mihael}]
-  s.date = %q{2011-08-09}
+  s.date = %q{2011-08-12}
   s.description = %q{Provides simple access to the Piwik API.}
   s.email = %q{mihael.ploh@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: simple-piwik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - mihael
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport