garb 0.8.4 → 0.8.5

data/lib/garb.rb

@@ -57,10 +57,7 @@ module Garb
   alias :from_ga :from_google_analytics
 
   def parse_properties(entry)
-    entry['dxp:property'].inject({}) do |hash, p|
-      hash[Garb.from_ga(p['name'])] = p['value']
-      hash
-    end
+    Hash[entry['dxp:property'].map {|p| [Garb.from_ga(p['name']),p['value']]}]
   end
 
   def parse_link(entry, rel)

data/lib/garb/management/account.rb

@@ -1,23 +1,27 @@
 module Garb
   module Management
     class Account
-      attr_reader :session, :path
-      attr_reader :id, :title, :name
+      attr_accessor :session, :path
+      attr_accessor :id, :title, :name
 
       def self.all(session = Session)
         feed = Feed.new(session, '/accounts') # builds request and parses response
 
-        feed.entries.map {|entry| new(entry, session)}
+        feed.entries.map {|entry| new_from_entry(entry, session)}
       end
 
-      def initialize(entry, session)
-        @session = session
-        @path = Garb.parse_link(entry, "self").gsub(Feed::BASE_URL, '')
-        @title = entry['title'].gsub('Google Analytics Account ', '')
+      def self.new_from_entry(entry, session)
+        account = new
+        account.session = session
+        account.path = Garb.parse_link(entry, "self").gsub(Feed::BASE_URL, '')
+        account.title = entry['title'].gsub('Google Analytics Account ', '')
+        account.properties = Garb.parse_properties(entry)
+        account
+      end
 
-        properties = Garb.parse_properties(entry)
-        @id = properties["account_id"]
-        @name = properties["account_name"]
+      def properties=(properties)
+        self.id = properties["account_id"]
+        self.name = properties["account_name"]
       end
 
       def web_properties

data/lib/garb/management/profile.rb

@@ -4,12 +4,12 @@ module Garb
 
       include ProfileReports
 
-      attr_reader :session, :path
-      attr_reader :id, :table_id, :title, :account_id, :web_property_id
+      attr_accessor :session, :path
+      attr_accessor :id, :table_id, :title, :account_id, :web_property_id
 
       def self.all(session = Session, path = '/accounts/~all/webproperties/~all/profiles')
         feed = Feed.new(session, path)
-        feed.entries.map {|entry| new(entry, session)}
+        feed.entries.map {|entry| new_from_entry(entry, session)}
       end
 
       def self.for_account(account)
@@ -20,16 +20,22 @@ module Garb
         all(web_property.session, web_property.path+'/profiles')
       end
 
-      def initialize(entry, session)
-        @session = session
-        @path = Garb.parse_link(entry, "self").gsub(Feed::BASE_URL, '')
+      def self.new_from_entry(entry, session)
+        profile = new
 
-        properties = Garb.parse_properties(entry)
-        @id = properties['profile_id']
-        @table_id = properties['table_id']
-        @title = properties['profile_name']
-        @account_id = properties['account_id']
-        @web_property_id = properties['web_property_id']
+        profile.session = session
+        profile.path = Garb.parse_link(entry, "self").gsub(Feed::BASE_URL, '')
+        profile.properties = Garb.parse_properties(entry)
+
+        profile
+      end
+
+      def properties=(properties)
+        self.id = properties['profile_id']
+        self.table_id = properties['dxp:table_id']
+        self.title = properties['profile_name']
+        self.account_id = properties['account_id']
+        self.web_property_id = properties['web_property_id']
       end
 
       # def goals

data/lib/garb/management/web_property.rb

@@ -1,25 +1,29 @@
 module Garb
   module Management
     class WebProperty
-      attr_reader :session, :path
-      attr_reader :id, :account_id
+      attr_accessor :session, :path
+      attr_accessor :id, :account_id
 
       def self.all(session = Session, path='/accounts/~all/webproperties')
         feed = Feed.new(session, path)
