simple-piwik 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/piwik/base.rb

@@ -10,6 +10,13 @@ module Piwik
   class UnknownSite < ArgumentError; end
   class UnknownUser < ArgumentError; end
 
+  mattr_accessor :piwik_url
+  mattr_accessor :auth_token
+
+  def self.is_configured?
+    @@piwik_url!=nil && @@auth_token!=nil
+  end
+
   class Base
     @@template  = <<-EOF
 # .piwik
@@ -76,18 +83,25 @@ EOF
     end
     
     # Checks for the config, creates it if not found
-    def self.load_config_from_file
+    def self.load_config
       config = {}
-      config_file = self.config_file
-      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)
+      if Piwik.is_configured?
+        config = { :piwik_url => Piwik.piwik_url, :auth_token => Piwik.auth_token }
+      else
+        config_file = self.config_file
+        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
         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
+        #cache settings
+        Piwik.piwik_url = config[:piwik_url]
+        Piwik.auth_token = config[:auth_token]
       end
       config
     end

data/lib/piwik/site.rb

@@ -16,7 +16,7 @@ module Piwik
     def initialize(attributes={}, piwik_url=nil, auth_token=nil)
       raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
       @config = if piwik_url.nil? || auth_token.nil?
-        self.class.load_config_from_file
+        self.class.load_config
       else
         {:piwik_url => piwik_url, :auth_token => auth_token}
       end
@@ -35,7 +35,7 @@ module Piwik
     def self.load(site_id, piwik_url=nil, auth_token=nil)
       raise ArgumentError, "expected a site Id" if site_id.nil?
       @config = if piwik_url.nil? || auth_token.nil?
-        load_config_from_file
+        load_config
       else
         {:piwik_url => piwik_url, :auth_token => auth_token}
       end

data/lib/piwik/trackable.rb

@@ -58,7 +58,7 @@ module Piwik
     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]
+    @@url = Piwik::Base.load_config[:piwik_url]
     cattr_accessor :url
     
     @@environments = ["production","development"]

data/lib/piwik/user.rb

@@ -18,7 +18,7 @@ module Piwik
     def initialize(attributes={}, piwik_url=nil, auth_token=nil)
       raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash)
       @config = if piwik_url.nil? || auth_token.nil?
-        self.class.load_config_from_file
+        self.class.load_config
       else
         {:piwik_url => piwik_url, :auth_token => auth_token}
       end
@@ -94,7 +94,7 @@ module Piwik
     def self.load(user_login, piwik_url=nil, auth_token=nil)
       raise ArgumentError, "expected a user Login" if user_login.nil?
       @config = if piwik_url.nil? || auth_token.nil?
-        load_config_from_file
+        load_config
       else
         {:piwik_url => piwik_url, :auth_token => auth_token}
       end

data/script/console

@@ -5,6 +5,6 @@ irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 libs =  " -r irb/completion"
 # Perhaps use a console_lib to store any extra methods I may want available in the cosole
 # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/piwik.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/simple-piwik.rb'}"
 puts "Loading piwik gem"
 exec "#{irb} #{libs} --simple-prompt"

data/simple-piwik.gemspec

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

data/test/simple-piwik_test.rb

@@ -54,16 +54,32 @@ class PiwikTest < Test::Unit::TestCase
   def test_can_read_standalone_config
     File.open(File.join(ENV["HOME"],".piwik"), "w") { p.puts(File.read("./files/config/piwik/yml")) } unless File.join(ENV["HOME"],".piwik")
     assert_nothing_raised do
-      Piwik::Base.load_config_from_file
+      Piwik::Base.load_config
     end
   end
   
-  
   def test_can_read_rails_config
     stub_rails_env do
       assert_nothing_raised do
-        Piwik::Base.load_config_from_file
+        Piwik::Base.load_config
+      end
+    end
+  end
+
+  def test_can_be_configured
+    stub_rails_env do
+      #configuring manualy overrides the config file settings, if any
+      Piwik.piwik_url  = "url"
+      Piwik.auth_token = "token"
+      assert_equal true, Piwik.is_configured?
+      assert_nothing_raised do
+        Piwik::Base.load_config
+        assert_equal "url", Piwik.piwik_url 
+        assert_equal "token", Piwik.auth_token
       end
+      Piwik.piwik_url  = nil
+      Piwik.auth_token = nil
     end
   end
+
 end

metadata

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