rconomic 0.4.1 → 0.5.0

data/lib/economic/proxies/actions/find_by_number.rb

@@ -1,11 +1,9 @@
 module FindByNumber
   # Returns handle with a given number.
   def find_by_number(number)
-    response = session.request(entity_class.soap_action('FindByNumber')) do
-      soap.body = {
-        'number' => number
-      }
-    end
+    response = request('FindByNumber', {
+      'number' => number
+    })
 
     if response == {}
       nil

data/lib/economic/proxies/cash_book_entry_proxy.rb

@@ -3,9 +3,10 @@ require 'economic/proxies/entity_proxy'
 module Economic
   class CashBookEntryProxy < EntityProxy
     def all
-      entity_hash = session.request(CashBookProxy.entity_class.soap_action(:get_entries)) do
-        soap.body = { "cashBookHandle" => owner.handle.to_hash }
-      end
+      entity_hash = session.request(
+        CashBookProxy.entity_class.soap_action_name(:get_entries),
+        {"cashBookHandle" => owner.handle.to_hash}
+      )
 
       if entity_hash != {}
         [ entity_hash.values.first ].flatten.each do |id_hash|
@@ -56,9 +57,12 @@ module Economic
     end
 
     def set_due_date(id, date)
-      session.request(entity_class.soap_action("SetDueDate")) do
-        soap.body = { 'cashBookEntryHandle' => { 'Id1' => owner.handle[:number], 'Id2' => id }, :value => date }
-      end
+      request("SetDueDate", {
+        'cashBookEntryHandle' => {
+          'Id1' => owner.handle[:number], 'Id2' => id
+        },
+        :value => date
+      })
     end
 
     protected
@@ -67,13 +71,12 @@ module Economic
       handle_name = handle_name_for_action(action)
       handle_key = Economic::Support::String.underscore(handle_name).intern
 
-      response = session.request(entity_class.soap_action(action)) do
-        data = ActiveSupport::OrderedHash.new
-        data["cashBookHandle"] = { 'Number' => owner.handle[:number] }
-        data[handle_name] = { 'Number'  => handles[handle_key][:number] } if handles[handle_key]
-        data["contraAccountHandle"] = { 'Number'  => handles[:contra_account_handle][:number] } if handles[:contra_account_handle]
-        soap.body = data
-      end
+      data = {}
+      data["cashBookHandle"] = { 'Number' => owner.handle[:number] }
+      data[handle_name] = { 'Number'  => handles[handle_key][:number] } if handles[handle_key]
+      data["contraAccountHandle"] = { 'Number'  => handles[:contra_account_handle][:number] } if handles[:contra_account_handle]
+
+      response = request(action, data)
 
       find(response)
     end

data/lib/economic/proxies/cash_book_proxy.rb

@@ -3,11 +3,9 @@ require 'economic/proxies/entity_proxy'
 module Economic
   class CashBookProxy < EntityProxy
     def find_by_name(name)
-      response = session.request entity_class.soap_action('FindByName') do
-        soap.body = {
-          'name' => name
-        }
-      end
+      response = request('FindByName', {
+        'name' => name
+      })
 
       cash_book = build
       cash_book.partial = true
@@ -16,27 +14,13 @@ module Economic
       cash_book
 
     end
-    
-    def all
-      response = session.request entity_class.soap_action('GetAll')
 
-      handles = [response[:cash_book_handle]].flatten.reject(&:blank?)
-      cash_books = []
-      handles.each do |handle|
-        cash_books << get_name(handle[:number])
-      end
-      
-      cash_books
-    end
-    
     def get_name(id)
