simple-piwik 0.5.0 → 0.5.1

data/README.rdoc

@@ -1,6 +1,38 @@
 = simple-piwik
 
-Description goes here.
+A client for the Piwik API. 
+
+* http://github.com/mihael/simple-piwik
+
+== DESCRIPTION:
+
+Provides simple access to the Piwik API.
+
+== FEATURES NO PROBLEMS
+
+== SYNOPSIS:
+
+  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>
+  site.pageviews(:month, Date.today)
+  => 88
+  
+  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>
+
+Piwik website (http://piwik.org) 
+
+Piwik API reference (http://dev.piwik.org/trac/wiki/API/Reference)
+
+== REQUIREMENTS:
+
+activesupport, rest-client, json
+
+== INSTALL:
+
+  sudo gem install simple-piwik --source=http://gemcutter.org
 
 == Note on Patches/Pull Requests
  
@@ -8,9 +40,7 @@ Description goes here.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   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)
+* 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

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/piwik/base.rb

@@ -1,4 +1,4 @@
-#require 'rubygems'
+require 'rubygems'
 #require 'cgi'
 require 'active_support/all'
 require 'json/ext'
@@ -23,16 +23,15 @@ piwik_url:
 auth_token: 
 EOF
 
-  def self.on_rails?
-    (defined?(::Rails) && ::Rails.respond_to?(:root)) || (defined?(RAILS_ROOT) && RAILS_ROOT!=nil)
-  end
-
   def self.config_file
-    if defined?(::Rails) && ::Rails.respond_to?(:root)
-      File.join(::Rails.root, 'config', 'piwik.yml')
-    elsif defined?(RAILS_ROOT) && RAILS_ROOT!=nil
-      File.join(RAILS_ROOT, 'config', 'piwik.yml')
+    if defined?(Rails.root) && Rails.root!=nil
+#     puts "config_file from Rails.root: #{Rails.root.to_s}"
+      Rails.root.join('config', 'piwik.yml')
+#   elsif defined?(RAILS_ROOT) && RAILS_ROOT!=nil
+#     puts "config_file from RAILS_ROOT: #{RAILS_ROOT}"
+#     File.join(RAILS_ROOT, 'config', 'piwik.yml')
     else
+#     puts "config_file from ~/.piwik"
       File.join( ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH'] || ".", '.piwik' )
     end
   end
@@ -80,14 +79,16 @@ EOF
     def self.load_config_from_file
       config = {}
       config_file = self.config_file
-      temp_config = if File.exists?(config_file)
-        YAML::load(open(config_file))
-      else
-        open(config_file,'w') { |f| f.puts @@template }
-        YAML::load(@@template)
+      if config_file
+        temp_config = if File.exists?(config_file)
+          YAML::load(open(config_file))
+        else
+          open(config_file,'w') { |f| f.puts @@template }
+          YAML::load(@@template)
+        end
+        temp_config.each { |k,v| config[k.to_sym] = v } if temp_config
+        raise MissingConfiguration, "Please edit #{config_file} to include piwik url and auth_key" if config[:piwik_url] == nil || config[:auth_token] == nil
       end
-      temp_config.each { |k,v| config[k.to_sym] = v } if temp_config
-      raise MissingConfiguration, "Please edit #{config_file} to include piwik url and auth_key" if config[:piwik_url] == nil || config[:auth_token] == nil
       config
     end
   end

data/lib/piwik/trackable.rb

@@ -57,6 +57,7 @@ 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_from_file[:piwik_url]
     cattr_accessor :url
     

data/simple-piwik.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple-piwik}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{mihael}]
-  s.date = %q{2011-08-03}
+  s.date = %q{2011-08-04}
   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.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - mihael
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 Z
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport