rugalytics 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.0.3. get some rails integration going on, with config/rugalytics.yml
+
 v0.0.2. only use graph points that fall within given report dates
 
 v0.0.1. initial release

data/Manifest

@@ -1,6 +1,5 @@
 CHANGELOG
 lib/rugalytics/account.rb
-lib/rugalytics/analytics.rb
 lib/rugalytics/connection.rb
 lib/rugalytics/graph.rb
 lib/rugalytics/item.rb
@@ -11,6 +10,7 @@ LICENSE
 Manifest
 README
 README.rdoc
+rugalytics.yml.example
 spec/fixtures/analytics_account_find_all.html
 spec/fixtures/analytics_profile_find_all.html
 spec/fixtures/dashboard_report_webgroup.xml

data/lib/rugalytics/item.rb

@@ -12,7 +12,10 @@ module Rugalytics
         morph(attribute, value)
       end
 
-      self.url = "http://#{base_url}#{url}" if respond_to?(:url)
+      if respond_to?(:url)
+        self.path = url
+        self.url = "http://#{base_url}#{url}"
+      end
     end
   end
 

data/lib/rugalytics.rb

@@ -7,10 +7,11 @@ require 'hpricot'
 require 'activesupport'
 require 'google/base'
 require 'morph'
+require 'yaml'
 
 # See README for usage documentation.
 module Rugalytics
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
   FORMAT_PDF = '0' unless defined? FORMAT_PDF
   FORMAT_XML = '1' unless defined? FORMAT_XML
@@ -29,16 +30,48 @@ module Rugalytics
   class InvalidCredentials < Exception
   end
 
-  def self.login username, password
-    Google::Base.establish_connection(username, password)
-  end
+  class << self
+    def login username, password
+      Google::Base.establish_connection(username, password)
+    end
+
+    def find_profile account_id_or_name, profile_id_or_name=nil
+      begin
+        Profile.find account_id_or_name, profile_id_or_name
+      rescue NameError => e
+        raise 'No connection - call Rugalytics.login(<username>,<password>)'
+      end
+    end
+
+    def default_profile
+      config_setup '.' unless config
+      if config && config.account
+        begin
+          find_profile config.account, config.profile
+        rescue Exception => e
+          if e.to_s.include? 'No connection'
+            login config.username, config.password if config.username && config.password
+            find_profile config.account, config.profile
+          end
+        end
+      end
+    end
 
-  def self.find_profile account_id_or_name, profile_id_or_name=nil
-    begin
-      Profile.find account_id_or_name, profile_id_or_name
-    rescue NameError => e
-      raise 'No connection - call Rugalytics.login(<username>,<password>)'
+    def config
+      @config
     end
+
+    def config_setup root
+      config_file = "#{root}/config/rugalytics.yml"
+      config_file = "#{root}/rugalytics.yml" unless File.exist? config_file
+      @config = load_config(config_file) if File.exist? config_file
+    end
+
+    def load_config filename
+      hash = YAML.load_file(filename)
+      OpenStruct.new(hash)
+    end
+
   end
 end
 
@@ -47,4 +80,6 @@ require File.dirname(__FILE__) + '/rugalytics/account'
 require File.dirname(__FILE__) + '/rugalytics/profile'
 require File.dirname(__FILE__) + '/rugalytics/report'
 require File.dirname(__FILE__) + '/rugalytics/item'
-require File.dirname(__FILE__) + '/rugalytics/graph'
+require File.dirname(__FILE__) + '/rugalytics/graph'
+
+# Rugalytics.config_setup(RAILS_ROOT) if defined?(RAILS_ROOT) && RAILS_ROOT

data/rugalytics.gemspec

@@ -1,20 +1,20 @@
 
