active_forms 0.3.0 → 0.3.1

data/lib/active_forms/request.rb

@@ -91,14 +91,30 @@ module ActiveForms
     end
 
     def verify_response(response)
-      ActiveForms.log("[ActiveForms] Response: #{response}")
-      if response["error"]
-        begin
-          klass = ("ActiveForms::" << response["error"]["code"].downcase.camelize).constantize
-          raise klass.new(response["error"]["message"])
-        rescue NameError, NoMethodError
-          raise("Unknown exception: #{response["error"].inspect}")
+      exception = nil
+
+      begin
+        # force parsing response to detect parsing errors
+        response.parsed_response
+
+        ActiveForms.log("[ActiveForms] Response: #{response}")
+        if response["error"]
+          begin
+            klass     = ("ActiveForms::" << response["error"]["code"].downcase.camelize).constantize
+            exception = klass.new(response["error"]["message"])
+          rescue NameError, NoMethodError
+            exception = Error.new("Unknown exception: #{response["error"].inspect}")
+          end
+        elsif response.response.code !~ /^20\d$/
+          exception = Error.new("Request returned status #{response.response.code} and does include properly formatted error message.")
         end
+      rescue MultiXml::ParseError
+        exception = ParseError.new($!.message)
+      end
+
+      unless exception.nil?
+        exception.response = response
+        raise exception
       end
     end
   end

data/lib/active_forms/version.rb

@@ -1,3 +1,3 @@
 module ActiveForms
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/active_forms.rb

@@ -34,7 +34,9 @@ module ActiveForms
     end
   end
 
-  class Error < StandardError; end
+  class Error < StandardError
+    attr_accessor :response
+  end
 
   class ApiKeyInvalid             < Error; end
   class ApiSigInvalid             < Error; end
@@ -56,6 +58,7 @@ module ActiveForms
   class MissingVendor             < Error; end
   class NullResponse              < Error; end
   class OptionNotFound            < Error; end
+  class ParseError                < Error; end
   class ResourceNotSupported      < Error; end
   class TemplateNotFound          < Error; end
   class Unauthorized              < Error; end

data/test/active_forms/application_print_test.rb

@@ -38,7 +38,7 @@ class ActiveForms::ApplicationPrintTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::ApplicationPrint.find with form code and application number" do
       setup do
-        stub_get(/applicationprint/, success_response("get_applicationprint"))
+        stub_get(/applicationprint/, success_response("get_applicationprint.xml"))
         @application_print = ActiveForms::ApplicationPrint.find(:apiFormCode => "credit_card_application", :apiNumber => "23456")
       end
 

data/test/active_forms/application_test.rb

@@ -36,7 +36,7 @@ class ActiveForms::ApplicationTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Application.all with multi-response" do
       setup do
-        stub_get(/applications/, success_response("get_applications"))
+        stub_get(/applications/, success_response("get_applications.xml"))
         @applications = ActiveForms::Application.all
       end
 
@@ -67,7 +67,7 @@ class ActiveForms::ApplicationTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Application.all with single-response" do
       setup do
-        stub_get(/applications/, success_response("get_applications_single"))
+        stub_get(/applications/, success_response("get_applications_single.xml"))
         @applications = ActiveForms::Application.all
       end
 

data/test/active_forms/entry_printout_test.rb

@@ -38,7 +38,7 @@ class ActiveForms::EntryPrintoutTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::EntryPrintout.find with form code and application number" do
       setup do
-        stub_get(/entryprintout/, success_response("get_entryprintout"))
+        stub_get(/entryprintout/, success_response("get_entryprintout.xml"))
         @entry_printout = ActiveForms::EntryPrintout.find(:formCode => "credit_card_entry", :number => "23456")
       end
 

data/test/active_forms/entry_test.rb

@@ -36,7 +36,7 @@ class ActiveForms::EntryTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Entry.all with multi-response" do
       setup do
-        stub_get(/entries/, success_response("get_entries"))
+        stub_get(/entries/, success_response("get_entries.xml"))
         @entries = ActiveForms::Entry.all
       end
 
@@ -67,7 +67,7 @@ class ActiveForms::EntryTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Entry.all with single-response" do
       setup do
-        stub_get(/entries/, success_response("get_entries_single"))
+        stub_get(/entries/, success_response("get_entries_single.xml"))
         @entries = ActiveForms::Entry.all
       end
 
@@ -87,7 +87,7 @@ class ActiveForms::EntryTest < Test::Unit::TestCase
 
     context "when post entry data by ActiveForms::Entry.create" do
       setup do
-        stub_post(/entrydata/, success_response("post_entrydata"))
+        stub_post(/entrydata/, success_response("post_entrydata.xml"))
         @entry = ActiveForms::Entry.create :apiFormCode => 'credit_card_entry'
       end
 
@@ -109,7 +109,7 @@ class ActiveForms::EntryTest < Test::Unit::TestCase
       setup do
         @response = { :status => ["204", "No content"], :content_type => "text/xml"}
         stub_delete(/entrydata/, @response)
-        stub_get(/entries/, success_response("get_entries"))
+        stub_get(/entries/, success_response("get_entries.xml"))
         @entries = ActiveForms::Entry.all
       end
 

data/test/active_forms/form_test.rb

