mpi_client 0.0.12 → 0.0.13

data/lib/mpi_client.rb

@@ -9,7 +9,6 @@ module MPIClient
   self.server_url = 'http://mpi.server.com/'
 
   autoload :OptionTranslator,   'mpi_client/option_translator'
-  autoload :ErrorParser,        'mpi_client/error_parser'
   autoload :BaseRequest,        'mpi_client/base_request'
   autoload :Verification,       'mpi_client/verification'
   autoload :AccountManagement,  'mpi_client/account_management'

data/lib/mpi_client/account_management/request.rb

@@ -19,7 +19,7 @@ module MPIClient
         builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
           xml.REQUEST(:type => request_type) do |xml|
             xml.Transaction(transaction_attrs) do |xml|
-              options.each do |k,v|  
+              options.each do |k,v|
                 xml.send(OptionTranslator.to_server(k), v)
               end
             end
@@ -29,19 +29,9 @@ module MPIClient
       end
 
       def parse_response(response_data)
-        doc = Nokogiri::XML(response_data)
-
-        if error = doc.xpath("//Error").first
-          response = {
-            :error_message => error.text,
-            :error_code    => error[:code],
-            :errors        => ErrorParser.parse(error.text, error[:code]),
-          }
-        else
-          response = Hash[*doc.xpath("//Transaction/*").collect{|a| [OptionTranslator.to_client(a.name.to_sym), a.text] }.flatten]
-        end
-
-        Response.new(response)
+        response = Response.new(response_data)
+        response.parse
+        response
       end
     end
   end

data/lib/mpi_client/account_management/response.rb

@@ -1,19 +1,71 @@
 module MPIClient
   module AccountManagement
     class Response
-      attr_reader   :data
+      attr_reader :response_source, :error_code, :error_message, :errors, \
+      :merchant_id, :site_name, :site_url, :certificate_subject, \
+      :acquirer_bin, :country_code, :password, :certificate,
+      :private_key, :directory_server_url, :brand, :response_url, \
+      :client_url, :term_url, :account_id
 
-      def initialize(data = {})
-        @data = data
+      def initialize(response_source)
+        @response_source = response_source
       end
 
       def success?
         error_code.nil? && error_message.nil?
       end
 
-      def method_missing(method)
-        data[method]
+      def parse
+        doc = Nokogiri::XML.parse(response_source)
+
+        if error = doc.xpath("//Error").first
+          @error_code    = error[:code]
+          @error_message = error.text
+          @errors        = errors_to_hash
+        else
+          set_account_attributes doc.xpath("//Transaction/*")
+        end
+
+      end
+
+      private
+
+      def errors_to_hash
+        contain_error_fields? ? error_fields : {:base => error_message}
+      end
+
+      def error_fields
+        {}.tap do |result|
+          extract_messages(error_message).each do |message|
+            key = OptionTranslator.to_client( field_name_from(message) )
+            result[key.to_sym] = error_description_from(message)
+          end
+        end
+      end
+
+      def field_name_from(message)
+        message.sub(/.+\[(.+)\].+/, '\1').to_sym
       end
+
+      def error_description_from(message)
+        message.sub /\s\[.+?\]/, ''
+      end
+
+      def extract_messages(message)
+        message.sub(/.*\((.+)\).*/, '\1').split(/\.\s*/)
+      end
+
+      def contain_error_fields?
+        error_code == 'C5'
+      end
+
+      def set_account_attributes(elements)
+        elements.each do |element|
+          name = OptionTranslator.to_client(element.name.to_sym)
+          instance_variable_set("@#{name}".to_sym, element.text)
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mpi_client
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Dmitry Plashchynski
@@ -10,39 +16,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +02:00
+date: 2010-11-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: alovak-network
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: alovak@gmail.com
 executables: []
@@ -52,16 +76,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/mpi_client/option_translator.rb
+- lib/mpi_client.rb
 - lib/mpi_client/base_request.rb
-- lib/mpi_client/account_management.rb
-- lib/mpi_client/account_management/request.rb
-- lib/mpi_client/account_management/response.rb
-- lib/mpi_client/error_parser.rb
-- lib/mpi_client/verification/request.rb
+- lib/mpi_client/option_translator.rb
 - lib/mpi_client/verification/response.rb
+- lib/mpi_client/verification/request.rb
+- lib/mpi_client/account_management.rb
 - lib/mpi_client/verification.rb
-- lib/mpi_client.rb
+- lib/mpi_client/account_management/response.rb
+- lib/mpi_client/account_management/request.rb
 has_rdoc: true
 homepage: http://github.com/alovak/mpi_client/
 licenses: []
@@ -72,21 +95,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: MPI client library

data/lib/mpi_client/error_parser.rb

@@ -1,19 +0,0 @@
-module MPIClient
-  module ErrorParser
-    def self.get_base_message(error_message, error_code)
-      error_message[/^(.*?)(?:\ \(|$)/, 1] unless error_code == 'C5'
-    end
-
-    def self.parse(error_message, error_code)
-      result = Hash.new
-      base_message = get_base_message(error_message, error_code)
-      result[:base] = base_message if base_message
-      error_message.scan(/(?:\ |\()([A-Z].*?)\./) do |error_field, second_field|
-        field_name = error_field[/^.*\ \[(.*)\].*$/, 1]
-        error_str  = error_field.gsub(/\ \[.*\]/,'')
-        result[OptionTranslator.to_client(field_name.to_sym)] = error_str
-      end
-      result
-    end
-  end
-end