economic-rest 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5bb0d48dd081895b21a673c69be152779d24bb7c69573d3700a059242410dca
-  data.tar.gz: 381297d78b417851357fee249ab2c86af0f9cba81c1d3adc7cceb2026d08bc29
+  metadata.gz: 708eea9e22edcc7c7ebdb0d619bcc7a61e088209ee0da3db606db8aeda83cd75
+  data.tar.gz: e7acc224d6e5f1dada3be67e7cc9f505b2a90c057140a3eb1f6b150d22367114
 SHA512:
-  metadata.gz: bc1637c6c5f36d3a47639635c12c1d91e80b04334808e4644e59fecacd6e011d1ca5821650af46700fef5eeef101b168fc5f3fabde3a7301ece1b12d8ec80f51
-  data.tar.gz: e85e9e5e8bc902af85a57dd9d92f85976bfe9c4ec02b99b30df0cdc478f26058ed7f4b6e18ad8be48052e16801b6a97c565a68c00207c7948d2034c518cec6db
+  metadata.gz: b968674ace73f8c88f64d066e55819aa79800a2fba25bc600c5b490bc9ad6773ac32ba985635c5fecf4903d7239fd0d4497b1b979bfbb72a571455dcefb6b7a7
+  data.tar.gz: ebaef0843aabde82c6160a84565a440181a95f4d3115b711bdeb449f11598df4dee4a404a7eef6a3d9b677a96c32f4f33fab0801e5340248ce410e7fa350f513

data/.gitignore

@@ -3,3 +3,5 @@
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
+
+/pkg*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    economic-rest (0.1.8)
+    economic-rest (0.1.9)
       rest-client
 
 GEM

data/lib/economic/base.rb

@@ -5,13 +5,17 @@ module Economic
     end
 
     class << self
-      attr_reader :attributes
+      attr_reader :attributes, :relations
     end
 
     def self.add_attribute(name)
       (@attributes ||= []).push(name)
     end
 
+    def self.add_relation(name, fields)
+      (@relations ||= []).push(name: name, fields: fields)
+    end
+
     def self.field(name, id: false, model: nil)
       economic_cased_attibute_name = name.to_s
       attr_accessor economic_cased_attibute_name
@@ -27,48 +31,49 @@ module Economic
     end
 
     def self.relation(name, fields:)
-      related_model = Object.const_get('Economic::' + name.slice(0, 1).capitalize + name.slice(1..-1)).new({})
-      define_method(name) do
-        @internal_hash[name] = related_model.to_h(fields: fields)
-        related_model
-      end
-      alias_method snake_case(name), name
+      economic_cased_attibute_name = name.to_s
+      add_relation economic_cased_attibute_name, fields
+      attr_reader economic_cased_attibute_name
+      alias_method snake_case(economic_cased_attibute_name), economic_cased_attibute_name
     end
 
     def values_based_on_hash(hash)
-      Hash.class_eval { include ExtraMethods }
-      @internal_hash = hash
-      @internal_hash.each do |k, v|
-        k = k.to_s
-        if self.class.attributes.include? k
-          if v.class == Hash
-            v.keys.count.times do |i|
-              v.alias!(Base.snake_case(v.keys[i]), v.keys[i])
-            end
-          end
-          send("#{k}=", v)
-        else
-          warn "unassigned k #{k} in #{self.class.name}" unless %w[layout self soap metaData].include? k
+      @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])
+
+          instance_variable_set("@#{name}", related_model)
         end
       end
     end
 
-    def to_h(fields: [])
-      self.class.attributes.each do |attribute|
-        @internal_hash[attribute.to_sym] = send(attribute) unless send(attribute).nil?
-      end
-      @internal_hash.each do |k, _v|
-        send(k) if respond_to? k
+    def to_h(only_fields: [])
+      return_hash = {}
+
+      self.class.attributes.each do |field_name|
+        next if only_fields.any? && !only_fields.include?(field_name.to_sym)
+
+        return_hash[field_name] = public_send(field_name) if public_send(field_name)
       end
-      unless fields.empty?
-        # because we have field we should only return those values from the hash
-        limited_hash = {}
-        fields.each do |field|
-          limited_hash[field.to_sym] = send(field) unless send(field).nil?
+
+      if self.class.relations
+        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)
+
+          return_hash[relation_name] = relation_data unless relation_data.empty?
         end
-        return limited_hash
       end
-      @internal_hash
+      return_hash
     end
 
     def dirty?
@@ -78,13 +83,6 @@ module Economic
       false
     end
 
-    def save
-      if dirty?
-        response = repo.save(self)
-        values_based_on_hash(JSON.parse(response.body))
-      end
-    end
-
     def self.snake_case(camel_cased)
       camel_cased.to_s.gsub(/::/, '/')
                  .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
@@ -101,12 +99,9 @@ module Economic
     def repo
       Object.const_get("#{self.class}Repo")
     end
-  end
-end
 
-module ExtraMethods
-  def alias!(newkey, oldkey)
-    self[newkey] = self[oldkey] if key?(oldkey)
-    self
+    def model_class(name)
+      Object.const_get('Economic::' + name.slice(0, 1).capitalize + name.slice(1..-1))
+    end
   end
 end

data/lib/economic/delivery.rb

@@ -0,0 +1,10 @@
+module Economic
+  class Delivery < Base
+    field :address
+    field :city
+    field :country
+    field :deliveryDate
+    field :deliveryTerms
+    field :zip
+  end
+end

data/lib/economic/layout.rb

@@ -0,0 +1,5 @@
+module Economic
+  class Layout < Base
+    field :layoutNumber
+  end
+end

data/lib/economic/notes.rb

@@ -0,0 +1,7 @@
+module Economic
+  class Notes < Base
+    field :heading
+    field :textLine1
+    field :textLine2
+  end
+end

data/lib/economic/order.rb

@@ -17,14 +17,14 @@ module Economic
     field :roundingAmount
     field :vatAmount
 
-    field :customer
-    field :delivery
-    field :notes
-    field :paymentTerms
-    field :pdf
-    field :project
-    field :recipient
-    field :references
-    field :templates
+    relation :customer, fields: [:customerNumber]
+    #   relation :delivery, fields: []
+    #    relation :notes, fields: []
+    relation :paymentTerms, fields: [:paymentTermsNumber]
+    #   relation :pdf, fields: []
+    #    relation :project, fields: []
+    relation :recipient, fields: [:name]
+    #    relation :references, fields: []
+    relation :layout, fields: [:layoutNumber]
   end
 end

data/lib/economic/orders/drafts_repo.rb

@@ -4,10 +4,12 @@ module Economic
       def self.send(model)
         url = ''
         url << URL
-        url << '/orders'
-        url << '/sent'
-        response = RestClient.post(url, model.to_h.to_json, headers)
-        response
+        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

data/lib/economic/orders/sent_repo.rb

@@ -4,10 +4,12 @@ module Economic
       def self.send(model)
         url = ''
         url << URL
-        url << '/orders'
-        url << '/drafts'
-        response = RestClient.post(url, model.to_h.to_json, headers)
-        response
+        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

data/lib/economic/payment_terms.rb

@@ -0,0 +1,8 @@
+module Economic
+  class PaymentTerms < Base
+    field :daysOfCredit
+    field :name
+    field :paymentTermsNumber
+    field :paymentTermsType
+  end
+end

data/lib/economic/pdf.rb

@@ -0,0 +1,5 @@
+module Economic
+  class Pdf < Base
+    field :self
+  end
+end

data/lib/economic/project.rb

@@ -0,0 +1,5 @@
+module Economic
+  class Project < Base
+    field :projectNumber
+  end
+end

data/lib/economic/recipient.rb

@@ -0,0 +1,8 @@
+module Economic
+  class Recipient < Base
+    field :address
+    field :name
+
+    relation :vatZone, fields: []
+  end
+end

data/lib/economic/references.rb

@@ -0,0 +1,5 @@
+module Economic
+  class References < Base
+    field :other
+  end
+end

data/lib/economic/rest.rb

@@ -3,6 +3,18 @@ require 'rest-client'
 
 require 'economic/base_repo'
 require 'economic/base'
+
+require 'economic/vat_zone'
+
+require 'economic/delivery'
+require 'economic/layout'
+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/product_repo'

data/lib/economic/rest/version.rb

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

data/lib/economic/vat_zone.rb

@@ -0,0 +1,5 @@
+module Economic
+  class VatZone < Base
+    field :vatZoneNumber
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: economic-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Klogborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,18 +102,27 @@ files:
 - lib/economic/base_repo.rb
 - lib/economic/customer.rb
 - lib/economic/customer_repo.rb
+- lib/economic/delivery.rb
 - lib/economic/journal.rb
 - lib/economic/journal_repo.rb
+- lib/economic/layout.rb
+- lib/economic/notes.rb
 - lib/economic/order.rb
 - lib/economic/orders/archived_repo.rb
 - lib/economic/orders/drafts_repo.rb
 - lib/economic/orders/repo.rb
 - lib/economic/orders/sent_repo.rb
+- lib/economic/payment_terms.rb
+- lib/economic/pdf.rb
 - lib/economic/product.rb
 - lib/economic/product_repo.rb
+- lib/economic/project.rb
+- lib/economic/recipient.rb
+- lib/economic/references.rb
 - lib/economic/rest.rb
 - lib/economic/rest/version.rb
 - lib/economic/session.rb
+- lib/economic/vat_zone.rb
 - lib/economic/voucher.rb
 homepage: https://bitbucket.org/traels/economic-rest
 licenses: