go_import 3.0.28 → 3.0.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQ0OWMyMzA2MjFhYmJhYTc1NzllNWFmMzE1Mzc4MmZhODFiYjYzZg==
+    Njc2YjFkNDUzNDc3NWY1YWI1MDY1MmJmMzQ4NTY5M2YzNjRiYmY2ZQ==
   data.tar.gz: !binary |-
-    NzZkNzYxN2JkMTk1NjY1OGJmZWJmNDVjYmJiMTU0ZjM1MWU0YmI4MQ==
+    YTVlNjU2N2U5MjA5YWJhNDhjMTM0MGVkMzljYzU5YzZhYjZmMjc0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OTY3MDI5Y2JkZDA5ZjgxYzhiNmU4NzEyMThhNzEzOWNmYjFmYWM1MjExNmNi
-    YTg5ZjJlMGQ5ZTQzYzI1ZTM4MDU4Mzc0OWU2NjI4OTEwMDlhNzc0N2UzZjhk
-    MTM1ODUyZjNjY2FjMjVlMDk0MDJmODU3Nzc5N2I1YjcyMzcxYzk=
+    NTcxZDE0OTFhYjA2MzI4MzkyMzYxMWU2NWUzOTg1OTIwYTQxMWEzOWM0MDdh
+    MDRkMWQyMzVmNmE1ZjFlZWFkYjMyMGE1OGYxNTQ4ZjM1NjZlNzliMWRmMGE1
+    MzAzYzE3ODJlOTdmODFiMGQxZWIwNGE5ZGQzZWUyN2M4NTRhMjU=
   data.tar.gz: !binary |-
-    NzAzN2FkNGNiYjIzNzJjNWM1NThkMTkzNjBmNjkxMDE2NDMxOWIyNzZkYjJk
-    ZGY4ODk3NGExNTUzOTgwZjBkMTM1NGVmNTY5NDM0ZGI1MzU1NTllYTY3MzM4
-    MTQxMDIxMGQ1NTlkNjA2MGVjNWJiNTVmNmJmNGFkZGZlZmYwNDU=
+    NzBkMTEyZjMyMjA1M2Q4YzBiODZmZWY4NDc1OWJkYzYyMTAzODBjYmRhNzNj
+    YzYwZjc2NTA0MDFhOWM0MzA2NmQwNDA1NjRiZDdkODBhYTRlNTc0Zjg5ZWJk
+    NWMwNzQwN2JhMzkzZGI2MmU5NDFjMTNjNmU2ZTA0MjYyYzU3NDY=

data/lib/go_import/errors.rb

@@ -2,6 +2,9 @@ module GoImport
     class AlreadyAddedError < StandardError
     end
 
+    class IntegrationIdIsRequiredError < StandardError
+    end
+
     class InvalidCustomFieldError < StandardError
     end
 

data/lib/go_import/model/rootmodel.rb

@@ -34,26 +34,19 @@ module GoImport
 
         def initialize()
             @settings = Settings.new
-            @organizations = []
-            @coworkers = []
+            @organizations = {}
+            @coworkers = {}
             @import_coworker = Coworker.new
             @import_coworker.integration_id = "import"
             @import_coworker.first_name = "Import"
-            @coworkers.push @import_coworker
-            @deals = []
-            @notes = []
+            @coworkers[@import_coworker.integration_id] = @import_coworker
+            @deals = {}
+            @notes = {}
             @documents = Documents.new
         end
 
         # Adds the specifed coworker object to the model.
-        # @example Add a coworker from a hash
-        #    rootmodel.add_coworker({
-        #        :integration_id=>"123",
-        #        :first_name=>"Kalle",
-        #        :last_name=>"Anka",
-        #        :email=>"kalle.anka@vonanka.com"
-        #    })
-        #
+
         # @example Add a coworker from a new coworker
         #    coworker = GoImport::Coworker.new
         #    coworker.integration_id = "123"
@@ -61,106 +54,76 @@ module GoImport
         #    coworker.last_name="Anka"
         #    coworker.email = "kalle.anka@vonanka.com"
         #    rootmodel.add_coworker(coworker)
-        #
-        # @example If you want to keep adding coworkers and dont care about duplicates not being added
-        #    begin
-        #       rootmodel.add_coworker(coworker)
-        #    rescue GoImport::AlreadyAddedError
-        #       puts "Warning: already added coworker"
-        #    end
-        # @see Coworker
         def add_coworker(coworker)
-            @coworkers = [] if @coworkers == nil
-
             if coworker.nil?
                 return nil
             end
 
-            coworker = Coworker.new(coworker) if !coworker.is_a?(Coworker)
+            if !coworker.is_a?(Coworker)
+                raise ArgumentError.new("Expected a coworker")
+            end
+
+            if coworker.integration_id.nil? || coworker.integration_id.length == 0
+                raise IntegrationIdIsRequiredError, "An integration id is required for a coworker."
+            end
 
             if find_coworker_by_integration_id(coworker.integration_id) != nil
                 raise AlreadyAddedError, "Already added a coworker with integration_id #{coworker.integration_id}"
             end
 
-            @coworkers.push(coworker)
+            @coworkers[coworker.integration_id] = coworker
 
             return coworker
         end
 
         # Adds the specifed organization object to the model.
-        # @example Add an organization from a hash
-        #    rootmodel.add_organization({
-        #        :integration_id => "123",
-        #        :name => "Beagle Boys",
-        #    })
-        #
         # @example Add an organization from a new organization
         #    organization = GoImport::Organization.new
         #    organization.integration_id = "123"
         #    organization.name = "Beagle Boys"
         #    rootmodel.add_organization(organization)
-        #
-        # @example If you want to keep adding organizations and dont
-        # care about duplicates not being added. Your model might not
-        # be saved due to duplicate integration_ids.
-        #    begin
-        #       rootmodel.add_organization(organization)
-        #    rescue GoImport::AlreadyAddedError
-        #       puts "Warning: already added organization"
-        #    end
-        # @see Coworker
         def add_organization(organization)
-            @organizations = [] if @organizations.nil?
-
             if organization.nil?
                 return nil
             end
 
-            organization = Organization.new(organization) if !organization.is_a?(Organization)
+            if !organization.is_a?(Organization)
+                raise ArgumentError.new("Expected an organization")
+            end
+            
+            if organization.integration_id.nil? || organization.integration_id.length == 0
+                raise IntegrationIdIsRequiredError, "An integration id is required for an organization."
+            end
 
-            if (!organization.integration_id.nil? && organization.integration_id.length > 0) &&
-                find_organization_by_integration_id(organization.integration_id) != nil
+            if find_organization_by_integration_id(organization.integration_id) != nil
                 raise AlreadyAddedError, "Already added an organization with integration_id #{organization.integration_id}"
             end
 
-            @organizations.push(organization)
+            @organizations[organization.integration_id] = organization
 
             return organization
         end
 
         # Adds the specifed deal object to the model.
-        # @example Add an deal from a hash
-        #    rootmodel.add_deal({
-        #        :integration_id => "123",
-        #        :name => "Big deal",
-        #    })
-        #
         # @example Add a deal from a new deal
         #    deal = GoImport::Deal.new
         #    deal.integration_id = "123"
         #    deal.name = "Big deal"
         #    rootmodel.add_deal(deal)
-        #
-        # @example If you want to keep adding deals and dont
-        # care about duplicates not being added. Your model might not
-        # be saved due to duplicate integration_ids.
-        #    begin
-        #       rootmodel.add_deal(deal)
-        #    rescue GoImport::AlreadyAddedError
-        #       puts "Warning: already added deal"
-        #    end
-        # @see Coworker
         def add_deal(deal)
-            @deals = [] if @deals.nil?
-
             if deal.nil?
                 return nil
             end
 
-            deal = Deal.new(deal) if !deal.is_a?(Deal)
+            if !deal.is_a?(Deal)
+                raise ArgumentError.new("Expected a deal")
+            end
+
+            if deal.integration_id.nil? || deal.integration_id.length == 0
+                raise IntegrationIdIsRequiredError, "An integration id is required for a deal."
+            end
 
-            if (!deal.integration_id.nil? && deal.integration_id.length > 0) &&
-               find_deal_by_integration_id(deal.integration_id) != nil
+            if find_deal_by_integration_id(deal.integration_id) != nil
                 raise AlreadyAddedError, "Already added a deal with integration_id #{deal.integration_id}"
             end
             
@@ -168,44 +131,35 @@ module GoImport
                 deal.responsible_coworker = @import_coworker
             end
 
-            @deals.push(deal)
+            @deals[deal.integration_id] = deal
 
             return deal
         end
 
         # Adds the specifed note object to the model.
-        # @example Add an deal from a hash
-        #    rootmodel.add_note({
-        #        :integration_id => "123",
-        #        :text => "This is a note",
-        #    })
+        #
+        # If no integration_id has been specifed go-import will use a
+        # GUID as integration_id.
         #
         # @example Add a note from a new note
         #    note = GoImport::Note.new
         #    note.integration_id = "123"
