garb 0.2.9 → 0.3.0

data/lib/garb/authentication_request.rb

@@ -4,16 +4,17 @@ module Garb
     
     URL = 'https://www.google.com/accounts/ClientLogin'
     
-    def initialize(email, password)
+    def initialize(email, password, opts={})
       @email = email
       @password = password
+      @account_type = opts.fetch(:account_type, 'HOSTED_OR_GOOGLE')
     end
     
     def parameters
       {
         'Email'       => @email,
         'Passwd'      => @password,
-        'accountType' => 'HOSTED_OR_GOOGLE',
+        'accountType' => @account_type,
         'service'     => 'analytics',
         'source'      => 'vigetLabs-garb-001'
       }

data/lib/garb/report_response.rb

@@ -34,7 +34,7 @@ module Garb
       include HappyMapper
 
       tag 'metric'
-      namespace 'http://schemas.google.com/dataexport/2009'
+      namespace 'http://schemas.google.com/analytics/2009'
 
       attribute :name, String
       attribute :value, String
@@ -44,7 +44,7 @@ module Garb
       include HappyMapper
 
       tag 'dimension'
-      namespace 'http://schemas.google.com/dataexport/2009'
+      namespace 'http://schemas.google.com/analytics/2009'
 
       attribute :name, String
       attribute :value, String

data/lib/garb/version.rb

@@ -2,8 +2,8 @@ module Garb
   module Version
 
     MAJOR = 0
-    MINOR = 2
-    TINY  = 9
+    MINOR = 3
+    TINY  = 0
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/test/fixtures/report_feed.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns='http://www.w3.org/2005/Atom'
   xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/'
-  xmlns:dxp='http://schemas.google.com/dataexport/2009'
+  xmlns:dxp='http://schemas.google.com/analytics/2009'
   xmlns:ga='http://schemas.google.com/analytics/2008'>
     <id>http://www.google.com/analytics/feeds/data?ids=ga:983247&amp;dimensions=ga:country,ga:city&amp;metrics=ga:pageViews&amp;start-date=2008-01-01&amp;end-date=2008-01-02</id>
     <updated>2008-01-02T15:59:59.999-08:00 </updated>

data/test/test_helper.rb

@@ -1,16 +1,18 @@
 $:.reject! { |e| e.include? 'TextMate' }
 
 require 'rubygems'
-require 'test/unit'
+require 'minitest/unit'
 require 'shoulda'
 require 'mocha'
 
 require File.dirname(__FILE__) + '/../lib/garb'
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
   
   def read_fixture(filename)
     File.read(File.dirname(__FILE__) + "/fixtures/#{filename}")
   end
   
-end
+end
+
+MiniTest::Unit.autorun

data/test/unit/account_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class AccountTest < Test::Unit::TestCase
+  class AccountTest < MiniTest::Unit::TestCase
     context "The Account class" do
       should "have an array of accounts with all profiles" do
         p1 = stub(:account_id => '1111', :account_name => 'Blog 1')

data/test/unit/authentication_request_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', '/test_helper')
 CA_CERT_FILE = File.join(File.dirname(__FILE__), '..', '/cacert.pem')
 
 module Garb
-  class AuthenticationRequestTest < Test::Unit::TestCase
+  class AuthenticationRequestTest < MiniTest::Unit::TestCase
     
     context "An instance of the AuthenticationRequest class" do
       
@@ -108,7 +108,7 @@ module Garb
 
         Net::HTTP.stubs(:new).with('www.google.com', 443).returns(http)
         
-        assert_raise(Garb::AuthenticationRequest::AuthError) do
+        assert_raises(Garb::AuthenticationRequest::AuthError) do
           @request.send_request(OpenSSL::SSL::VERIFY_NONE)
         end
       end

data/test/unit/data_request_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class DataRequestTest < Test::Unit::TestCase
+  class DataRequestTest < MiniTest::Unit::TestCase
     
     context "An instance of the DataRequest class" do
 

data/test/unit/garb_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
-class GarbTest < Test::Unit::TestCase
+class GarbTest < MiniTest::Unit::TestCase
   context "A green egg" do
     should "be served with ham" do
       assert true

data/test/unit/oauth_session_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class OAuthSessionTest < Test::Unit::TestCase
+  class OAuthSessionTest < MiniTest::Unit::TestCase
     context "An instance of OAuthSession" do
       should "have tests" do
         assert true

data/test/unit/operator_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
-class OperatorTest < Test::Unit::TestCase
+class OperatorTest < MiniTest::Unit::TestCase
   context "An instance of an Operator" do
     should "lower camelize the target" do
       assert_equal "ga:uniqueVisits=", Operator.new(:unique_visits, "=").to_ga
@@ -23,15 +23,15 @@ class OperatorTest < Test::Unit::TestCase
     should "not be equal to another operator if target, operator, or prefix is different" do
       op1 = Operator.new(:hello, "==")
       op2 = Operator.new(:hello, "==", true)
-      assert_not_equal op1, op2
+      refute_equal op1, op2
       
       op1 = Operator.new(:hello1, "==")
       op2 = Operator.new(:hello2, "==")
-      assert_not_equal op1, op2
+      refute_equal op1, op2
       
       op1 = Operator.new(:hello, "!=")
       op2 = Operator.new(:hello, "==")
-      assert_not_equal op1, op2
+      refute_equal op1, op2
     end
   end
 end

data/test/unit/profile_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class ProfileTest < Test::Unit::TestCase
+  class ProfileTest < MiniTest::Unit::TestCase
     
     context "The Profile class" do
       

data/test/unit/report_parameter_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class ReportParameterTest < Test::Unit::TestCase
+  class ReportParameterTest < MiniTest::Unit::TestCase
     
     context "An instance of the ReportParameter class" do
       setup do

data/test/unit/report_response_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class ReportResponseTest < Test::Unit::TestCase
+  class ReportResponseTest < MiniTest::Unit::TestCase
     context "An instance of the ReportResponse class" do
       setup do
         @xml = File.read(File.join(File.dirname(__FILE__), '..', "/fixtures/report_feed.xml"))

data/test/unit/report_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
   # Also tests Garb::Resource, which is the basis for Garb::Report
-  class ReportTest < Test::Unit::TestCase    
+  class ReportTest < MiniTest::Unit::TestCase    
     context "An instance of the Report class" do
       setup do
         @now = Time.now

data/test/unit/resource_test.rb

@@ -5,7 +5,7 @@ class TestReport
 end
 
 # Most of the resource testing is done as a part of ReportTest
-class ResourceTest < Test::Unit::TestCase
+class ResourceTest < MiniTest::Unit::TestCase
 
   context "A class with Garb::Resource mixed in" do
     should "get results from GA" do

data/test/unit/session_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
 module Garb
-  class SessionTest < Test::Unit::TestCase
+  class SessionTest < MiniTest::Unit::TestCase
     
     context "The Session class" do
       

data/test/unit/string_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
-class StringTest < Test::Unit::TestCase
+class StringTest < MiniTest::Unit::TestCase
   context "An instance of a String" do
     should 'prefix a string with ga: for GA' do
       assert_equal 'ga:bob', 'bob'.to_ga

data/test/unit/symbol_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
-class SymbolTest < Test::Unit::TestCase
+class SymbolTest < MiniTest::Unit::TestCase
   
   context "An instance of the Symbol class" do
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: garb
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tony Pitale
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -04:00
+date: 2009-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency