rconomic 0.5.0 → 0.5.1

data/spec/fixtures/{spec_entity_delete → account_delete}/success.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <soap:Body>
-    <SpecEntity_DeleteResponse xmlns="http://e-conomic.com" />
+    <Account_DeleteResponse xmlns="http://e-conomic.com" />
   </soap:Body>
 </soap:Envelope>

data/spec/fixtures/{spec_entity_get_data → account_get_data}/success.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
   <soap:Body>
-    <SpecEntity_GetDataResponse xmlns="http://e-conomic.com">
-      <SpecEntity_GetDataResult>
+    <Account_GetDataResponse xmlns="http://e-conomic.com">
+      <Account_GetDataResult>
         <Foo>bar</Foo>
         <Baz>qux</Baz>
-      </SpecEntity_GetDataResult>
-    </SpecEntity_GetDataResponse>
+      </Account_GetDataResult>
+    </Account_GetDataResponse>
   </soap:Body>
-</soap:Envelope>
+</soap:Envelope>

data/spec/fixtures/{spec_entity_update_from_data → account_update_from_data}/success.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
   <soap:Body>
-    <SpecEntity_UpdateFromDataResponse xmlns="http://e-conomic.com">
-      <SpecEntity_UpdateFromDataResult>
+    <Account_UpdateFromDataResponse xmlns="http://e-conomic.com">
+      <Account_UpdateFromDataResult>
         <Number>42</Number>
-      </SpecEntity_UpdateFromDataResult>
-    </SpecEntity_UpdateFromDataResponse>
+      </Account_UpdateFromDataResult>
+    </Account_UpdateFromDataResponse>
   </soap:Body>
-</soap:Envelope>
+</soap:Envelope>

data/spec/fixtures/cash_book_entry_create_creditor_invoice/success.xml

@@ -3,8 +3,8 @@
   <soap:Body>
     <CashBookEntry_CreateCreditorInvoiceResponse xmlns="http://e-conomic.com">
       <CashBookEntry_CreateCreditorInvoiceResult>
-        <Id1>int</Id1>
-        <Id2>int</Id2>
+        <Id1>13</Id1>
+        <Id2>14</Id2>
       </CashBookEntry_CreateCreditorInvoiceResult>
     </CashBookEntry_CreateCreditorInvoiceResponse>
   </soap:Body>

data/spec/fixtures/cash_book_entry_create_creditor_payment/success.xml

@@ -3,8 +3,8 @@
   <soap:Body>
     <CashBookEntry_CreateCreditorPaymentResponse xmlns="http://e-conomic.com">
       <CashBookEntry_CreateCreditorPaymentResult>
-        <Id1>int</Id1>
-        <Id2>int</Id2>
+        <Id1>13</Id1>
+        <Id2>14</Id2>
       </CashBookEntry_CreateCreditorPaymentResult>
     </CashBookEntry_CreateCreditorPaymentResponse>
   </soap:Body>

data/spec/fixtures/creditor_contact_create_from_data/success.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <CreditorContact_CreateFromDataResponse xmlns="http://e-conomic.com">
+      <CreditorContact_CreateFromDataResult>
+        <Id>42</Id>
+      </CreditorContact_CreateFromDataResult>
+    </CreditorContact_CreateFromDataResponse>
+  </soap:Body>
+</soap:Envelope>

data/spec/fixtures/debtor_contact_create_from_data/success.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <DebtorContact_CreateFromDataResponse xmlns="http://e-conomic.com">
+      <DebtorContact_CreateFromDataResult>
+        <Id>int</Id>
+      </DebtorContact_CreateFromDataResult>
+    </DebtorContact_CreateFromDataResponse>
+  </soap:Body>
+</soap:Envelope>