-        #    note.text = "Big deal"
+        #    note.text = "This is a note"
         #    rootmodel.add_note(note)
-        #
-        # @example If you want to keep adding deals and dont
-        # care about duplicates not being added. Your model might not
-        # be saved due to duplicate integration_ids.
-        #    begin
-        #       rootmodel.add_deal(deal)
-        #    rescue GoImport::AlreadyAddedError
-        #       puts "Warning: already added deal"
-        #    end
-        # @see Coworker
         def add_note(note)
-            @notes = [] if @notes == nil
-
             if note.nil?
                 return nil
-             end
+            end
 
-            note = Note.new(note) if !note.is_a?(Note)
+            if !note.is_a?(Note)
+                raise ArgumentError.new("Expected a note")
+            end
 
-            if (!note.integration_id.nil? && note.integration_id.length > 0) &&
-                    find_note_by_integration_id(note.integration_id) != nil
+            if note.integration_id.nil? || note.integration_id.length == 0
+                note.integration_id = SecureRandom.uuid
+            end
+            
+            if find_note_by_integration_id(note.integration_id) != nil
                 raise AlreadyAddedError, "Already added a note with integration_id #{note.integration_id}"
             end
 
@@ -213,7 +167,7 @@ module GoImport
                 note.created_by = @import_coworker
             end
             
-            @notes.push(note)
+            @notes[note.integration_id] = note
 
             return note
         end
@@ -231,28 +185,35 @@ module GoImport
         end
 
         def find_coworker_by_integration_id(integration_id)
-            return @coworkers.find do |coworker|
-                coworker.integration_id == integration_id
+            if @coworkers.has_key?(integration_id)
+                return @coworkers[integration_id]
+            else
+                return nil
             end
         end
 
         def find_organization_by_integration_id(integration_id)
-            return @organizations.find do |organization|
-                organization.integration_id == integration_id
+            if @organizations.has_key?(integration_id)
+                return @organizations[integration_id]
+            else
+                return nil
             end
+
         end
 
         def find_person_by_integration_id(integration_id)
             return nil if @organizations.nil?
-            @organizations.each do |organization|
+            @organizations.each do |key, organization|
                 person = organization.find_employee_by_integration_id(integration_id)
                 return person if person
             end
         end
 
         def find_note_by_integration_id(integration_id)
-            return @notes.find do |note|
-                note.integration_id == integration_id
+            if @notes.has_key?(integration_id)
+                return @notes[integration_id]
+            else
+                return nil
             end
         end
 
@@ -260,7 +221,7 @@ module GoImport
         def find_deals_for_organization(organization)
             deals = []
 
-            deals = @deals.select do |deal|
+            deals = @deals.values.select do |deal|
                 !deal.customer.nil? && deal.customer.integration_id == organization.integration_id
             end
 
@@ -268,34 +229,37 @@ module GoImport
         end
 
         def find_deal_by_integration_id(integration_id)
-            return @deals.find do |deal|
-                deal.integration_id == integration_id
+            if @deals.has_key?(integration_id)
+                return @deals[integration_id]
+            else
+                return nil
             end
         end
 
-        # Returns a string describing problems with the data. For instance if integration_id for any entity is not unique.
+        # Returns a string describing problems with the data. For
+        # instance if integration_id for any entity is not unique.
         def sanity_check
             error = String.new
 
-            dups = get_integration_id_duplicates(with_non_empty_integration_id(@coworkers))
-            dups_error_items = (dups.collect{|coworker| coworker.integration_id}).compact
-            if dups.length > 0
-                error = "#{error}\nDuplicate coworker integration_id: #{dups_error_items.join(", ")}."
-            end
-
-            dups = get_integration_id_duplicates(with_non_empty_integration_id(@organizations))
-            dups_error_items = (dups.collect{|org| org.integration_id}).compact
-            if dups.length > 0
-                error = "#{error}\nDuplicate organization integration_id: #{dups_error_items.join(", ")}."
-            end
-
-            dups = get_integration_id_duplicates(with_non_empty_integration_id(@deals))
-            dups_error_items = (dups.collect{|deal| deal.integration_id}).compact
-            if dups_error_items.length > 0
-                error = "#{error}\nDuplicate deal integration_id: #{dups_error_items.join(", ")}."
-            end
-
-            persons = @organizations.collect{|o| o.employees}.flatten.compact
+            # dups = get_integration_id_duplicates(with_non_empty_integration_id(@coworkers))
+            # dups_error_items = (dups.collect{|coworker| coworker.integration_id}).compact
+            # if dups.length > 0
+            #     error = "#{error}\nDuplicate coworker integration_id: #{dups_error_items.join(", ")}."
+            # end
+
+            # dups = get_integration_id_duplicates(with_non_empty_integration_id(@organizations))
+            # dups_error_items = (dups.collect{|org| org.integration_id}).compact
+            # if dups.length > 0
+            #     error = "#{error}\nDuplicate organization integration_id: #{dups_error_items.join(", ")}."
+            # end
+
+            # dups = get_integration_id_duplicates(with_non_empty_integration_id(@deals))
+            # dups_error_items = (dups.collect{|deal| deal.integration_id}).compact
+            # if dups_error_items.length > 0
+            #     error = "#{error}\nDuplicate deal integration_id: #{dups_error_items.join(", ")}."
+            # end
+
+            persons = @organizations.collect{|k, o| o.employees}.flatten.compact
             dups = get_integration_id_duplicates(with_non_empty_integration_id(persons))
             dups_error_items = (dups.collect{|person| person.integration_id}).compact
             if dups_error_items.length > 0
