economic-rest 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 708eea9e22edcc7c7ebdb0d619bcc7a61e088209ee0da3db606db8aeda83cd75
-  data.tar.gz: e7acc224d6e5f1dada3be67e7cc9f505b2a90c057140a3eb1f6b150d22367114
+SHA1:
+  metadata.gz: 70dd914f6e7821a8c727eeb8d6f1bb3ccd5cb1ad
+  data.tar.gz: 263b1e229629e472e794f4722942ae976e9dcbe5
 SHA512:
-  metadata.gz: b968674ace73f8c88f64d066e55819aa79800a2fba25bc600c5b490bc9ad6773ac32ba985635c5fecf4903d7239fd0d4497b1b979bfbb72a571455dcefb6b7a7
-  data.tar.gz: ebaef0843aabde82c6160a84565a440181a95f4d3115b711bdeb449f11598df4dee4a404a7eef6a3d9b677a96c32f4f33fab0801e5340248ce410e7fa350f513
+  metadata.gz: 5f528aeceed253f32041d2e5acf86a88e7889f00634ff3798793621bba6a60e5f705cc51061062c411a343866f8a1acc24607343c1b8543484079ad4d541b9f1
+  data.tar.gz: d91757bca5942f4c9f7b9613e85198d3cfee707633cc2bff1551707adffcd5a54211d2da67d462c4542c67462802a5cabef5afc47fa4c503e3701f669512bb1c

data/.gitignore

@@ -5,3 +5,6 @@
 #   git config --global core.excludesfile '~/.gitignore_global'
 
 /pkg*
+
+# Ignore coverage
+/coverage

data/Gemfile

@@ -4,5 +4,3 @@ git_source(:bitbucket) { |_repo_name| 'https://bitbucket.org/traels/economic-res
 
 # Specify your gem's dependencies in economic-rest.gemspec
 gemspec
-
-gem 'webmock', '~> 3.5'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    economic-rest (0.1.9)
+    economic-rest (0.2.0)
       rest-client
 
 GEM
@@ -11,11 +11,13 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    docile (1.3.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     hashdiff (0.3.8)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    json (2.1.0)
     m (1.5.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -32,6 +34,11 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     safe_yaml (1.0.4)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
@@ -49,6 +56,7 @@ DEPENDENCIES
   m
   minitest (~> 5.0)
   rake (~> 10.0)
+  simplecov
   webmock (~> 3.5)
 
 BUNDLED WITH

data/economic-rest.gemspec

@@ -27,5 +27,8 @@ The documentation can be found at https://restdocs.e-conomic.com'
   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'
 end

data/lib/economic/base.rb

@@ -1,6 +1,6 @@
 module Economic
   class Base
-    def initialize(hash)
+    def initialize(hash = {})
       values_based_on_hash(hash)
     end
 
@@ -16,18 +16,13 @@ module Economic
       (@relations ||= []).push(name: name, fields: fields)
     end
 
-    def self.field(name, id: false, model: nil)
+    def self.field(name, id: false)
       economic_cased_attibute_name = name.to_s
       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
       add_attribute economic_cased_attibute_name
-      if model
-        define_method("create_#{economic_cased_attibute_name[0...-1]}") do |class_instance|
-          repo.save(self, submodel: class_instance)
-        end
-      end
     end
 
     def self.relation(name, fields:)

data/lib/economic/base_repo.rb

@@ -5,47 +5,31 @@ require 'economic/session'
 module Economic
   class BaseRepo
     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(endpoint:, page_or_id: nil, pageindex: 0, filter_text: '')
-        url = ''
-        url << URL
-        url << endpoint.to_s if endpoint
-        url << if page_or_id.nil? || page_or_id.to_s.empty?
-                 "?skippages=#{pageindex}&pagesize=1000"
-               else
-                 "/#{page_or_id}"
-               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(url, headers) do |response, _request, _result|
-          response
-        end
+
+        response = RestClient.get(url, headers)
         test_response(response)
       end
 
-      def save(model, submodel: '')
-        url = ''
-        url << URL
-        url << endpoint_name.to_s if endpoint_name
-        url << "/#{model.id_key}"
-        url << sub_endpoint_name(submodel) unless submodel == ''
-        relevant_model = if submodel == ''
-                           model
-                         else
-                           submodel
-                         end
-        response = if relevant_model.id_key.nil?
-                     RestClient.post(url, relevant_model.to_h.to_json, headers) do |response, _request, _result|
-                       response
-                     end
-                   else
-                     RestClient.put(url, relevant_model.to_h.to_json, headers) do |response, _request, _result|
-                       response
-                     end
-                   end
+      def save(model)
+        post_or_put = model.id_key.nil? ? :post : :put
+
+        response = RestClient.public_send(post_or_put, endpoint_url + '/' + model.id_key.to_s, model.to_h.to_json, headers)
+
+        test_response(response)
+      end
+
+      def send(model)
+        response = RestClient.post(endpoint_url, model.to_h.to_json, headers)
         test_response(response)
       end
 
@@ -56,7 +40,7 @@ module Economic
 
         # Loop until last page, last page does not have a 'nextPage'
         while pagination['nextPage'] || pageindex.zero?
-          response = fetch(endpoint: endpoint_name, pageindex: pageindex, filter_text: filter_text)
+          response = fetch(pageindex: pageindex, filter_text: filter_text)
 
           hash = JSON.parse(response.body)
           hash['collection'].each do |entry_hash|
@@ -84,7 +68,7 @@ module Economic
       end
 
       def find(entry_number)
-        response = fetch(endpoint: endpoint_name, page_or_id: entry_number)
+        response = test_response(RestClient.get(endpoint_url + '/' + entry_number.to_s, headers))
         entry_hash = JSON.parse(response.body)
         model.new(entry_hash)
       end
@@ -107,10 +91,8 @@ module Economic
         end_p.downcase
       end
 
-      def sub_endpoint_name(submodel)
-        end_p = submodel.class.name.sub('Economic::', '')
-        end_p = "/#{end_p}s"
-        end_p.downcase
+      def endpoint_url
+        URL + endpoint_name
       end
 
       def test_response(response)

data/lib/economic/customer.rb

@@ -24,16 +24,16 @@ module Economic
     field :website
     field :zip
 
-    field :attention
-    field :customerContact
-    field :customerGroup
-    field :defaultDeliveryLocation
-    field :invoices
-    field :layout
-    field :paymentTerms
-    field :salesPerson
-    field :templates
-    field :totals
-    field :vatZone
+    # field :attention
+    # field :customerContact
+    relation :customerGroup, fields: [:customerGroupNumber]
+    # field :defaultDeliveryLocation
+    # field :invoices
+    # field :layout
+    relation :paymentTerms, fields: [:paymentTermsNumber]
+    # field :salesPerson
+    # field :templates
+    # field :totals
+    relation :vatZone, fields: [:vatZoneNumber]
   end
 end

data/lib/economic/customer_group.rb

@@ -0,0 +1,9 @@
+module Economic
+  class CustomerGroup < Base
+    field :account
+    field :customerGroupNumber, id: true
+    field :customers
+    field :layout
+    field :name
+  end
+end

data/lib/economic/journal.rb

@@ -3,7 +3,7 @@ module Economic
     field :entries
     field :journalNumber, id: true
     field :name
-    field :vouchers, model: :Voucher
+    field :vouchers
 
     field :settings
     field :templates

data/lib/economic/journal_voucher_repo.rb

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

data/lib/economic/orders/drafts_repo.rb

@@ -1,16 +1,6 @@
 module Economic
   module Orders
     class DraftsRepo < Economic::Orders::Repo
-      def self.send(model)
-        url = ''
-        url << URL
-        url << 'orders'
-        url << '/drafts'
-        response = RestClient.post(url, model.to_h.to_json, headers) do |response, _request, _result|
-          response
-        end
-        test_response(response)
-      end
     end
   end
 end

data/lib/economic/orders/sent_repo.rb

@@ -1,16 +1,6 @@
 module Economic
   module Orders
     class SentRepo < Economic::Orders::Repo
-      def self.send(model)
-        url = ''
-        url << URL
-        url << 'orders'
-        url << '/sent'
-        response = RestClient.post(url, model.to_h.to_json, headers) do |response, _request, _result|
-          response
-        end
-        test_response(response)
-      end
     end
   end
 end

data/lib/economic/product.rb

@@ -10,11 +10,11 @@ module Economic
     field :recommendedPrice
     field :salesPrice
 
-    field :departmentalDistribution
-    field :inventory
-    field :invoices
-    field :pricing
-    field :productGroup
-    field :unit
+    # field :departmentalDistribution
+    # field :inventory
+    # field :invoices
+    # field :pricing
+    relation :productGroup, fields: [:productGroupNumber]
+    # field :unit
   end
 end

data/lib/economic/product_group.rb

@@ -0,0 +1,5 @@
+module Economic
+  class ProductGroup < Base
+    field :productGroupNumber
+  end
+end

data/lib/economic/rest/version.rb

@@ -1,5 +1,5 @@
 module Economic
   module Rest
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

data/lib/economic/rest.rb

@@ -5,6 +5,8 @@ require 'economic/base_repo'
 require 'economic/base'
 
 require 'economic/vat_zone'
+require 'economic/customer_group'
+require 'economic/product_group'
 
 require 'economic/delivery'
 require 'economic/layout'
@@ -28,9 +30,10 @@ require 'economic/orders/sent_repo'
 
 require 'economic/journal_repo'
 require 'economic/journal'
+require 'economic/journal_voucher_repo'
+require 'economic/voucher'
 
 require 'economic/accounting_year'
-require 'economic/voucher'
 
 module Economic
   class Demo

data/lib/economic/voucher.rb

@@ -3,8 +3,8 @@ module Economic
     field :voucherNumber, id: true
 
     field :entries
-    field :journal
 
+    relation :journal, fields: [:journalNumber]
     relation :accountingYear, fields: [:year]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: economic-rest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Peter Klogborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -101,10 +129,12 @@ files:
 - lib/economic/base.rb
 - lib/economic/base_repo.rb
 - lib/economic/customer.rb
+- lib/economic/customer_group.rb
 - lib/economic/customer_repo.rb
 - lib/economic/delivery.rb
 - lib/economic/journal.rb
 - lib/economic/journal_repo.rb
+- lib/economic/journal_voucher_repo.rb
 - lib/economic/layout.rb
 - lib/economic/notes.rb
 - lib/economic/order.rb
@@ -115,6 +145,7 @@ files:
 - lib/economic/payment_terms.rb
 - lib/economic/pdf.rb
 - lib/economic/product.rb
+- lib/economic/product_group.rb
 - lib/economic/product_repo.rb
 - lib/economic/project.rb
 - lib/economic/recipient.rb
@@ -143,7 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the e-conomic REST API, that aims at making working with