data/spec/fixtures/debtor_create_from_data/success.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <Debtor_CreateFromData xmlns="http://e-conomic.com">
+      <data>
+        <Handle>
+          <Number>string</Number>
+        </Handle>
+        <Number>string</Number>
+        <DebtorGroupHandle>
+          <Number>int</Number>
+        </DebtorGroupHandle>
+        <Name>string</Name>
+        <VatZone>HomeCountry or EU or Abroad</VatZone>
+        <ExtendedVatZone>
+          <Number>string</Number>
+        </ExtendedVatZone>
+        <CurrencyHandle>
+          <Code>string</Code>
+        </CurrencyHandle>
+        <PriceGroupHandle>
+          <Number>int</Number>
+        </PriceGroupHandle>
+        <IsAccessible>boolean</IsAccessible>
+        <Ean>string</Ean>
+        <PublicEntryNumber>string</PublicEntryNumber>
+        <Email>string</Email>
+        <TelephoneAndFaxNumber>string</TelephoneAndFaxNumber>
+        <Website>string</Website>
+        <Address>string</Address>
+        <PostalCode>string</PostalCode>
+        <City>string</City>
+        <Country>string</Country>
+        <CreditMaximum>decimal</CreditMaximum>
+        <VatNumber>string</VatNumber>
+        <County>string</County>
+        <CINumber>string</CINumber>
+        <TermOfPaymentHandle>
+          <Id>int</Id>
+        </TermOfPaymentHandle>
+        <LayoutHandle>
+          <Id>int</Id>
+        </LayoutHandle>
+        <AttentionHandle>
+          <Id>int</Id>
+        </AttentionHandle>
+        <YourReferenceHandle>
+          <Id>int</Id>
+        </YourReferenceHandle>
+        <OurReferenceHandle>
+          <Number>int</Number>
+        </OurReferenceHandle>
+        <Balance>decimal</Balance>
+      </data>
+    </Debtor_CreateFromData>
+  </soap:Body>
+</soap:Envelope>

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'savon'
-require 'savon_spec'
+require "savon/mock/spec_helper"
 
 if ENV['TRAVIS'] == "true"
   require 'coveralls'
@@ -9,115 +9,21 @@ end
 require './lib/rconomic'
 
 RSpec.configure do |config|
-  config.mock_with :mocha
-  config.include Savon::Spec::Macros
+  config.include Savon::SpecHelper
 
   config.before :each do
     # Ensure we don't actually send requests over the network
-    HTTPI.expects(:get).never
-    HTTPI.expects(:post).never
+    expect(HTTPI).to receive(:get).never
+    expect(HTTPI).to receive(:post).never
+    savon.mock!
   end
 
-end
-
-Savon.configure do |config|
-  config.logger = Logger.new(File.join('spec', 'debug.log'))
-end
-
-Savon::Spec::Fixture.path = File.expand_path("../fixtures", __FILE__)
-
-# Stub the WSDL instead of fetching it over the wire
-module Savon
-  module Wasabi
-    class Document < ::Wasabi::Document
-      def resolve_document
-        File.read(File.expand_path('../../lib/economic/economic.wsdl', __FILE__))
-      end
-    end
-  end
-end
-
-
-class Savon::Spec::Mock
-  # Fix issue with savon_specs #with method, so that it allows other values than the expected.
-  # Without this, savon_spec 0.1.6 doesn't work with savon 0.9.3.
-  #
-  #   savon.expects('Connect').with(has_entries(:agreementNumber => 123456)).returns(:success)
-  #
-  # would trigger a irrelevant
-  #
-  #   Mocha::ExpectationError: unexpected invocation: #<AnyInstance:Savon::SOAP::XML>.body=(nil)
-  def with(soap_body)
-    if mock_method == :expects
-      Savon::SOAP::XML.any_instance.stubs(:body=)
-      Savon::SOAP::XML.any_instance.expects(:body=).with(soap_body)
-    end
-    self
+  config.after :each do
+    savon.unmock!
   end
-end
-
-def make_session
-  Economic::Session.new(123456, 'api', 'passw0rd')
-end
 
-def make_current_invoice(properties = {})
-  invoice = make_debtor.current_invoices.build
-
-  # Assign specified properties
-  properties.each { |key, value|
-    invoice.send("#{key}=", value)
-  }
-
-  # Use defaults for the rest of the properties
-  invoice.date ||= Time.now
-  invoice.due_date ||= Time.now + 15
-  invoice.exchange_rate ||= 100
-  invoice.is_vat_included ||= false
-
-  invoice
-end
-
-def make_debtor(properties = {})
-  debtor = Economic::Debtor.new
-
-  # Assign specified properties
-  properties.each { |key, value|
-    debtor.send("#{key}=", value)
-  }
-
-  # Use defaults for the rest of the properties
-  debtor.session ||= make_session
-  debtor.handle ||= { :number => 42 }
-  debtor.number ||= 42
-  debtor.debtor_group_handle || { :number => 1 }
-  debtor.name ||= 'Bob'
-  debtor.vat_zone ||= 'HomeCountry' # HomeCountry, EU, Abroad
-  debtor.currency_handle ||= { :code => 'DKK' }
-  debtor.price_group_handle ||= { :number => 1 }
-  debtor.is_accessible ||= true
-  debtor.ci_number ||= '12345678'
-  debtor.term_of_payment_handle ||= { :id => 1 }
-  debtor.layout_handle ||= { :id => 16 }
-
-  debtor
 end
 
