bsm-openx 1.9.2 → 1.9.3

data/.gitignore

@@ -1,3 +1,4 @@
 *.swp
 .svn/
+.bundle
 pkg/

data/Gemfile

@@ -4,4 +4,5 @@ group :test do
   gem 'activesupport', :require => 'active_support/test_case'
   gem 'rake'
   gem 'jeweler'
+  gem 'mocha'
 end

data/Gemfile.lock

@@ -9,6 +9,8 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
+    mocha (0.9.8)
+      rake
     rake (0.8.7)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
@@ -19,4 +21,5 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   jeweler
+  mocha
   rake

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

data/bsm-openx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bsm-openx}
-  s.version = "1.9.2"
+  s.version = "1.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Andy Smith", "TouchLocal P/L", "Dimitrij Denissenko"]
-  s.date = %q{2010-09-09}
+  s.date = %q{2010-09-13}
   s.description = %q{A Ruby interface to the OpenX XML-RPC API}
   s.email = %q{dimitrij@blacksquaremedia.com}
   s.extra_rdoc_files = [
@@ -55,6 +55,8 @@ Gem::Specification.new do |s|
      "test/test_session.rb",
      "test/test_targeting_rule.rb",
      "test/test_targeting_rules.rb",
+     "test/test_xmlrpc_client.rb",
+     "test/test_xmlrpc_session_client.rb",
      "test/test_zone.rb"
   ]
   s.homepage = %q{http://github.com/bsm/openx}
@@ -63,7 +65,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby interface to the OpenX XML-RPC API}
   s.test_files = [
-    "test/test_openx.rb",
+    "test/test_xmlrpc_session_client.rb",
+     "test/test_openx.rb",
      "test/test_channel.rb",
      "test/test_targeting_rule.rb",
      "test/test_zone.rb",
@@ -76,6 +79,7 @@ Gem::Specification.new do |s|
      "test/test_services.rb",
      "test/test_banner.rb",
      "test/test_targeting_rules.rb",
+     "test/test_xmlrpc_client.rb",
      "test/test_publisher.rb"
   ]
 

data/lib/openx/services/session.rb

@@ -24,8 +24,7 @@ module OpenX
       def create(user, password)
         self.user     = user
         self.password = password
-        self.id       = @client.call('ox.logon', user, password)
-        self
+        recreate!
       end
 
       def recreate!
@@ -39,6 +38,7 @@ module OpenX
         self.id = nil
         self
       end
+
     end
   end
 end

data/lib/openx/services/targeting_rule.rb

@@ -74,13 +74,13 @@ module OpenX
         update 'comparison' => '!x', 'data' => convert(value)
       end
 
-      def include?(*value)
-        update 'comparison' => '=~', 'data' => convert(value)
+      def include?(*values)
+        update 'comparison' => '=~', 'data' => convert(values)
       end
       alias_method :contains?, :include?
 
-      def exclude?(*value)
-        update 'comparison' => '!~', 'data' => convert(value)
+      def exclude?(*values)
+        update 'comparison' => '!~', 'data' => convert(values)
       end
       alias_method :does_not_contain?, :exclude?
 

data/lib/openx/xmlrpc_client.rb

@@ -2,29 +2,31 @@ require 'xmlrpc/client'
 
 module OpenX
 
-  unless defined? HTTPBroken
-    # A module that captures all the possible Net::HTTP exceptions
-    # from http://pastie.org/pastes/145154
-    module HTTPBroken; end
-    [
-      Timeout::Error, Errno::EINVAL, Errno::EPIPE,
-      Errno::ECONNRESET, EOFError, Net::HTTPBadResponse,
-      Net::HTTPHeaderSyntaxError, Net::ProtocolError
-    ].each {|m| m.send(:include, HTTPBroken) }
-  end
-
   class XmlrpcClient
+    EXCEPTION_CLASSES = [
+      ::Timeout::Error,
+      ::Errno::EINVAL,
+      ::Errno::EPIPE,
+      ::Errno::ECONNRESET,
+      ::EOFError,
+      ::Net::HTTPBadResponse,
+      ::Net::HTTPHeaderSyntaxError,
+      ::Net::ProtocolError
+    ].freeze
+
     attr_reader :client, :url
 
     def initialize(url)
-      @url = url
+      @url     = url
+      @retries = 0
       init_client!
     end
 
     def call(method, *args)
