rconomic 0.5.2 → 0.6.0

data/lib/economic/proxies/actions/debtor_contact/all.rb

@@ -0,0 +1,63 @@
+module Economic
+  module Proxies
+    module Actions
+      module DebtorContact
+        class All
+          def initialize(caller)
+            @caller = caller
+            @session = caller.session
+          end
+
+          def call
+            build_partial_contact_entities(handles_from_endpoint)
+          end
+
+          private
+
+          def build(*options)
+            @caller.build(options)
+          end
+
+          def build_partial_contact_entities(handles)
+            handles.collect do |handle|
+              contact = build
+              contact.partial = true
+              contact.persisted = true
+              contact.handle = handle
+              contact.id = handle[:id]
+              contact.number = handle[:number]
+              contact
+            end
+          end
+
+          def handles_from_endpoint
+            [response[handle_key]].flatten.reject(&:blank?)
+          end
+
+          def handle_key
+            (Support::String.underscore(@caller.class.entity_class_name) + "_handle").to_sym
+          end
+
+          def owner
+            @caller.owner
+          end
+
+          def request(action, data)
+            @session.request(
+              soap_action_name("Debtor", action),
+              data
+            )
+          end
+
+          def response
+            request("get_debtor_contacts", {"debtorHandle" => {"Number" => owner.number}})
+          end
+
+          def soap_action_name(entity_class, action)
+            Endpoint.new.soap_action_name(entity_class, action)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,9 +3,7 @@ module FindByCiNumber
   # be partially loaded
   def find_by_ci_number(ci_number)
     # Get a list of handles from e-conomic
-    response = request(:find_by_ci_number, {
-      'ciNumber' => ci_number
-    })
+    response = request(:find_by_ci_number, "ciNumber" => ci_number)
 
     # Make sure we always have an array of handles even if the result only
     # contains one

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

@@ -1,15 +1,12 @@
 module Economic
   module FindByDateInterval
-
     # Returns entity objects for a given interval of days.
     def find_by_date_interval(from, unto)
-      response = request(:find_by_date_interval, {
-        'first' => from.iso8601,
-        'last' => unto.iso8601
-      })
+      response = request(:find_by_date_interval, "first" => from.iso8601,
+                                                 "last" => unto.iso8601)
 
       handle_key = "#{Support::String.underscore(entity_class_name)}_handle".intern
-      handles = [ response[handle_key] ].flatten.reject(&:blank?).collect do |handle|
+      handles = [response[handle_key]].flatten.reject(&:blank?).collect do |handle|
         Entity::Handle.build(handle)
       end
 

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

@@ -3,7 +3,7 @@
 module FindByHandleWithNumber
   def find(handle)
     handle = if handle.respond_to?(:to_i)
-      Economic::Entity::Handle.build(:number => handle.to_i)
+      Economic::Entity::Handle.build(:number => handle)
     else
       Economic::Entity::Handle.build(handle)
     end

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

@@ -53,7 +53,7 @@ module Economic
         end
 
         def response
-          request('FindByName', {'name' => name})
+          request("FindByName", {"name" => name})
         end
 
         def scope_to_owner(contacts)

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

@@ -1,9 +1,7 @@
 module FindByNumber
   # Returns handle with a given number.
   def find_by_number(number)
-    response = request('FindByNumber', {
-      'number' => number
-    })
+    response = request("FindByNumber", "number" => number)
 
     if response.empty?
       nil
@@ -12,7 +10,7 @@ module FindByNumber
       entity.partial = true
       entity.persisted = true
       entity.handle = response
-      entity.number = response[:number].to_i
+      entity.number = response[:number]
       entity
     end
   end

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

@@ -1,9 +1,7 @@
 module FindByTelephoneAndFaxNumber
   # Returns handle for debtor with phone or fax number.
   def find_by_telephone_and_fax_number(number)
