mno-enterprise-core 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97f70735ab98bb1b3bff86657960ced3660fec3
-  data.tar.gz: 37550a7f9e952087af9528da9cf42b94ee5fdce9
+  metadata.gz: b8199d332fbf50bd3d639dfe2459e7329eb96b50
+  data.tar.gz: beccbb31a39bbcdd02b6c1f17a331dc004e8b629
 SHA512:
-  metadata.gz: e5b872bbc67a77473f0bf98c4dce1cfbb73d5e92b7662305613af70ca0f399575922e99fd464799fef86784e616a1851b2908de0c783d39ae26fbf11a7a7bb89
-  data.tar.gz: b7f2a1a8f29ca87ee0dd196c703d32a0596d3e444409573ea3f026bdc8d4f607ec289973017fac519a3ddfa9e604dcaaafdccccc03a201fc775f343789e34b46
+  metadata.gz: e1b5c8f95e08f2cd2cbbb9cadbb07a752d31f03d830aac0af8f4024208f59720138923d10000acf74d7114058bd6e48d5d1997661d01d242edde32953d1fdb89
+  data.tar.gz: de3c722cb6e6df6f3854d511d2472746f1a7f326b80def73f428b1a75b86050f61e0818e74825116243a2d9cabf0ec10fb696e44913f4df805d2570be61845b9

data/app/models/mno_enterprise/base_resource.rb

@@ -142,7 +142,8 @@ module MnoEnterprise
       if perform_validations(options)
         ret = super()
         process_response_errors
-        raise_record_invalid
+        raise_record_invalid if self.errors.any?
+        ret
       else
         false
       end

data/lib/her_extension/model/associations/belongs_to_association.rb

@@ -0,0 +1,25 @@
+# Backport https://github.com/remiprev/her/pull/343/files
+# Fix belongs_to when foreign key is nil
+module Her
+  module Model
+    module Associations
+      class BelongsToAssociation < Association
+        # @private
+        def fetch
+          foreign_key_value = @parent.attributes[@opts[:foreign_key].to_sym]
+          data_key_value = @parent.attributes[@opts[:data_key].to_sym]
+          return @opts[:default].try(:dup) if (@parent.attributes.include?(@name) && @parent.attributes[@name].nil? && @params.empty?) || (foreign_key_value.blank? && data_key_value.blank?)
+
+          return @cached_result unless @params.any? || @cached_result.nil?
+          return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
+
+          path_params = @parent.attributes.merge(@params.merge(@klass.primary_key => foreign_key_value))
+          path = build_association_path lambda { @klass.build_request_path(path_params) }
+          @klass.get(path, @params).tap do |result|
+            @cached_result = result if @params.blank?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mno_enterprise/core.rb

@@ -17,6 +17,7 @@ require "her_extension/model/parse"
 require "her_extension/model/associations/association"
 require "her_extension/model/associations/association_proxy"
 require "her_extension/model/associations/has_many_association"
+require "her_extension/model/associations/belongs_to_association"
 require "her_extension/middleware/mnoe_api_v1_parse_json"
 require "her_extension/middleware/mnoe_raise_error"
 require "faraday_middleware"

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,6 +316,7 @@ files:
 - lib/her_extension/middleware/mnoe_raise_error.rb
 - lib/her_extension/model/associations/association.rb
 - lib/her_extension/model/associations/association_proxy.rb
+- lib/her_extension/model/associations/belongs_to_association.rb
 - lib/her_extension/model/associations/has_many_association.rb
 - lib/her_extension/model/attributes.rb
 - lib/her_extension/model/orm.rb
@@ -402,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - Core functionnality