-# Gem::Specification for Rugalytics-0.0.2
+# Gem::Specification for Rugalytics-0.0.3
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{rugalytics}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
-  s.date = %q{2008-06-07}
+  s.date = %q{2008-06-16}
   s.description = %q{Rugalytics is a Ruby API for Google Analytics.}
   s.email = ["rob ~@nospam@~ rubyforge.org"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "lib/rugalytics/account.rb", "lib/rugalytics/analytics.rb", "lib/rugalytics/connection.rb", "lib/rugalytics/graph.rb", "lib/rugalytics/item.rb", "lib/rugalytics/profile.rb", "lib/rugalytics/report.rb", "lib/rugalytics.rb", "LICENSE", "Manifest", "README", "README.rdoc", "spec/fixtures/analytics_account_find_all.html", "spec/fixtures/analytics_profile_find_all.html", "spec/fixtures/dashboard_report_webgroup.xml", "spec/lib/rugalytics/account_spec.rb", "spec/lib/rugalytics/graph_spec.rb", "spec/lib/rugalytics/item_spec.rb", "spec/lib/rugalytics/profile_spec.rb", "spec/lib/rugalytics/report_spec.rb", "spec/lib/rugalytics_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "rugalytics.gemspec"]
+  s.files = ["CHANGELOG", "lib/rugalytics/account.rb", "lib/rugalytics/connection.rb", "lib/rugalytics/graph.rb", "lib/rugalytics/item.rb", "lib/rugalytics/profile.rb", "lib/rugalytics/report.rb", "lib/rugalytics.rb", "LICENSE", "Manifest", "README", "README.rdoc", "rugalytics.yml.example", "spec/fixtures/analytics_account_find_all.html", "spec/fixtures/analytics_profile_find_all.html", "spec/fixtures/dashboard_report_webgroup.xml", "spec/lib/rugalytics/account_spec.rb", "spec/lib/rugalytics/graph_spec.rb", "spec/lib/rugalytics/item_spec.rb", "spec/lib/rugalytics/profile_spec.rb", "spec/lib/rugalytics/report_spec.rb", "spec/lib/rugalytics_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "rugalytics.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rugalytics", "--main", "README", "--inline-source"]
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<hpricot>, [">= 0.6"])
   s.add_dependency(%q<activesupport>, [">= 2.0.2"])
   s.add_dependency(%q<googlebase>, [">= 0.2.0"])
-  s.add_dependency(%q<morph>, [">= 0.1.5"])
+  s.add_dependency(%q<morph>, [">= 0.2.0"])
 end
 
 
@@ -44,7 +44,7 @@ end
 #     m.rubyforge_name = "rugalytics"
 #     m.rdoc_options << '--inline-source'
 #     m.rdoc_pattern = ["README", "CHANGELOG", "LICENSE"]
-#     m.dependencies = ["hpricot >=0.6", "activesupport >=2.0.2", "googlebase >=0.2.0", "morph >=0.1.5"]
+#     m.dependencies = ["hpricot >=0.6", "activesupport >=2.0.2", "googlebase >=0.2.0", "morph >=0.2.0"]
 #   end
 # 
 # rescue LoadError

data/rugalytics.yml.example

@@ -0,0 +1,5 @@
+--- 
+account: <account_name>
+profile: <profile_name>
+username: <user_name>
+password: <pass_w>

data/spec/lib/rugalytics/item_spec.rb

@@ -12,6 +12,7 @@ describe Rugalytics::Item, 'when creating' do
     item = Rugalytics::Item.new @attributes.split(','), @values.split(','), @url
 
     item.url.should == 'http://theyworkforyou.co.nz/'
+    item.path.should == '/'
     item.page_views.should == '189'
     item.unique_page_views.should == '157'
     item.time_on_page.should == '54.94957983193277'

data/spec/lib/rugalytics_spec.rb

@@ -2,32 +2,114 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Rugalytics do
 
-  describe "finding a profile by its account name and profile name" do
-    it 'should return the match' do
-      account_name = 'your_site.com'
-      profile_name = 'blog.your_site.com'
-      profile = mock('profile')
-      Rugalytics::Profile.should_receive(:find).with(account_name, profile_name).and_return profile
-      Rugalytics::find_profile(account_name, profile_name).should == profile
+  describe "finding a profile" do
+
+    describe "by its account name and profile name" do
+      it 'should return the match' do
+        account_name = 'your_site.com'
+        profile_name = 'blog.your_site.com'
+        profile = mock('profile')
+        Rugalytics::Profile.should_receive(:find).with(account_name, profile_name).and_return profile
+        Rugalytics::find_profile(account_name, profile_name).should == profile
+      end
+    end
+
+    describe "by its account_id and profile_id" do
+      it 'should return the match' do
+        account_id = 1254221
+        profile_id = 12341234
+        profile = mock('profile')
+        Rugalytics::Profile.should_receive(:find).with(account_id, profile_id).and_return profile
+        Rugalytics::find_profile(account_id, profile_id).should == profile
+      end
+    end
+
+    describe "by passing single name when account and profile name are the same" do
+      it 'should return the match' do
+        name = 'your_site.com'
+        profile = mock('profile')
+        Rugalytics::Profile.should_receive(:find).with(name, nil).and_return profile
+        Rugalytics::find_profile(name).should == profile
+      end
     end
   end
 
-  describe "finding a profile by its account_id and profile_id" do
-    it 'should return the match' do
-      account_id = 1254221
-      profile_id = 12341234
-      profile = mock('profile')
-      Rugalytics::Profile.should_receive(:find).with(account_id, profile_id).and_return profile
-      Rugalytics::find_profile(account_id, profile_id).should == profile
+  describe 'when RAILS_ROOT is nil' do
+
+    it 'should not call config_setup method' do
+      Rugalytics.should_not_receive(:config_setup)
+      load(File.dirname(__FILE__) + '/../../lib/rugalytics.rb')
+    end
+  end
+
+  describe 'when RAILS_ROOT is defined and not nil' do
+
+    before do
+      @rails_root = '.'
+      @config_file = "#{@rails_root}/config/rugalytics.yml"
+      @alt_config_file = "#{@rails_root}/rugalytics.yml"
+    end
+
+    it 'should look for rugalytics.yml file' do
+      File.should_receive(:exist?).with(@config_file).and_return false
+      File.should_receive(:exist?).with(@alt_config_file).and_return false
+      Rugalytics.config_setup(@rails_root)
+    end
+
+    describe 'and config/rugalytics.yml is present' do
+      before do
+        File.stub!(:exist?).with(@config_file).and_return true
+      end
+
+      it 'should load config' do
+        Rugalytics.should_receive(:load_config).with(@config_file).and_return mock('config')
+        Rugalytics.config_setup(@rails_root)
+      end
+
+      it 'should save username and password if in credentials' do
+        user = 'user'
+        password = 'password'
+        Rugalytics.stub!(:load_config).and_return OpenStruct.new({:username => user, :password => password})
+        Rugalytics.config_setup(@rails_root)
+        Rugalytics.config.username.should == user
+        Rugalytics.config.password.should == password
+      end
+
+      it 'should save profile if in credentials' do
+        profile = 'profile'
+        account = 'account'
+        Rugalytics.stub!(:load_config).and_return OpenStruct.new({:profile => profile, :account => account})
+        Rugalytics.config_setup(@rails_root)
+        Rugalytics.config.account.should == account
+        Rugalytics.config.profile.should == profile
+      end
+
+      it 'should load config file using Yaml' do
+        file = 'file'
+        hash = mock('hash')
+        YAML.should_receive(:load_file).with(file).and_return hash
+        OpenStruct.should_receive(:new).with(hash)
+        Rugalytics.load_config(file)
+      end
+
+    # it 'should call config_setup method' do
+      # RAILS_ROOT = '.'
+      # Rugalytics.should_receive(:config_setup).with(RAILS_ROOT)
+      # load(File.dirname(__FILE__) + '/../../lib/rugalytics.rb')
+      # RAILS_ROOT = nil
+    # end
+
     end
   end
 
-  describe "finding a profile by passing single name when account and profile name are the same" do
-    it 'should return the match' do
-      name = 'your_site.com'
+  describe "finding default profile when config has been set" do
+    it 'should find profile using config' do
       profile = mock('profile')
-      Rugalytics::Profile.should_receive(:find).with(name, nil).and_return profile
-      Rugalytics::find_profile(name).should == profile
+      profile_name = 'profile'
+      account = 'account'
+      Rugalytics.stub!(:config).and_return mock('config', :account=>account, :profile=>profile_name)
+      Rugalytics.should_receive(:find_profile).with(account,profile_name).and_return profile
+      Rugalytics.default_profile.should == profile
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rugalytics
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-07 00:00:00 +01:00
+date: 2008-06-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
+        version: 0.2.0
     version: 
 description: Rugalytics is a Ruby API for Google Analytics.
 email: 
@@ -62,7 +62,6 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - lib/rugalytics/account.rb
-- lib/rugalytics/analytics.rb
 - lib/rugalytics/connection.rb
 - lib/rugalytics/graph.rb
 - lib/rugalytics/item.rb
@@ -73,6 +72,7 @@ files:
 - Manifest
 - README
 - README.rdoc
+- rugalytics.yml.example
 - spec/fixtures/analytics_account_find_all.html
 - spec/fixtures/analytics_profile_find_all.html
 - spec/fixtures/dashboard_report_webgroup.xml