-    response = request('FindByTelephoneAndFaxNumber', {
-      'telephoneAndFaxNumber' => number
-    })
+    response = request("FindByTelephoneAndFaxNumber", "telephoneAndFaxNumber" => number)
     if response == {}
       nil
     else

data/lib/economic/proxies/cash_book_entry_proxy.rb

@@ -1,15 +1,15 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class CashBookEntryProxy < EntityProxy
     def all
       entity_hash = session.request(
         Endpoint.new.soap_action_name(CashBook, :get_entries),
-        {"cashBookHandle" => owner.handle.to_hash}
+        "cashBookHandle" => owner.handle.to_hash
       )
 
       if entity_hash != {}
-        [ entity_hash.values.first ].flatten.each do |id_hash|
+        [entity_hash.values.first].flatten.each do |id_hash|
           find(id_hash)
         end
       end
@@ -23,7 +23,7 @@ module Economic
     #     :contra_account_handle => { :number => 1011 }
     #   )
     def create_finance_voucher(handles)
-      create_cash_book_entry_for_handles(handles, 'CreateFinanceVoucher')
+      create_cash_book_entry_for_handles(handles, "CreateFinanceVoucher")
     end
 
     # Creates a debtor payment and returns the cash book entry.
@@ -33,7 +33,7 @@ module Economic
     #     :contra_account_handle => { :number => 1510 }
     #   )
     def create_debtor_payment(handles)
-      create_cash_book_entry_for_handles(handles, 'CreateDebtorPayment')
+      create_cash_book_entry_for_handles(handles, "CreateDebtorPayment")
     end
 
     # Creates a creditor payment and returns the cash book entry.
@@ -43,7 +43,7 @@ module Economic
     #     :contra_account_handle => { :number => 1510 }
     #   )
     def create_creditor_payment(handles)
-      create_cash_book_entry_for_handles(handles, 'CreateCreditorPayment')
+      create_cash_book_entry_for_handles(handles, "CreateCreditorPayment")
     end
 
     # Creates a creditor invoice and returns the cash book entry.
@@ -53,28 +53,26 @@ module Economic
     #     :contra_account_handle => { :number => 1510 }
     #   )
     def create_creditor_invoice(handles)
-      create_cash_book_entry_for_handles(handles, 'CreateCreditorInvoice')
+      create_cash_book_entry_for_handles(handles, "CreateCreditorInvoice")
     end
 
     def set_due_date(id, date)
-      request("SetDueDate", {
-        'cashBookEntryHandle' => {
-          'Id1' => owner.handle[:number], 'Id2' => id
-        },
-        :value => date
-      })
+      request("SetDueDate", "cashBookEntryHandle" => {
+                "Id1" => owner.handle[:number], "Id2" => id
+              },
+                            :value => date)
     end
 
     protected
 
-    def create_cash_book_entry_for_handles(handles, action, foobar = nil)
+    def create_cash_book_entry_for_handles(handles, action, _foobar = nil)
       handle_name = handle_name_for_action(action)
       handle_key = Economic::Support::String.underscore(handle_name).intern
 
       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]
+      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)
 
@@ -83,12 +81,11 @@ module Economic
 
     def handle_name_for_action(action_name)
       {
-        'CreateFinanceVoucher' => 'accountHandle',
-        'CreateDebtorPayment' => 'debtorHandle',
-        'CreateCreditorInvoice' => 'creditorHandle',
-        'CreateCreditorPayment' => 'creditorHandle'
+        "CreateFinanceVoucher" => "accountHandle",
+        "CreateDebtorPayment" => "debtorHandle",
+        "CreateCreditorInvoice" => "creditorHandle",
+        "CreateCreditorPayment" => "creditorHandle"
       }[action_name]
     end
-
   end
 end

data/lib/economic/proxies/cash_book_proxy.rb

@@ -1,26 +1,21 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class CashBookProxy < EntityProxy
     def find_by_name(name)