@@ -315,7 +279,7 @@ module GoImport
             errors = String.new
             warnings = String.new
 
-            @organizations.each do |o|
+            @organizations.each do |k, o|
                 validation_message = o.validate()
 
                 if !validation_message.empty?

data/lib/go_import/serialize_helper.rb

@@ -37,6 +37,10 @@ module GoImport
                             raw_var.each do |raw_var_elem|
                                 SerializeHelper::serialize_rexml(element, raw_var_elem)
                             end
+                        elsif (raw_var.is_a?(Hash))
+                            raw_var.each do |key, raw_var_elem|
+                                SerializeHelper::serialize_rexml(element, raw_var_elem)
+                            end
                         else
                             element.text = raw_var.to_s.encode('UTF-8')
                         end

data/sources/excel/.go_import/runner.rb

@@ -2,6 +2,7 @@
 
 require 'go_import'
 require 'roo'
+require 'progress'
 require_relative("../converter")
 
 def convert_source
@@ -93,7 +94,7 @@ def convert_source
     # coworkers.
     if defined?(organization_rows) && !organization_rows.nil?
         puts "Trying to convert organizations..."
-        organization_rows.each do |row|
+        organization_rows.with_progress().each do |row|
             organization = converter.to_organization(row, rootmodel)
             rootmodel.add_organization(organization)
         end
@@ -102,7 +103,7 @@ def convert_source
     # Add people and link them to their organizations
     if defined?(person_rows) && !person_rows.nil?
         puts "Trying to convert persons..."
-        person_rows.each do |row|
+        person_rows.with_progress().each do |row|
             # People are special since they are not added directly to
             # the root model
             converter.import_person_to_organization(row, rootmodel)
@@ -112,7 +113,7 @@ def convert_source
     # Deals can connected to coworkers, organizations and people.
     if defined?(deal_rows) && !deal_rows.nil?
         puts "Trying to convert deals..."
-        deal_rows.each do |row|
+        deal_rows.with_progress().each do |row|
             rootmodel.add_deal(converter.to_deal(row, rootmodel))
         end
     end
@@ -121,14 +122,14 @@ def convert_source
     # organizations and notes and might refernce a person
     if defined?(note_rows) && !note_rows.nil?
         puts "Trying to convert notes..."
-        note_rows.each do |row|
+        note_rows.with_progress().each do |row|
             rootmodel.add_note(converter.to_note(row, rootmodel))
         end
     end
 
     if defined?(file_rows) && !file_rows.nil?
         puts "Trying to convert files..."
-        file_rows.each do |row|
+        file_rows.with_progress().each do |row|
             rootmodel.add_file(converter.to_file(row, rootmodel))
         end
     end

data/sources/excel/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rspec'
-gem 'roo'
+gem 'roo', '2.0.0beta'
 gem 'thor'
 gem 'go_import'
+gem 'progress'

data/sources/excel-basic/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
 gem 'rspec'
-gem 'roo'
+gem 'roo', '2.0.0beta'
 gem 'thor'
 gem 'go_import'

data/sources/lime-easy/converter.rb

@@ -1,4 +1,4 @@
-# encoding: iso-8859-1
+# encoding: UTF-8
 require 'go_import'
 
 # Customize this file to suit your input files.
@@ -21,7 +21,7 @@ require 'go_import'
 # 1) Export all data from KONTAKT.mdb to a folder named Export located
 # in the folder created by go_import new. Export data using the
 # magical tool called PowerSellMigrationExport.exe that can be found
