economic-rest 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a633a68e3f3e3964b2e10f80edb798c311e3fd8c37698a1d0ad5b03a2204d6e2
-  data.tar.gz: 65e84202a3457bb9f6fcf1e8a850775eb6194b584c0b5bf5586a71655524fa73
+  metadata.gz: 908c6d73f7538cacc8a9dc4803dddbd62372a93c338c39deba8e5b50d2b6cf2c
+  data.tar.gz: 458eff20fc6976d941553ba149b9ce7124231c8bd46c9bb8377e5b586b4614e1
 SHA512:
-  metadata.gz: da971e525dcf7da5e976fce77ff63331417bc6d015f0819f68d29a0a8beddb2752336d0eb0f8af210c789463bd7a66d42fcfb82131e49123d5451d0db06dd91b
-  data.tar.gz: ebec1e21d5838c138f97caf560f25197a156bb359b2fb4592f3be340362e93b0ef8297d99f41284a7c35ea1e551cca4d4984dfb278c9eaed0c992ee767380326
+  metadata.gz: 1f437c2d4fbf955927245cf941b66acc8a665680e2e5a054b29047236637b19bbcce7776f7c20819b0c8656fb67117c1aa4bf6fe79ae489e52bba8ec2c765ee5
+  data.tar.gz: e125cd5b5920aa6858f49dda59b1f6595a03beb015109844a6cc233f7dd206f33c204dd260d01ea01a82aac9ceb71fcb762c2ec49907fcda796c09ed27b04189

data/Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-git_source(:bitbucket) { |_repo_name| 'https://bitbucket.org/traels/economic-rest' }
+git_source(:bitbucket) { |_repo_name| "https://bitbucket.org/traels/economic-rest" }
 
 # Specify your gem's dependencies in economic-rest.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    economic-rest (0.3.3)
+    economic-rest (0.3.5)
       rest-client
 
 GEM
@@ -15,6 +15,7 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     hashdiff (0.3.8)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     json (2.1.0)
@@ -22,14 +23,15 @@ GEM
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     minitest (5.11.3)
     netrc (0.11.0)
     public_suffix (3.0.3)
     rake (10.5.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)

data/Rakefile

@@ -1,10 +1,10 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: :test

data/economic-rest.gemspec

@@ -1,34 +1,34 @@
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'economic/rest/version'
+require "economic/rest/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'economic-rest'
-  spec.version       = Economic::Rest::VERSION
-  spec.authors       = ['Peter Klogborg']
-  spec.email         = ['klogborg@traels.it']
+  spec.name = "economic-rest"
+  spec.version = Economic::Rest::VERSION
+  spec.authors = ["Peter Klogborg"]
+  spec.email = ["klogborg@traels.it"]
 
-  spec.summary       = 'Ruby wrapper for the e-conomic REST API, that aims at making working with the API bearable.
+  spec.summary = 'Ruby wrapper for the e-conomic REST 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/.
 The documentation can be found at https://restdocs.e-conomic.com'
-  spec.homepage      = 'https://bitbucket.org/traels/economic-rest'
-  spec.license       = 'MIT'
+  spec.homepage = "https://bitbucket.org/traels/economic-rest"
+  spec.license = "MIT"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'm'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'webmock', '~> 3.5'
+  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "m"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "webmock", "~> 3.5"
 
-  spec.add_dependency 'rest-client'
+  spec.add_dependency "rest-client"
 end

data/lib/economic/base.rb

@@ -21,7 +21,7 @@ module Economic
       attr_accessor economic_cased_attibute_name
       alias_method snake_case(economic_cased_attibute_name), economic_cased_attibute_name
       alias_method "#{snake_case(economic_cased_attibute_name)}=", "#{economic_cased_attibute_name}="
-      alias_method 'id_key', economic_cased_attibute_name if id
+      alias_method "id_key", economic_cased_attibute_name if id
       add_attribute economic_cased_attibute_name
     end
 
@@ -34,18 +34,15 @@ module Economic
 
     def values_based_on_hash(hash)
       @internal_hash = hash || {}
-
       self.class.attributes.each do |field_name|
         public_send("#{field_name}=", @internal_hash[field_name])
       end
 
-      if self.class.relations
-        self.class.relations.each do |relation_hash|
-          name = relation_hash[:name]
-          related_model = model_class(name).new(@internal_hash[name])
+      self.class.relations&.each do |relation_hash|
+        name = relation_hash[:name]
+        related_model = model_class(name).new(@internal_hash[name])
 
-          instance_variable_set("@#{name}", related_model)
-        end
+        instance_variable_set("@#{name}", related_model)
       end
     end
 
@@ -58,15 +55,13 @@ module Economic
         return_hash[field_name] = public_send(field_name) if public_send(field_name)
       end
 
-      if self.class.relations
-        self.class.relations.each do |relation_hash|
-          relation_name = relation_hash[:name]
-          relation_fields = relation_hash[:fields]
+      self.class.relations&.each do |relation_hash|
+        relation_name = relation_hash[:name]
+        relation_fields = relation_hash[:fields]
 
-          relation_data = public_send(relation_name).to_h(only_fields: relation_fields)
+        relation_data = public_send(relation_name).to_h(only_fields: relation_fields)
 
-          return_hash[relation_name] = relation_data unless relation_data.empty?
-        end
+        return_hash[relation_name] = relation_data unless relation_data.empty?
       end
       return_hash
     end
@@ -79,15 +74,15 @@ module Economic
     end
 
     def self.snake_case(camel_cased)
-      camel_cased.to_s.gsub(/::/, '/')
-                 .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-                 .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-                 .tr('-', '_')
-                 .downcase
+      camel_cased.to_s.gsub(/::/, "/")
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr("-", "_")
+        .downcase
     end
 
     def self.low_camel_case(snake_cased)
-      camel = snake_cased.split('_').collect(&:capitalize).join
+      camel = snake_cased.split("_").collect(&:capitalize).join
       camel[0, 1].downcase + camel[1..-1]
     end
 
@@ -96,7 +91,7 @@ module Economic
     end
 
     def model_class(name)
-      Object.const_get('Economic::' + name.slice(0, 1).capitalize + name.slice(1..-1))
+      Object.const_get("Economic::" + name.slice(0, 1).capitalize + name.slice(1..-1))
     end
   end
 end

data/lib/economic/base_repo.rb

@@ -1,53 +1,37 @@
-require 'rest-client'
-require 'json'
-require 'economic/session'
+require "rest-client"
+require "json"
+require "economic/session"
 
 module Economic
   class BaseRepo
-    URL = 'https://restapi.e-conomic.com/'.freeze
+    URL = "https://restapi.e-conomic.com/".freeze
 
     class << self
-      def headers
-        { 'X-AppSecretToken': Session.app_secret_token, 'X-AgreementGrantToken': Session.agreement_grant_token, 'Content-Type': 'application/json' }
-      end
-
-      def fetch(pageindex: 0, filter_text: '')
-        url = endpoint_url
-        url << "?skippages=#{pageindex}&pagesize=1000"
-        url << "&filter=#{filter_text}" unless filter_text == ''
-
-        response = RestClient.get(URI.escape(url), headers)
-        test_response(response)
-      end
-
       def save(model)
         post_or_put = model.id_key.nil? ? :post : :put
 
-        response = RestClient.public_send(post_or_put, URI.escape(endpoint_url + '/' + model.id_key.to_s), model.to_h.to_json, headers)
-
-        test_response(response)
+        send_request(method: post_or_put, url: URI.escape(endpoint_url + "/" + model.id_key.to_s), payload: model.to_h.to_json)
       end
 
       def send(model)
-        response = RestClient.post(URI.escape(endpoint_url), model.to_h.to_json, headers)
-        test_response(response)
+        send_request(method: :post, url: URI.escape(endpoint_url), payload: model.to_h.to_json)
       end
 
-      def all(filter_text: '')
+      def all(filter_text: "")
         pagination = {}
         pageindex = 0
         entries = []
 
         # Loop until last page, last page does not have a 'nextPage'
-        while pagination['nextPage'] || pageindex.zero?
+        while pagination["nextPage"] || pageindex.zero?
           response = fetch(pageindex: pageindex, filter_text: filter_text)
 
           hash = JSON.parse(response.body)
