baidu 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b8eabdad5f511d630d6b08c547b3e36df32189
-  data.tar.gz: efd30483fe5357b901b647919db740890c07844b
+  metadata.gz: e37178c85f6521e658f59cf8c8c3249e8e1492e7
+  data.tar.gz: ae7378591b0e813359a7deea907d1e8291174834
 SHA512:
-  metadata.gz: 6b6fbc268eba762a1414ea0b2cffc6a319e55fd1c8a3e708c226483f4bd060ca118451b22c5466dc3ebd0cca33f3599e2890d4fd8b5131c3e298a2b4c46324c5
-  data.tar.gz: 71c57fae2b36d8f91bad436dc4fa39fcdd8b5ed457f5b9ed4fe08f60285781a92ceb4c8f6c4774a736c1c059ae6183a9092a68cdf28d034490c022f151941e53
+  metadata.gz: 4d9a6405a089e4b2ddea08558ebfaeb2d0c17186d8730d865f2e79aae1191daca2f8cdbbccc5b2e3438fc2b5052b6b2faf1204079887825cd2ba5093e293f48b
+  data.tar.gz: c48d4431fe582fa0ce8c4567145598fad25c80a674520c7edea4b13298f3610f86de6141cb230730eb3efa6877894bb06a91f22d74c838ab1d3d4b6b1ad2c170

data/lib/baidu/sem/base.rb

@@ -12,7 +12,6 @@ module Baidu
         @password = auth.password
         @token = auth.token
         @client = Savon.new("https://api.baidu.com/sem/sms/v3/#{classname}?wsdl")
-        # Savon.new(@base_uri+service_name+'?wsdl')
       end
       def method_missing(name, *args, &block)
         options,debug = args[0],args[1]
@@ -39,7 +38,6 @@ module Baidu
         end
 
         name_request_sym = (name_tmp+'Request').to_sym #if %w(getCampaignByCampaignId getAllCampaign addCampaign updateCampaign deleteCampaign).include?name
-        # puts name_request_sym
         name_response_sym = (name+'Response').snake_case.to_sym
         operation = make_operation(name)
         operation.header = operation_header
@@ -50,12 +48,7 @@ module Baidu
         puts operation.build if debug
         response = operation.call
         ap response if debug
-        # ap response.failures if debug
-        if response.failures
-          raise response.failures.to_s
-        else
-          Baidu::Response.new(response,name_response_sym)
-        end
+        Baidu::Response.new(response,name_response_sym)
       end
       def operations
         @client.operations(@service_name,@port_name)
@@ -88,9 +81,6 @@ module Baidu
         end
       end
 
-      # def invalid_options?(options,necessary_options)
-      #   return true if necessary_options.any?{|necessary_option|!options.has_key?necessary_option}
-      # end
     end
   end
 end

data/lib/baidu/version.rb

@@ -1,3 +1,3 @@
 module Baidu
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/sem_report_spec.rb

@@ -1,34 +1,54 @@
 require 'spec_helper'
 describe Baidu::SEM::ReportService do
   subject{Baidu::SEM::ReportService.new($auth)}
-    before :each do
-      @options = {}
-      @options[:performanceData] = [Baidu::SEM::PerformanceData::IMPRESSION, Baidu::SEM::PerformanceData::CLICK, Baidu::SEM::PerformanceData::CPC]
-      @options[:startDate] = (Time.now - 24*3600).utc.iso8601
-      @options[:endDate] = Time.now.utc.iso8601
-      @options[:statIds] = $campaign_ids
-      @options[:levelOfDetails] = Baidu::SEM::LevelOfDetails::CAMPAIGN
-      @options[:reportType] = Baidu::SEM::ReportType::CAMPAIGN
-    end
+    # before :each do
+    # end
 
-    # describe "ReportService#getProfessionalReportId" do
-    #   @report_id = nil
-    it "返回的id必须是32位数字和小写字母组合" do
-      pending('need to rewrite')
-      response = subject.getProfessionalReportId({:reportRequestType => @options}).body
-      expect{ApiResponse.verify(response)}.not_to raise_error
-      # report_id.class.should == String
-      # report_id.should =~ /^[a-z0-9]{32}$/
-    end
+    it 'should not raise error on #getProfessionalReportId #getReportState #getReportFileUrl series test' do
+      #getProfessionalReportId
+      options = {
+        :performanceData => [Baidu::SEM::PerformanceData::IMPRESSION, Baidu::SEM::PerformanceData::CLICK, Baidu::SEM::PerformanceData::CPC],
+        :startDate => (Time.now - 24*3600).utc.iso8601,
+        :endDate => Time.now.utc.iso8601,
+        :statIds => [$campaign_id],
+        :levelOfDetails => Baidu::SEM::LevelOfDetails::CAMPAIGN,
+        :reportType => Baidu::SEM::ReportType::CAMPAIGN
+      }
+      response = subject.getProfessionalReportId({:reportRequestType => options})
+      response.status.should == 0
+      response.desc.should == 'success'
+      response.quota.should == 2
+      response.rquota.should > 0
+      expect{ApiResponse.verify(response.body)}.not_to raise_error
+
+      #parse report_id
+      report_id = response.body[:report_id]
+
+      #getReportState
+      try_count = 0
+      loop do
+        response = subject.getReportState({:reportId => report_id})
+        response.status.should == 0
+        response.desc.should == 'success'
+        response.quota.should == 2
+        response.rquota.should > 0
+        expect{ApiResponse.verify(response.body)}.not_to raise_error
+        #verify is_generated status
+        is_generated = response.body[:is_generated]
+        break if is_generated == '3' or try_count > 10
+        sleep 1
+        try_count +=1
+      end
+
+
+      #getReportFileUrl
+      response = subject.getReportFileUrl({:reportId => report_id})
+      response.status.should == 0
+      response.desc.should == 'success'
+      response.quota.should == 2
+      response.rquota.should > 0
+      expect{ApiResponse.verify(response.body)}.not_to raise_error
 
-    it "处理未过期有效id(1小时内产生的）应返回ReportState中的枚举值" do
-      pending('need to rewrite')
-      response = subject.getProfessionalReportId({:reportRequestType => @options}).body
-      report_id = response[:report_id]
-      response = subject.getReportState({:reportId=>report_id}).body
-      expect{ApiResponse.verify(response)}.not_to raise_error
-      # report_state = response[:report_state]
-      # [Baidu::SEM::ReportState::PENDING,ReportState::DOING,ReportState::DONE].should include report_state
     end
 
     it "处理过期/无效id,应返回false" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baidu
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - seoaqua
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler