rapuncel 0.0.5 → 0.0.6.RC1

data/Gemfile

@@ -1,3 +1,4 @@
 source 'http://www.rubygems.org'
 gemspec
+gem 'rake', :require => false
 

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    rapuncel (0.0.5.RC1)
+    rapuncel (0.0.6.RC1)
       activesupport (>= 3.0.0)
       nokogiri
 
 GEM
   remote: http://www.rubygems.org/
   specs:
-    activesupport (3.0.9)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     diff-lcs (1.1.2)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     rake (0.9.2)
     rspec (2.6.0)

data/README.md

@@ -159,6 +159,7 @@ Don't use Symbols as keys for deserialized `<struct>`, but Strings.
 * HTTP-Proxy support
 * Async requests
 * XMLRPC Extensions (pluggable support)
+  * Apache vendor extensions
 * How do i test SSL?
 
 ## What happens if something goes wrong?

data/lib/rapuncel/client.rb

@@ -4,15 +4,26 @@ require 'rapuncel/xml_rpc/serializer'
 require 'rapuncel/xml_rpc/deserializer'
 require 'active_support/core_ext/hash/except'
 require 'active_support/inflector/methods'
+require 'active_support/deprecation'
 
 module Rapuncel
   class Client
+    autoload :Logging, 'rapuncel/client/logging'
+    
     attr_accessor :connection, :raise_on_fault, :raise_on_error
 
     include Adapters::NetHttpAdapter
 
-    def proxy_for interface
-      Proxy.new self, interface
+    def proxy_for interface = nil
+      if interface.nil?
+        @default_proxy ||= Proxy.new self, nil
+      else
+        @proxies ||= Hash.new do |hash, key|
+          hash[key] = Proxy.new self, key
+        end
+        
+        @proxies[interface.to_s]
+      end
     end
 
     def proxy
@@ -33,16 +44,22 @@ module Rapuncel
       else
         [false, false]
       end
+      
+      if logger = configuration[:logger]
+        extend Logging
+        initialize_logging logger, configuration[:log_level]
+      end
     end
 
     # Dispatch a method call and return the response as Rapuncel::Response object.
     def call name, *args
-      execute Request.new(name, *args)
+      ActiveSupport::Deprecation.warn "Using #call is deprecated, please use #call_to_ruby instead.", caller
+      _call name, *args
     end
 
     # Dispatch a method call and return the response as parsed ruby.
     def call_to_ruby name, *args
-      response = call name, *args
+      response = _call name, *args
 
       raise_on_fault && response.fault? && raise_fault(response)
       raise_on_error && response.error? && raise_error(response)
@@ -51,6 +68,10 @@ module Rapuncel
     end
 
     protected
+    def _call name, *args
+      execute Request.new(name, *args)
+    end
+    
     def execute request
       xml = serializer[request]
 

data/lib/rapuncel/client/logging.rb

@@ -0,0 +1,83 @@
+require 'logger'
+
+module Rapuncel
+  module Client::Logging
+    attr_accessor :logger
+    
+    def log_level
+      @logger.try :level
+    end
+    
+    def log_level= log_level
+      @logger && @logger.level = log_level
+    end
+    
+    def logger= logger
+      @logger = case logger
+      when Logger
+        logger
+      when IO
+        Logger.new logger
+      when String, Symbol
+        Logger.new ActiveSupport::Inflector.constantize(logger.to_s.upcase)
+      else
+        Logger.new STDOUT
+      end
+    end
+    
+    protected
+    def initialize_logging logger, log_level
+      self.logger = logger
+      if log_level
+        self.log_level = log_level
+      end
+      
+      logger.info { with_log_prefix "Initialized." }
+      logger.debug { with_log_prefix "Using (De)Serializer: #{serialization.to_s}" }
+    end
+    
+    def _call name, *args
+      if logger.debug?
+        logger.debug { with_log_prefix "Calling RPC Method \"#{name}\" with #{args.map(&:inspect).join(', ')}" }
+      else
+        logger.info { with_log_prefix "Calling RPC Method \"#{name}\" with #{args.length} arguments." }
+      end
+      
+      super
+    end
+    
+    def send_method_call xml
+      logger.debug { with_log_prefix "Sending XML:\n #{xml}" }
+      
+      super
+    end
+    
+    def execute request
+      super.tap do |response|
+        case
+        when response.success?
+          logger.debug { "Received XML-Response: \n #{response.body}" }
+        when response.fault?
+          level = raise_on_fault ? :error : :warn
+          logger.add(level) { "Received XML-Fault: \n #{response.body}" }
+        when response.error?
+          level = raise_on_error ? :error : :warn
+          logger.add(level) { "HTTP Error: #{response.status}\n #{response.body}" }
+        end
+      end
+    end
+    
+    private
+    def log_host_config
+      "#{connection.host}:#{connection.port}#{connection.path}"
+    end
+    
+    def with_log_prefix message
+      "#{log_prefix} #{message}"
+    end
+    
+    def log_prefix
+      @log_prefix ||= "[XML-RPC@#{log_host_config}]"
+    end
+  end
+end

data/rapuncel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "rapuncel"
-  s.version     = "0.0.5"
+  s.version     = "0.0.6.RC1"
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.authors     = ["Michael Eickenberg", "Marian Theisen"]
   s.email       = 'marian@cice-online.net'

data/spec/unit/client_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'logger'
+
+describe Rapuncel::Client do
+  let(:logger) { nil }
+  subject { Rapuncel::Client.new :logger => logger }
+  
+  it { should_not respond_to :logger }
+  it { should_not respond_to :log_level }
+  
+  describe "with Logging enabled" do
+    let(:logger) { Logger.new(STDOUT) }
+    
+    it { should respond_to :logger }
+    it { should respond_to :log_level }
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rapuncel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6.RC1
+  prerelease: 6
 platform: ruby
 authors:
 - Michael Eickenberg
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70165832864660 !ruby/object:Gem::Requirement
+  requirement: &70109985630700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165832864660
+  version_requirements: *70109985630700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70165832864100 !ruby/object:Gem::Requirement
+  requirement: &70109985630120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165832864100
+  version_requirements: *70109985630120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165832863580 !ruby/object:Gem::Requirement
+  requirement: &70109985629600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +44,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70165832863580
+  version_requirements: *70109985629600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165832863200 !ruby/object:Gem::Requirement
+  requirement: &70109985629220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165832863200
+  version_requirements: *70109985629220
 description: Rapuncel is a simple XML-RPC Client based on Nokogiri, thus provides
   a fast and easy way to interact with XML-RPC services.
 email: marian@cice-online.net
@@ -68,6 +67,7 @@ files:
 - Gemfile.lock
 - lib/rapuncel/adapters/net_http_adapter.rb
 - lib/rapuncel/base_64_string.rb
+- lib/rapuncel/client/logging.rb
 - lib/rapuncel/client.rb
 - lib/rapuncel/connection.rb
 - lib/rapuncel/proxy.rb
@@ -78,8 +78,6 @@ files:
 - lib/rapuncel.rb
 - MIT-LICENSE
 - Rakefile
-- rapuncel-0.0.5.RC1.gem
-- rapuncel-0.0.5.RC2.gem
 - rapuncel.gemspec
 - README.md
 - spec/functional/client_spec.rb
@@ -88,6 +86,7 @@ files:
 - spec/unit/array_spec.rb
 - spec/unit/base64_spec.rb
 - spec/unit/boolean_spec.rb
+- spec/unit/client_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/custom_serialization_spec.rb
 - spec/unit/float_spec.rb
@@ -100,7 +99,6 @@ files:
 - spec/unit/response_spec.rb
 - spec/unit/string_spec.rb
 - spec/unit/time_spec.rb
-has_rdoc: true
 homepage: http://github.com/cice/rapuncel
 licenses: []
 post_install_message: 
@@ -116,12 +114,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple XML-RPC Client