-      response = session.request entity_class.soap_action("GetName") do
-        soap.body = {
-          'cashBookHandle' => {
-            'Number' => id
-          }
+      response = request("GetName", {
+        'cashBookHandle' => {
+          'Number' => id
         }
-      end
+      })
 
       cash_book = build
       cash_book.number = id

data/lib/economic/proxies/creditor_contact_proxy.rb

@@ -2,63 +2,20 @@ require 'economic/proxies/entity_proxy'
 
 module Economic
   class CreditorContactProxy < EntityProxy
-
-    # Returns a new, unpersisted Economic::CreditorContact
-    def build(properties = {})
-      contact = super
-      initialize_properties_with_values_from_owner(contact) if owner.is_a?(Creditor)
-      contact
-    end
-
-    # Gets data for CreditorContact from the API
-    def find(handle)
-      handle = Entity::Handle.build(:id => handle) unless handle.is_a?(Entity::Handle)
-      super(handle)
-    end
-
-    # Returns CreditorContact that have the given name. The objects will only be partially loaded
+    # Returns CreditorContact that have the given name. The objects will only be
+    # partially loaded
     def find_by_name(name)
-      # Get a list of CreditorContactHandles from e-conomic
-      response = session.request entity_class.soap_action('FindByName') do
-        soap.body = {
-          'name' => name
-        }
-      end
-
-      # Make sure we always have an array of handles even if the result only contains one
-      handles = [response[:creditor_contact_handle]].flatten.reject(&:blank?)
-
-      # Create partial CreditorContact entities
-      contacts = handles.collect do |handle|
-        creditor_contact = build
-        creditor_contact.partial = true
-        creditor_contact.persisted = true
-        creditor_contact.handle = handle
-        creditor_contact.id = handle[:id]
-        creditor_contact.number = handle[:number]
-        creditor_contact
-      end
-
-      if owner.is_a?(Creditor)
-        # Scope to the owner
-        contacts.select do |creditor_contact|
-          creditor_contact.get_data
-          creditor_contact.creditor.handle == owner.handle
-        end
-      else
-        contacts
-      end
-
+      Proxies::Actions::FindByName.new(self, name).call
     end
 
-
   private
 
     # Initialize properties in contact with values from owner. Returns contact.
     def initialize_properties_with_values_from_owner(contact)
-      contact.creditor = owner
+      if owner.is_a?(Creditor)
+        contact.creditor = owner
+      end
       contact
     end
-
   end
 end

data/lib/economic/proxies/creditor_entry_proxy.rb

@@ -3,11 +3,9 @@ require 'economic/proxies/entity_proxy'
 module Economic
   class CreditorEntryProxy < EntityProxy
     def find_by_invoice_number(invoice_number)
-      response = session.request(entity_class.soap_action('FindByInvoiceNumber')) do
-        soap.body = {
-          'invoiceNumber' => invoice_number
-        }
-      end
+      response = request('FindByInvoiceNumber', {
+        'invoiceNumber' => invoice_number
+      })
 
       response[:creditor_entry_handle].map do |creditor_entry_handle|
         # Kinda ugly, but we get an array instead of a hash when there's only one result. :)
@@ -16,27 +14,23 @@ module Economic
     end
 
     def find(serial_number)
-      response = session.request(entity_class.soap_action('GetData')) do
-        soap.body = {
-          'entityHandle' => {
-            'SerialNumber' => serial_number
-           }
-        }
-      end
+      response = request('GetData', {
+        'entityHandle' => {
+          'SerialNumber' => serial_number
+         }
+      })
 
       build(response)
     end
 
     def match(*serial_numbers)
-      response = session.request(entity_class.soap_action('MatchEntries')) do
-        soap.body = {
-          :entries => {
-            "CreditorEntryHandle" => serial_numbers.map { |serial_number|
-              { "SerialNumber" => serial_number }
-            }
+      response = request('MatchEntries', {
+        :entries => {
+          "CreditorEntryHandle" => serial_numbers.map { |serial_number|
+            { "SerialNumber" => serial_number }
           }
         }
-      end
+      })
     end
   end
 end

data/lib/economic/proxies/creditor_proxy.rb

@@ -10,14 +10,12 @@ module Economic
     include FindByNumber
 
     def create_simple(opts)
-      response = session.request(entity_class.soap_action('Create')) do
-        soap.body = {
-          'number' => opts[:number],
-          'creditorGroupHandle' => { 'Number' => opts[:creditor_group_handle][:number] },
-          :name => opts[:name],
-          :vatZone => opts[:vat_zone]
-        }
-      end
+      response = request('Create', {
+        'number' => opts[:number],
+        'creditorGroupHandle' => { 'Number' => opts[:creditor_group_handle][:number] },
+        :name => opts[:name],
+        :vatZone => opts[:vat_zone]
+      })
 
       find(response)
     end

data/lib/economic/proxies/current_invoice_line_proxy.rb

@@ -2,13 +2,6 @@ require 'economic/proxies/entity_proxy'
 
 module Economic
   class CurrentInvoiceLineProxy < EntityProxy
-    # Returns a new, unpersisted Economic::CurrentInvoiceLine
-    def build(properties = {})
-      invoice_line = super
-      initialize_properties_with_values_from_owner(invoice_line) if owner.is_a?(CurrentInvoice)
-      invoice_line
-    end
-
     # Gets data for CurrentInvoiceLine from the API
     def find(handle)
       handle = Entity::Handle.build(:number => handle) unless handle.is_a?(Entity::Handle)
@@ -19,9 +12,10 @@ module Economic
 
     # Initialize properties in invoice_line with values from owner
     def initialize_properties_with_values_from_owner(invoice_line)
-      invoice_line.invoice = owner
+      if owner.is_a?(CurrentInvoice)
+        invoice_line.invoice = owner
+      end
       invoice_line
     end
-
   end
 end

data/lib/economic/proxies/current_invoice_proxy.rb

@@ -5,30 +5,22 @@ module Economic
   class CurrentInvoiceProxy < EntityProxy
     include FindByDateInterval
 
-    # Returns a new, unpersisted Economic::CurrentInvoice
-    def build(properties = {})
-      invoice = super
-      initialize_properties_with_values_from_owner(invoice) if owner.is_a?(Debtor)
-      invoice
-    end
-
   private
 
     # Initialize properties in invoice with values from owner
     def initialize_properties_with_values_from_owner(invoice)
-      invoice.debtor = owner
-
-      invoice.debtor_name         ||= owner.name
-      invoice.debtor_address      ||= owner.address
-      invoice.debtor_postal_code  ||= owner.postal_code
-      invoice.debtor_city         ||= owner.city
-
-      invoice.term_of_payment_handle  ||= owner.term_of_payment_handle
-      invoice.layout_handle           ||= owner.layout_handle
-      invoice.currency_handle         ||= owner.currency_handle
-
-      invoice
+      if owner.is_a?(Debtor)
+        invoice.debtor = owner
+
+        invoice.debtor_name         ||= owner.name
+        invoice.debtor_address      ||= owner.address
+        invoice.debtor_postal_code  ||= owner.postal_code
+        invoice.debtor_city         ||= owner.city
+
+        invoice.term_of_payment_handle  ||= owner.term_of_payment_handle
+        invoice.layout_handle           ||= owner.layout_handle
+        invoice.currency_handle         ||= owner.currency_handle
+      end
     end
-
   end
 end

data/lib/economic/proxies/debtor_contact_proxy.rb

@@ -2,63 +2,20 @@ require 'economic/proxies/entity_proxy'
 
 module Economic
   class DebtorContactProxy < EntityProxy
-
-    # Returns a new, unpersisted Economic::DebtorContact
-    def build(properties = {})
-      contact = super
-      initialize_properties_with_values_from_owner(contact) if owner.is_a?(Debtor)
-      contact
-    end
-
-    # Gets data for DebtorContact from the API
-    def find(handle)
-      handle = Entity::Handle.build(:id => handle) unless handle.is_a?(Entity::Handle)
-      super(handle)
-    end
-
-    # Returns DebtorContact that have the given name. The objects will only be partially loaded
+    # Returns DebtorContact that have the given name. The objects will only be
+    # partially loaded
     def find_by_name(name)
-      # Get a list of DebtorContactHandles from e-conomic
-      response = session.request entity_class.soap_action('FindByName') do
-        soap.body = {
-          'name' => name
-        }
-      end
-
-      # Make sure we always have an array of handles even if the result only contains one
-      handles = [response[:debtor_contact_handle]].flatten.reject(&:blank?)
-
-      # Create partial DebtorContact entities
-      contacts = handles.collect do |handle|
-        debtor_contact = build
-        debtor_contact.partial = true
-        debtor_contact.persisted = true
-        debtor_contact.handle = handle
-        debtor_contact.id = handle[:id]
-        debtor_contact.number = handle[:number]
-        debtor_contact
-      end
-
-      if owner.is_a?(Debtor)
-        # Scope to the owner
-        contacts.select do |debtor_contact|
-          debtor_contact.get_data
-          debtor_contact.debtor.handle == owner.handle
-        end
-      else
-        contacts
-      end
-
+      Proxies::Actions::FindByName.new(self, name).call
     end
 
-
   private
 
     # Initialize properties in contact with values from owner. Returns contact.
     def initialize_properties_with_values_from_owner(contact)
-      contact.debtor = owner
+      if owner.is_a?(Debtor)
+        contact.debtor = owner
+      end
       contact
     end
-
   end
 end

data/lib/economic/proxies/debtor_entry_proxy.rb

@@ -3,13 +3,10 @@ require 'economic/proxies/entity_proxy'
 module Economic
   class DebtorEntryProxy < EntityProxy
     def find_by_invoice_number(from, to = from)
-      response = session.request(entity_class.soap_action('FindByInvoiceNumber')) do
-        soap.body = {
-          'from'  => from,
-          'to'    => to,
-          :order! => [ 'from', 'to' ]
-        }
-      end
+      response = request('FindByInvoiceNumber', {
+        'from'  => from,
+        'to'    => to
+      })
 
       response[:debtor_entry_handle].map do |debtor_entry_handle|
         # Kinda ugly, but we get an array instead of a hash when there's only one result. :)
@@ -18,15 +15,13 @@ module Economic
     end
 
     def match(*serial_numbers)
-      response = session.request(entity_class.soap_action('MatchEntries')) do
-        soap.body = {
-          :entries => {
-            "DebtorEntryHandle" => serial_numbers.map { |serial_number|
-              { "SerialNumber" => serial_number }
-            }
+      response = request('MatchEntries', {
+        :entries => {
+          "DebtorEntryHandle" => serial_numbers.map { |serial_number|
+            { "SerialNumber" => serial_number }
           }
         }
-      end
+      })
     end
   end
 end

data/lib/economic/proxies/debtor_proxy.rb

@@ -11,7 +11,7 @@ module Economic
 
     # Returns the next available debtor number
     def next_available_number
-      session.request Debtor.soap_action(:get_next_available_number)
+      request :get_next_available_number
     end
   end
 end

data/lib/economic/proxies/entity_proxy.rb

@@ -14,7 +14,10 @@ module Economic
 
     include Enumerable
 
-    attr_reader :owner, :items
+    extend Forwardable
+    def_delegators :@items, :each, :empty?, :last, :size, :[]
+
+    attr_reader :owner
 
     def initialize(owner)
       @owner = owner
@@ -27,7 +30,7 @@ module Economic
 
     # Fetches all entities from the API.
     def all
-      response = session.request(entity_class.soap_action(:get_all))
+      response = request(:get_all)
       handles = response.values.flatten.collect { |handle| Entity::Handle.build(handle) }
 
       if handles.size == 1
@@ -55,6 +58,7 @@ module Economic
       entity.partial = false
 
       self.append(entity)
+      initialize_properties_with_values_from_owner(entity)
 
       entity
     end
@@ -82,11 +86,9 @@ module Economic
     def get_data(handle)
       handle = Entity::Handle.new(handle)
 
-      entity_hash = session.request(entity_class.soap_action(:get_data)) do
-        soap.body = {
-          'entityHandle' => handle.to_hash
-        }
-      end
+      entity_hash = request(:get_data, {
+        'entityHandle' => handle.to_hash
+      })
       entity_hash
     end
 
@@ -96,30 +98,29 @@ module Economic
     end
     alias :<< :append
 
-    def each
-      items.each { |i| yield i }
+    # Requests an action from the API endpoint
+    def request(action, data = nil)
+      session.request(entity_class.soap_action_name(action), data)
     end
 
-    def empty?
-      items.empty?
-    end
+  protected
 
-    # Returns the number of entities in proxy
-    def size
-      items.size
+    def items
+      @items
     end
 
-  protected
-
     # Fetches all data for the given handles. Returns Array with hashes of entity data
     def get_data_array(handles)
       return [] unless handles && handles.any?
 
       entity_class_name_for_soap_request = entity_class.name.split('::').last
-      response = session.request(entity_class.soap_action(:get_data_array)) do
-        soap.body = {'entityHandles' => {"#{entity_class_name_for_soap_request}Handle" => handles.collect(&:to_hash)}}
-      end
+      response = request(:get_data_array, {'entityHandles' => {"#{entity_class_name_for_soap_request}Handle" => handles.collect(&:to_hash)}})
       [response["#{entity_class.key}_data".intern]].flatten
     end
+
+    # Initialize properties of entity with values from owner. Returns entity
+    def initialize_properties_with_values_from_owner(entity)
+      entity
+    end
   end
 end