@@ -10,7 +10,7 @@ class ActiveForms::FormTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Form.all with multi-response" do
       setup do
-        stub_get(/forms/, success_response("get_forms"))
+        stub_get(/forms/, success_response("get_forms.xml"))
         @forms = ActiveForms::Form.all
       end
 
@@ -41,7 +41,7 @@ class ActiveForms::FormTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Form.all with single-response" do
       setup do
-        stub_get(/forms/, success_response("get_forms_single"))
+        stub_get(/forms/, success_response("get_forms_single.xml"))
         @forms = ActiveForms::Form.all
       end
 

data/test/active_forms/form_version_test.rb

@@ -10,7 +10,7 @@ class ActiveForms::FormVersionTest < Test::Unit::TestCase
 
     context "when send ActiveForms::FormVersion.all with multi-response" do
       setup do
-        stub_get(/forminfo/, success_response("get_forminfo"))
+        stub_get(/forminfo/, success_response("get_forminfo.xml"))
         @versions = ActiveForms::FormVersion.all :apiFormCode => 'hipoteka'
       end
 

data/test/active_forms/request_test.rb

@@ -111,5 +111,31 @@ class ActiveForms::RequestTest < Test::Unit::TestCase
         assert_equal @response.parsed_response, request.perform.parsed_response
       end
     end
+
+    context "Request that returns not properly formatted response with status != 20x" do
+      setup do
+        stub_get(/.+/, error_response("40x.html"))
+        @request = ActiveForms::Request.new(:get, "entries")
+      end
+
+      should "raise Error exception" do
+        assert_raise ActiveForms::Error, "Request returned status 401 and does include properly formatted error message." do
+          @request.perform
+        end
+      end
+    end
+
+    context "Request that returns invalid XML" do
+      setup do
+        stub_get(/.+/, error_response("parse_error.html"))
+        @request = ActiveForms::Request.new(:get, "entries")
+      end
+
+      should "raise ParseError exception" do
+        assert_raise ActiveForms::ParseError do
+          @request.perform
+        end
+      end
+    end
   end
 end

data/test/active_forms/token_test.rb

@@ -10,7 +10,7 @@ class ActiveForms::EntryTest < Test::Unit::TestCase
 
     context "when sent ActiveForms::Token.all with multi-response" do
       setup do
-        stub_get(/formaccesstokens/, success_response("get_formaccesstokens"))
+        stub_get(/formaccesstokens/, success_response("get_formaccesstokens.xml"))
         @tokens = ActiveForms::Token.all :apiFormCode => 'hipoteka'
       end
 

data/test/fixtures/40x.html

@@ -0,0 +1,13 @@
+<html><head>
+<title>401 Authorization Required</title>
+</head><body>
+<h1>Authorization Required</h1>
+<p>This server could not verify that you
+are authorized to access the document
+requested.  Either you supplied the wrong
+credentials (e.g., bad password), or your
+browser doesn't understand how to supply
+the credentials required.</p>
+<hr/>
+<address>Apache Server at activeforms.com Port 443</address>
+</body></html>

data/test/fixtures/parse_error.html

@@ -0,0 +1,2 @@
+<html><head>
+<title

data/test/test_helper.rb

@@ -53,7 +53,7 @@ class Test::Unit::TestCase
     response = {
       :status       => ["200", "OK"],
       :content_type => "text/xml",
-      :body         => fixture(file || "success")
+      :body         => fixture(file || "success.xml")
     }
   end
 
@@ -61,12 +61,12 @@ class Test::Unit::TestCase
     response = {
       :status       => ["401", "Unauthorized"],
       :content_type => "text/xml",
-      :body         => fixture(file || "error")
+      :body         => fixture(file || "error.xml")
     }
   end
 
   def fixture(file)
-    File.read(File.join(File.dirname(__FILE__), "fixtures", "#{file}.xml"))
+    File.read(File.join(File.dirname(__FILE__), "fixtures", "#{file}"))
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_forms
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Micha\xC5\x82 Szajbe"
@@ -118,6 +118,7 @@ files:
 - test/active_forms/request_test.rb
 - test/active_forms/token_test.rb
 - test/active_forms_test.rb
+- test/fixtures/40x.html
 - test/fixtures/error.xml
 - test/fixtures/get_applicationdata.xml
 - test/fixtures/get_applicationprint.xml
@@ -131,6 +132,7 @@ files:
 - test/fixtures/get_forminfo.xml
 - test/fixtures/get_forms.xml
 - test/fixtures/get_forms_single.xml
+- test/fixtures/parse_error.html
 - test/fixtures/post_entrydata.xml
 - test/fixtures/success.xml
 - test/test_helper.rb
@@ -178,6 +180,7 @@ test_files:
 - test/active_forms/request_test.rb
 - test/active_forms/token_test.rb
 - test/active_forms_test.rb
+- test/fixtures/40x.html
 - test/fixtures/error.xml
 - test/fixtures/get_applicationdata.xml
 - test/fixtures/get_applicationprint.xml
@@ -191,6 +194,7 @@ test_files:
 - test/fixtures/get_forminfo.xml
 - test/fixtures/get_forms.xml
 - test/fixtures/get_forms_single.xml
+- test/fixtures/parse_error.html
 - test/fixtures/post_entrydata.xml
 - test/fixtures/success.xml
 - test/test_helper.rb