sem4r 0.1.1 → 0.1.2

data/spec/rspec_matchers.rb

@@ -0,0 +1,102 @@
+# -------------------------------------------------------------------------
+# Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+# -------------------------------------------------------------------------
+
+require 'rexml/document'
+require 'differ'
+require 'differ/string'
+
+def pretty_xml(xml)
+  normalized = Class.new(REXML::Formatters::Pretty) do
+    def write_text(node, output)
+      super(node.to_s.strip, output)
+    end
+  end
+  normalized.new(0,false).write(xml, xml_pretty='')
+  xml_pretty
+end
+
+def normalize_xml(expected_xml)
+  if expected_xml.class != String
+    expected_xml = expected_xml.to_s
+  end
+
+  if expected_xml.class == String
+    # erase namespaces i.e. <ns1:tag> -> <tag>
+    expected_xml  = expected_xml.gsub(/\b(ns\d:|xsi:|s:|soapenv:|env:|soap:|^\n)/, "").strip
+    begin
+      expected_xml = REXML::Document.new(expected_xml)
+    rescue RuntimeError
+      puts "----------------------------------"
+      puts xml
+      puts "----------------------------------"
+      raise
+    end
+  end
+  expected_normalized = pretty_xml(expected_xml)
+  # erase namespaces i.e. <ns1:tag> -> <tag>
+  expected_normalized.gsub(/(ns\d:|xsi:|s:|soapenv:|env:|soap:|^\n| {2,})/, "").strip
+end
+
+def diff_xml(expected_xml, xml)
+  expected_normalized = normalize_xml(expected_xml)
+  xml_normalized = normalize_xml(xml)
+
+  if xml_normalized != expected_normalized
+    puts "----differ start"
+
+    puts xml_normalized
+
+    puts "---"
+    puts expected_normalized
+    puts "---"
+    diff = Differ.diff_by_line(xml_normalized, expected_normalized)
+    puts diff.format_as(:ascii)
+    puts "----differ end"
+    false
+  else
+    true
+  end
+end
+
+def _xml_contains(expected_xml, xml)
+  expected_normalized = normalize_xml(expected_xml)
+  xml_normalized = normalize_xml(xml)
+  unless xml_normalized.match(expected_normalized)
+    false
+  else
+    true
+  end
+end
+
+RSpec::Matchers.define :xml_equivalent do |expected_xml|
+  match do |xml|
+    diff_xml(expected_xml, xml)
+  end
+end
+
+RSpec::Matchers.define :xml_contains do |expected_xml|
+  match do |xml|
+    _xml_contains(expected_xml, xml)
+  end
+end

data/spec/rspec_sem4r_helper.rb

@@ -0,0 +1,88 @@
+# -------------------------------------------------------------------------
+# Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+# -------------------------------------------------------------------------
+
+# comparing xml is always a b-i-a-t-c-h in any testing environment.  here is a
+# little snippet for ruby that, i think, it a good first pass at making it
+# easier.  comment with your improvements please!
+#
+# http://drawohara.com/post/89110816/ruby-comparing-xml
+
+module Sem4rSpecHelper
+
+  require "stringio"
+  def with_stdout_captured
+    old_stdout = $stdout
+    out = StringIO.new
+    $stdout = out
+    begin
+      yield
+    ensure
+      $stdout = old_stdout
+    end
+    out.string
+  end
+
+  #############################################################################
+
+  def read_xml(service, xml_file, *args)
+    # xml_filepath  = File.join(File.dirname(__FILE__), "fixtures", *args)
+    xml_filepath  = File.join(File.dirname(__FILE__), "sem4r", service, "fixtures", xml_file)
+    unless File.exist?(xml_filepath)
+      raise "file #{xml_filepath} not exists"
+    end
+    contents = File.open(xml_filepath).read
+    contents.gsub!(/\b(ns\d:|xsi:|s:|soapenv:|env:|soap:)/, "")
+    contents.gsub!(/xmlns=["'].*?['"]/, '')
+    contents
+  end
+
+  def read_model(xpath, service, xml_file, *args, &blk)
+    contents = read_xml(service, xml_file, *args)
+    xml_document = Nokogiri::XML::Document.parse(contents)
+    if xpath && blk
+      el = xml_document.xpath(xpath).each do |node|
+        yield node
+      end
+    elsif xpath
+      el = xml_document.xpath(xpath).first
+    else
+      el = xml_document.root.children.to_a.first
+    end
+    if el.nil?
+      raise "xml element not found '#{xpath}'"
+    end
+    el
+  end
+
+  def read_xml_document(service, xml_file, *args)
+    contents = read_xml(service, xml_file, *args)
+    Nokogiri::XML::Document.parse(contents)
+  end
+
+  def read_xml_document_with_rexml(service, xml_file, *args)
+    contents = read_xml(service, xml_file, *args)
+    REXML::Document.new(contents)
+  end
+
+end

data/spec/sem4r/account_spec.rb

@@ -22,8 +22,7 @@
 # 
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require File.expand_path(File.dirname(__FILE__) + '/../rspec_helper')
 
 describe Account do
 
@@ -38,7 +37,7 @@ describe Account do
     @adwords = stub_adwords(services)
     @credentials = stub_credentials
 
-      @account = Account.new(@adwords, @credentials)
+    @account = Account.new(@adwords, @credentials)
   end
 
   describe "account management" do
@@ -48,7 +47,7 @@ describe Account do
     end
 
     it "should retrieve cost" do
-      @account.year_unit_cost("UNIT_COUNT").should == 100
+      @account.year_unit_cost("UNIT_COUNT").should == 0
     end
 
   end

data/spec/sem4r/ad_group/ad_group_bids_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 AdGroupBids do
   include Sem4rSpecHelper
@@ -51,12 +52,12 @@ describe AdGroupBids do
       bids = ManualCPCAdGroupBids.new
       bids.keyword_max_cpc 20000000
       bids.site_max_cpc 30000000
-      expected_xml = read_model("//bids", "services", "ad_group", "mutate_add-req.xml")
+      expected_xml = read_model("//bids", "ad_group", "mutate_add-req.xml")
       bids.to_xml.should xml_equivalent(expected_xml)
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//bids", "services", "ad_group", "get-first-res.xml")
+      el = read_model("//bids", "ad_group", "get-first-res.xml")
       bids = AdGroupBids.from_element(el)
       bids.keyword_max_cpc.should == 20000000
       bids.site_max_cpc.should    == 30000000

data/spec/sem4r/ad_group/ad_group_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 AdGroupService do
   include Sem4rSpecHelper
@@ -32,34 +33,34 @@ describe AdGroupService do
   end
 
   it "should define 'all'" do
