garb 0.7.4 → 0.7.5

data/lib/garb/data_request.rb

@@ -32,11 +32,11 @@ module Garb
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.get("#{uri.path}#{query_string}", 'Authorization' => "GoogleLogin auth=#{@session.auth_token}")
+      http.get("#{uri.path}#{query_string}", {'Authorization' => "GoogleLogin auth=#{@session.auth_token}", 'GData-Version' => '2'})
     end
 
     def oauth_user_request
-      @session.access_token.get("#{uri}#{query_string}")
+      @session.access_token.get("#{uri}#{query_string}", {'GData-Version' => '2'})
     end
   end
 end

data/lib/garb/report_response.rb

@@ -23,7 +23,7 @@ module Garb
 
     def entries
       entry_hash = Crack::XML.parse(@xml)
-      entry_hash ? [entry_hash['feed']['entry']].flatten : []
+      entry_hash ? [entry_hash['feed']['entry']].flatten.compact : []
     end
 
     def values_for(entry)

data/lib/garb/resource.rb

@@ -40,6 +40,10 @@ module Garb
       @filter_parameters = FilterParameters.new
     end
 
+    def set_segment_id(id)
+      @segment = "gaid::#{id.to_i}"
+    end
+
     def results(profile, opts = {}, &block)
       @profile = profile.is_a?(Profile) ? profile : Profile.first(profile, opts.fetch(:session, Session))
 
@@ -67,13 +71,18 @@ module Garb
         'end-date' => format_time(@end_date)}
     end
 
+    def segment_params
+      @segment ? {'segment' => @segment} : {}
+    end
+
     def params
       [
         metrics.to_params,
         dimensions.to_params,
         sort.to_params,
         filters.to_params,
-        page_params
+        page_params,
+        segment_params
       ].inject(default_params) do |p, i|
         p.merge(i)
       end

data/lib/garb/version.rb

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

data/test/unit/garb/report_response_test.rb

@@ -9,6 +9,13 @@ module Garb
         
         assert_equal ['33', '2', '1'], response.results.map(&:pageviews)
       end
+
+      should "return an empty array if there are no results" do
+        response = ReportResponse.new("result xml")
+        Crack::XML.stubs(:parse).with("result xml").returns({'feed' => {'entry' => nil}})
+
+        assert_equal [], response.results
+      end
     end
   end
 end

data/test/unit/garb/report_test.rb

@@ -43,6 +43,11 @@ module Garb
         assert_equal params, @report.default_params
       end
 
+      should "allow setting a segment id to the segment params" do
+        @report.set_segment_id 121
+        assert_equal({'segment' => 'gaid::121'}, @report.segment_params)
+      end
+
       should "collect params from metrics, dimensions, filters, sort, and defaults" do
         @report.stubs(:metrics).returns(stub(:to_params => {'metrics' => 6}))
         @report.stubs(:dimensions).returns(stub(:to_params => {'dimensions' => 5}))
@@ -50,9 +55,12 @@ module Garb
         @report.stubs(:sort).returns(stub(:to_params => {'sort' => 3}))
         @report.stubs(:page_params).returns({'page_params' => 2})
         @report.stubs(:default_params).returns({'default_params' => 1})
+        @report.stubs(:segment_params).returns({'segment' => 'gaid::10'})
         
-        params = {'metrics' => 6, 'dimensions' => 5, 'filters' => 4, 'sort' => 3, 'page_params' => 2, 'default_params' => 1}
-        assert_equal params, @report.params
+        expected_params = {'metrics' => 6,'dimensions' => 5, 'filters' => 4, 'sort' => 3,
+                            'page_params' => 2, 'default_params' => 1, 'segment' => 'gaid::10'}
+
+        assert_equal expected_params, @report.params
       end
 
       should "format time" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Tony Pitale
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -04:00
+date: 2010-05-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency