sepafm 0.1.0 → 0.1.1

data/test/sepa/banks/nordea/nordea_cert_application_request_test.rb

@@ -5,7 +5,7 @@ class NordeaCertApplicationRequestTest < ActiveSupport::TestCase
 
   def setup
     @get_cert_params = nordea_cert_params
-    ar_cert = Sepa::SoapBuilder.new(@get_cert_params).ar
+    ar_cert = Sepa::SoapBuilder.new(@get_cert_params).application_request
     @xml = Nokogiri::XML(ar_cert.to_xml)
   end
 
@@ -13,7 +13,7 @@ class NordeaCertApplicationRequestTest < ActiveSupport::TestCase
     sha1 = OpenSSL::Digest::SHA1.new
     cert_schema = File.read("#{SCHEMA_PATH}/cert_application_request.xsd")
     cert_digest = sha1.digest(cert_schema)
-    assert_equal Base64.encode64(cert_digest).strip, "sFwy9Tj+cERTdcmaGhm8WpmJBH4="
+    assert_equal encode(cert_digest).strip, "sFwy9Tj+cERTdcmaGhm8WpmJBH4="
   end
 
   def test_should_initialize_with_only_get_certificate_params

data/test/sepa/banks/nordea/nordea_cert_request_soap_builder_test.rb

@@ -49,7 +49,7 @@ class NordeaCertRequestSoapBuilderTest < ActiveSupport::TestCase
       "//cer:ApplicationRequest", 'cer' => 'http://bxd.fi/CertificateService'
     ).first
 
-    ar_doc = Nokogiri::XML(Base64.decode64(ar_node.content))
+    ar_doc = Nokogiri::XML(decode(ar_node.content))
 
     assert ar_doc.respond_to?(:canonicalize)
     assert_equal ar_doc.at_css("CustomerId").content, @nordea_generic_params[:customer_id]

data/test/sepa/banks/nordea/nordea_generic_soap_builder_test.rb

@@ -124,7 +124,7 @@ class NordeaGenericSoapBuilderTest < ActiveSupport::TestCase
       "//bxd:ApplicationRequest", 'bxd' => 'http://model.bxd.fi'
     ).first
 
-    ar_doc = Nokogiri::XML(Base64.decode64(ar_node.content))
+    ar_doc = Nokogiri::XML(decode(ar_node.content))
 
     assert ar_doc.respond_to?(:canonicalize)
     assert_equal ar_doc.at_css("CustomerId").content, @nordea_generic_params[:customer_id]
@@ -163,7 +163,7 @@ class NordeaGenericSoapBuilderTest < ActiveSupport::TestCase
       with_comments = false
     )
 
-    actual_digest = Base64.encode64(sha1.digest(body_node)).strip
+    actual_digest = encode(sha1.digest(body_node)).strip
 
     assert_equal actual_digest, added_digest
   end
@@ -211,7 +211,7 @@ class NordeaGenericSoapBuilderTest < ActiveSupport::TestCase
       with_comments = false
     )
 
-    actual_digest = Base64.encode64(sha1.digest(timestamp_node)).strip
+    actual_digest = encode(sha1.digest(timestamp_node)).strip
 
     assert_equal actual_digest, added_digest
   end
@@ -233,7 +233,7 @@ class NordeaGenericSoapBuilderTest < ActiveSupport::TestCase
       with_comments = false
     )
 
-    actual_signature = Base64.encode64(
+    actual_signature = encode(
       private_key.sign(sha1, signed_info_node)
     ).gsub(/\s+/, "")
 

data/test/sepa/banks/nordea/nordea_response_test.rb

@@ -4,43 +4,59 @@ class NordeaResponseTest < ActiveSupport::TestCase
   include Sepa::Utilities
 
   def setup
-    keys_path = File.expand_path('../keys', __FILE__)
-    @root_cert = OpenSSL::X509::Certificate.new File.read("#{keys_path}/root_cert.cer")
-    @not_root_cert = OpenSSL::X509::Certificate.new File.read("#{keys_path}/nordea.crt")
-
-    dfl = Nokogiri::XML(File.read("#{NORDEA_TEST_RESPONSE_PATH}/dfl.xml"))
-    @dfl = Sepa::Response.new(dfl, command: :download_file_list)
-
-    uf = Nokogiri::XML(File.read("#{NORDEA_TEST_RESPONSE_PATH}/uf.xml"))
-    @uf = Sepa::Response.new(uf, command: :upload_file)
-
-    df_tito = Nokogiri::XML(File.read("#{NORDEA_TEST_RESPONSE_PATH}/df_tito.xml"))
-    @df_tito = Sepa::Response.new(df_tito, command: :download_file)
-
-    df_ktl = Nokogiri::XML(File.read("#{NORDEA_TEST_RESPONSE_PATH}/df_ktl.xml"))
-    @df_ktl = Sepa::Response.new(df_ktl, command: :download_file)
-
-    gui = Nokogiri::XML(File.read("#{NORDEA_TEST_RESPONSE_PATH}/gui.xml"))
-    @gui = Sepa::Response.new(gui, command: :get_user_info)
-
-    gc = Nokogiri::XML(File.read("#{NORDEA_TEST_RESPONSE_PATH}/gc.xml"))
-    @gc = Sepa::NordeaResponse.new(gc, command: :get_certificate)
+    options = {
+      response: File.read("#{NORDEA_TEST_RESPONSE_PATH}/dfl.xml"),
+      command: :download_file_list
+    }
+    @dfl = Sepa::NordeaResponse.new options
+
+    options = {
+      response: File.read("#{NORDEA_TEST_RESPONSE_PATH}/uf.xml"),
+      command: :upload_file
+    }
+    @uf = Sepa::NordeaResponse.new options
+
+    options = {
+      response: File.read("#{NORDEA_TEST_RESPONSE_PATH}/df_tito.xml"),
+      command: :download_file
+    }
+    @df_tito = Sepa::NordeaResponse.new options
+
+    options = {
+      response: File.read("#{NORDEA_TEST_RESPONSE_PATH}/df_ktl.xml"),
+      command: :download_file
+    }
+    @df_ktl = Sepa::NordeaResponse.new options
+
+    options = {
+      response: File.read("#{NORDEA_TEST_RESPONSE_PATH}/gui.xml"),
+      command: :get_user_info
+    }
+    @gui = Sepa::NordeaResponse.new options
+
+    options = {
+      response: File.read("#{NORDEA_TEST_RESPONSE_PATH}/gc.xml"),
+      command: :get_certificate
+    }
+    @gc = Sepa::NordeaResponse.new options
   end
 
   def test_should_be_valid
-    assert @dfl.valid?
-    assert @uf.valid?
-    assert @df_tito.valid?
-    assert @gui.valid?
+    assert @dfl.valid?, @dfl.errors.messages
+    assert @uf.valid?, @uf.errors.messages
+    assert @df_tito.valid?, @df_tito.errors.messages
+    assert @df_ktl.valid?, @df_ktl.errors.messages
+    assert @gui.valid?, @gui.errors.messages
+    assert @gc.valid?, @gc.errors.messages
   end
 
   def test_should_fail_with_improper_params
-    a = Sepa::Response.new("Jees", command: 'not')
+    a = Sepa::Response.new({ response: "Jees", command: 'not'})
     refute a.valid?
   end
 
   def test_should_complain_if_ar_not_valid_against_schema
-    a = Sepa::Response.new(Nokogiri::XML("<ar>text</ar>"), command: 'notvalid')
+    a = Sepa::Response.new({ response: "<ar>text</ar>", command: 'notvalid' })
     refute a.valid?
   end
 
@@ -52,21 +68,26 @@ class NordeaResponseTest < ActiveSupport::TestCase
   end
 
   def test_cert_check_should_work
-    assert @dfl.cert_is_trusted(@root_cert)
+    keys_path = File.expand_path('../keys', __FILE__)
+    root_cert = OpenSSL::X509::Certificate.new File.read("#{keys_path}/root_cert.cer")
+    not_root_cert = OpenSSL::X509::Certificate.new File.read("#{keys_path}/nordea.crt")
+
+    assert @dfl.cert_is_trusted(root_cert)
     assert_raises(SecurityError) do
-     @dfl.cert_is_trusted(@not_root_cert)
+     @dfl.cert_is_trusted(not_root_cert)
    end
   end
 
   def test_signature_check_should_work
     assert @dfl.signature_is_valid?
-    @dfl.soap.at_css(
-        'xmlns|SignatureValue',
-        'xmlns' => 'http://www.w3.org/2000/09/xmldsig#'
-      ).content = "kissa"
+    @dfl.doc.at('xmlns|SignatureValue', 'xmlns' => DSIG).content = "kissa"
     refute @dfl.signature_is_valid?
   end
 
+  test 'to_s works' do
+    assert_equal File.read("#{NORDEA_TEST_RESPONSE_PATH}/dfl.xml"), @dfl.to_s
+  end
+
   ##
   # Tests for download file command
 
@@ -110,7 +131,8 @@ class NordeaResponseTest < ActiveSupport::TestCase
 
   test 'certificate can be extracted from get certificate response' do
     assert_nothing_raised do
-      OpenSSL::X509::Certificate.new Base64.decode64(@gc.content)
+      OpenSSL::X509::Certificate.new decode(@gc.own_signing_cert)
     end
   end
+
 end

data/test/sepa/client_test.rb

@@ -8,24 +8,10 @@ class ClientTest < ActiveSupport::TestCase
     # Get params hashes from fixtures for different banks and for different request types
     @nordea_generic_params = nordea_generic_params
     @nordea_cert_params = nordea_cert_params
-
     @danske_cert_params = danske_cert_params
 
     # Namespaces
     @cor = 'http://bxd.fi/CorporateFileService'
-
-    # Create an observer to fake sending requests to bank
-    observer = Class.new {
-      def notify(operation_name, builder, globals, locals)
-        @operation_name = operation_name
-        @builder = builder
-        @globals = globals
-        @locals  = locals
-        HTTPI::Response.new(200, { "Reponse is actually" => "the request, w0000t" }, locals[:xml])
-      end
-    }.new
-
-    Savon.observers << observer
   end
 
   test "should initialize class" do
@@ -172,75 +158,75 @@ class ClientTest < ActiveSupport::TestCase
 
   # # The response from savon will be the request to check that a proper request
   # # was made in the following four tests
-  def test_should_send_proper_request_with_get_user_info
+  test "should_send_proper_request_with_get_user_info" do
     @nordea_generic_params[:command] = :get_user_info
     client = Sepa::Client.new(@nordea_generic_params)
     response = client.send_request
 
-    assert response.soap.at_css('cor|getUserInfoin', cor: @cor)
+    assert response.doc.at_css('cor|getUserInfoin', cor: @cor)
 
     Dir.chdir(SCHEMA_PATH) do
       xsd = Nokogiri::XML::Schema(IO.read('soap.xsd'))
-      assert xsd.valid?(response.soap)
+      assert xsd.valid?(response.doc)
     end
   end
 
-  def test_should_send_proper_request_with_download_file_list
+  test "should_send_proper_request_with_download_file_list" do
     @nordea_generic_params[:command] = :download_file_list
     client = Sepa::Client.new(@nordea_generic_params)
     response = client.send_request
 
-    assert response.soap.at_css('cor|downloadFileListin', cor: @cor)
+    assert response.doc.at_css('cor|downloadFileListin', cor: @cor)
 
     Dir.chdir(SCHEMA_PATH) do
       xsd = Nokogiri::XML::Schema(IO.read('soap.xsd'))
-      assert xsd.valid?(response.soap)
+      assert xsd.valid?(response.doc)
     end
   end
 
-  def test_should_send_proper_request_with_download_file
+  test "should_send_proper_request_with_download_file" do
     @nordea_generic_params[:command] = :download_file
     client = Sepa::Client.new(@nordea_generic_params)
     response = client.send_request
 
-    assert response.soap.at_css('cor|downloadFilein', cor: @cor)
+    assert response.doc.at_css('cor|downloadFilein', cor: @cor)
 
     Dir.chdir(SCHEMA_PATH) do
       xsd = Nokogiri::XML::Schema(IO.read('soap.xsd'))
-      assert xsd.valid?(response.soap)
+      assert xsd.valid?(response.doc)
     end
   end
 
-  def test_should_send_proper_request_with_upload_file
+  test "should_send_proper_request_with_upload_file" do
     @nordea_generic_params[:command] = :upload_file
     client = Sepa::Client.new(@nordea_generic_params)
     response = client.send_request
 
-    assert response.soap.at_css('cor|uploadFilein', cor: @cor)
+    assert response.doc.at_css('cor|uploadFilein', cor: @cor)
 
     Dir.chdir(SCHEMA_PATH) do
       xsd = Nokogiri::XML::Schema(IO.read('soap.xsd'))
-      assert xsd.valid?(response.soap)
+      assert xsd.valid?(response.doc)
     end
   end
 
-  def test_should_initialize_with_proper_cert_params
+  test "should_initialize_with_proper_cert_params" do
     assert Sepa::Client.new(@nordea_cert_params)
   end
 
-  def test_should_send_proper_request_with_get_certificate
+  test "should_send_proper_request_with_get_certificate" do
     client = Sepa::Client.new(@nordea_cert_params)
     response = client.send_request
 
-    assert response.soap.at_css('cer|getCertificatein')
+    assert response.doc.at_css('cer|getCertificatein')
 
     Dir.chdir(SCHEMA_PATH) do
       xsd = Nokogiri::XML::Schema(IO.read('soap.xsd'))
-      assert xsd.valid?(response.soap)
+      assert xsd.valid?(response.doc)
     end
   end
 
-  def test_should_check_signing_cert_request_with_create_certificate
+  test "should_check_signing_cert_request_with_create_certificate" do
     @danske_cert_params[:command] = :create_certificate
     @danske_cert_params.delete(:signing_cert_pkcs10)
 
@@ -249,7 +235,7 @@ class ClientTest < ActiveSupport::TestCase
     assert_includes sepa.errors.messages.to_s, SIGNING_CERT_REQUEST_ERROR_MESSAGE
   end
 
-  def test_should_check_encryption_cert_request_with_create_certificate
+  test "should_check_encryption_cert_request_with_create_certificate" do
     @danske_cert_params[:command] = :create_certificate
     @danske_cert_params.delete(:encryption_cert_pkcs10)
 
@@ -258,7 +244,7 @@ class ClientTest < ActiveSupport::TestCase
     assert_includes sepa.errors.messages.to_s, ENCRYPTION_CERT_REQUEST_ERROR_MESSAGE
   end
 
-  def test_should_check_pin_with_create_certificate
+  test "should_check_pin_with_create_certificate" do
     @danske_cert_params[:command] = :create_certificate
     @danske_cert_params.delete(:pin)
 
@@ -267,7 +253,7 @@ class ClientTest < ActiveSupport::TestCase
     assert_includes sepa.errors.messages.to_s, PIN_ERROR_MESSAGE
   end
 
-  def test_should_check_encryption_cert_with_create_certificate
+  test "should_check_encryption_cert_with_create_certificate" do
     @danske_cert_params[:command] = :create_certificate
     @danske_cert_params.delete(:enc_cert)
 
@@ -276,4 +262,27 @@ class ClientTest < ActiveSupport::TestCase
     assert_includes sepa.errors.messages.to_s, ENCRYPTION_CERT_ERROR_MESSAGE
   end
 
+  test "response should be invalid on savon exception" do
+    # Create an observer to fake sending requests to bank
+    observer = Class.new {
+      def notify(operation_name, builder, globals, locals)
+        @operation_name = operation_name
+        @builder = builder
+        @globals = globals
+        @locals  = locals
+        HTTPI::Response.new(500, {}, 'THE ERROR!')
+      end
+    }.new
+
+    Savon.observers << observer
+
+    client = Sepa::Client.new @nordea_generic_params
+    response = client.send_request
+
+    refute response.valid?, response.errors.messages
+    assert_includes response.errors.messages.to_s, "HTTP error (500): THE ERROR!"
+
+    Savon.observers.pop
+  end
+
 end

data/test/sepa/fixtures.rb

@@ -50,7 +50,7 @@ Sn4Uz7Zjk3UrBIbMYEv0u2mcCypwsb0nGE5/gzDPjGE9cxWW+rXARIs+sNQVClnh
     target_id: '11111111A1',
     language: 'FI',
     file_type: 'TITO',
-    content: Base64.encode64("haisuli"),
+    content: encode("haisuli"),
     file_reference: "11111111A12006030329501800000014"
   }
 end

data/test/sepa/sepa_test.rb

@@ -4,7 +4,7 @@ class TestSepa < ActiveSupport::TestCase
 
   def test_version_must_be_defined
     refute_nil Sepa::VERSION
-    assert_equal "0.1.0", Sepa::VERSION
+    assert_equal "0.1.1", Sepa::VERSION
   end
 
 end

data/test/test_helper.rb

@@ -20,6 +20,8 @@ end
 require 'sepafm'
 require 'sepa/fixtures'
 
+include Sepa::Utilities
+
 # Test responses
 NORDEA_TEST_RESPONSE_PATH = "#{ROOT_PATH}/test/sepa/banks/nordea/responses"
 DANSKE_TEST_RESPONSE_PATH = "#{ROOT_PATH}/test/sepa/banks/danske/responses/"
@@ -32,3 +34,16 @@ DANSKE_BANK_ROOT_CERT = File.read "#{DANSKE_TEST_KEYS_PATH}bank_root_cert.pem"
 DANSKE_OWN_ENCRYPTION_CERT = File.read "#{DANSKE_TEST_KEYS_PATH}own_enc_cert.pem"
 
 I18n.enforce_available_locales = true
+
+# Create an observer to fake sending requests to bank
+observer = Class.new {
+  def notify(operation_name, builder, globals, locals)
+    @operation_name = operation_name
+    @builder = builder
+    @globals = globals
+    @locals  = locals
+    HTTPI::Response.new(200, { "Reponse is actually" => "the request, w0000t" }, locals[:xml])
+  end
+}.new
+
+Savon.observers << observer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepafm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joni Kanerva
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -136,7 +136,6 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE
-- README.md
 - Rakefile
 - lib/sepa/application_request.rb
 - lib/sepa/application_response.rb
@@ -185,6 +184,7 @@ files:
 - lib/sepa/xml_templates/soap/header.xml
 - lib/sepa/xml_templates/soap/upload_file.xml
 - lib/sepafm.rb
+- readme.md
 - sepafm.gemspec
 - test/sepa/banks/danske/danske_cert_response_test.rb
 - test/sepa/banks/danske/danske_cert_soap_builder_test.rb