mojito_import 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1b2abb1bf2d64aeec53cd821b2252e347676efa91c3d70c3e41a75a0b1d05f
-  data.tar.gz: bc39366394d3356484a3a4469306e36397fa7a4b6e95835c08b68cef220b8d97
+  metadata.gz: 1fb1f7944e74c2ce2cc58ba3e864ffb690f8ca9671db7a79ed027d236892d80f
+  data.tar.gz: 33dea6e1d699b345ca168600ffbe97fa5b67e2503298c1ae77a0f879d70c6804
 SHA512:
-  metadata.gz: 177b8db20f9cb273bd1e58cfefd98a3ccfd420ea8f9c876ae5250735900016e98a1212099b0988f3438d80d028d9df84954501ebc472e37992bcb40563e4301f
-  data.tar.gz: '08558abc4b0110540bb0d796ade2bb70dc330f8c728c1fd3fb8ba90408261676f3470bc676105e53bd3bf6b527665602b2ea34c58247f9b3f584fb691f02963a'
+  metadata.gz: 4598f50532267ef4f38e195822c4014f8e444b9ad07db585ce8aff11772cc79a5d72e1832c6f9aa553a348e490cd337af9697d31326f32ad60487c673d2def10
+  data.tar.gz: 73748e5074cdc80b1c70f8269320905c5dfc6719b6b1480a7ebbfd1f720b726fb2c0ac29c4a1b4f729d54f0f9518536246b0f3e70fcec193305ffe49716d9e6c

data/changelog.md

@@ -1,3 +1,6 @@
+* MojitoImport 0.8.0
+  * new json schema !
+
 * MojitoImport 0.7.0
   * iFrame with token auth
 

data/lib/mojito_import/report.rb

@@ -1,53 +1,70 @@
+require 'json'
+
 module MojitoImport
   class Report
-    attr_accessor :data_errors, :general_errors, :data_updates, :import_id
+    attr_accessor :object_errors, :request_errors, :object_updates, :import_id
 
     def initialize(import_id)
       self.import_id = import_id
-      self.data_errors = []
-      self.general_errors = []
-      self.data_updates = []
+      self.object_errors = []
+      self.request_errors = []
+      self.object_updates = []
+    end
+
+    def to_json
+      {
+        "mojitoRequestId" => self.import_id,
+        "requestErrors" => self.request_errors,
+        "objectErrors" => self.object_errors,
+        "objectUpdates" => self.object_updates
+      }.to_json
     end
 
-    def add_general_error(error)
-      general_errors << error
+    def add_request_error(error)
+      request_errors << error
     end
 
-    def add_data_update(mojito_id, field, from, to: nil)
-      # reload!; report = MojitoImport::Report.new('1234'); report.add_data_error('123', 'name', 'your name sucks')
+    def add_object_update(mojito_id, field, from, to: nil)
+
       hash_element =
-        data_updates.detect { |error_hash| error_hash["mojitoId"] == mojito_id }
+        object_updates.detect { |error_hash| error_hash["mojitoObjectId"] == mojito_id }
 
       update_hash = {"before" => from}
       update_hash["after"] = to unless to.nil?
 
       if hash_element.nil?
-        new_update_hash = { "mojitoId" => mojito_id, field => update_hash }
-        data_updates << new_update_hash
+        new_update_hash = { "mojitoObjectId" => mojito_id, field => update_hash }
+        object_updates << new_update_hash
       else
         hash_element[field] = update_hash
       end
     end
 
-    def add_data_error(mojito_id, field, error)
-      # reload!; report = MojitoImport::Report.new('1234'); report.add_data_error('123', 'name', 'your name sucks')
+    def add_object_error(mojito_id, error, field: nil)
+
       hash_element =
-        data_errors.detect { |error_hash| error_hash["mojitoId"] == mojito_id }
+        object_errors.detect { |error_hash| error_hash["mojitoObjectId"] == mojito_id }
 
       if hash_element.nil?
-        new_error_hash = { "mojitoId" => mojito_id, field => [error] }
-        data_errors << new_error_hash
-      else
-        hash_element[field] ||= []
-        hash_element[field] << error
+        hash_element = { "mojitoObjectId" => mojito_id, "general" => [], "fields" => { } }
+        object_errors << hash_element
       end
+
+        if field.nil? # it's a general error
+          hash_element["general"] << error
+        else
+          # The field has to be initialized to an array
+          # Else we got an error when adding an error to a 2nd field
+          hash_element["fields"][field] ||= []
+          hash_element["fields"][field] << error
+        end
     end
 
     def find_errors_for_object(mojito_id)
-      data_error = data_errors.detect { |data| data["mojitoId"] == mojito_id }
-      return if data_error.nil?
+      object_error = object_errors.detect { |data| data["mojitoObjectId"] == mojito_id }
+      return if object_error.nil?
 
-      data_error.except("mojitoId")
+      object_error.except("mojitoObjectId")
     end
   end
 end

data/lib/mojito_import/version.rb

@@ -1,3 +1,3 @@
 module MojitoImport
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mojito_import
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Thomas Darde
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client