-      response = request('FindByName', {
-        'name' => name
-      })
+      response = request("FindByName", "name" => name)
 
       cash_book = build
       cash_book.partial = true
       cash_book.persisted = true
       cash_book.number = response[:number]
       cash_book
-
     end
 
     def get_name(id)
-      response = request("GetName", {
-        'cashBookHandle' => {
-          'Number' => id
-        }
-      })
+      response = request("GetName", "cashBookHandle" => {
+                           "Number" => id
+                         })
 
       cash_book = build
       cash_book.number = id

data/lib/economic/proxies/company_proxy.rb

@@ -0,0 +1,9 @@
+require "economic/proxies/entity_proxy"
+
+module Economic
+  class CompanyProxy < EntityProxy
+    def get
+      get_data(request(:get))
+    end
+  end
+end

data/lib/economic/proxies/creditor_contact_proxy.rb

@@ -1,4 +1,4 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class CreditorContactProxy < EntityProxy
@@ -8,7 +8,7 @@ module Economic
       Proxies::Actions::FindByName.new(self, name).call
     end
 
-  private
+    private
 
     # Initialize properties in contact with values from owner. Returns contact.
     def initialize_properties_with_values_from_owner(contact)

data/lib/economic/proxies/creditor_entry_proxy.rb

@@ -1,11 +1,9 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class CreditorEntryProxy < EntityProxy
     def find_by_invoice_number(invoice_number)
-      response = request('FindByInvoiceNumber', {
-        'invoiceNumber' => invoice_number
-      })
+      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. :)
@@ -14,21 +12,17 @@ module Economic
     end
 
     def find(serial_number)
-      response = request('GetData', {
-        'entityHandle' => {
-          'SerialNumber' => serial_number
-         }
-      })
+      response = request("GetData", "entityHandle" => {
+                           "SerialNumber" => serial_number
+                         })
 
       build(response)
     end
 
     def match(*serial_numbers)
