economic-rest 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5c4b058e2e275c5237bc7a9d3869a937d1b77953880e81b032ee4b5f1e15f7
-  data.tar.gz: 4d74b2cc1d465e0564d6089149da62d4df99f4df511b6629ff8692721d109cb2
+  metadata.gz: b473d597cbf374c0e92f3245a94084f000db7a041b6334bdf1ef7c46edceebf4
+  data.tar.gz: 52063b43f5a64ab68427c99afeed90f5ae0cdc90b51e54d49e956e906305d451
 SHA512:
-  metadata.gz: 834f8b17ade63e95bed74c10d878e766b233f139662c0b51e55d7d6c218162d97f562e4e265ddd1ce1ea17e5931ecf8cabbe4968823ac80d71a11eb061cedcef
-  data.tar.gz: '02086b6474d10a861fe95da559bbe684684e6df78d8facc34ff68252d242b1281f51aeef00edfdcc0ecbf19337091f74400f52b1faf66e415acc76e7cc4f7e93'
+  metadata.gz: 1b5d444c61f9212d5b9e5416c70d85a12d39e7bed57315f6cdf5dce36e32e1a24985595410e2bd28f0a4415355aa695027938e5529328ca35bf08d15017bc2c4
+  data.tar.gz: b55ac45dbe4a4f213053758545b858bb2393ae9cbee8477a3e7e11c7e4fa79ab9c5c11d568c4b56e6a9f8aa201fd4e8b49a3b738c66e3c8f19ab8a68b4939458

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    economic-rest (0.4.7)
+    economic-rest (0.5.0)
       activesupport
       rest-client
       savon

data/lib/economic/base.rb

@@ -41,21 +41,25 @@ 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])
+        public_send("#{field_name}=", @internal_hash[field_name] || @internal_hash[field_name.to_sym])
       end
 
       self.class.relations&.each do |relation_hash|
+        relation_name = relation_hash[:name]
         if relation_hash[:multiple]
-          relation_name = relation_hash[:name]
           model_name = relation_hash[:name].singularize
           related_model_array = Array(@internal_hash[relation_name])&.map { |data|
             model_class(model_name).new(data)
           }
           instance_variable_set("@#{relation_name}", related_model_array)
         else
-          name = relation_hash[:name]
-          related_model = model_class(name).new(@internal_hash[name])
-          instance_variable_set("@#{name}", related_model)
+          related_model = model_class(relation_name).new(@internal_hash[relation_name])
+          instance_variable_set("@#{relation_name}", related_model)
+        end
+        if related_model
+          unless @internal_hash[relation_name.to_sym].blank?
+            related_model.values_based_on_hash(@internal_hash[relation_name.to_sym])
+          end
         end
       end
     end

data/lib/economic/base_repo.rb

@@ -108,7 +108,8 @@ module Economic
           RestClient::Request.execute(method: method, url: url, payload: payload, headers: headers, &block)
         end
       rescue => e
-        raise "#{e}#{e.respond_to?(:response) ? ": #{e.response}" : ""}"
+        warn "#{e} #{e.response}" if e.respond_to?(:response)
+        raise e
       end
 
       def headers

data/lib/economic/rest/version.rb

@@ -1,5 +1,5 @@
 module Economic
   module Rest
-    VERSION = "0.4.7".freeze
+    VERSION = "0.5.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: economic-rest
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Peter Klogborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler