Moved report-gathering logic into Report.

Added data gathering logic.
Data returned as array of keyword hashes.

Author: Bill Gathen

lib/yieldmanager/client.rb

@@ -92,10 +92,10 @@ def paginate block_size
       end until (block_size * (page-1)) > total
     end
 
-    def pull_report xml
-      rpt = Yieldmanager::Report.new
-      
-      rpt
+    def pull_report token, xml
+      report = Yieldmanager::Report.new
+      report.pull(token, self.report, xml)
+      report
     end
 
 private
@@ -119,28 +119,5 @@ def load_service name
       wsdl_path = "#{BASE_URL}#{api_version}/#{name}.php?wsdl"
       SOAP::WSDLDriverFactory.new(wsdl_path).create_rpc_driver
     end
-    
-    def request_report_token token, xml
-      report.requestViaXML(token,xml)
-    end
-    
-    def retrieve_report_url token, report_token
-      report_url = nil
-      60.times do |secs| # Poll until report ready
-        report_url = report.status(token,report_token)
-        break if report_url != nil
-        sleep(5)
-      end
-      report_url
-    end
-    
-    def retrieve_data url
-      rpt = Yieldmanager::Report.new
-      doc = open(url) { |f| Hpricot(f) }
-      (doc/"header column").each do |col|
-        rpt.headers << col.inner_html
-      end
-      rpt
-    end
   end
 end

lib/yieldmanager/report.rb

@@ -1,9 +1,47 @@
 module Yieldmanager
   class Report
-    attr_accessor :headers
+    attr_accessor :headers, :data
 
     def initialize
       self.headers = []
+      self.data = []
+    end
+    
+    def pull token, report, xml
+      report_token = request_report_token token, report, xml
+      report_url = retrieve_report_url token, report, report_token
+      retrieve_data report_url
+    end
+
+private
+    
+    def request_report_token token, report, xml
+      report.requestViaXML(token,xml)
+    end
+
+    def retrieve_report_url token, report, report_token
+      report_url = nil
+      60.times do |secs| # Poll until report ready
+        report_url = report.status(token,report_token)
+        break if report_url != nil
+        sleep(5)
+      end
+      report_url
+    end
+    
+    def retrieve_data url
+      doc = open(url) { |f| Hpricot(f) }
+      (doc/"header column").each do |col|
+        headers << col.inner_html
+      end
+      (doc/"row").each_with_index do |row,idx|
+        row_hash = {}
+        (row/"column").each do |col|
+          row_hash[headers[idx]] = col.inner_html
+        end
+        data << row_hash
+      end
     end
   end
+
 end

spec/yieldmanager/report_spec.rb

@@ -16,38 +16,46 @@
   end
 
   it "returns report object" do
-    rpt = @ym.pull_report(request_xml)
-    rpt.should be_instance_of(Yieldmanager::Report)
+    @ym.session do |token|
+      rpt = @ym.pull_report(token, request_xml)
+      rpt.should be_instance_of(Yieldmanager::Report)
+    end
   end
 
   it "makes request and returns report token" do
     @ym.session do |token|
-      @ym.send(:request_report_token, token,request_xml).should_not be_nil
+      rpt = Yieldmanager::Report.new
+      rpt.send(:request_report_token, token, @ym.report, request_xml).should_not be_nil
     end
   end
 
   it "uses report token to pull report url" do
     @ym.session do |token|
-      report_token = @ym.send(:request_report_token, token, request_xml)
-      report_url = @ym.send(:retrieve_report_url, token, report_token)
+      rpt = Yieldmanager::Report.new
+      report_token = rpt.send(:request_report_token, token, @ym.report, request_xml)
+      report_url = rpt.send(:retrieve_report_url, token, @ym.report, report_token)
       report_url.should_not be_nil
     end
   end
 
   it "uses report url to pull report" do
     @ym.session do |token|
-      report_token = @ym.send(:request_report_token, token, request_xml)
-      report_url = @ym.send(:retrieve_report_url, token, report_token)
+      rpt = Yieldmanager::Report.new
+      report_token = rpt.send(:request_report_token, token, @ym.report, request_xml)
+      report_url = rpt.send(:retrieve_report_url, token, @ym.report, report_token)
 
-      report = @ym.send(:retrieve_data, report_url)
-      report.should be_instance_of(Yieldmanager::Report)
-      report.headers[0].should == "advertiser_name"
+      rpt.send(:retrieve_data, report_url)
+      rpt.headers[0].should == "advertiser_name"
     end
   end
 
-  it "offers data as name/value pairs"
-  
-  it "offers data as ordered array"
+  it "offers data as name/value pairs" do
+    @ym.session do |token|
+      report = @ym.pull_report(token, request_xml)
+      report.data[0]['advertiser_name'].should_not be_nil
+      # report.data[0][0].should == report.data[0]['advertiser_name']
+    end
+  end
 
   it "complains if report token is nil"