-          hash['collection'].each do |entry_hash|
+          hash["collection"].each do |entry_hash|
             entries.push model.new(entry_hash)
           end
 
-          pagination = hash['pagination']
+          pagination = hash["pagination"]
           pageindex += 1
         end
         entries
@@ -61,52 +45,71 @@ module Economic
         filter("lastUpdated$gt:#{to_iso8601z(date)}")
       end
 
-      def to_iso8601z(date)
-        date = date.iso8601
-        date = date[0...-5].tr('+', 'Z') if date.include?('+')
-        date
-      end
-
       def find(id)
-        response = test_response(RestClient.get(endpoint_url + '/' + id.to_s, headers))
+        response = send_request(method: :get, url: endpoint_url + "/" + id.to_s)
         entry_hash = JSON.parse(response.body)
         model.new(entry_hash)
       end
 
+      def endpoint_url
+        URL + endpoint_name
+      end
+
+      private
+
       def model
-        scopes = name.split('::')
+        scopes = name.split("::")
         scopes[1] = scopes[1][0...-1] if scopes.count == 3
-        Object.const_get("#{scopes[0]}::#{scopes[1].sub('Repo', '')}")
+        Object.const_get("#{scopes[0]}::#{scopes[1].sub("Repo", "")}")
       end
 
       def endpoint_name
-        end_p = name.sub('Economic::', '')
-        if end_p.include?('::')
-          end_p = end_p.gsub('Repo', '')
-          end_p = end_p.gsub('::', '/')
+        end_p = name.sub("Economic::", "")
+        if end_p.include?("::")
+          end_p = end_p.gsub("Repo", "")
+          end_p = end_p.gsub("::", "/")
         else
-          end_p = end_p.gsub('Repo', 's')
+          end_p = end_p.gsub("Repo", "s")
         end
-        end_p = end_p.gsub('Journals', 'Journals-Experimental')
+        end_p = end_p.gsub("Journals", "Journals-Experimental")
+        end_p = end_p.gsub("Selfs", "Self")
         kebab(end_p)
       end
 
-      def endpoint_url
-        URL + endpoint_name
+      def to_iso8601z(date)
+        date = date.iso8601
+        date = date[0...-5].tr("+", "Z") if date.include?("+")
+        date
+      end
+
+      def send_request(method:, url:, payload: "", &block)
+        if payload.strip.empty?
+          RestClient::Request.execute(method: method, url: url, headers: headers, &block)
+        else
+          RestClient::Request.execute(method: method, url: url, payload: payload, headers: headers, &block)
+        end
+      rescue => e
+        raise e.to_s + ": " + e.response.to_s
+      end
+
+      def headers
+        {'X-AppSecretToken': Session.app_secret_token, 'X-AgreementGrantToken': Session.agreement_grant_token, 'Content-Type': "application/json"}
       end
 
-      def test_response(response)
-        raise response unless response.code.between?(200, 299)
+      def fetch(pageindex: 0, filter_text: "")
+        url = endpoint_url
+        url << "?skippages=#{pageindex}&pagesize=1000"
+        url << "&filter=#{filter_text}" unless filter_text == ""
 
-        response
+        send_request(method: :get, url: URI.escape(url))
       end
 
       def kebab(string)
-        string.gsub(/::/, '/')
-              .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-              .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-              .tr('_', '-')
-              .downcase
+        string.gsub(/::/, "/")
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .tr("_", "-")
+          .downcase
       end
     end
   end

data/lib/economic/company.rb

@@ -0,0 +1,16 @@
+module Economic
+  class Company < Base
+    field :addressLine1
+    field :addressLine2
+    field :attention
+    field :city
+    field :companyIdentificationNumber
+    field :country
+    field :email
+    field :name
+    field :phoneNumber
+    field :vatNumber
+    field :website
+    field :zip
+  end
+end

data/lib/economic/journal_voucher_repo.rb

@@ -1,19 +1,13 @@
 module Economic
   class JournalVoucherRepo < Economic::BaseRepo
     def self.save(voucher)
-      response = RestClient.post(
-        URI.escape(Economic::JournalRepo.endpoint_url + '/' + voucher.journal.journalNumber.to_s + '/vouchers'),
-        voucher.to_h.to_json,
-        headers
-      )
-
-      test_response(response)
+      response = send_request(method: :post, url: URI.escape(Economic::JournalRepo.endpoint_url + "/" + voucher.journal.journalNumber.to_s + "/vouchers"), payload: voucher.to_h.to_json)
 
       Voucher.new(JSON.parse(response.body).first)
     end
 
     def self.endpoint_name
-      raise StandardError, 'only save is available on this repository'
+      raise StandardError, "only save is available on this repository"
     end
   end
 end

data/lib/economic/pricing_repo.rb

@@ -4,12 +4,12 @@ module Economic
       id = product_or_product_number.product_number if product_or_product_number.respond_to? :product_number
       id ||= product_or_product_number
 
-      end_point = [superclass.endpoint_url, id, 'pricing', 'currency-specific-sales-prices'].join('/')
-      response = test_response(RestClient.get(URI.escape(end_point), headers))
+      end_point = [superclass.endpoint_url, id, "pricing", "currency-specific-sales-prices"].join("/")
+      response = send_request(method: :get, url: URI.escape(end_point))
       entry_hash = JSON.parse(response.body)
       pricings = []
 
-      entry_hash['collection'].each do |pricing|
+      entry_hash["collection"].each do |pricing|
         pricings.push Pricing.new(pricing)
       end
       pricings

data/lib/economic/product_repo.rb

@@ -4,12 +4,12 @@ module Economic
       id = product_group_or_product_group_number.product_group_number if product_group_or_product_group_number.respond_to? :product_group_number
       id ||= product_group_or_product_group_number
 
-      end_point = [ProductGroupRepo.endpoint_url, id, 'products'].join('/')
-      response = test_response(RestClient.get(URI.escape(end_point), headers))
+      end_point = [ProductGroupRepo.endpoint_url, id, "products"].join("/")
+      response = send_request(method: :get, url: URI.escape(end_point))
       entry_hash = JSON.parse(response.body)
       products = []
 
-      entry_hash['collection'].each do |product|
+      entry_hash["collection"].each do |product|
         products.push Product.new(product)
       end
       products

data/lib/economic/rest.rb

@@ -1,61 +1,65 @@
-require 'economic/rest/version'
-require 'rest-client'
-
-require 'economic/base_repo'
-require 'economic/base'
-
-require 'economic/currency'
-require 'economic/vat_zone'
-require 'economic/vat_zone_repo'
-require 'economic/vat_type'
-require 'economic/vat_type_repo'
-require 'economic/inventory'
-require 'economic/customer_group'
-require 'economic/product_group'
-
-require 'economic/pricing'
-require 'economic/delivery'
-require 'economic/layout'
-require 'economic/layout_repo'
-require 'economic/notes'
-require 'economic/payment_terms'
-require 'economic/pdf'
-require 'economic/project'
-require 'economic/recipient'
-require 'economic/references'
-
-require 'economic/customer_repo'
-require 'economic/customer'
-require 'economic/customer_group_repo'
-require 'economic/product_repo'
-require 'economic/product'
-require 'economic/pricing_repo'
-
-require 'economic/orders/repo'
-require 'economic/order'
-require 'economic/orders/archived_repo'
-require 'economic/orders/drafts_repo'
-require 'economic/orders/sent_repo'
-require 'economic/product_group_repo'
-
-require 'economic/journal_repo'
-require 'economic/journal'
-require 'economic/journal_voucher_repo'
-require 'economic/voucher'
-
-require 'economic/accounting_year'
-require 'economic/accounting_year_repo'
-
-require 'economic/unit'
-require 'economic/unit_repo'
+require "economic/rest/version"
+require "rest-client"
+
+require "economic/base_repo"
+require "economic/base"
+
+require "economic/currency"
+require "economic/vat_zone"
+require "economic/vat_zone_repo"
+require "economic/vat_type"
+require "economic/vat_type_repo"
+require "economic/inventory"
+require "economic/customer_group"
+require "economic/product_group"
+
+require "economic/pricing"
+require "economic/delivery"
+require "economic/layout"
+require "economic/layout_repo"
+require "economic/notes"
+require "economic/payment_terms"
+require "economic/pdf"
+require "economic/project"
+require "economic/recipient"
+require "economic/references"
+
+require "economic/customer_repo"
+require "economic/customer"
+require "economic/customer_group_repo"
+require "economic/product_repo"
+require "economic/product"
+require "economic/pricing_repo"
+
+require "economic/orders/repo"
+require "economic/order"
+require "economic/orders/archived_repo"
+require "economic/orders/drafts_repo"
+require "economic/orders/sent_repo"
+require "economic/product_group_repo"
+
+require "economic/journal_repo"
+require "economic/journal"
+require "economic/journal_voucher_repo"
+require "economic/voucher"
+
+require "economic/accounting_year"
+require "economic/accounting_year_repo"
+
+require "economic/unit"
+require "economic/unit_repo"
+
+require "economic/company"
+require "economic/self"
+require "economic/self_repo"
 
 module Economic
   class Demo
     def self.hello