-def make_creditor(properties = {})
-  creditor = Economic::Creditor.new
-
-  # Assign specified properties
-  properties.each { |key, value|
-    creditor.send("#{key}=", value)
-  }
-
-  # Use defaults for the rest of the properties
-  creditor.session ||= make_session
-  creditor.handle ||= { :number => 42 }
-  creditor.number ||= 42
-  creditor.name ||= 'Bob'
-  creditor.vat_zone ||= 'HomeCountry' # HomeCountry, EU, Abroad
-  creditor.is_accessible ||= true
-  creditor.ci_number ||= '12345678'
-
-  creditor
-end
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories.
+Dir[File.expand_path("spec/support/**/*.rb")].each {|f| require f}

data/spec/support/api_requests.rb

@@ -0,0 +1,20 @@
+# Set up an expectation that a specific operation must be called with specific
+# data in the message body, returning a specific response.
+def mock_request(operation, data, response)
+  operation = Economic::Support::String.underscore(operation)
+  response = if response.is_a?(Symbol)
+    fixture(operation, response)
+  elsif response.is_a?(Hash)
+    {:code => 200}.merge(response)
+  end
+
+  mock = savon.expects(operation.intern)
+  mock.with(:message => data) if data
+  mock.returns(response)
+end
+
+# Set up a fake request so that when operation is called with data in the
+# message body it returns the desired response.
+def stub_request(operation, data, response)
+  mock_request(operation, data || :any, response)
+end

data/spec/support/factories.rb

@@ -0,0 +1,65 @@
+def make_creditor(properties = {})
+  creditor = Economic::Creditor.new
+
+  # Assign specified properties
+  properties.each { |key, value|
+    creditor.send("#{key}=", value)
+  }
+
+  # Use defaults for the rest of the properties
+  creditor.session ||= make_session
+  creditor.handle ||= { :number => 42 }
+  creditor.number ||= 42
+  creditor.name ||= 'Bob'
+  creditor.vat_zone ||= 'HomeCountry' # HomeCountry, EU, Abroad
+  creditor.is_accessible ||= true
+  creditor.ci_number ||= '12345678'
+
+  creditor
+end
+
+def make_current_invoice(properties = {})
+  invoice = make_debtor.current_invoices.build
+
+  # Assign specified properties
+  properties.each { |key, value|
+    invoice.send("#{key}=", value)
+  }
+
+  # Use defaults for the rest of the properties
+  invoice.date ||= Time.now
+  invoice.due_date ||= Time.now + 15
+  invoice.exchange_rate ||= 100
+  invoice.is_vat_included ||= false
+
+  invoice
+end
+
+def make_debtor(properties = {})
+  debtor = Economic::Debtor.new
+
+  # Assign specified properties
+  properties.each { |key, value|
+    debtor.send("#{key}=", value)
+  }
+
+  # Use defaults for the rest of the properties
+  debtor.session ||= make_session
+  debtor.handle ||= { :number => 42 }
+  debtor.number ||= 42
+  debtor.debtor_group_handle || { :number => 1 }
+  debtor.name ||= 'Bob'
+  debtor.vat_zone ||= 'HomeCountry' # HomeCountry, EU, Abroad
+  debtor.currency_handle ||= { :code => 'DKK' }
+  debtor.price_group_handle ||= { :number => 1 }
+  debtor.is_accessible ||= true
+  debtor.ci_number ||= '12345678'
+  debtor.term_of_payment_handle ||= { :id => 1 }
+  debtor.layout_handle ||= { :id => 16 }
+
+  debtor
+end
+
+def make_session
+  Economic::Session.new(123456, 'api', 'passw0rd')
+end

data/spec/support/fixtures.rb

@@ -0,0 +1,9 @@
+# Returns the contents of a fixture file for operation
+def fixture(operation, fixture)
+  fixture_path = File.join(
+    "spec/fixtures",
+    operation.to_s,
+    "#{fixture}.xml"
+  )
+  File.read(fixture_path)
+end

metadata

