tfso 0.11.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02d9906c1e939ac6bbe6b0adebfd7ab8614582a36d041560fdde3d2930dd08a
-  data.tar.gz: 5f50765e1440337a223dcb10693d7baccf806acc93c528335e639b9475ae5b75
+  metadata.gz: 49fddfbc2027f861bb99bcca42cbf7b345c4c491e1c04c5f76e9b3e7aa2b1dd3
+  data.tar.gz: ca977aff312bf6266cb7034d85c7f4b97fa4c9f2f99f244cf1ce4168c1577d03
 SHA512:
-  metadata.gz: '07789a426e785143a03a3e5bbfe7c43df4364b06afbde3fc96eaaff29cfc6a7c4485cb710c4f25b753aa3d4b4ca7f55ebe593909ce7dc720a5895ddfa1c985ea'
-  data.tar.gz: 57eb84fce1e27bf13b2ad7208db724e49e8915262e462e4472960fa2402048e272d2a1c4996b179c257cf19b45866f47451cf2354e744432305d77f7483d0404
+  metadata.gz: 507ae593e60c81909016c498f2ca7d3b64f45a64b3ea6be04cb6ccbc2f9b1ff0ab224c14c514e2b541469fdb101912c6b19b325804ec1a3364e63e349614874b
+  data.tar.gz: 5a76203f710eec5d3c6cc212510473c9dd7efbb428299d4663bd3bff42beac45aec6d0e2ab22f674d9dc4a9c049335ac27592708ee0017ef86c3e0e99fce94be

data/lib/tfso.rb

@@ -1,6 +1,7 @@
 require 'savon'
-require "tfso/version"
+require 'tfso/version'
 require 'tfso/helpers'
+require 'tfso/errors'
 require 'tfso/authentication'
 require 'tfso/client'
 require 'tfso/company'

data/lib/tfso/authentication.rb

@@ -14,17 +14,19 @@ module TFSO
     end
 
     def authenticated?
-      response = savon_client.call(:has_session, cookies: @cookies )
+      response = savon_client.call(:has_session, cookies: @cookies)
+      raise Errors::Authentication, 'Not authenticated' if !response.body[:has_session_response][:has_session_result]
       response.body[:has_session_response][:has_session_result]
     end
 
     def authenticate(username, password, identity_id = nil)
-      response = savon_client.call(:login, message: { credential: {Username: username, Password: password, IdentityId: identity_id, ApplicationId: application_id} })
+      response = savon_client.call(:login, message: { credential: {Username: username, Password: password, IdentityId: identity_id, ApplicationId: application_id}})
+      raise Errors::Authentication, 'Incorrect credentials' if response.body[:login_response][:login_result].blank?
       self.session_id = response.body[:login_response][:login_result]
     end
 
     def identities
-      response = savon_client.call(:get_identities, cookies: @cookies )
+      response = savon_client.call(:get_identities, cookies: @cookies)
       list = response.body[:get_identities_response][:get_identities_result][:identity]
       if list.is_a?(Hash)
         [list]
@@ -39,7 +41,7 @@ module TFSO
     end
 
     def identity_id=(identity_id)
-      response = savon_client.call(:set_identity_by_id, message: {identityId: identity_id}, cookies: @cookies)
+      savon_client.call(:set_identity_by_id, message: {identityId: identity_id}, cookies: @cookies)
       @identity_id = identity_id
     end
 

data/lib/tfso/client.rb

@@ -6,12 +6,13 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Client/V001/ClientService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
 
     def type_groups(module_type)
-      response = savon_client.call(:get_type_group_list, message: {module_type: module_type }, cookies: @cookies)
+      response = savon_client.call(:get_type_group_list, message: {module_type: module_type}, cookies: @cookies)
       response.body[:get_type_group_list_response][:get_type_group_list_result]
     end
 

data/lib/tfso/company.rb

@@ -6,12 +6,13 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/CRM/Company/V001/CompanyService.asmx?wsdl'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
 
     def find(search_params)
-      response = savon_client.call(:get_companies, message: {searchParams: search_params, returnProperties: {string: ['Id', 'OrganizationNumber', 'NickName', 'Country', 'Addresses', 'EmailAddresses', 'PhoneNumbers', 'InvoiceLanguage', 'TypeGroup', 'DistributionMethod', 'Currency'] } }, cookies: @cookies)
+      response = savon_client.call(:get_companies, message: {searchParams: search_params, returnProperties: {string: ['Id', 'OrganizationNumber', 'NickName', 'Country', 'Addresses', 'EmailAddresses', 'PhoneNumbers', 'InvoiceLanguage', 'TypeGroup', 'DistributionMethod', 'Currency']}}, cookies: @cookies)
       result = response.body[:get_companies_response][:get_companies_result]
       if result
         if result[:company].class == Hash
@@ -35,12 +36,12 @@ module TFSO
     end
 
     def create(company_info)
-      response = savon_client.call(:save_companies, message: {companies: [{Company: company_info}] }, cookies: @cookies)
+      response = savon_client.call(:save_companies, message: {companies: [{Company: company_info}]}, cookies: @cookies)
       result = response.body[:save_companies_response][:save_companies_result]
       if result
         if result[:company].class == Hash
           if result[:company][:api_exception]
-            raise "Error when saving tfso company"
+            raise result[:company][:api_exception]
           else
             result[:company]
           end
@@ -109,13 +110,13 @@ module TFSO
         company.delete(:billing_address)
       end
       if company[:tfso]
-        company[:tfso].keys.each{|k| company[k] = company[:tfso].delete(k) }
+        company[:tfso].keys.each{|k| company[k] = company[:tfso].delete(k)}
         company.delete(:tfso)
       end
 
       mappings = {:name => :Name, :nickname => :NickName, :gov_no => :OrganizationNumber, :country_code => :Country}
 
-      company.keys.each { |k| company[ mappings[k] ] = company.delete(k) if mappings[k] }
+      company.keys.each {|k| company[ mappings[k] ] = company.delete(k) if mappings[k]}
       company
     end
 

data/lib/tfso/errors.rb

@@ -0,0 +1,5 @@
+module TFSO
+  module Errors
+    class Authentication < StandardError; end
+  end
+end

data/lib/tfso/helpers.rb

@@ -1,15 +1,20 @@
 module TFSO
 
   module Helpers
+
     def intialize_savon_client
       @savon_client = Savon.client(wsdl: self.class::URL, convert_request_keys_to: :none)
-      if defined?(Rails) && Rails.env.development?
+      if ENV['RACK_ENV'] == 'test' || defined?(Rails) && Rails.env.development?
         @savon_client.globals.proxy('http://localhost:8080')
         @savon_client.globals.ssl_verify_mode(:none)
       end
       @savon_client.globals.unwrap(true)
     end
 
+    def ensure_authenticated(auth)
+      auth.authenticated?
+    end
+
     def savon_client
       @savon_client
     end

data/lib/tfso/invoice.rb

@@ -6,6 +6,7 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Economy/InvoiceOrder/V001/InvoiceService.asmx?wsdl'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
@@ -41,7 +42,7 @@ module TFSO
     end
 
     def create(order_attributes)
-      response = savon_client.call(:save_invoices, message: {invoices: [{InvoiceOrder: order_attributes }] }, cookies: @cookies)
+      response = savon_client.call(:save_invoices, message: {invoices: [{InvoiceOrder: order_attributes}] }, cookies: @cookies)
       response.body[:save_invoices_response][:save_invoices_result][:invoice_order]
     end
 
@@ -92,14 +93,22 @@ module TFSO
       if items.any?
         invoiceRows = []
         items.each {|item|
-          invoiceRows << {
-            ProductId: item[:product_id],
-            Name: item[:description],
-            Price: item[:price].to_f,
-            Quantity: item[:quantity].to_f
-          }
+          if item[:type] == :text
+            invoiceRows << {:InvoiceRow => {
+              Type: 'Text',
+              Name: item[:name]
+            }}
+          else
+            invoiceRows << {:InvoiceRow => {
+              Type: 'Normal',
+              ProductId: item[:product_id],
+              Name: item[:name],
+              Price: item[:price].to_f,
+              Quantity: item[:quantity].to_f
+            }}
+          end
         }
-        invoice_info[:InvoiceRows] = { :InvoiceRow => invoiceRows }
+        invoice_info[:InvoiceRows] = invoiceRows
       end
       invoice_info
     end

data/lib/tfso/payment.rb

@@ -6,12 +6,13 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Economy/InvoiceOrder/V001/PaymentService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
 
     def create(payment_info)
-      response = savon_client.call(:register_invoice_payment, message: {payment: payment_info }, cookies: @cookies)
+      response = savon_client.call(:register_invoice_payment, message: {payment: payment_info}, cookies: @cookies)
       response.body[:register_invoice_payment_response][:register_invoice_payment_result]
     end
 

data/lib/tfso/person.rb

@@ -6,6 +6,7 @@ module TFSO
     URL = 'https://webservices.24sevenoffice.com/CRM/Contact/PersonService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
@@ -30,7 +31,7 @@ module TFSO
       if result
         if result.class == Hash
           if result[:api_exception]
-            raise "Error when saving tfso person"
+            raise result[:api_exception]
           else
             result
           end

data/lib/tfso/product.rb

@@ -6,6 +6,7 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Logistics/Product/V001/ProductService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end

data/lib/tfso/version.rb

@@ -1,3 +1,3 @@
 module TFSO
-  VERSION = "0.11.0"
+  VERSION = '1.0.2'
 end

data/tfso.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "savon"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "dotenv"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfso
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Espen Antonsen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -28,44 +28,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - espen@inspired.no
 executables: []
@@ -99,6 +99,7 @@ files:
 - lib/tfso/authentication.rb
 - lib/tfso/client.rb
 - lib/tfso/company.rb
+- lib/tfso/errors.rb
 - lib/tfso/helpers.rb
 - lib/tfso/invoice.rb
 - lib/tfso/payment.rb
@@ -110,7 +111,7 @@ homepage: https://github.com/espen/tfso
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Ruby API Wrapper for 24SevenOffice.
 test_files: []