sem4r 0.1.1 → 0.1.2

data/spec/sem4r/rexml_parsing_spec.rb

@@ -22,27 +22,27 @@
 #
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../rspec_helper')
 
 describe "Test Parsing with REXML" do
   include Sem4rSpecHelper
 
 
-  it "ddd" do
-    pending "test"
-    xml_document = read_xml_document("services", "ad_group_ad", "mutate_add_two_criterions-res.xml")
-    els = REXML::XPath.match( xml_document, "//mutateResponse/rval/value/ad/id")
-    els.each {|e| puts e.text.strip.to_i }
-  end
+#  it "ddd" do
+#    pending "test"
+#    xml_document = read_xml_document_with_rexml("services", "ad_group_ad", "mutate_add_two_criterions-res.xml")
+#    els = REXML::XPath.match( xml_document, "//mutateResponse/rval/value/ad/id")
+#    els.each {|e| puts e.text.strip.to_i }
+#  end
 
   it "test_account_get_client_accounts" do
-    xml_document = read_xml_document("services", "v13_account", "get_client_accounts-res.xml")
+    xml_document = read_xml_document_with_rexml("v13_account", "get_client_accounts-res.xml")
     els = REXML::XPath.match( xml_document, "//getClientAccountsReturn")
     els.length.should == 5
   end
 
   it "test_campaign_get" do
-    xml_document = read_xml_document("services", "campaign", "get-res.xml")
+    xml_document = read_xml_document_with_rexml("campaign", "get-res.xml")
     rval = REXML::XPath.first( xml_document, "//getResponse/rval")
     els = REXML::XPath.match( rval, "entries")
 
@@ -74,27 +74,27 @@ describe "Test Parsing with REXML" do
     names_expected.should == names
   end
 
-  it "test_adgroup_criterion_get" do
-    xml_document = read_xml_document("services", "ad_group_criterion", "get-res.xml")
-    rval = REXML::XPath.first( xml_document, "//getResponse/rval")
-
-    el = REXML::XPath.first( rval, "entries/criterion[@xsi:type='Keyword']")
-
-    el.elements["id"].text.should == "11536082"
-    el.elements["text"].text.should == "pippo"
-    el.elements["matchType"].text.should == "BROAD"
-  end
+#  it "test_adgroup_criterion_get" do
+#    xml_document = read_xml_document_with_rexml("ad_group_criterion", "get-res.xml")
+#    rval = REXML::XPath.first( xml_document, "//getResponse/rval")
+#
+#    el = REXML::XPath.first( rval, "entries/criterion[@xsi:type='Keyword']")
+#
+#    el.elements["id"].text.should == "11536082"
+#    el.elements["text"].text.should == "pippo"
+#    el.elements["matchType"].text.should == "BROAD"
+#  end
 
   it "test_info_get" do
-    xml_document = read_xml_document("services", "info", "get_unit_count-res.xml")
+    xml_document = read_xml_document_with_rexml("info", "get_unit_count-res.xml")
 
     response_header = REXML::XPath.first(xml_document, "//ResponseHeader")
     response_header.elements["operations"].text.strip.should == "1"
-    response_header.elements["responseTime"].text.strip.should == "173"
+    response_header.elements["responseTime"].text.strip.should == "291"
     response_header.elements["units"].text.strip.should == "1"
 
     cost = REXML::XPath.first( xml_document, "//getResponse/rval/cost")
-    cost.text.strip.should == "100"
+    cost.text.strip.should == "0"
   end
 
 end

data/spec/sem4r/services/service_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -22,7 +23,7 @@
 # 
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../rspec_helper')
 
 describe Service do
   include Sem4rSpecHelper

data/spec/sem4r/services/soap_call_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -22,7 +23,7 @@
 # 
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../rspec_helper')
 
 describe SoapCall do
   include Sem4rSpecHelper
@@ -38,10 +39,10 @@ describe SoapCall do
       @connector = connector
     end
 
-    soap_call_v2009 :get,          :mutate => false
-    soap_call_v2009 :get_with_arg, :mutate => false
-    soap_call_v2009 :mutate
-    soap_call_v2009 :mutate_bis,   :mutate => true
+    soap_call_v2010 :get,          :mutate => false
+    soap_call_v2010 :get_with_arg, :mutate => false
+    soap_call_v2010 :mutate
+    soap_call_v2010 :mutate_bis,   :mutate => true
 
     private
 

data/spec/sem4r/services/soap_message_v13_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -22,24 +23,17 @@
 # 
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../rspec_helper')
 
 describe SoapMessageV13 do
-
   include Sem4rSpecHelper
 
-  before(:all) do
-    @credentials = mock("credentials")
-    # @credentials.should_receive(:sandbox?).and_return(true)
-    @credentials.should_receive(:email).and_return("example@gmail.com")
-    @credentials.should_receive(:password).and_return("secret")
-    @credentials.should_receive(:client_email).and_return(nil)
-    @credentials.should_receive(:useragent).and_return("sem4r")
-    @credentials.should_receive(:developer_token).and_return("dev_token")
+  before do
+    @credentials = stub_credentials
   end
 
   it "should update counters" do
-    response_xml = read_xml_file("services", "v13_report", "get_all_jobs-res.xml")
+    response_xml = read_xml("v13_report", "get_all_jobs-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
 

data/spec/{fixtures/services/targeting_idea → sem4r/targeting_idea/fixtures}/get-req.xml

@@ -14,13 +14,10 @@
     </s:RequestHeader>
   </env:Header>
   <env:Body>
-
     <s:get>
       <s:selector>
-
         <s:ideaType>KEYWORD</s:ideaType>
         <s:requestType>IDEAS</s:requestType>
-
         <s:searchParameters xsi:type='s:ExcludedKeywordSearchParameter'>
           <s:keywords xsi:type='Keyword'>
             <Criterion.Type>Keyword</Criterion.Type>
@@ -28,7 +25,6 @@
             <matchType>EXACT</matchType>
           </s:keywords>
         </s:searchParameters>
-
         <s:searchParameters xsi:type='s:KeywordMatchTypeSearchParameter'>
           <s:keywordMatchTypes>BROAD</s:keywordMatchTypes>
           <s:keywordMatchTypes>EXACT</s:keywordMatchTypes>
@@ -40,21 +36,23 @@
             <text>dvd player</text>
             <matchType>EXACT</matchType>
           </s:keywords>
+          <s:keywords xsi:type='Keyword'>
+            <Criterion.Type>Keyword</Criterion.Type>
+            <text>car stereo</text>
+            <matchType>EXACT</matchType>
+          </s:keywords>          
         </s:searchParameters>
-
         <s:searchParameters xsi:type='s:CountryTargetSearchParameter'>
-          <s:countryTargets><s:countryCode>US</s:countryCode></s:countryTargets>
+          <s:countryTargets><countryCode>US</countryCode></s:countryTargets>
+        </s:searchParameters>
+        <s:searchParameters xsi:type='s:NgramGroupsSearchParameter'>
+          <s:ngramGroups>dvd player</s:ngramGroups>
         </s:searchParameters>
-
         <s:paging>
           <startIndex>0</startIndex>
           <numberResults>100</numberResults>
         </s:paging>
-
       </s:selector>
     </s:get>
-
   </env:Body>
 </env:Envelope>
-
-