-      response = request('MatchEntries', {
-        :entries => {
-          "CreditorEntryHandle" => serial_numbers.map { |serial_number|
-            { "SerialNumber" => serial_number }
-          }
+      request("MatchEntries", :entries => {
+        "CreditorEntryHandle" => serial_numbers.map { |serial_number|
+          {"SerialNumber" => serial_number}
         }
       })
     end

data/lib/economic/proxies/creditor_proxy.rb

@@ -1,7 +1,7 @@
-require 'economic/proxies/entity_proxy'
-require 'economic/proxies/actions/find_by_ci_number'
-require 'economic/proxies/actions/find_by_handle_with_number'
-require 'economic/proxies/actions/find_by_number'
+require "economic/proxies/entity_proxy"
+require "economic/proxies/actions/find_by_ci_number"
+require "economic/proxies/actions/find_by_handle_with_number"
+require "economic/proxies/actions/find_by_number"
 
 module Economic
   class CreditorProxy < EntityProxy
@@ -10,15 +10,12 @@ module Economic
     include FindByNumber
 
     def create_simple(opts)
-      response = request('Create', {
-        'number' => opts[:number],
-        'creditorGroupHandle' => { 'Number' => opts[:creditor_group_handle][:number] },
-        :name => opts[:name],
-        :vatZone => opts[:vat_zone]
-      })
+      response = request("Create", "number" => opts[:number],
+                                   "creditorGroupHandle" => {"Number" => opts[:creditor_group_handle][:number]},
+                                   :name => opts[:name],
+                                   :vatZone => opts[:vat_zone])
 
       find(response)
     end
-
   end
 end

data/lib/economic/proxies/current_invoice_line_proxy.rb

@@ -1,4 +1,4 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class CurrentInvoiceLineProxy < EntityProxy
@@ -8,7 +8,7 @@ module Economic
       super(handle)
     end
 
-  private
+    private
 
     # Initialize properties in invoice_line with values from owner
     def initialize_properties_with_values_from_owner(invoice_line)

data/lib/economic/proxies/current_invoice_proxy.rb

@@ -1,11 +1,11 @@
-require 'economic/proxies/entity_proxy'
-require 'economic/proxies/actions/find_by_date_interval'
+require "economic/proxies/entity_proxy"
+require "economic/proxies/actions/find_by_date_interval"
 
 module Economic
   class CurrentInvoiceProxy < EntityProxy
     include FindByDateInterval
 
-  private
+    private
 
     # Initialize properties in invoice with values from owner
     def initialize_properties_with_values_from_owner(invoice)

data/lib/economic/proxies/debtor_contact_proxy.rb

@@ -1,4 +1,4 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class DebtorContactProxy < EntityProxy
@@ -8,7 +8,11 @@ module Economic
       Proxies::Actions::FindByName.new(self, name).call
     end
 
-  private
+    def all
+      Proxies::Actions::DebtorContact::All.new(self).call
+    end
+
+    private
 
     # Initialize properties in contact with values from owner. Returns contact.
     def initialize_properties_with_values_from_owner(contact)

data/lib/economic/proxies/debtor_entry_proxy.rb

@@ -1,12 +1,10 @@
-require 'economic/proxies/entity_proxy'
+require "economic/proxies/entity_proxy"
 
 module Economic
   class DebtorEntryProxy < EntityProxy
     def find_by_invoice_number(from, to = from)
-      response = request('FindByInvoiceNumber', {
-        'from'  => from,
-        'to'    => to
-      })
+      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. :)
@@ -15,11 +13,9 @@ module Economic
     end
 
     def match(*serial_numbers)
-      response = request('MatchEntries', {
-        :entries => {
-          "DebtorEntryHandle" => serial_numbers.map { |serial_number|
-            { "SerialNumber" => serial_number }
-          }
+      request("MatchEntries", :entries => {
+        "DebtorEntryHandle" => serial_numbers.map { |serial_number|
+          {"SerialNumber" => serial_number}
         }
       })
     end

data/lib/economic/proxies/debtor_proxy.rb

@@ -1,8 +1,8 @@
-require 'economic/proxies/entity_proxy'
-require 'economic/proxies/actions/find_by_ci_number'
-require 'economic/proxies/actions/find_by_handle_with_number'
-require 'economic/proxies/actions/find_by_number'
-require 'economic/proxies/actions/find_by_telephone_and_fax_number'
+require "economic/proxies/entity_proxy"
+require "economic/proxies/actions/find_by_ci_number"
+require "economic/proxies/actions/find_by_handle_with_number"
+require "economic/proxies/actions/find_by_number"
+require "economic/proxies/actions/find_by_telephone_and_fax_number"
 
 module Economic
   class DebtorProxy < EntityProxy
@@ -17,64 +17,49 @@ module Economic
     end
 
     def get_debtor_contacts(debtor_handle)
-      response = request :get_debtor_contacts, {
-        'debtorHandle' => { 'Number' => debtor_handle.number }
-      }
-      if response.empty?
-        nil
-      else
-        entities = []
-        [response[:debtor_contact_handle]].flatten.each do |handle|
-          entity = Economic::DebtorContact.new(:session => session)
-          entity.partial = true
-          entity.persisted = true
-          entity.handle = handle
-          entity.number = handle[:number].to_i
-          entities << entity
-        end
-        entities
-      end
+      response = fetch_response(:get_debtor_contacts, debtor_handle)
+      build_entities_from_response(
+        Economic::DebtorContact,
+        response[:debtor_contact_handle]
+      )
     end
 
     def get_invoices(debtor_handle)
-      response = request :get_invoices, {
-        'debtorHandle' => { 'Number' => debtor_handle.number }
-      }
-      if response.empty?
-        nil
-      else
-        entities = []
-        [response[:invoice_handle]].flatten.each do |handle|
-          entity = Economic::Invoice.new(:session => session)
-          entity.partial = true
-          entity.persisted = true
-          entity.handle = handle
-          entity.number = handle[:number].to_i
-          entities << entity
-        end
-        entities
-      end
+      response = fetch_response(:get_invoices, debtor_handle)
+      build_entities_from_response(
+        Economic::Invoice,
+        response[:invoice_handle]
+      )
     end
 
     # Returns handle for orders for debtor.
     def get_orders(debtor_handle)
-      response = request :get_orders, {
-        'debtorHandle' => { 'Number' => debtor_handle.number }
-      }
-      if response.empty?
-        nil
-      else
-        entities = []
-        [response[:order_handle]].flatten.each do |handle|
-          entity = Economic::Order.new(:session => session)
-          entity.partial = true
-          entity.persisted = true
-          entity.handle = handle
-          entity.number = handle[:id].to_i
-          entities << entity
-        end
-        entities
+      response = fetch_response(:get_orders, debtor_handle)
+      build_entities_from_response(
+        Economic::Order,
+        response[:order_handle]
+      )
+    end
+
+    private
+
+    def build_entities_from_response(entity_class, handles)
+      return nil if handles.nil?
+      [handles].flatten.map do |handle|
+        entity = entity_class.new(:session => session)
+        entity.partial = true
+        entity.persisted = true
+        entity.handle = handle
+        entity.number = handle[:id].to_i
+        entity
       end
     end
+
+    def fetch_response(operation, debtor_handle)
+      request(
+        operation,
+        "debtorHandle" => {"Number" => debtor_handle.number}
+      )
+    end
   end
 end

data/lib/economic/proxies/entity_proxy.rb

@@ -1,16 +1,16 @@
-require 'forwardable'
+require "forwardable"
 
 module Economic
   class EntityProxy
     class << self
       # Returns the class this Proxy is a proxy for
       def entity_class
-        Economic.const_get(self.entity_class_name)
+        Economic.const_get(entity_class_name)
       end
 
       def entity_class_name
-        proxy_class_name = name.split('::').last
-        proxy_class_name.sub(/Proxy$/, '')
+        proxy_class_name = name.split("::").last
+        proxy_class_name.sub(/Proxy$/, "")
       end
     end
 
@@ -59,7 +59,7 @@ module Economic
       entity.update_properties(properties)
       entity.partial = false
 
-      self.append(entity)
+      append(entity)
       initialize_properties_with_values_from_owner(entity)
 
       entity
@@ -78,7 +78,11 @@ module Economic
     # Fetches Entity data from API and returns an Entity initialized with that
     # data added to Proxy
     def find(handle)
-      handle = Entity::Handle.new(handle)
+      handle = if handle.respond_to?(:to_i)
+        Entity::Handle.new(:id => handle)
+      else
+        Entity::Handle.new(handle)
+      end
       entity_hash = get_data(handle)
       entity = build(entity_hash)
       entity.persisted = true
@@ -88,9 +92,7 @@ module Economic
     # Gets data for Entity from the API. Returns Hash with the response data
     def get_data(handle)
       handle = Entity::Handle.new(handle)
-      entity_hash = request(:get_data, {
-        'entityHandle' => handle.to_hash
-      })
+      entity_hash = request(:get_data, "entityHandle" => handle.to_hash)
       entity_hash
     end
 
@@ -98,21 +100,19 @@ module Economic
     def append(item)
       items << item unless items.include?(item)
     end
-    alias :<< :append
+    alias << append
 
     protected
 
-    def items
-      @items
-    end
+    attr_reader :items
 
     # 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 = request(:get_data_array, {'entityHandles' => {"#{entity_class_name_for_soap_request}Handle" => handles.collect(&:to_hash)}})
+      entity_class_name_for_soap_request = entity_class.name.split("::").last
+      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