rconomic 0.5.1 → 0.5.2

data/lib/economic/endpoint.rb

@@ -2,6 +2,11 @@
 #
 # This is where all knowledge of SOAP actions and requests exists.
 class Economic::Endpoint
+  extend Forwardable
+
+  def_delegator "client.globals", :logger, :logger=
+  def_delegator "client.globals", :log_level, :log_level=
+  def_delegator "client.globals", :log, :log=
 
   # Invokes soap_action on the API endpoint with the given data.
   #
@@ -27,7 +32,9 @@ class Economic::Endpoint
   # take several hundred megabytes of RAM after a while...)
   def client
     @@client ||= Savon.client do
-      wsdl File.expand_path(File.join(File.dirname(__FILE__), "economic.wsdl"))
+      wsdl      File.expand_path(File.join(File.dirname(__FILE__), "economic.wsdl"))
+      log       false
+      log_level :info
     end
   end
 

data/lib/economic/entity/handle.rb

@@ -12,6 +12,7 @@ class Economic::Entity
         :id => 'Id',
         :id1 => 'Id1',
         :id2 => 'Id2',
+        :name => 'Name',
         :number => 'Number',
         :serial_number => 'SerialNumber',
         :vat_code => 'VatCode'
@@ -35,7 +36,7 @@ class Economic::Entity
       verify_sanity_of_arguments!(hash)
       hash = prepare_hash_argument(hash) unless hash.is_a?(self.class)
 
-      [:code, :vat_code].each do |key|
+      [:code, :name, :vat_code].each do |key|
         instance_variable_set("@#{key}", hash[key]) if hash[key]
       end
       [:id, :id1, :id2, :number, :serial_number].each do |key|

data/lib/economic/invoice.rb

@@ -5,6 +5,7 @@ module Economic
     has_properties :number,
       :net_amount,
       :vat_amount,
+      :gross_amount,
       :due_date,
       :debtor_handle,
       :debtor_name,

data/lib/economic/order.rb

@@ -0,0 +1,66 @@
+require 'economic/entity'
+
+module Economic
+  class Order < Entity
+    has_properties :number,
+      :net_amount,
+      :vat_amount,
+      :gross_amount,
+      :due_date,
+      :debtor_handle,
+      :debtor_name,
+      :debtor_name,
+      :debtor_address,
+      :debtor_postal_code,
+      :debtor_city,
+      :debtor_country,
+      :debtor_ean,
+      :attention_handle,
+      :heading
+
+    def attention
+      return nil if attention_handle.nil?
+      @attention ||= session.contacts.find(attention_handle)
+    end
+
+    def attention=(contact)
+      self.attention_handle = contact.handle
+      @attention = contact
+    end
+
+    def attention_handle=(handle)
+      @attention = nil unless handle == @attention_handle
+      @attention_handle = handle
+    end
+
+    def debtor
+      return nil if debtor_handle.nil?
+      @debtor ||= session.debtors.find(debtor_handle)
+    end
+
+    def debtor=(debtor)
+      self.debtor_handle = debtor.handle
+      @debtor = debtor
+    end
+
+    def debtor_handle=(handle)
+      @debtor = nil unless handle == @debtor_handle
+      @debtor_handle = handle
+    end
+
+    # Returns the PDF version of Invoice as a String.
+    #
+    # To get it as a file you can do:
+    #
+    #   File.open("invoice.pdf", 'wb') do |file|
+    #     file << invoice.pdf
+    #   end
+    def pdf
+      response = request(:get_pdf, {
+                           "orderHandle" => handle.to_hash
+      })
+
+      Base64.decode64(response)
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module FindByNumber
       'number' => number
     })
 
-    if response == {}
+    if response.empty?
       nil
     else
       entity = build

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

@@ -0,0 +1,18 @@
+module FindByTelephoneAndFaxNumber
+  # Returns handle for debtor with phone or fax number.
+  def find_by_telephone_and_fax_number(number)
+    response = request('FindByTelephoneAndFaxNumber', {
+      'telephoneAndFaxNumber' => number
+    })
+    if response == {}
+      nil
+    else
+      entity = build
+      entity.partial = true
+      entity.persisted = true
+      entity.handle = response[:debtor_handle]
+      entity.number = response[:debtor_handle][:number].to_i
+      entity
+    end
+  end
+end

data/lib/economic/proxies/debtor_proxy.rb

@@ -2,16 +2,79 @@ 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
     include FindByCiNumber
     include FindByHandleWithNumber
     include FindByNumber
+    include FindByTelephoneAndFaxNumber
 
     # Returns the next available debtor number
     def next_available_number
       request :get_next_available_number
     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
+    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
+    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
+      end
+    end
   end
 end

data/lib/economic/proxies/entity_proxy.rb

@@ -88,7 +88,6 @@ 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
       })

data/lib/economic/proxies/order_proxy.rb

@@ -0,0 +1,18 @@
+require 'economic/proxies/entity_proxy'
+require 'economic/proxies/actions/find_by_date_interval'
+require 'economic/proxies/actions/find_by_handle_with_number'
+
+module Economic
+  class OrderProxy < EntityProxy
+    include FindByDateInterval
+    include FindByHandleWithNumber
+
+    def find(handle)
+      if handle.is_a?(Hash)
+        super handle
+      else
+        super({:id => handle})
+      end
+    end
+  end
+end

data/lib/economic/session.rb

@@ -1,26 +1,54 @@
+require 'forwardable'
+
 module Economic
   # The Economic::Session contains details and behaviors for a current
   # connection to the API endpoint.
   class Session
+    extend Forwardable
+
+    def_delegators :endpoint, :logger=, :log_level=, :log=
+
     attr_accessor :agreement_number, :user_name, :password
     attr_reader :authentication_token
 
-    def initialize(agreement_number, user_name, password)
+    def initialize(agreement_number = nil, user_name = nil, password = nil)
       self.agreement_number = agreement_number
       self.user_name = user_name
       self.password = password
+      yield endpoint if block_given?
     end
 
-    # Authenticates with e-conomic
-    def connect
+    def connect_with_token(private_app_id, access_id)
+      endpoint.call(
+        :connect_with_token,
+        {
+          :token => access_id,
+          :appToken => private_app_id
+        }
+      ) do |response|
+        store_authentication_token(response)
+      end
+    end
+
+    def connect_with_credentials(agreement_number, user_name, password)
       endpoint.call(
         :connect,
-        authentication_details
+        {
+          :agreementNumber => agreement_number,
+          :userName => user_name,
+          :password => password
+        }
       ) do |response|
         store_authentication_token(response)
       end
     end
 
+    # Authenticates with E-conomic using credentials
+    # Assumes ::new was called with credentials as arguments.
+    def connect
+      connect_with_credentials(self.agreement_number, self.user_name, self.password)
+    end
+
     # Provides access to the DebtorContacts
     def contacts
       @contacts ||= DebtorContactProxy.new(self)
@@ -37,6 +65,11 @@ module Economic
       @invoices ||= InvoiceProxy.new(self)
     end
 
+    # Provides access to the orders
+    def orders
+      @orders ||= OrderProxy.new(self)
+    end
+
     # Provides access to the debtors
     def debtors
       @debtors ||= DebtorProxy.new(self)
@@ -88,14 +121,6 @@ module Economic
 
     private
 
-    def authentication_details
-      {
-        :agreementNumber => self.agreement_number,
-        :userName => self.user_name,
-        :password => self.password
-      }
-    end
-
     def store_authentication_token(response)
       @authentication_token = response.http.cookies
     end

data/lib/rconomic.rb

@@ -12,6 +12,7 @@ require 'economic/creditor_contact'
 require 'economic/current_invoice'
 require 'economic/current_invoice_line'
 require 'economic/invoice'
+require 'economic/order'
 require 'economic/cash_book'
 require 'economic/cash_book_entry'
 require 'economic/account'
@@ -26,6 +27,7 @@ require 'economic/proxies/debtor_contact_proxy'
 require 'economic/proxies/creditor_proxy'
 require 'economic/proxies/creditor_contact_proxy'
 require 'economic/proxies/invoice_proxy'
+require 'economic/proxies/order_proxy'
 require 'economic/proxies/cash_book_proxy'
 require 'economic/proxies/cash_book_entry_proxy'
 require 'economic/proxies/account_proxy'

data/lib/rconomic/version.rb

@@ -1,3 +1,3 @@
 module Rconomic
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/rconomic.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Jakob Skjerning"]
   s.email       = 'jakob@mentalized.net'
   s.homepage    = 'https://github.com/lokalebasen/rconomic'
-
+  s.license     = 'MIT'
   s.version     = Rconomic::VERSION
   s.platform    = Gem::Platform::RUBY
 

data/spec/economic/account_spec.rb

@@ -0,0 +1,34 @@
+require './spec/spec_helper'
+
+describe Economic::Account do
+  let(:session) { make_session }
+  subject { Economic::Account.new(:session => session) }
+
+  it "inherits from Economic::Entity" do
+    expect(Economic::Account.ancestors).to include(Economic::Entity)
+  end
+
+  describe "#save" do
+    it 'should save it' do
+      stub_request('Account_CreateFromData', nil, :success)
+      subject.save
+    end
+
+    it "builds and sends data to API" do
+      subject.handle = {"Name" => "Bob"}
+      subject.name = "Bob"
+      subject.number = 42
+      mock_request(
+        :account_create_from_data, {
+          "data" => {
+            "Handle" => {"Name" => "Bob"},
+            "Name" => "Bob",
+            "Number" => 42
+          }
+        },
+        :success
+      )
+      subject.save
+    end
+  end
+end

data/spec/economic/cash_book_spec.rb

@@ -31,4 +31,32 @@ describe Economic::CashBook do
       expect(subject.book).to eq(832)
     end
   end
+
+  describe "#save" do
+    before :each do
+      subject.persisted = true
+    end
+
+    it 'should save it' do
+      stub_request('CashBook_UpdateFromData', nil, :success)
+      subject.save
+    end
+
+    it "builds and sends data to API" do
+      subject.handle = {"Number" => 42}
+      subject.name = "Bob"
+      subject.number = 42
+      mock_request(
+        :cash_book_update_from_data, {
+          "data" => {
+            "Handle" => {"Number" => 42},
+            "Name" => "Bob",
+            "Number" => 42
+          }
+        },
+        :success
+      )
+      subject.save
+    end
+  end
 end

data/spec/economic/creditor_spec.rb

@@ -49,4 +49,23 @@ describe Economic::Creditor do
     end
   end
 
+  describe "#save" do
+    it 'should save it' do
+      stub_request('Creditor_CreateFromData', nil, :success)
+      subject.save
+    end
+
+    it "builds and sends data to API" do
+      mock_request(
+        :creditor_create_from_data, {
+          "data" => {
+            "Handle" => {},
+            "Number" => nil
+          }
+        },
+        :success
+      )
+      subject.save
+    end
+  end
 end