-      RestClient.get('https://restapi.e-conomic.com/',
-                     'X-AppSecretToken': 'Demo',
-                     'X-AgreementGrantToken': 'Demo',
-                     'Content-Type': 'application/json')
+      RestClient.get("https://restapi.e-conomic.com/",
+        'X-AppSecretToken': "Demo",
+        'X-AgreementGrantToken': "Demo",
+        'Content-Type': "application/json")
     end
   end
 end

data/lib/economic/rest/version.rb

@@ -1,5 +1,5 @@
 module Economic
   module Rest
-    VERSION = '0.3.4'.freeze
+    VERSION = "0.3.5".freeze
   end
 end

data/lib/economic/self.rb

@@ -0,0 +1,17 @@
+module Economic
+  class Self < Base
+    field :agreementNumber
+    field :canSendElectronicInvoice
+    field :companyAffiliation
+    field :modules
+    field :signupDate
+    field :userName
+
+    # relation :agreementType  object      The type of agreement this is. It can either be denmark, sweden or norway
+    # relation :application  object      The company’s bank settings.
+    # relation :bankInformation  object      The company’s bank settings.
+    relation :company, fields: []
+    # relation :settings  object      Other settings.
+    # relation :user  object      The currently logged in user.
+  end
+end

data/lib/economic/self_repo.rb

@@ -0,0 +1,9 @@
+module Economic
+  class SelfRepo < Economic::BaseRepo
+    def self.self
+      response = send_request(method: :get, url: URI.escape(Economic::SelfRepo.endpoint_url))
+      entry_hash = JSON.parse(response.body)
+      model.new(entry_hash)
+    end
+  end
+end

data/lib/economic/session.rb

@@ -8,13 +8,13 @@ module Economic
     end
 
     def self.app_secret_token
-      raise ArgumentError, 'Authentication tokens not set, Call Session.authentication' if @private_app_id.nil?
+      raise ArgumentError, "Authentication tokens not set, Call Session.authentication" if @private_app_id.nil?
 
       @private_app_id
     end
 
     def self.agreement_grant_token
-      raise ArgumentError, 'Authentication tokens not set, Call Session.authentication' if @access_id.nil?
+      raise ArgumentError, "Authentication tokens not set, Call Session.authentication" if @access_id.nil?
 
       @access_id
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: economic-rest
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Peter Klogborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - lib/economic/accounting_year_repo.rb
 - lib/economic/base.rb
 - lib/economic/base_repo.rb
+- lib/economic/company.rb
 - lib/economic/currency.rb
 - lib/economic/customer.rb
 - lib/economic/customer_group.rb
@@ -160,6 +161,8 @@ files:
 - lib/economic/references.rb
 - lib/economic/rest.rb
 - lib/economic/rest/version.rb
+- lib/economic/self.rb
+- lib/economic/self_repo.rb
 - lib/economic/session.rb
 - lib/economic/unit.rb
 - lib/economic/unit_repo.rb
@@ -187,8 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the e-conomic REST API, that aims at making working with