garb 0.4.1 → 0.4.2

data/lib/extensions/string.rb

@@ -1,9 +1,9 @@
 class String
-  def to_ga
+  def to_google_analytics
     "ga:#{self}"
   end
 
-  def from_ga
+  def from_google_analytics
     self.gsub(/^ga\:/, '')
   end
 end

data/lib/extensions/symbol.rb

@@ -30,7 +30,7 @@ class Symbol
             :not_substring => '!@'
 
   # Metric filters  
-  def to_ga
-    self.to_s.camelize(:lower).to_ga
+  def to_google_analytics
+    self.to_s.camelize(:lower).to_google_analytics
   end
 end

data/lib/garb.rb

@@ -9,6 +9,7 @@ require 'happymapper'
 require 'active_support'
 
 require 'garb/version'
+require 'garb/profile_array'
 require 'garb/authentication_request'
 require 'garb/data_request'
 require 'garb/session'
@@ -22,7 +23,6 @@ require 'garb/operator'
 
 require 'extensions/string'
 require 'extensions/symbol'
-require 'extensions/array'
 
 module Garb
   GA = "http://schemas.google.com/analytics/2008"

data/lib/garb/operator.rb

@@ -4,12 +4,12 @@ module Garb
     attr_reader :target, :operator, :prefix
   
     def initialize(target, operator, prefix=false)
-      @target   = target.to_ga
+      @target   = target.to_google_analytics
       @operator = operator
       @prefix = prefix
     end
   
-    def to_ga
+    def to_google_analytics
       @prefix ? "#{operator}#{target}" : "#{target}#{operator}"
     end
   

data/lib/garb/profile.rb

@@ -13,7 +13,7 @@ module Garb
       attribute :value, String
 
       def instance_name
-        name.from_ga.underscore
+        name.from_google_analytics.underscore
       end
     end
 
@@ -38,13 +38,14 @@ module Garb
     end
 
     def id
-      @table_id.from_ga
+      @table_id.from_google_analytics
     end
 
     def self.all
       url = "https://www.google.com/analytics/feeds/accounts/default"
       response = DataRequest.new(url).send_request      
-      Entry.parse(response.body).map {|entry| new(entry)}
+      profiles = Entry.parse(response.body).map {|entry| new(entry)}
+      ProfileArray.new(profiles)
     end
 
     def self.first(id)

data/lib/garb/profile_array.rb

@@ -0,0 +1,18 @@
+module Garb
+  class ProfileArray < Array
+    def group_to_array
+      h = Hash.new
+
+      each do |element|
+        key = yield(element)
+        if h.has_key?(key)
+          h[key] << element
+        else
+          h[key] = [element]
+        end
+      end
+
+      h.map{|k,v| v}
+    end
+  end
+end

data/lib/garb/report_parameter.rb

@@ -26,7 +26,7 @@ module Garb
             "#{k.target}#{URI.encode(k.operator.to_s, /[=<>]/)}#{CGI::escape(v.to_s)}"
           end.join(';')
         else
-          elem.to_ga
+          elem.to_google_analytics
         end
       end.join(',')
       

data/lib/garb/version.rb

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

data/test/unit/account_test.rb

@@ -6,7 +6,7 @@ module Garb
       should "have an array of accounts with all profiles" do
         p1 = stub(:account_id => '1111', :account_name => 'Blog 1')
         p2 = stub(:account_id => '1112', :account_name => 'Blog 2')
-        Profile.stubs(:all).returns([p1,p2,p1,p2])
+        Profile.stubs(:all).returns(ProfileArray.new([p1,p2,p1,p2]))
         Account.expects(:new).with([p1,p1]).returns('account1')
         Account.expects(:new).with([p2,p2]).returns('account2')
         assert_equal ['account1','account2'], Account.all

data/test/unit/operator_test.rb

@@ -4,15 +4,15 @@ module Garb
   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
+        assert_equal "ga:uniqueVisits=", Operator.new(:unique_visits, "=").to_google_analytics
       end
     
       should "return target and operator together" do
-        assert_equal "ga:metric=", Operator.new(:metric, "=").to_ga
+        assert_equal "ga:metric=", Operator.new(:metric, "=").to_google_analytics
       end
     
       should "prefix the operator to the target" do
-        assert_equal "-ga:metric", Operator.new(:metric, "-", true).to_ga
+        assert_equal "-ga:metric", Operator.new(:metric, "-", true).to_google_analytics
       end
     
       should "know if it is equal to another operator" do

data/test/unit/string_test.rb

@@ -3,11 +3,11 @@ require File.join(File.dirname(__FILE__), '..', '/test_helper')
 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
+      assert_equal 'ga:bob', 'bob'.to_google_analytics
     end
 
     should 'remove ga: prefix' do
-      assert_equal 'bob', 'ga:bob'.from_ga
+      assert_equal 'bob', 'ga:bob'.from_google_analytics
     end
   end
 end

data/test/unit/symbol_test.rb

@@ -5,7 +5,7 @@ class SymbolTest < MiniTest::Unit::TestCase
   context "An instance of the Symbol class" do
     
     should "properly format itself for ga" do
-      assert_equal "ga:requestUri", :request_uri.to_ga
+      assert_equal "ga:requestUri", :request_uri.to_google_analytics
     end
     
     should "define a :desc operator" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: garb
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Tony Pitale
@@ -44,7 +44,6 @@ extra_rdoc_files: []
 files: 
 - README.md
 - Rakefile
-- lib/extensions/array.rb
 - lib/extensions/string.rb
 - lib/extensions/symbol.rb
 - lib/garb/account.rb
@@ -53,6 +52,7 @@ files:
 - lib/garb/oauth_session.rb
 - lib/garb/operator.rb
 - lib/garb/profile.rb
+- lib/garb/profile_array.rb
 - lib/garb/report.rb
 - lib/garb/report_parameter.rb
 - lib/garb/report_response.rb

data/lib/extensions/array.rb

@@ -1,16 +0,0 @@
-class Array
-  def group_to_array
-    h = Hash.new
-
-    each do |element|
-      key = yield(element)
-      if h.has_key?(key)
-        h[key] << element
-      else
-        h[key] = [element]
-      end
-    end
-
-    h.map{|k,v| v}
-  end
-end