@@ -1,47 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: rconomic
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jakob Skjerning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: gyoku
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-description: ! "                  Ruby wrapper for the e-conomic SOAP API, that aims
-  at making working with the API bearable.\n\n                  E-conomic is a web-based
-  accounting system. For their marketing speak, see http://www.e-conomic.co.uk/about/.
-  More details about their API at http://www.e-conomic.co.uk/integration/integration-partner/.\n"
+        version: '2.2'
+description: |2
+                    Ruby wrapper for the e-conomic SOAP API, that aims at making working with the API bearable.
+
+                    E-conomic is a web-based accounting system. For their marketing speak, see http://www.e-conomic.co.uk/about/. More details about their API at http://www.e-conomic.co.uk/integration/integration-partner/.
 email: jakob@mentalized.net
 executables: []
 extensions: []
@@ -65,8 +51,10 @@ files:
 - lib/economic/debtor_contact.rb
 - lib/economic/debtor_entry.rb
 - lib/economic/economic.wsdl
+- lib/economic/endpoint.rb
 - lib/economic/entity.rb
 - lib/economic/entity/handle.rb
+- lib/economic/entity/mapper.rb
 - lib/economic/entry.rb
 - lib/economic/invoice.rb
 - lib/economic/proxies/account_proxy.rb
@@ -102,7 +90,9 @@ files:
 - spec/economic/debtor_contact_spec.rb
 - spec/economic/debtor_entry_spec.rb
 - spec/economic/debtor_spec.rb
+- spec/economic/endpoint_spec.rb
 - spec/economic/entity/handle_spec.rb
+- spec/economic/entity/mapper_spec.rb
 - spec/economic/entity_spec.rb
 - spec/economic/entry_spec.rb
 - spec/economic/invoice_spec.rb
@@ -120,6 +110,10 @@ files:
 - spec/economic/proxies/entry_proxy_spec.rb
 - spec/economic/proxies/invoice_proxy_spec.rb
 - spec/economic/session_spec.rb
+- spec/fixtures/account_create_from_data/success.xml
+- spec/fixtures/account_delete/success.xml
+- spec/fixtures/account_get_data/success.xml
+- spec/fixtures/account_update_from_data/success.xml
 - spec/fixtures/cash_book_book/success.xml
 - spec/fixtures/cash_book_entry_create_creditor_invoice/success.xml
 - spec/fixtures/cash_book_entry_create_creditor_payment/success.xml
@@ -134,6 +128,7 @@ files:
 - spec/fixtures/cash_book_get_entries/success.xml
 - spec/fixtures/cash_book_get_name/success.xml
 - spec/fixtures/connect/success.xml
+- spec/fixtures/creditor_contact_create_from_data/success.xml
 - spec/fixtures/creditor_contact_find_by_name/multiple.xml
 - spec/fixtures/creditor_contact_find_by_name/none.xml
 - spec/fixtures/creditor_contact_get_data/success.xml
@@ -160,9 +155,11 @@ files:
 - spec/fixtures/current_invoice_get_data_array/multiple.xml
 - spec/fixtures/current_invoice_get_data_array/single.xml
 - spec/fixtures/current_invoice_line_get_data/success.xml
+- spec/fixtures/debtor_contact_create_from_data/success.xml
 - spec/fixtures/debtor_contact_find_by_name/multiple.xml
 - spec/fixtures/debtor_contact_find_by_name/none.xml
 - spec/fixtures/debtor_contact_get_data/success.xml
+- spec/fixtures/debtor_create_from_data/success.xml
 - spec/fixtures/debtor_entry_find_by_invoice_number/many.xml
 - spec/fixtures/debtor_entry_find_by_invoice_number/single.xml
 - spec/fixtures/debtor_entry_match_entries/success.xml
@@ -190,11 +187,10 @@ files:
 - spec/fixtures/invoice_get_data_array/single.xml
 - spec/fixtures/invoice_get_pdf/success.xml
 - spec/fixtures/invoice_get_remainder/success.xml
-- spec/fixtures/spec_entity_create_from_data/success.xml
-- spec/fixtures/spec_entity_delete/success.xml
-- spec/fixtures/spec_entity_get_data/success.xml
-- spec/fixtures/spec_entity_update_from_data/success.xml
 - spec/spec_helper.rb
+- spec/support/api_requests.rb
+- spec/support/factories.rb
+- spec/support/fixtures.rb
 homepage: https://github.com/lokalebasen/rconomic
 licenses: []
 metadata: {}
@@ -204,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Wrapper for e-conomic.dk's SOAP API.