-      @client.call(method, *convert(args))
-    rescue HTTPBroken
-      raise unless OpenX.configuration['retry']
+      @client.call(method, *(convert(args)))
+    rescue *EXCEPTION_CLASSES => e
+      cycle = (cycle || 0) + 1
+      raise(e) if cycle > 10 || OpenX.configuration['retry'] == false
       init_client!
       retry
     end
@@ -56,8 +58,9 @@ module OpenX
 
     def call(method, *args)
       super
-    rescue XMLRPC::FaultException => error
-      raise unless error.message =~ /Session ID.*invalid/i
+    rescue XMLRPC::FaultException => e
+      cycle = (cycle || 0) + 1
+      raise(e) if cycle > 10 || e.message !~ /Session ID.*invalid/i
       session.recreate!
       retry
     end

data/test/test_xmlrpc_client.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/helper'
+require 'xmlrpc/client'
+
+class XmlrpcClientTest < OpenX::TestCase
+
+  def client
+    @client ||= OpenX::XmlrpcClient.new("http://example.com/random/path")
+  end
+
+  def stub_xrc
+    stub(:call => nil, :timeout= => 10)
+  end
+
+  test "initialize" do
+    assert_equal "http://example.com/random/path", client.url
+    assert_instance_of XMLRPC::Client, client.client
+  end
+
+  test "call forwarding" do
+    client.client.expects(:call).with('ox.getAgency', 1)
+    client.call('ox.getAgency', 1)
+  end
+
+  test "call rescueing" do
+    a, b, c = stub_xrc, stub_xrc, stub_xrc
+    ::XMLRPC::Client.stubs(:new2).returns(a, b, c)
+
+    a.expects(:call).with('ox.getAgency', 1).once.raises(Net::HTTPBadResponse, 'Bad response')
+    b.expects(:call).with('ox.getAgency', 1).once.raises(Errno::EPIPE, 'Other problem')
+    client.call('ox.getAgency', 1)
+
+    assert_not_equal  client.client, a
+    assert_not_equal  client.client, b
+    assert_equal      client.client, c
+  end
+
+end

data/test/test_xmlrpc_session_client.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/helper'
+require 'xmlrpc/client'
+
+class XmlrpcSessionClientTest < OpenX::TestCase
+
+  def client
+    @client ||= OpenX::XmlrpcSessionClient.new(stub_session)
+  end
+
+  def stub_session
+    stub(:url => "http://example.com/random/path", :id => 33)
+  end
+
+  def stub_xrc
+    stub(:call => nil, :timeout= => 10)
+  end
+
+  test "call forwarding" do
+    client.client.expects(:call).with('ox.getAgency', 33, 1)
+    client.call('ox.getAgency', 1)
+  end
+
+  test "call rescueing" do
+    a, b = stub_xrc, stub_xrc
+    ::XMLRPC::Client.stubs(:new2).returns(a, b)
+
+    a.expects(:call).once.raises(Net::HTTPBadResponse, 'Bad response')
+    b.expects(:call).once.raises(XMLRPC::FaultException.new(0, 'session id is invalid'))
+    client.session.expects(:recreate!).once
+
+    client.call('ox.getAgency', 1)
+    assert_not_equal  client.client, a
+    assert_equal  client.client, b
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bsm-openx
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 9
-  - 2
-  version: 1.9.2
+  - 3
+  version: 1.9.3
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +01:00
+date: 2010-09-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -70,6 +70,8 @@ files:
 - test/test_session.rb
 - test/test_targeting_rule.rb
 - test/test_targeting_rules.rb
+- test/test_xmlrpc_client.rb
+- test/test_xmlrpc_session_client.rb
 - test/test_zone.rb
 has_rdoc: true
 homepage: http://github.com/bsm/openx
@@ -106,6 +108,7 @@ signing_key:
 specification_version: 3
 summary: A Ruby interface to the OpenX XML-RPC API
 test_files: 
+- test/test_xmlrpc_session_client.rb
 - test/test_openx.rb
 - test/test_channel.rb
 - test/test_targeting_rule.rb
@@ -119,4 +122,5 @@ test_files:
 - test/test_services.rb
 - test/test_banner.rb
 - test/test_targeting_rules.rb
+- test/test_xmlrpc_client.rb
 - test/test_publisher.rb