-        feed.entries.map {|entry| new(entry, session)}
+        feed.entries.map {|entry| new_from_entry(entry, session)}
       end
 
       def self.for_account(account)
         all(account.session, account.path+'/webproperties')
       end
 
-      def initialize(entry, session)
-        @session = session
-        @path = Garb.parse_link(entry, "self").gsub(Feed::BASE_URL, '')
+      def self.new_from_entry(entry, session)
+        web_property = new
+        web_property.session = session
+        web_property.path = Garb.parse_link(entry, "self").gsub(Feed::BASE_URL, '')
+        web_property.properties = Garb.parse_properties(entry)
+        web_property
+      end
 
-        properties = Garb.parse_properties(entry)
-        @id = properties["web_property_id"]
-        @account_id = properties["account_id"]
+      def properties=(properties)
+        self.id = properties["web_property_id"]
+        self.account_id = properties["account_id"]
       end
 
       def profiles

data/lib/garb/profile_reports.rb

@@ -3,7 +3,7 @@ module Garb
     def self.add_report_method(klass)
       # demodulize leaves potential to redefine
       # these methods given different namespaces
-      method_name = klass.name.demodulize.underscore
+      method_name = klass.name.to_s.demodulize.underscore
       return unless method_name.length > 0
 
       class_eval <<-CODE

data/lib/garb/report_response.rb

@@ -14,11 +14,9 @@ module Garb
     private
     def parse
       entries.map do |entry|
-        hash = values_for(entry).inject({}) do |h, v|
-          h.merge(Garb.from_ga(v['name']) => v['value'])
-        end
-
-        @instance_klass.new(hash)
+        @instance_klass.new(Hash[
+          values_for(entry).map {|v| [Garb.from_ga(v['name']), v['value']]}
+        ])
       end
     end
 

data/lib/garb/version.rb

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

data/test/unit/garb/management/account_test.rb

@@ -8,12 +8,12 @@ module Garb
           feed = stub(:entries => ["entry1"])
           Feed.stubs(:new).returns(feed)
 
-          Account.stubs(:new)
+          Account.stubs(:new_from_entry)
           Account.all
 
           assert_received(Feed, :new) {|e| e.with(Session, '/accounts')}
           assert_received(feed, :entries)
-          assert_received(Account, :new) {|e| e.with("entry1", Session)}
+          assert_received(Account, :new_from_entry) {|e| e.with("entry1", Session)}
         end
       end
 
@@ -27,7 +27,7 @@ module Garb
               {"name" => "ga:accountName", "value" => "Garb"}
             ]
           }
-          @account = Account.new(entry, Session)
+          @account = Account.new_from_entry(entry, Session)
         end
 
         should "extract id and title from GA entry" do

data/test/unit/garb/management/profile_test.rb

@@ -8,12 +8,12 @@ module Garb
           feed = stub(:entries => ["entry1"])
           Feed.stubs(:new).returns(feed)
 
-          Profile.stubs(:new)
+          Profile.stubs(:new_from_entry)
           Profile.all
 
           assert_received(Feed, :new) {|e| e.with(Session, '/accounts/~all/webproperties/~all/profiles')}
           assert_received(feed, :entries)
-          assert_received(Profile, :new) {|e| e.with("entry1", Session)}
+          assert_received(Profile, :new_from_entry) {|e| e.with("entry1", Session)}
         end
 
         should "find all web properties for a given account"
@@ -31,7 +31,7 @@ module Garb
               {"name" => "ga:profileName", "value" => "example.com"}
             ]
           }
-          @profile = Profile.new(entry, Session)
+          @profile = Profile.new_from_entry(entry, Session)
         end
 
         should "have a title" do

data/test/unit/garb/management/web_property_test.rb

@@ -8,12 +8,12 @@ module Garb
           feed = stub(:entries => ["entry1"])
           Feed.stubs(:new).returns(feed)
 
-          WebProperty.stubs(:new)
+          WebProperty.stubs(:new_from_entry)
           WebProperty.all
 
           assert_received(Feed, :new) {|e| e.with(Session, '/accounts/~all/webproperties')}
           assert_received(feed, :entries)
-          assert_received(WebProperty, :new) {|e| e.with("entry1", Session)}
+          assert_received(WebProperty, :new_from_entry) {|e| e.with("entry1", Session)}
         end
 
         should "find all web properties for a given account" do
@@ -36,7 +36,7 @@ module Garb
             ]
           }
 
-          @web_property = WebProperty.new(entry, Session)
+          @web_property = WebProperty.new_from_entry(entry, Session)
         end
 
         should "have an id" do

data/test/unit/garb/model_test.rb

@@ -51,7 +51,7 @@ module Garb
             ]
           }
 
-          @profile = Garb::Management::Profile.new(entry, Session)
+          @profile = Garb::Management::Profile.new_from_entry(entry, Session)
         end
 
         context "when getting results" do
@@ -66,6 +66,8 @@ module Garb
             now = Time.now
             Time.stubs(:new).returns(now)
 
+            # p @profile.id
+
             @params = {'ids' => Garb.to_ga(@profile.id),
               'start-date' => (now - Model::MONTH).strftime('%Y-%m-%d'),
               'end-date' => now.strftime('%Y-%m-%d'),

data/test/unit/garb/resource_test.rb

@@ -1,49 +1,50 @@
 require 'test_helper'
 
-class TestReport
-  extend Garb::Resource
-end
-
 # Most of the resource testing is done as a part of ReportTest
 class ResourceTest < MiniTest::Unit::TestCase
 
   context "A class with Garb::Resource mixed in" do
+    setup do
+      @test_report = Class.new
+      @test_report.extend(Garb::Resource)
+    end
+
     should "get results from GA" do
       profile = stub(:is_a? => true)
-      TestReport.expects(:send_request_for_body).returns('xml')
+      @test_report.expects(:send_request_for_body).returns('xml')
       Garb::ReportResponse.expects(:new).with('xml', OpenStruct).returns(mock(:results => 'analytics'))
 
-      assert_equal 'analytics', TestReport.results(profile)
+      assert_equal 'analytics', @test_report.results(profile)
     end
 
     should "get results from GA using a specific user session" do
       profile = '123'
       session = Garb::Session.new
-      TestReport.expects(:send_request_for_body).returns('xml')
+      @test_report.expects(:send_request_for_body).returns('xml')
       Garb::ReportResponse.expects(:new).with('xml', OpenStruct).returns(mock(:results => 'analytics'))
       Garb::Profile.expects(:first).with(profile, session).returns(mock('Garb::Profile'))
 
-      assert_equal 'analytics', TestReport.results(profile, :session => session)
+      assert_equal 'analytics', @test_report.results(profile, :session => session)
     end
 
     should "permit setting a segment id" do
-      TestReport.set_segment_id 1
-      assert_equal "gaid::1", TestReport.segment
+      @test_report.set_segment_id 1
+      assert_equal "gaid::1", @test_report.segment
     end
 
     should "permit setting a klass used for instantiation of results" do
       TestKlass = Class.new(OpenStruct)
-      TestReport.set_instance_klass TestKlass
-      assert_equal TestKlass, TestReport.instance_klass
+      @test_report.set_instance_klass TestKlass
+      assert_equal TestKlass, @test_report.instance_klass
     end
 
     should "return an empty result set if profile is invalid" do
       profile = '123'
-      TestReport.expects(:send_request_for_body).never
+      @test_report.expects(:send_request_for_body).never
       Garb::ReportResponse.expects(:new).never
 
       Garb::Profile.expects(:first).returns(nil)
-      assert_equal [], TestReport.results(profile)
+      assert_equal [], @test_report.results(profile)
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: garb
 version: !ruby/object:Gem::Version 
-  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Tony Pitale
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 1
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 2
@@ -131,7 +128,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -140,7 +136,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"