economic-rest 0.5.10 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec06c8760ea6c2c97777086789faf1cc3a9c4c16f8c66a968c8cd4ecf996bd95
-  data.tar.gz: c04eb4ba040c5e701dd0e239b11ece5d24591539cfa77e7207bf9d7d4093193a
+  metadata.gz: 278962b344fb0863870814da49a72d359c3db946e2a391e4a7cc8e02a0af4663
+  data.tar.gz: 3bdd8ebd9455c297fd2a8f426c7d39aa1b7906f584de8055e32be3439ef538ef
 SHA512:
-  metadata.gz: feb3b14f3646417e9cb8cdfdf529294d2fddfb612f46522f1c139a7576435d2e0866464bd291957652bbba6535124437f7316475c446617d69fb5ac1f26766b4
-  data.tar.gz: 86cb60fc957737e4acf489240548d6b24634ab71e3d8fd3d2464a02ab939b62c5a907ea232a04a6e9e893ae495ac53cf58952ce6c10fbad4af79f027c66a57ad
+  metadata.gz: 13b95c8dae49a0f77c9aead2a101366a60f5c6bd388996b45a6caa8ff715f922ba5fde9c259fd2a7f3579d6ec165f0e772d4430884d58cdd6a999a1a4d37cfe2
+  data.tar.gz: 29c4391f5aa1d187753a8297a9455e43860e94f5b91860076a7fb8e4226b1f8e980a6deacf94114eb14ff5df83ccc2a87213ee7f32f63e6fb64e512a7aebe763

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    economic-rest (0.5.10)
+    economic-rest (0.6.0)
       activesupport
       rest-client
       savon
@@ -9,12 +9,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     akami (1.3.1)
@@ -22,8 +22,8 @@ GEM
       nokogiri
     ast (2.4.0)
     awesome_print (1.8.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
+    builder (3.2.4)
+    concurrent-ruby (1.1.8)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -42,10 +42,10 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httpi (2.4.4)
+    httpi (2.4.5)
       rack
       socksify
-    i18n (1.7.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
     json (2.1.0)
@@ -54,22 +54,24 @@ GEM
       rake (>= 0.9.2.2)
     metaclass (0.0.4)
     method_source (0.9.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
+    mime-types-data (3.2021.0225)
+    mini_portile2 (2.5.0)
     minitest (5.11.3)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
     netrc (0.11.0)
-    nokogiri (1.10.5)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nori (2.6.0)
     parallel (1.17.0)
     parser (2.6.4.1)
       ast (~> 2.4.0)
     public_suffix (3.0.3)
-    rack (2.0.7)
+    racc (1.5.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (10.5.0)
     rest-client (2.1.0)
@@ -88,7 +90,7 @@ GEM
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
-    savon (2.12.0)
+    savon (2.12.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
@@ -108,22 +110,22 @@ GEM
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    thread_safe (0.3.6)
     tins (1.22.1)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.6.0)
-    wasabi (3.5.0)
+    wasabi (3.6.1)
+      addressable
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    zeitwerk (2.2.2)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -65,7 +65,7 @@ copy pasta from https://restdocs.e-conomic.com/#specifying-operator-affinity
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` or 'bundle exec m' to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec m` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/lib/economic/base.rb

@@ -75,7 +75,7 @@ module Economic
           relation_fields = relation_hash[:fields]
           begin
             arr = public_send(relation_name).map { |relation| relation.to_h(only_fields: relation_fields) }
-            return_hash[relation_name] = arr
+            return_hash[relation_name] = arr unless arr.empty?
           rescue NoMethodError
           end
         else

data/lib/economic/base_repo.rb

@@ -76,7 +76,6 @@ module Economic
       end
 
       def send_request(method:, url:, payload: "", &block)
-        url = URI.escape(url)
         if payload.strip.empty?
           RestClient::Request.execute(method: method, url: url, headers: headers, &block)
         else

data/lib/economic/customer.rb

@@ -29,7 +29,7 @@ module Economic
     relation :customerGroup, fields: [:customerGroupNumber]
     # field :defaultDeliveryLocation
     # field :invoices
-    # field :layout
+    relation :layout, fields: [:layoutNumber]
     relation :paymentTerms, fields: [:paymentTermsNumber]
     # field :salesPerson
     # field :templates

data/lib/economic/department.rb

@@ -0,0 +1,6 @@
+module Economic
+  class Department < Base
+    field :name
+    field :departmentNumber, id: true
+  end
+end

data/lib/economic/department_repo.rb

@@ -0,0 +1,4 @@
+module Economic
+  class DepartmentRepo < Economic::BaseRepo
+  end
+end

data/lib/economic/departmental_distribution.rb

@@ -0,0 +1,11 @@
+module Economic
+  class DepartmentalDistribution < Base
+    field :name
+    field :departmentalDistributionNumber, id: true
+    field :distributionType
+
+    relation :customer, fields: []
+    relation :distributions, fields: [], multiple: true
+    # relation :subCollections, fields: [?]
+  end
+end

data/lib/economic/departmental_distribution_repo.rb

@@ -0,0 +1,24 @@
+module Economic
+  class DepartmentalDistributionRepo < Economic::BaseRepo
+    class << self
+      def all(distribution: nil)
+        return super(url: endpoint_url(distribution)) unless distribution.nil?
+
+        super(url: endpoint_url(distribution))
+      end
+
+      def find(id, distribution:)
+        super(id, url: endpoint_url(distribution))
+      end
+
+      private
+
+      def endpoint_url(distribution)
+        return super() if distribution.nil?
+        return super() + "/departments" if distribution == :single_department
+
+        super() + "/distributions"
+      end
+    end
+  end
+end

data/lib/economic/distribution.rb

@@ -0,0 +1,7 @@
+module Economic
+  class Distribution < Base
+    field :percentage
+
+    relation :department, fields: [:departmentNumber]
+  end
+end

data/lib/economic/invoice.rb

@@ -24,7 +24,7 @@ module Economic
     relation :paymentTerms, fields: [:paymentTermsNumber]
     relation :pdf, fields: [:download]
     # relation :project, fields: []
-    relation :recipient, fields: [:name, :ean]
+    relation :recipient, fields: []
     relation :references, fields: [:other]
     relation :lines, fields: [:lineNumber, :description, :sortKey, :quantity, :unitNetPrice, :discountPercentage, :unitCostPrice, :marginInBaseCurrency, :marginPercentage, :totalNetAmount], multiple: true
 

data/lib/economic/invoices/booked_repo.rb

@@ -3,7 +3,7 @@ module Economic
     class BookedRepo < Economic::Invoices::Repo
       class << self
         def send(invoice, book_with_number: nil)
-          response = send_request(method: :post, url: URI.escape(endpoint_url), payload: payload(invoice, book_with_number: book_with_number))
+          response = send_request(method: :post, url: endpoint_url, payload: payload(invoice, book_with_number: book_with_number))
 
           entry_hash = JSON.parse(response.body)
 

data/lib/economic/journal_voucher_repo.rb

@@ -1,7 +1,7 @@
 module Economic
   class JournalVoucherRepo < Economic::BaseRepo
     def self.save(voucher)
-      response = send_request(method: :post, url: URI.escape(Economic::JournalRepo.endpoint_url + "/" + voucher.journal.journalNumber.to_s + "/vouchers"), payload: voucher.to_h.to_json)
+      response = send_request(method: :post, url: "#{Economic::JournalRepo.endpoint_url}/#{voucher.journal.journalNumber}/vouchers", payload: voucher.to_h.to_json)
 
       Voucher.new(JSON.parse(response.body).first)
     end

data/lib/economic/line.rb

@@ -11,9 +11,10 @@ module Economic
     field :marginPercentage
     field :totalNetAmount
 
-    relation :product, fields: [:productNumber]
-    relation :unit, fields: [:unitNumber, :name]
-    relation :delivery, fields: [:address, :zip, :city, :country, :deliveryDate]
+    relation :product, fields: []
+    relation :unit, fields: []
+    relation :delivery, fields: []
+    relation :departmentalDistribution, fields: []
 
     def self.build_from_soap_api(data)
       # This is not instantiated with the hash, as lines are never pulled out by themselves, but always as part of

data/lib/economic/pricing_repo.rb

@@ -6,7 +6,7 @@ module Economic
 
       id = Economic::BaseRepo.id_to_url_formatted_id(id)
       end_point = [superclass.endpoint_url, id, "pricing", "currency-specific-sales-prices"].join("/")
-      response = send_request(method: :get, url: URI.escape(end_point))
+      response = send_request(method: :get, url: end_point)
       entry_hash = JSON.parse(response.body)
       pricings = []
 

data/lib/economic/product_repo.rb

@@ -5,7 +5,7 @@ module Economic
       id ||= product_group_or_product_group_number
 
       end_point = [ProductGroupRepo.endpoint_url, id, "products"].join("/")
-      response = send_request(method: :get, url: URI.escape(end_point))
+      response = send_request(method: :get, url: end_point)
       entry_hash = JSON.parse(response.body)
       products = []
 

data/lib/economic/rest.rb

@@ -90,6 +90,12 @@ require "economic/remittance_advice"
 require "economic/payment_type"
 require "economic/payment_type_repo"
 
+require "economic/department"
+require "economic/department_repo"
+require "economic/departmental_distribution"
+require "economic/distribution"
+require "economic/departmental_distribution_repo"
+
 require "economic/account"
 
 module Economic

data/lib/economic/rest/version.rb

@@ -1,5 +1,5 @@
 module Economic
   module Rest
-    VERSION = "0.5.10".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/economic/self_repo.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: economic-rest
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.6.0
 platform: ruby
 authors:
 - Peter Klogborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -241,6 +241,11 @@ files:
 - lib/economic/customer_group_repo.rb
 - lib/economic/customer_repo.rb
 - lib/economic/delivery.rb
+- lib/economic/department.rb
+- lib/economic/department_repo.rb
+- lib/economic/departmental_distribution.rb
+- lib/economic/departmental_distribution_repo.rb
+- lib/economic/distribution.rb
 - lib/economic/inventory.rb
 - lib/economic/invoice.rb
 - lib/economic/invoices/booked_repo.rb
@@ -319,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the e-conomic REST API, that aims at making working with