-    response_xml = read_xml_file("services", "ad_group", "get-first-res.xml")
+    response_xml = read_xml("ad_group", "get-first-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupService.new(connector)
     soap_message = service.all( @credentials, "campaign_id" )
-    els = REXML::XPath.match( soap_message.response, "//getResponse")
+    els = soap_message.response.xpath("//getResponse")
     els.should_not be_empty
   end
 
   it "should define 'create'" do
     @credentials.should_receive(:mutable?).and_return(true)
-    response_xml = read_xml_file("services", "ad_group", "mutate_add-res.xml")
+    response_xml = read_xml("ad_group", "mutate_add-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupService.new(connector)
     soap_message = service.create( @credentials, "xml" )
-    els = REXML::XPath.match( soap_message.response, "//mutateResponse")
+    els = soap_message.response.xpath("//mutateResponse")
     els.should_not be_empty
   end
 
   it "should define 'delete'"  do
     @credentials.should_receive(:mutable?).and_return(true)
-    response_xml = read_xml_file("services", "ad_group", "mutate_add-res.xml")
+    response_xml = read_xml("ad_group", "mutate_add-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupService.new(connector)
     soap_message = service.delete( @credentials, "id" )
-    els = REXML::XPath.match( soap_message.response, "//mutateResponse")
+    els = soap_message.response.xpath("//mutateResponse")
     els.should_not be_empty
   end
 

data/spec/sem4r/ad_group/ad_group_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 AdGroup do
@@ -85,12 +86,12 @@ describe AdGroup do
           site_max_cpc 30000000
         end
       end
-      exepected_xml = read_model("//operand", "services", "ad_group", "mutate_add-req.xml")
+      exepected_xml = read_model("//operand", "ad_group", "mutate_add-req.xml")
       adgroup.to_xml("operand").should xml_equivalent(exepected_xml)
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//entries", "services", "ad_group", "get-first-res.xml")
+      el = read_model("//entries", "ad_group", "get-first-res.xml")
       adgroup = AdGroup.from_element(@campaign, el)
       adgroup.id.should == 3060217923
       adgroup.name.should == "test adgroup"
@@ -98,7 +99,7 @@ describe AdGroup do
     end
 
     it "should parse xml (produced by google) with manual cpm bids" do
-      el = read_model("//entries", "services", "ad_group", "get-manual-cpm-bids-res.xml")
+      el = read_model("//entries", "ad_group", "get-manual-cpm-bids-res.xml")
       adgroup = AdGroup.from_element(@campaign, el)
       adgroup.bids.should be_instance_of(ManualCPMAdGroupBids)
     end

data/spec/sem4r/ad_group_ad/ad_group_ad_operation_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -22,8 +23,7 @@
 # 
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
+require File.expand_path(File.dirname(__FILE__) + '/../../rspec_helper')
 
 describe AdGroupAdOperation do
   include Sem4rSpecHelper
@@ -51,7 +51,7 @@ describe AdGroupAdOperation do
     text_ad.url          = "http://www.example.com"
     @ad_operation.add text_ad
 
-    expected_xml = read_model("//operations", "services", "bulk_mutate_job", "mutate-req.xml")
+    expected_xml = read_model("//operations", "bulk_mutate_job", "mutate-req.xml")
     @ad_operation.to_xml('operations').should xml_equivalent(expected_xml)
   end
 

data/spec/sem4r/ad_group_ad/ad_group_ad_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 AdGroupAdService do
   include Sem4rSpecHelper
@@ -32,23 +33,23 @@ describe AdGroupAdService do
   end
 
   it "should define 'all'" do
-    response_xml = read_xml_file("services", "ad_group_ad", "get_mobile_ad-res.xml")
+    response_xml = read_xml("ad_group_ad", "get_mobile_ad-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupAdService.new(connector)
     soap_message = service.all( @credentials, "ad_group_id" )
-    els = REXML::XPath.match( soap_message.response, "//getResponse")
+    els = soap_message.response.xpath("//getResponse")
     els.should_not be_empty
   end
 
   it "should define 'mutate'" do
     @credentials.should_receive(:mutable?).and_return(true)
-    response_xml = read_xml_file("services", "ad_group_ad", "mutate_add_mobile_ad-res.xml")
+    response_xml = read_xml("ad_group_ad", "mutate_add_mobile_ad-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupAdService.new(connector)
     soap_message = service.mutate( @credentials, "xml" )
-    els = REXML::XPath.match( soap_message.response, "//mutateResponse")
+    els = soap_message.response.xpath("//mutateResponse")
     els.should_not be_empty
   end
 

data/spec/sem4r/ad_group_ad/ad_group_ad_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 AdGroupAd do
 
@@ -38,7 +39,7 @@ describe AdGroupAd do
   describe AdGroupAd do
 
     it "should parse xml (output from google)" do
-      el = read_model("//ad", "services", "ad_group_ad", "get_text_ad-res.xml")
+      el = read_model("//ad", "ad_group_ad", "get_text_ad-res.xml")
       ad = AdGroupAd.from_element(@adgroup, el)
       # ad.id.should == 218770
       ad.url.should == "http://www.pluto.com"
@@ -108,7 +109,7 @@ describe AdGroupAd do
         url          "http://www.pluto.com"
         display_url  "www.Pluto.com"
       end
-      expected_xml = read_model("//operand", "services", "ad_group_ad", "mutate_add_text_ad-req.xml")
+      expected_xml = read_model("//operand", "ad_group_ad", "mutate_add_text_ad-req.xml")
       text_ad.to_xml("operand").should xml_equivalent(expected_xml)
     end
 
@@ -158,12 +159,12 @@ describe AdGroupAd do
         phone_number  "0612345"
       end
 
-      expected_xml = read_model("//operand", "services", "ad_group_ad", "mutate_add_mobile_ad-req.xml")
+      expected_xml = read_model("//operand", "ad_group_ad", "mutate_add_mobile_ad-req.xml")
       mobile_ad.to_xml("operand").should xml_equivalent(expected_xml)
     end
 
     it "should parse xml (output from google)" do
-      el = read_model("//ad", "services", "ad_group_ad", "get_mobile_ad-res.xml")
+      el = read_model("//ad", "ad_group_ad", "get_mobile_ad-res.xml")
       ad = AdGroupAd.from_element(@adgroup, el)
       ad.headline.should == "sem4r"
     end

data/spec/sem4r/ad_group_criterion/ad_group_criterion_bids_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
 # 
@@ -22,13 +23,13 @@
 # 
 # -------------------------------------------------------------------------
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../rspec_helper')
 
 describe AdGroupCriterionBids do
   include Sem4rSpecHelper
 
   it "should parse xml (produced by google)" do
-    el = read_model("//bids", "services", "ad_group_criterion", "get-res.xml")
+    el = read_model("//bids", "ad_group_criterion", "get-res.xml")
     bids = AdGroupCriterionBids.from_element(el)
     bids.should be_instance_of ManualCPCAdGroupCriterionBids
   end
@@ -44,12 +45,12 @@ describe AdGroupCriterionBids do
     it "should build xml (input for google)" do
       bids = ManualCPCAdGroupCriterionBids.new
       bids.max_cpc 10000000
-      expected_xml = read_model("//bids", "services", "ad_group_criterion", "mutate_add_criterion_keyword-req.xml")
+      expected_xml = read_model("//bids", "ad_group_criterion", "mutate_add_criterion_keyword-req.xml")
       bids.to_xml.should  xml_equivalent( expected_xml )
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//bids", "services", "ad_group_criterion", "get-res.xml")
+      el = read_model("//bids", "ad_group_criterion", "get-res.xml")
       bids = ManualCPCAdGroupCriterionBids.from_element(el)
       bids.bid_source.should == "ADGROUP"
       bids.max_cpc.should == 10000000

data/spec/sem4r/ad_group_criterion/ad_group_criterion_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 AdGroupCriterionService do
   include Sem4rSpecHelper
@@ -32,23 +33,23 @@ describe AdGroupCriterionService do
   end
 
   it "should define 'all'" do
-    response_xml = read_xml_file("services", "ad_group_criterion", "get-res.xml")
+    response_xml = read_xml("ad_group_criterion", "get-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupCriterionService.new(connector)
     soap_message = service.all( @credentials, "ad_group_id" )
-    els = REXML::XPath.match( soap_message.response, "//getResponse")
+    els = soap_message.response.xpath("//getResponse")
     els.should_not be_empty
   end
 
   it "should define 'mutate'" do
     @credentials.should_receive(:mutable?).and_return(true)
-    response_xml = read_xml_file("services", "ad_group_criterion", "mutate_add_criterion_keyword-res.xml")
+    response_xml = read_xml("ad_group_criterion", "mutate_add_criterion_keyword-res.xml")
     connector = mock("connector")
     connector.should_receive(:send).and_return(response_xml)
     service = AdGroupCriterionService.new(connector)
     soap_message = service.mutate( @credentials, "xml" )
-    els = REXML::XPath.match( soap_message.response, "//mutateResponse")
+    els = soap_message.response.xpath("//mutateResponse")
     els.should_not be_empty
   end
 

data/spec/sem4r/ad_group_criterion/ad_group_criterion_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 AdGroupCriterion do
@@ -59,12 +60,12 @@ describe AdGroupCriterion do
       biddable_criterion.criterion keyword
       biddable_criterion.bids bids
 
-      xml_expected = read_model("//operand", "services", "ad_group_criterion", "mutate_add_criterion_keyword-req.xml")
+      xml_expected = read_model("//operand", "ad_group_criterion", "mutate_add_criterion_keyword-req.xml")
       biddable_criterion.to_xml("operand").should  xml_equivalent(xml_expected)
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//entries", "services", "ad_group_criterion", "get-res.xml")
+      el = read_model("//entries", "ad_group_criterion", "get-res.xml")
       biddable_criterion = BiddableAdGroupCriterion.from_element(@ad_group, el)
       biddable_criterion.bids.should be_instance_of(ManualCPCAdGroupCriterionBids)
       biddable_criterion.criterion.should be_instance_of(CriterionKeyword)
@@ -87,12 +88,12 @@ describe AdGroupCriterion do
       end
       biddable_criterion = NegativeAdGroupCriterion.new(@ad_group)
       biddable_criterion.criterion keyword
-      xml_expected = read_model("//operand", "services", "ad_group_criterion", "mutate_add_negative_keyword-req.xml")
+      xml_expected = read_model("//operand", "ad_group_criterion", "mutate_add_negative_keyword-req.xml")
       biddable_criterion.to_xml("operand").should  xml_equivalent(xml_expected)
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//value", "services", "ad_group_criterion", "mutate_add_negative_keyword-res.xml")
+      el = read_model("//value", "ad_group_criterion", "mutate_add_negative_keyword-res.xml")
       negative = AdGroupCriterion.from_element(@ad_group, el)
       negative.criterion.text.should == "java api library"
       negative.criterion.match.should == "BROAD"

data/spec/sem4r/ad_group_criterion/criterion_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 Criterion do
@@ -50,12 +51,12 @@ describe Criterion do
         text       "sem4r adwords api"
         match      "BROAD"
       end
-      xml_expected = read_model("//criterion", "services", "ad_group_criterion", "mutate_add_criterion_keyword-req.xml")
+      xml_expected = read_model("//criterion", "ad_group_criterion", "mutate_add_criterion_keyword-req.xml")
       keyword.to_xml("criterion").should  xml_equivalent(xml_expected)
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//entries/criterion", "services", "ad_group_criterion", "get-res.xml")
+      el = read_model("//entries/criterion", "ad_group_criterion", "get-res.xml")
       keyword = CriterionKeyword.from_element(@ad_group, el)
       keyword.id.should == 11536082
       keyword.text.should == "pippo"
@@ -74,7 +75,7 @@ describe Criterion do
     end
 
     it "should parse xml (produced by google)" do
-      el = read_model("//criterion", "services", "ad_group_criterion", "mutate_add_criterion_placement-res.xml")
+      el = read_model("//criterion", "ad_group_criterion", "mutate_add_criterion_placement-res.xml")
       placement = CriterionPlacement.from_element(@ad_group, el)
       placement.id.should == 11536085
       placement.url.should == "github.com"