ppc 1.3.0 → 1.3.2

data/lib/ppc/operation/report.rb

@@ -0,0 +1,23 @@
+module PPC
+  module Operation
+    module Report
+
+      def download_report( param = nil, debug = false )
+        call('report').download_report( @auth, param, debug )
+      end
+
+      def query_report( param = nil, debug = false )
+        call('report').query_report( @auth, param, debug )
+      end
+
+      def creative_report( param = nil, debug = false )
+        call('report').creative_report( @auth, param, debug )
+      end
+
+      def keyword_report( param = nil, debug = false )
+        call('report').keyword_report( @auth, param, debug )
+      end
+
+    end
+  end
+end

data/ppc.gemspec

@@ -1,7 +1,16 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+# require ppc for version
 require 'ppc'
+
+puts """################ WARNING #################
+#  Savon 3.0 is not avaliable on gem source.
+#  Please download it from github, 
+#  checkout savon3 branch and install manually.
+##########################################""" 
+
 Gem::Specification.new do |spec|
   spec.name          = "ppc"
   spec.version       = PPC::VERSION
@@ -9,14 +18,15 @@ Gem::Specification.new do |spec|
   spec.email         = ["maqianlie@gmail.com, liuyu_tc@163.com, seoaqua@qq.com"]
   spec.summary       = %q{ppc api for  baidu qihu sogou}
   spec.description   = %q{ppc api for  baidu qihu sogou}
-  spec.homepage      = "http://github.com/seoaqua/ppc"
-  spec.license       = "MIT"
+  spec.homepage      = "https://github.com/warriors-of-the-night/ppc"
+  spec.license       = "GNU"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_dependency 'httparty', '~> 0.13', '>= 0.13.0'
+  spec.add_dependency 'savon',  '~> 3.0', '>= 3.0.0'
+  spec.add_dependency 'awesome_print'
 end

data/spec/baidu/api_baidu_account_spec.rb

@@ -0,0 +1,16 @@
+describe ::PPC::API::Baidu::Account do
+  auth = $baidu_auth
+  #::PPC::API::Baidu.debug_on
+  
+  it 'can get account info' do
+      result = ::PPC::API::Baidu::Account::info auth 
+      is_success result 
+  end
+
+  it 'can update account' do
+    update = {budget_type: 1, budget: 1000}
+    result =  ::PPC::API::Baidu::Account::update(auth, update)
+    is_success result 
+  end
+
+end

data/spec/baidu/api_baidu_creative_spec.rb

@@ -0,0 +1,73 @@
+# -*- coding:utf-8 -*-
+describe ::PPC::API::Baidu::Creative do
+  auth = $baidu_auth
+
+  ::PPC::API::Baidu::debug_off
+  test_group_id = ::PPC::API::Baidu::Group::ids( auth )[:result][0][:group_ids][0]
+  test_plan_id = ::PPC::API::Baidu::Plan::all( auth )[:result][0][:plan_id]
+  test_creative_id = []
+  ::PPC::API::Baidu::debug_on
+
+ it 'can add creative' do
+    creative = {
+                  group_id: test_group_id, 
+                  title: 'TestCreative', preference:1, 
+                  description1:'this is rest',
+                  description2:'also is a test',
+                  pc_destination:$domain,
+                  pc_display:$domain 
+                }
+    response = ::PPC::API::Baidu::Creative::add( auth, creative )
+    is_success( response )
+    test_creative_id << response[:result][0][:id]
+  end
+
+  it 'can update creative' do
+    update = { 
+                id:test_creative_id[0], 
+                title:'ElongUpdateTest',
+                description1:'test for update',
+                mobile_destination:$domain,
+                pc_destination:$domain,
+                pause:true
+              } 
+    response = ::PPC::API::Baidu::Creative::update( auth, update )
+    is_success( response )
+  end
+
+  it 'can activate creative' do
+    response = ::PPC::API::Baidu::Creative::activate( auth, test_creative_id )
+    is_success( response )
+  end
+
+  # 连续测试的系统返回system_failured
+  # it 'can get status' do
+  #   response1 = ::PPC::API::Baidu::Creative::status( auth, test_group_id, 'group' )
+  #   response2 = ::PPC::API::Baidu::Creative::status( auth, test_creative_id, 'creative' )
+  #   response3 = ::PPC::API::Baidu::Creative::status( auth, test_plan_id, 'plan' )
+  #   is_success( response1 ) 
+  #   is_success( response2 ) 
+  #   is_success( response3 ) 
+  # end
+
+  it 'can search id by group id' do
+    response = ::PPC::API::Baidu::Creative::search_id_by_group_id( auth, test_group_id, 0 )
+    is_success( response )
+  end
+
+  it 'can search creative by group id' do
+    response = ::PPC::API::Baidu::Creative::search_by_group_id( auth, test_group_id, 0 )
+    is_success( response )
+  end
+
+  it 'can search creative by creative id' do
+    response = ::PPC::API::Baidu::Creative::get( auth, test_creative_id, 0 )
+    is_success( response )
+  end
+
+  it 'can delete creative' do 
+    response = ::PPC::API::Baidu::Creative::delete( auth, test_creative_id )
+    is_success( response )
+  end
+
+end

data/spec/{api_baidu_group_spec.rb → baidu/api_baidu_group_spec.rb}

@@ -1,49 +1,44 @@
 describe ::PPC::API::Baidu::Group do
-  auth =  {}
-  auth[:username] = $baidu_username
-  auth[:password] = $baidu_password 
-  auth[:token] = $baidu_token
+  auth = $baidu_auth
 
-  Test_plan_id = []
-  Test_group_id = []
+  test_plan_id = ::PPC::API::Baidu::Plan.ids(auth)[:result][0]
+  test_group_id = []
 
   it 'can get all group' do 
     response = ::PPC::API::Baidu::Group::ids( auth )
-    is_successed( response ) 
-    pair = response['body']['campaignAdgroupIds'][0]
-    Test_plan_id << pair['campaignId']
+    is_success( response ) 
   end
 
   it 'can add group' do 
-    group = { name: 'test_group', plan_id:Test_plan_id[0], price:500 }
+    group = { name: 'test_group', plan_id:test_plan_id, price:500 }
     response = ::PPC::API::Baidu::Group::add( auth, group )
     is_success( response )
-    Test_group_id << response[:result][0][:id]
+    test_group_id << response[:result][0][:id]
   end
   
   it 'can update group' do 
-    group = { id: Test_group_id[0], price:600 }
+    group = { id: test_group_id[0], price:600 }
     response = ::PPC::API::Baidu::Group::update( auth, group )
     is_success( response )
   end
 
   it 'can search group by group id' do
-    response = ::PPC::API::Baidu::Group::get( auth, Test_group_id )
+    response = ::PPC::API::Baidu::Group::get( auth, test_group_id )
     is_success( response )
   end
   
-  it 'can search group id by group id' do
-    response = ::PPC::API::Baidu::Group::search_id_by_plan_id( auth, Test_plan_id )
+  it 'can search group id by plan id' do
+    response = ::PPC::API::Baidu::Group::search_id_by_plan_id( auth, test_plan_id )
     is_success( response )
   end
 
   it 'search by plan id' do 
-    response = ::PPC::API::Baidu::Group::search_by_plan_id( auth, Test_plan_id )
+    response = ::PPC::API::Baidu::Group::search_by_plan_id( auth, test_plan_id )
     is_success( response )
   end  
 
   it 'can delete group' do 
-    response = ::PPC::API::Baidu::Group::delete( auth, Test_group_id )
+    response = ::PPC::API::Baidu::Group::delete( auth, test_group_id )
     is_success( response )
   end
   

data/spec/baidu/api_baidu_keyword_spec.rb

@@ -0,0 +1,61 @@
+# -*- coding:utf-8 -*-
+describe ::PPC::API::Baidu::Keyword do
+  auth = $baidu_auth
+
+  test_group_id = ::PPC::API::Baidu::Group::ids( auth )[:result][0][:group_ids][0]
+  test_plan_id = ::PPC::API::Baidu::Plan::all( auth )[:result][0][:plan_id]
+  test_keyword_id = []
+
+  it 'can search keyword by group id' do
+    response = ::PPC::API::Baidu::Keyword::search_by_group_id( auth, test_group_id )
+    is_success( response )
+  end
+
+  it 'can add keyword' do
+    keyword = { group_id: test_group_id, keyword: 'testkeywordid', match_type:'exact' }
+    response = ::PPC::API::Baidu::Keyword::add( auth, keyword )
+    is_success( response )
+    test_keyword_id << response[:result][0][:id]
+  end
+
+  it 'can update keyword' do
+    update = { id:test_keyword_id[0],  pc_destination: $baidu_domain, pause:true} 
+    response = ::PPC::API::Baidu::Keyword::update( auth, update )
+    is_success( response )
+  end
+
+  it 'can activate keyword' do
+    response = ::PPC::API::Baidu::Keyword::activate( auth, test_keyword_id )
+    is_success( response )
+  end
+
+  # 连续测试系统返回system failure
+  # it 'can get status' do
+  #   response1 = ::PPC::API::Baidu::Keyword::status( auth, test_group_id, 'group' )
+  #   response2 = ::PPC::API::Baidu::Keyword::status( auth, test_keyword_id, 'keyword' )
+  #   response3 = ::PPC::API::Baidu::Keyword::status( auth, test_plan_id, 'plan' )
+  #   is_success( response1 ) 
+  #   is_success( response2 ) 
+  #   is_success( response3 ) 
+  # end
+
+  # it 'can get quality' do
+  #   response1 = ::PPC::API::Baidu::Keyword::quality( auth, test_group_id, 'group', true )
+  #   response2 = ::PPC::API::Baidu::Keyword::quality( auth, test_keyword_id, 'keyword', true )
+  #   response3 = ::PPC::API::Baidu::Keyword::quality( auth, test_plan_id, 'plan', true )
+  #   is_successed( response1 ) 
+  #   is_successed( response2 ) 
+  #   is_successed( response3 ) 
+  # end
+
+  it 'can get 10-quality' do
+    response = ::PPC::API::Baidu::Keyword::quality( auth, test_keyword_id, 'keyword', 'pc' )
+    is_success( response )    
+  end
+
+  it 'can delete keyword' do
+    response = ::PPC::API::Baidu::Keyword::delete( auth, test_keyword_id )
+    is_success( response )
+  end
+
+end

data/spec/baidu/api_baidu_phone_spec.rb

@@ -0,0 +1,22 @@
+# -*- coding:utf-8 -*-
+describe ::PPC::API::Baidu::Phone do
+  auth = $baidu_auth
+
+  ::PPC::API::Baidu::debug_off
+  test_group_id = ::PPC::API::Baidu::Group::ids( auth )[:result][0][:group_ids][0]
+  test_phone_id = 0
+  ::PPC::API::Baidu::debug_on
+
+  it 'can search id by group id' do
+    response = ::PPC::API::Baidu::Phone::search_id_by_group_id( auth, test_group_id, 0 )
+    test_phone_id =  response[:result][0][:phone_ids][0]
+    is_success( response )
+  end
+
+  it 'can update' do 
+    response = ::PPC::API::Baidu::Phone::update( auth, {id: test_phone_id,pause: true})
+    p response
+    is_success( response )
+  end
+
+end

data/spec/{api_baidu_plan_spec.rb → baidu/api_baidu_plan_spec.rb}

@@ -1,10 +1,9 @@
 describe ::PPC::API::Baidu::Plan do
-  auth =  {}
-  auth[:username] = $baidu_username
-  auth[:password] = $baidu_password 
-  auth[:token] = $baidu_token
+  auth = $baidu_auth
 
-  Test_plan_id = []
+  test_plan_id = []
+
+  #::PPC::API::Baidu.debug_on
 
   it "can get all plans" do
     response = ::PPC::API::Baidu::Plan::all( auth )
@@ -17,25 +16,27 @@ describe ::PPC::API::Baidu::Plan do
   end 
 
   it "can add plan" do
-    test_plan = { name: "test_plan1", negative: ["test"] }
+    test_plan = { name: "test_elong_e", negative: ["test"] }
     response = ::PPC::API::Baidu::Plan::add( auth, test_plan )
     is_success( response )
-    Test_plan_id << response['body']['campaignTypes'][0]['campaignId']
+    test_plan_id << response[:result][0][:id]
   end
 
   it "can get plan by id" do
-    response = ::PPC::API::Baidu::Plan::get( auth, Test_plan_id )
+    response = ::PPC::API::Baidu::Plan::get( auth, test_plan_id )
     is_success( response )
   end
 
   it 'can update plan' do
-    update = { id: Test_plan_id[0], name:"test_plan_update"}
+    update = { id: test_plan_id[0], name:"test_plan_update", is_dynamic:false }
     response = ::PPC::API::Baidu::Plan::update( auth, update )
+    # param isDynamicCreative should not be default value
+    expect( response[:result][0][:is_dynamic] ).to eq false
     is_success( response )
   end
 
   it "can delete plan" do
-    response = ::PPC::API::Baidu::Plan::delete( auth, Test_plan_id )
+    response = ::PPC::API::Baidu::Plan::delete( auth, test_plan_id )
     is_success( response )
   end
 

data/spec/baidu/api_baidu_report_spec.rb

@@ -0,0 +1,44 @@
+describe ::PPC::API::Baidu::Report do
+  auth = $baidu_auth
+
+  test_report_id = []
+
+  it 'can get professional report id' do
+    param = { type: 'plan', level:'plan',range:'plan',unit:'week',device:'all' }
+    response = ::PPC::API::Baidu::Report::get_id( auth, param )
+    is_success( response )
+    test_report_id << response[:result]
+  end
+
+  it 'can get professional report status' do
+    response = ::PPC::API::Baidu::Report::get_state( auth, test_report_id[0] )
+    is_success( response )
+  end
+
+  # it 'can get professional report download URL' do
+  #   response = ::PPC::API::Baidu::Report::get_file_url( auth, test_report_id[0] )
+  #   is_success( response )
+  # end
+end
+
+describe "::PPC::API::Baidu::Report Operation interface" do
+  auth =  $baidu_auth 
+
+  subject{
+    ::PPC::API::Baidu::Report
+  }
+  # opetation report test
+  it 'can get report' do
+    endDate = ( Time.now-2*3600*24).to_s[0..9].split('-').join
+    startDate =( Time.now-27*3600*24).to_s[0..9].split('-').join
+
+    p "startDate:#{startDate}"
+    p "endDate:#{endDate}"
+
+    param = {startDate:startDate, endDate:endDate}
+    p subject.query_report( auth, param, true )
+    p subject.keyword_report( auth, param, true )
+    p subject.creative_report( auth,param, true )
+  end
+
+end

data/spec/{api_baidu_spec.rb → baidu/api_baidu_spec.rb}

@@ -12,30 +12,25 @@ describe ::PPC::API::Baidu do
 
   response = JSON.parse fake_response
 
-  Expected_success_result = [:id, :balance, :cost, :payment, 
+  expected_success_result = [:id, :balance, :cost, :payment, 
                                                 :budget_type, :budget, :region, :exclude_ip, 
                                                 :open_domains, :reg_domain, :offline_time, 
                                                 :weekly_budget ]
 
-  Expected_failure_result = ["code", "message", "position", "content"] 
+  expected_failure_result = ["code", "message", "position", "content"] 
 
   it 'can process response' do
     response = ::PPC::API::Baidu::process( response, 'accountInfoType' ){|x| ::PPC::API::Baidu::Account::reverse_type(x)}
-    
-    p "HAHA"*12
-    p response
-
-    expect( response[:result][0].keys ).to eq Expected_success_result
+    expect( response[:result][0].keys ).to eq expected_success_result
   end
 
   # params for make_type and reverse_type test
-    test_map = 
-  [
-    [ :id , :campaignId],
-    [ :name , :campaignName],
-    [ :exclude_ip, :excludeIp],
-    [ :exact_negative , :exactNegativeWords],
-  ]
+  test_map = [
+              [ :id , :campaignId],
+              [ :name , :campaignName],
+              [ :exclude_ip, :excludeIp],
+              [ :exact_negative , :exactNegativeWords],
+            ]
 
   test_type = {  }
   test_type['campaignId'] = 123
@@ -47,7 +42,7 @@ describe ::PPC::API::Baidu do
   test_param[ :id] = 123
   test_param[ :name] = 'testplan'
   test_param[ :exclude_ip] =  [321,5432,52,1]
-  test_param[ :exact_negative] = ['test','plan']
+  test_param[ :exact_negative] = ['wu','liaode']
 
   expected_type = [{:campaignId=>123, :campaignName=>"testplan", :excludeIp=>[321, 5432, 52, 1], :exactNegativeWords=>["wu", "liaode"]}]
   expexted_params = [{:id=>123, :name=>"test_plan", :exclude_ip=>[321, 5432, 52, 1], :exact_negative=>["wu", "liaode"]}]

data/spec/operation/operation_baidu_report_spec.rb

@@ -0,0 +1,17 @@
+describe ::PPC::Operation::Account do
+  subject{
+    ::PPC::Operation::Account.new( $baidu_auth )
+  }
+  # opetation report test
+  it 'can get report' do
+    endDate = ( Time.now-2*3600*24).to_s[0..9].split('-').join
+    startDate =( Time.now-27*3600*24).to_s[0..9].split('-').join
+
+    p "startDate:#{startDate},endDate:#{endDate}"
+    param = {startDate:startDate, endDate:endDate}
+
+    subject.query_report( param, true )
+    subject.keyword_report( param, true )
+    subject.creative_report( param, true )
+  end
+end