-# in K:\Lundalogik\LIME Easy\Tillbeh�r\Migrationsexport.
+# in K:\Lundalogik\LIME Easy\Tillbehör\Migrationsexport.
 #
 # 2) Modify this file (the to_* methods) according to your customer's
 # KONTAKT.mdb and wishes.

data/sources/lime-pro-basic/.go_import/runner.rb

@@ -396,7 +396,7 @@ class LIMEProConnection
             end
         }.join(",")
 
-        sql = "SELECT #{sqlForFields} FROM [#{table.name}]"
+        sql = "SELECT #{sqlForFields} FROM [#{table.name}] WHERE [#{table.name}].[status] = 0"
         return sql
     end
 

data/sources/salesforce/Gemfile.lock

@@ -1,48 +1,48 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    global_phone (1.0.1)
-    go_import (3.0.18)
-      bundler
-      global_phone
-      iso_country_codes
-      nokogiri
-      roo
-      sixarm_ruby_email_address_validation
-      thor
-    iso_country_codes (0.6.1)
-    mini_portile (0.6.1)
-    nokogiri (1.6.4.1-x86-mingw32)
-      mini_portile (~> 0.6.0)
-    roo (1.13.2)
-      nokogiri
-      rubyzip
-      spreadsheet (> 0.6.4)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    ruby-ole (1.2.11.7)
-    rubyzip (1.1.6)
-    sixarm_ruby_email_address_validation (2.0.0)
-    spreadsheet (1.0.0)
-      ruby-ole (>= 1.0)
-    thor (0.19.1)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  go_import
-  rspec
-  rubyzip
-  thor
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    global_phone (1.0.1)
+    go_import (3.0.18)
+      bundler
+      global_phone
+      iso_country_codes
+      nokogiri
+      roo
+      sixarm_ruby_email_address_validation
+      thor
+    iso_country_codes (0.6.1)
+    mini_portile (0.6.1)
+    nokogiri (1.6.4.1-x86-mingw32)
+      mini_portile (~> 0.6.0)
+    roo (1.13.2)
+      nokogiri
+      rubyzip
+      spreadsheet (> 0.6.4)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    ruby-ole (1.2.11.7)
+    rubyzip (1.1.6)
+    sixarm_ruby_email_address_validation (2.0.0)
+    spreadsheet (1.0.0)
+      ruby-ole (>= 1.0)
+    thor (0.19.1)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  go_import
+  rspec
+  rubyzip
+  thor

data/spec/helpers/serialize_helper_spec.rb

@@ -184,6 +184,7 @@ describe GoImport::SerializeHelper do
             rootmodel = GoImport::RootModel.new
             organization = GoImport::Organization.new
             organization.name = "Ankeborgs bibliotek"
+            organization.integration_id = "123"
             rootmodel.add_organization organization
             GoImport::SerializeHelper::serialize(rootmodel, -1)
         }

data/spec/helpers/xsd_validate_spec.rb

@@ -9,12 +9,13 @@ describe GoImport::SerializeHelper do
                 s.set_custom_field({:integration_id => "2", :title => "cf title"})
                 s.set_custom_field({:integration_id => "3", :title => "cf title2"})
             end
-            rootmodel.add_coworker({
-                :integration_id => "123",
-                :first_name => "Kalle",
-                :last_name => "Anka",
-                :email => "kalle.anka@vonanka.com"
-            })
+            coworker = GoImport::Coworker.new({
+                                                  :integration_id => "123",
+                                                  :first_name => "Kalle",
+                                                  :last_name => "Anka",
+                                                  :email => "kalle.anka@vonanka.com"
+                                              })
+            rootmodel.add_coworker(coworker)
             organization = GoImport::Organization.new
             organization.name = "Ankeborgs bibliotek"
             organization.with_source do |source|
@@ -25,6 +26,7 @@ describe GoImport::SerializeHelper do
             organization.set_tag("tag:Bj\u{00F6}rk")
             organization.set_custom_value("2", "cf value")
             organization.set_custom_value("3", "cf Bj\u{00F6}rk")
+            organization.integration_id = "313"
             organization.with_postal_address do |addr|
                 addr.city = "Ankeborg"
             end

data/spec/rootmodel_spec.rb

@@ -6,62 +6,64 @@ describe "RootModel" do
         GoImport::RootModel.new
     }
 
-    it "will contain integration coworker by default" do
+    it "will contain import coworker by default" do
         rootmodel.find_coworker_by_integration_id("import").first_name.should eq "Import"
         rootmodel.coworkers.length.should eq 1
     end
-
-    it "can add a coworker from a hash" do
-        rootmodel.add_coworker({
-            :integration_id => "123key",
-            :first_name => "Kalle",
-            :last_name => "Anka",
-            :email => "kalle.anka@vonanka.com"
-        })
-        rootmodel.find_coworker_by_integration_id("123key").first_name.should eq "Kalle"
-        rootmodel.coworkers.length.should eq 2
-    end
-
+    
     it "can add a coworker from a new coworker" do
+        # given
         coworker = GoImport::Coworker.new
         coworker.integration_id = "123key"
         coworker.first_name="Kalle"
         coworker.last_name="Anka"
         coworker.email = "kalle.anka@vonanka.com"
+
+        # when
         rootmodel.add_coworker(coworker)
+
+        # end
         rootmodel.find_coworker_by_integration_id("123key").first_name.should eq "Kalle"
         rootmodel.coworkers.length.should eq 2
     end
 
+    it "will only add coworkers" do
+        # given
+        not_a_coworker = { :integration_id => "123", :first_name => "Vincent" }
+
+        # when, then
+        expect {
+            rootmodel.add_coworker(not_a_coworker)
+        }.to raise_error(ArgumentError)
+        rootmodel.coworkers.length.should eq 1        
+    end
+
     it "will not add a new coworker when the coworker is already added (same integration id)" do
-        rootmodel.add_coworker({
-            :integration_id=>"123key",
-            :first_name=>"Kalle",
-            :last_name=>"Anka",
-            :email=>"kalle.anka@vonanka.com"
-        })
+        # when
+        coworker1 = GoImport::Coworker.new({
+                                               :integration_id => "123key",
+                                               :first_name => "Kalle",
+                                               :last_name => "Anka",
+                                               :email => "kalle.anka@vonanka.com"
+                                           })
+        rootmodel.add_coworker(coworker1)
         rootmodel.coworkers.length.should eq 2
+
+        # when
+        coworker2 = GoImport::Coworker.new({
+
+                                               :integration_id => "123key",
+                                               :first_name => "Knatte",
+                                               :last_name => "Anka",
+                                               :email => "knatte.anka@vonanka.com"
+                                           })
         expect {
-            rootmodel.add_coworker({
-                :integration_id=>"123key",
-                :first_name=>"Knatte",
-                :last_name=>"Anka",
-                :email=>"knatte.anka@vonanka.com"
-            })
+            rootmodel.add_coworker(coworker2)
         }.to raise_error(GoImport::AlreadyAddedError)
         rootmodel.find_coworker_by_integration_id("123key").first_name.should eq "Kalle"
         rootmodel.coworkers.length.should eq 2
     end
 
-    it "can add an organization from hash" do
-        rootmodel.add_organization({
-                                       :integration_id => "123key",
-                                       :name => "Beagle Boys"
-        })
-        rootmodel.find_organization_by_integration_id("123key").name.should eq "Beagle Boys"
-        rootmodel.organizations.length.should eq 1
-    end
-
     it "can add an organization from a new organization" do
         # given
         organization = GoImport::Organization.new
@@ -76,48 +78,61 @@ describe "RootModel" do
         rootmodel.organizations.length.should eq 1
     end
 
-    it "will not add a new organizations when the organizations is already added (same integration id)" do
+    it "will only add organizations" do
         # given
-        rootmodel.add_organization({
-            :integration_id => "123key",
-            :name => "Beagle Boys"
-        })
+        not_an_organization = { :integration_id => "123", :name => "This is not a note"}
+
+        # when, then
+        expect {
+            rootmodel.add_organization(not_an_organization)
+        }.to raise_error(ArgumentError)
+        rootmodel.organizations.length.should eq 0
+    end
+    
+    it "will not add a new organization when the organization is already added (same integration id)" do
+        # given
+        org = GoImport::Organization.new({
+                                             :integration_id => "123key",
+                                             :name => "Beagle Boys"
+                                         })
+        rootmodel.add_organization(org)
         rootmodel.organizations.length.should eq 1
         rootmodel.find_organization_by_integration_id("123key").name.should eq "Beagle Boys"
 
         # when, then
+        org2 = GoImport::Organization.new({
+                                              :integration_id => "123key",
+                                              :name => "Beagle Boys 2"
+                                          })
         expect {
-            rootmodel.add_organization({
-                :integration_id => "123key",
-                :name => "Beagle Boys 2"
-            })
+            rootmodel.add_organization(org2)
         }.to raise_error(GoImport::AlreadyAddedError)
         rootmodel.find_organization_by_integration_id("123key").name.should eq "Beagle Boys"
         rootmodel.organizations.length.should eq 1
     end
 
-    it "will add two organizations without integration id" do
+    it "will not add a organization when integration_id is nil" do
         # given
         org1 = GoImport::Organization.new
         org1.name = "Beagle Boys"
-        org2 = GoImport::Organization.new
-        org2.name = "The Corporation"
-
-        # when
-        rootmodel.add_organization(org1)
-        rootmodel.add_organization(org2)
+        org1.integration_id = nil
 
-        # then
-        rootmodel.organizations.length.should eq 2
+        # when, then
+        expect {
+            rootmodel.add_organization(org1)
+        }.to raise_error(GoImport::IntegrationIdIsRequiredError)
     end
 
-    it "can add a deal from hash" do
-        rootmodel.add_deal({
-                :integration_id => "123key",
-                :name => "Big deal"
-        })
-        rootmodel.find_deal_by_integration_id("123key").name.should eq "Big deal"
-        rootmodel.deals.length.should eq 1
+    it "will not add a organization when integration_id is empty" do
+        # given
+        org1 = GoImport::Organization.new
+        org1.name = "Beagle Boys"
+        org1.integration_id = ""
+
+        # when, then
+        expect {
+            rootmodel.add_organization(org1)
+        }.to raise_error(GoImport::IntegrationIdIsRequiredError)
     end
 
     it "can add a deal from a new deal" do
@@ -134,6 +149,17 @@ describe "RootModel" do
         rootmodel.deals.length.should eq 1
     end
 
+    it "will only add deals" do
+        # given
+        not_a_deal = { :integration_id => "123", :name => "This is not a deal" }
+
+        # when, then
+        expect {
+            rootmodel.add_deal(not_a_deal)
+        }.to raise_error(ArgumentError)
+        rootmodel.deals.length.should eq 0
+    end
+
     it "will set reponsible coworker to import_coworker if none specifed" do
         # given
         deal = GoImport::Deal.new
@@ -165,48 +191,61 @@ describe "RootModel" do
 
     it "will not add a new deal when the deal is already added (same integration id)" do
         # given
-        rootmodel.add_deal({
-            :integration_id => "123key",
-            :name => "Big deal"
-        })
+        deal1 = GoImport::Deal.new({
+                                       :integration_id => "123key",
+                                       :name => "Big deal"
+                                   })
+        rootmodel.add_deal(deal1)
         rootmodel.deals.length.should eq 1
         rootmodel.find_deal_by_integration_id("123key").name.should eq "Big deal"
 
         # when, then
+        deal2 = GoImport::Deal.new({
+                                       :integration_id => "123key",
+                                       :name => "Bigger deal"
+                                   })
         expect {
-            rootmodel.add_deal({
-                :integration_id => "123key",
-                :name => "Bigger deal"
-            })
+            rootmodel.add_deal(deal2)
         }.to raise_error(GoImport::AlreadyAddedError)
         rootmodel.find_deal_by_integration_id("123key").name.should eq "Big deal"
         rootmodel.deals.length.should eq 1
     end
 
-    it "will add two deal without integration id" do
+    it "will not add a deal when integration_id is nil" do
         # given
-        deal1 = GoImport::Deal.new
-        deal1.name = "The big deal"
-        deal2 = GoImport::Deal.new
-        deal2.name = "The even bigger deal"
+        deal = GoImport::Deal.new
+        deal.name = "The new deal"
+        deal.integration_id = nil
 
-        # when
-        rootmodel.add_deal(deal1)
-        rootmodel.add_deal(deal2)
+        # when, then
+        expect {
+            rootmodel.add_deal(deal)
+        }.to raise_error(GoImport::IntegrationIdIsRequiredError)
+    end
 
-        # then
-        rootmodel.deals.length.should eq 2
-    end    
+    it "will not add a deal when integration_id is empty" do
+        # given
+        deal = GoImport::Deal.new
+        deal.name = "The new deal"
+        deal.integration_id = ""
 
-    it "can add a note from hash" do
-        rootmodel.add_note({
-                               :integration_id => "123key",
-                               :text => "This is a note"
-        })
-        rootmodel.find_note_by_integration_id("123key").text.should eq "This is a note"
-        rootmodel.notes.length.should eq 1
+        # when, then
+        expect {
+            rootmodel.add_deal(deal)
+        }.to raise_error(GoImport::IntegrationIdIsRequiredError)
     end
 
+    it "will only add notes" do
+        # given
+        not_a_note = { :integration_id => "123", :text => "This is not a note"}
+
+        # when, then
+        expect {
+            rootmodel.add_note(not_a_note)
+        }.to raise_error(ArgumentError)
+        rootmodel.notes.length.should eq 0
+    end
+    
     it "can add a note from a new note" do
         # given
         note = GoImport::Note.new
@@ -221,6 +260,34 @@ describe "RootModel" do
         rootmodel.notes.length.should eq 1
     end
 
+    it "will generate an integration id if the new note dont have one" do
+        # given
+        note = GoImport::Note.new
+        note.text = "This is a note"
+
+        # when
+        rootmodel.add_note(note)
+
+        # then
+        note.integration_id.length.should be > 0
+    end
+
+    it "will generate unique integration ids for each note" do
+        # given
+        note1 = GoImport::Note.new
+        note1.text = "This is a note"
+
+        note2 = GoImport::Note.new
+        note2.text = "This is a different note"
+
+        # when
+        rootmodel.add_note note1
+        rootmodel.add_note note2
+
+        # then
+        note1.integration_id.should be != note2.integration_id
+    end
+
     it "will not add a nil note" do
         # given, when
         rootmodel.add_note(nil)
@@ -282,20 +349,22 @@ describe "RootModel" do
         rootmodel.documents.files.length.should eq 1
     end
 
-    it "will not add a new organizations when the organizations is already added (same integration id)" do
+    it "will not add a new note when the note is already added (same integration id)" do
         # given
-        rootmodel.add_note({
-            :integration_id => "123key",
-            :text => "This is a note"
-        })
+        note = GoImport::Note.new({
+                                      :integration_id => "123key",
+                                      :text => "This is a note"
+                                  })
+        rootmodel.add_note(note)
         rootmodel.notes.length.should eq 1
 
         # when, then
+        note2 = GoImport::Note.new({
+                                       :integration_id => "123key",
+                                       :text => "This is another note"
+                                   })
         expect {
-            rootmodel.add_note({
-                :integration_id => "123key",
-                :text => "This is another note"
-            })
+            rootmodel.add_note(note2)
         }.to raise_error(GoImport::AlreadyAddedError)
         rootmodel.notes.length.should eq 1
         rootmodel.find_note_by_integration_id("123key").text.should eq "This is a note"
@@ -305,6 +374,7 @@ describe "RootModel" do
         # given
         organization = GoImport::Organization.new
         organization.name = "Hubba Bubba"
+        organization.integration_id = "321"
         organization.add_employee({
             :integration_id => "123",
             :first_name => "Billy",
@@ -326,6 +396,7 @@ describe "RootModel" do
         # given
         organization = GoImport::Organization.new
         organization.name = "Hubba Bubba"
+        organization.integration_id = "321"
         organization.add_employee({
             :integration_id => "123",
             :first_name => "Billy",
@@ -348,53 +419,6 @@ describe "RootModel" do
         found_person.last_name.should eq "Bob"
     end
 
-    it "will ignore empty integration ids during sanity check" do
-        org1 = GoImport::Organization.new
-        org1.name = "company 1"
-        rootmodel.organizations.push org1
-
-        org2 = GoImport::Organization.new
-        org2.name = "company 2"
-        rootmodel.organizations.push org2
-
-        rootmodel.sanity_check.should eq ""
-    end
-
-    it "will report when the same integration id is used during sanity check" do
-        org1 = GoImport::Organization.new
-        org1.integration_id = "1"
-        org1.name = "company 1"
-        rootmodel.organizations.push org1
-
-        org2 = GoImport::Organization.new
-        org2.integration_id = "1"
-        org2.name = "company 2"
-        rootmodel.organizations.push org2
-
-        rootmodel.sanity_check.should eq "Duplicate organization integration_id: 1."
-    end
-
-    it "will report when the same integrationid on person is used during sanity check" do
-        org1 = GoImport::Organization.new
-        org1.integration_id = "1"
-        org1.name = "company 1"
-        person1 = GoImport::Person.new
-        person1.integration_id = '1'
-        org1.add_employee person1
-
-        rootmodel.organizations.push org1
-
-        org2 = GoImport::Organization.new
-        org2.integration_id = "2"
-        org2.name = "company 2"
-        person2 = GoImport::Person.new
-        person2.integration_id = '1'
-        org2.add_employee person2
-        rootmodel.organizations.push org2
-
-        rootmodel.sanity_check.should eq "Duplicate person integration_id: 1."
-    end
-
     it "will report when two links has the same integration id during sanity check" do
         # given
         link1 = GoImport::Link.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_import
 version: !ruby/object:Gem::Version
-  version: 3.0.28
+  version: 3.0.29
 platform: ruby
 authors:
 - Petter Sandholdt
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes