go_import 3.0.7 → 3.0.8

data/lib/go_import/model/deal.rb

@@ -56,9 +56,9 @@ module GoImport
                 }
             } +
                 [
-                 { :id => :customer, :type => :organization_reference },
-                 { :id => :responsible_coworker, :type => :coworker_reference },
-                 { :id => :customer_contact, :type => :person_reference },
+                 { :id => :customer_reference, :type => :organization_reference, :element_name => :customer },
+                 { :id => :responsible_coworker_reference, :type => :coworker_reference, :element_name => :responsible_coworker },
+                 { :id => :customer_contact_reference, :type => :person_reference, :element_name => :customer_contact},
                  { :id => :custom_values, :type => :custom_values },
                  { :id => :tags, :type => :tags },
                  { :id => :status, :type => :deal_status }
@@ -131,20 +131,39 @@ module GoImport
         end
 
         def customer=(customer)
-            @customer = OrganizationReference.from_organization(customer)
+            @customer_reference = OrganizationReference.from_organization(customer)
+
+            if customer.is_a?(Organization)
+                @customer = customer
+            end
+        end
+
+        # Gets the customer to which this deal belongs
+        def customer()
+            return @customer
         end
 
         def responsible_coworker=(coworker)
-            @responsible_coworker = CoworkerReference.from_coworker(coworker)
+            @responsible_coworker_reference = CoworkerReference.from_coworker(coworker)
+
+            if coworker.is_a?(Coworker)
+                @responsible_coworker = coworker
+            end
         end
 
         def customer_contact=(person)
-            @customer_contact = PersonReference.from_person(person)
+            @customer_contact_reference = PersonReference.from_person(person)
+
+            if person.is_a?(Person)
+                @customer_contact = person
+            end
         end
 
         def value=(value)
             if value.nil?
-                @value = 0
+                @value = "0"
+            elsif value.empty?
+                @value = "0"
             else
                 # we have had some issues with LIME Easy imports where
                 # the value was in the format "357 000". We need to
@@ -155,6 +174,8 @@ module GoImport
                     @value = fixed_value
                 elsif is_float?(fixed_value)
                     @value = fixed_value
+                elsif fixed_value.length == 0
+                    @value = "0"
                 else
                     raise InvalidValueError, value
                 end

data/lib/go_import/model/file.rb

@@ -41,9 +41,9 @@ module GoImport
                 }
             } +
                 [
-                 { :id => :created_by, :type => :coworker_reference },
-                 { :id => :organization, :type => :organization_reference },
-                 { :id => :deal, :type => :deal_reference }
+                 { :id => :created_by_reference, :type => :coworker_reference, :element_name => :created_by },
+                 { :id => :organization_reference, :type => :organization_reference, :element_name => :organization },
+                 { :id => :deal_reference, :type => :deal_reference, :element_name => :deal }
                 ]
         end
 
@@ -79,15 +79,27 @@ module GoImport
         end
 
         def organization=(org)
-            @organization = OrganizationReference.from_organization(org)
+            @organization_reference = OrganizationReference.from_organization(org)
+
+            if org.is_a?(Organization)
+                @organization = org
+            end
         end
 
         def deal=(deal)
-            @deal = DealReference.from_deal(deal)
+            @deal_reference = DealReference.from_deal(deal)
+
+            if deal.is_a?(Deal)
+                @deal = deal
+            end
         end
 
         def created_by=(coworker)
-            @created_by = CoworkerReference.from_coworker(coworker)
+            @created_by_reference = CoworkerReference.from_coworker(coworker)
+
+            if coworker.is_a?(Coworker)
+                @created_by = coworker
+            end
         end
 
         def validate
@@ -117,15 +129,15 @@ module GoImport
                 error = "#{error}A file must have a name.\n"
             end
 
-            if @created_by.nil?
+            if @created_by_reference.nil?
                 error = "#{error}Created_by is required for file.\n"
             end
 
-            if @organization.nil? && @deal.nil?
+            if @organization_reference.nil? && @deal_reference.nil?
                 error = "#{error}A file must have either an organization or a deal.\n"
             end
 
-            if !@organization.nil? && !@deal.nil?
+            if !@organization_reference.nil? && !@deal_reference.nil?
                 error = "#{error}A file can't be attached to both an organization and a deal."
             end
 

data/lib/go_import/model/link.rb

@@ -26,22 +26,34 @@ module GoImport
                 }
             } +
                 [
-                 { :id => :created_by, :type => :coworker_reference },
-                 { :id => :organization, :type => :organization_reference },
-                 { :id => :deal, :type => :deal_reference }
+                 { :id => :created_by_reference, :type => :coworker_reference, :element_name => :created_by },
+                 { :id => :organization_reference, :type => :organization_reference, :element_name => :organization },
+                 { :id => :deal_reference, :type => :deal_reference, :element_name => :deal }
                 ]
         end
 
         def organization=(org)
-            @organization = OrganizationReference.from_organization(org)
+            @organization_reference = OrganizationReference.from_organization(org)
+
+            if org.is_a?(Organization)
+                @organization = org
+            end
         end
 
         def deal=(deal)
-            @deal = DealReference.from_deal(deal)
+            @deal_reference = DealReference.from_deal(deal)
+
+            if deal.is_a?(Deal)
+                @deal = deal
+            end
         end
 
         def created_by=(coworker)
-            @created_by = CoworkerReference.from_coworker(coworker)
+            @created_by_reference = CoworkerReference.from_coworker(coworker)
+
+            if coworker.is_a?(Coworker)
+                @created_by = coworker
+            end
         end
 
         def validate
@@ -51,15 +63,15 @@ module GoImport
                 error = "Url is required for link\n"
             end
 
-            if @created_by.nil?
+            if @created_by_reference.nil?
                 error = "#{error}Created_by is required for link\n"
             end
 
-            if @organization.nil? && @deal.nil?
+            if @organization_reference.nil? && @deal_reference.nil?
                 error = "#{error}A link must have either an organization or a deal\n"
             end
 
-            if !@organization.nil? && !@deal.nil?
+            if !@organization_reference.nil? && !@deal_reference.nil?
                 error = "#{error}A link can't be attached to both an organization and a deal"
             end
 

data/lib/go_import/model/note.rb

@@ -29,10 +29,10 @@ module GoImport
             } +
                 [
                  { :id => :date, :type => :date },
-                 { :id => :created_by, :type => :coworker_reference },
-                 { :id => :organization, :type => :organization_reference },
-                 { :id => :deal, :type => :deal_reference },
-                 { :id => :person, :type => :person_reference }
+                 { :id => :created_by_reference, :type => :coworker_reference, :element_name => :created_by },
+                 { :id => :organization_reference, :type => :organization_reference, :element_name => :organization },
+                 { :id => :deal_reference, :type => :deal_reference, :element_name => :deal },
+                 { :id => :person_reference, :type => :person_reference, :element_name => :person }
                 ]
         end
 
@@ -50,19 +50,35 @@ module GoImport
         end
 
         def organization=(org)
-            @organization = OrganizationReference.from_organization(org)
+            @organization_reference = OrganizationReference.from_organization(org)
+
+            if org.is_a?(Organization)
+                @organization = org
+            end
         end
 
         def created_by=(coworker)
-            @created_by = CoworkerReference.from_coworker(coworker)
+            @created_by_reference = CoworkerReference.from_coworker(coworker)
+
+            if coworker.is_a?(Coworker)
+                @created_by = coworker
+            end
         end
 
         def person=(person)
-            @person = PersonReference.from_person(person)
+            @person_reference = PersonReference.from_person(person)
+
+            if person.is_a?(Person)
+                @person = person
+            end
         end
 
         def deal=(deal)
-            @deal = DealReference.from_deal(deal)
+            @deal_reference = DealReference.from_deal(deal)
+
+            if deal.is_a?(Deal)
+                @deal = deal
+            end
         end
 
         def classification=(classification)

data/lib/go_import/model/organization.rb

@@ -130,7 +130,11 @@ module GoImport
         end
 
         def responsible_coworker=(coworker)
-            @responsible_coworker = CoworkerReference.from_coworker(coworker)
+            @responsible_coworker_reference = CoworkerReference.from_coworker(coworker)
+
+            if coworker.is_a?(Coworker)
+                @responsible_coworker = coworker
+            end
         end
 
         # Sets the organization's relation to the specified value. The
@@ -177,7 +181,7 @@ module GoImport
              { :id => :employees, :type => :persons },
              { :id => :custom_values, :type => :custom_values },
              { :id => :tags, :type => :tags },
-             { :id => :responsible_coworker, :type => :coworker_reference},
+             { :id => :responsible_coworker_reference, :type => :coworker_reference, :element_name => :responsible_coworker},
              { :id => :relation, :type => :string },
              { :id => :relation_last_modified, :type => :string }
             ]

data/lib/go_import/serialize_helper.rb

@@ -15,9 +15,18 @@ module GoImport
         def self.serialize_variables_rexml(elem, obj)
             if (obj.respond_to?(:serialize_variables))
                 obj.serialize_variables.each do |serialize_variable|
-                    element_name = serialize_variable[:id].to_s.gsub(/^\@/,'').split('_').map do |m|
-                        m.capitalize
-                    end.join('')
+                    if serialize_variable[:element_name].nil?
+                        # Remove the @ and replace a _ with the next
+                        # letter capitalized. Ie @customer_reference
+                        # should be CustomerReference
+                        element_name = serialize_variable[:id].to_s.gsub(/^\@/,'').split('_').map do |m|
+                            m.capitalize
+                        end.join('')
+                    else
+                        element_name = serialize_variable[:element_name].to_s.split('_').map do |m|
+                            m.capitalize
+                        end.join('')
+                    end
 
                     raw_var = obj.instance_variable_get("@#{serialize_variable[:id].to_s}")
                     if raw_var != nil

data/sources/VISMA/.go_import/runner.rb

@@ -37,7 +37,9 @@ def convert_source
     organization_rows.each do |row|
         if not row.nil?
             if not row["NAMN"] == ""
-                rootmodel.add_organization(converter.to_organization(row, rootmodel))
+                organization = converter.to_organization(row, rootmodel)
+                organization.set_tag "Imported"
+                rootmodel.add_organization(organization)
             end
         end
     end

data/sources/csv/.go_import/runner.rb

@@ -35,7 +35,9 @@ def convert_source
     # organizations
     if defined?(ORGANIZATION_FILE) && !ORGANIZATION_FILE.nil? && !ORGANIZATION_FILE.empty?
         process_rows ORGANIZATION_FILE do |row|
-            rootmodel.add_organization(converter.to_organization(row, rootmodel))
+            organization = converter.to_organization(row, rootmodel)
+            organization.set_tag "Imported"
+            rootmodel.add_organization(organization)
         end
     end
 

data/sources/easy/.go_import/runner.rb

@@ -105,6 +105,7 @@ end
 
 def init_organization(row, rootmodel)
     organization = GoImport::Organization.new
+    organization.set_tag "Imported"
     # integration_id is typically the company Id in Easy
     # Must be set to be able to import the same file more
     # than once without creating duplicates

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

@@ -94,7 +94,9 @@ def convert_source
     if defined?(organization_rows) && !organization_rows.nil?
         puts "Trying to convert organizations..."
         organization_rows.each do |row|
-            rootmodel.add_organization(converter.to_organization(row, rootmodel))
+            organization = converter.to_organization(row, rootmodel)
+            organization.set_tag "Imported"
+            rootmodel.add_organization(organization)
         end
     end
 

data/sources/excel/converter.rb

@@ -90,7 +90,6 @@ class Converter
 
     def to_organization(row, rootmodel)
         organization = GoImport::Organization.new()
-        organization.set_tag "Importerad"
 
         # Integrationid is typically the id in the system that we are
         # getting the csv from. Must be set to be able to import the

data/spec/deal_spec.rb

@@ -6,7 +6,7 @@ describe "Deal" do
         GoImport::Deal.new
     }
 
-    it "will auto convert org to org.ref during assignment" do
+    it "will set customer ref when customer is assigned" do
         # given
         org = GoImport::Organization.new({:integration_id => "123", :name => "Lundalogik"})
 
@@ -14,10 +14,11 @@ describe "Deal" do
         deal.customer = org
 
         # then
-        deal.customer.is_a?(GoImport::OrganizationReference).should eq true
+        deal.customer.is_a?(GoImport::Organization).should eq true
+        deal.instance_variable_get(:@customer_reference).is_a?(GoImport::OrganizationReference).should eq true
     end
 
-    it "will auto convert coworker to coworker.ref during assignment" do
+    it "will set coworker ref when coworker is assigned" do
         # given
         coworker = GoImport::Coworker.new({:integration_id => "456", :first_name => "Billy", :last_name => "Bob"})
 
@@ -25,10 +26,11 @@ describe "Deal" do
         deal.responsible_coworker = coworker
 
         # then
-        deal.responsible_coworker.is_a?(GoImport::CoworkerReference).should eq true
+        deal.responsible_coworker.is_a?(GoImport::Coworker).should eq true
+        deal.instance_variable_get(:@responsible_coworker_reference).is_a?(GoImport::CoworkerReference).should eq true
     end
 
-    it "will auto convert person to person.ref during assignment" do
+    it "will set person ref when person is assigned" do
         # given
         person = GoImport::Person.new({:integration_id => "123"})
 
@@ -36,7 +38,8 @@ describe "Deal" do
         deal.customer_contact = person
 
         # then
-        deal.customer_contact.is_a?(GoImport::PersonReference).should eq true
+        deal.customer_contact.is_a?(GoImport::Person).should eq true
+        deal.instance_variable_get(:@customer_contact_reference).is_a?(GoImport::PersonReference).should eq true
     end
 
     it "will fail on validation if name is empty" do
@@ -92,6 +95,28 @@ describe "Deal" do
         deal.value.should eq "357000"
     end
 
+    it "should set empty string to 0 value" do
+        # given
+        deal.name = "The deal with no value"
+
+        # when
+        deal.value = ""
+
+        # then
+        deal.value.should eq "0"
+    end
+
+    it "should set value to 0 if assigned a string with spaces" do
+        # given
+        deal.name = "The deal with no value"
+
+        # when
+        deal.value = "  "
+
+        # then
+        deal.value.should eq "0"
+    end
+
     it "should raise invalidvalueerror if value is not a number" do
         # given
         deal.name = "The deal with an invalid value"
@@ -132,7 +157,7 @@ describe "Deal" do
         deal.value = nil
 
         # then
-        deal.value.should eq 0
+        deal.value.should eq "0"
     end
 
     it "should set status_reference from status_setting" do

data/spec/file_spec.rb

@@ -101,7 +101,7 @@ describe "File" do
         file.name.should eq ''
     end
 
-    it "will auto convert org to org.ref during assignment" do
+    it "will set organization ref when organization is assinged" do
         # given
         org = GoImport::Organization.new({:integration_id => "123", :name => "Beagle Boys!"})
 
@@ -109,10 +109,11 @@ describe "File" do
         file.organization = org
 
         # then
-        file.organization.is_a?(GoImport::OrganizationReference).should eq true
+        file.organization.is_a?(GoImport::Organization).should eq true
+        file.instance_variable_get(:@organization_reference).is_a?(GoImport::OrganizationReference).should eq true
     end
 
-    it "will auto convert deal to deal.ref during assignment" do
+    it "will set deal ref when deal is assinged" do
         # given
         deal = GoImport::Deal.new({:integration_id => "123" })
         deal.name = "The new deal"
@@ -121,10 +122,11 @@ describe "File" do
         file.deal = deal
 
         # then
-        file.deal.is_a?(GoImport::DealReference).should eq true
+        file.deal.is_a?(GoImport::Deal).should eq true
+        file.instance_variable_get(:@deal_reference).is_a?(GoImport::DealReference).should eq true
     end
 
-    it "will auto convert coworker to coworker.ref during assignment" do
+    it "will set coworker ref when coworker is assinged" do
         # given
         coworker = GoImport::Coworker.new({:integration_id => "123" })
         coworker.parse_name_to_firstname_lastname_se "Billy Bob"
@@ -133,8 +135,7 @@ describe "File" do
         file.created_by = coworker
 
         # then
-        file.created_by.is_a?(GoImport::CoworkerReference).should eq true
+        file.created_by.is_a?(GoImport::Coworker).should eq true
+        file.instance_variable_get(:@created_by_reference).is_a?(GoImport::CoworkerReference).should eq true
     end
-
-
 end

data/spec/link_spec.rb

@@ -67,7 +67,7 @@ describe "Link" do
         link.validate.length.should be > 0
     end
 
-    it "will auto convert org to org.ref during assignment" do
+    it "will set organization ref when organization is assigned" do
         # given
         org = GoImport::Organization.new({:integration_id => "123", :name => "Beagle Boys!"})
 
@@ -75,10 +75,11 @@ describe "Link" do
         link.organization = org
 
         # then
-        link.organization.is_a?(GoImport::OrganizationReference).should eq true
+        link.organization.is_a?(GoImport::Organization).should eq true
+        link.instance_variable_get(:@organization_reference).is_a?(GoImport::OrganizationReference).should eq true
     end
 
-    it "will auto convert deal to deal.ref during assignment" do
+    it "will set deal ref when deal is assigned" do
         # given
         deal = GoImport::Deal.new({:integration_id => "123" })
         deal.name = "The new deal"
@@ -87,10 +88,11 @@ describe "Link" do
         link.deal = deal
 
         # then
-        link.deal.is_a?(GoImport::DealReference).should eq true
+        link.deal.is_a?(GoImport::Deal).should eq true
+        link.instance_variable_get(:@deal_reference).is_a?(GoImport::DealReference).should eq true
     end
 
-    it "will auto convert coworker to coworker.ref during assignment" do
+    it "will set coworker ref when coworker is assigned" do
         # given
         coworker = GoImport::Coworker.new({:integration_id => "123" })
         coworker.parse_name_to_firstname_lastname_se "Billy Bob"
@@ -99,6 +101,7 @@ describe "Link" do
         link.created_by = coworker
 
         # then
-        link.created_by.is_a?(GoImport::CoworkerReference).should eq true
+        link.created_by.is_a?(GoImport::Coworker).should eq true
+        link.instance_variable_get(:@created_by_reference).is_a?(GoImport::CoworkerReference).should eq true
     end
 end

data/spec/note_spec.rb

@@ -13,8 +13,8 @@ describe "Note" do
     it "is valid when it has text, created_by and organization" do
         # given
         note.text = "They are very interested in the new deal (the one where you get a free bike as a gift)"
-        note.created_by = GoImport::CoworkerReference.new( { :integration_id => "123", :heading => "kalle anka" } )
-        note.organization = GoImport::OrganizationReference.new({ :integration_id => "456", :heading => "Lundalogik" })
+        note.created_by = GoImport::Coworker.new( { :integration_id => "123", :heading => "kalle anka" } )
+        note.organization = GoImport::Organization.new({ :integration_id => "456", :heading => "Lundalogik" })
 
         # when, then
         note.validate.should eq ""
@@ -23,7 +23,7 @@ describe "Note" do
     it "is valid when it has text, created_by and person" do
         # given
         note.text = "They are very interested in the new deal (the one where you get a free bike as a gift)"
-        note.created_by = GoImport::CoworkerReference.new( { :integration_id => "123", :heading => "kalle anka" } )
+        note.created_by = GoImport::Coworker.new( { :integration_id => "123", :heading => "kalle anka" } )
         note.person = GoImport::Person.new({ :integration_id => "456", :heading => "Billy Bob" })
 
         # when, then
@@ -33,7 +33,7 @@ describe "Note" do
     it "is valid when it has text, created_by and deal" do
         # given
         note.text = "They are very interested in the new deal (the one where you get a free bike as a gift)"
-        note.created_by = GoImport::CoworkerReference.new( { :integration_id => "123", :heading => "kalle anka" } )
+        note.created_by = GoImport::Coworker.new( { :integration_id => "123", :heading => "kalle anka" } )
         note.deal = GoImport::Deal.new({ :integration_id => "456", :heading => "The new deal" })
 
         # when, then
@@ -43,13 +43,13 @@ describe "Note" do
     it "is invalid if no note has no attached objects" do
         # given
         note.text = "They are very interested in the new deal (the one where you get a free bike as a gift)"
-        note.created_by = GoImport::CoworkerReference.new( { :integration_id => "123", :heading => "kalle anka" } )
+        note.created_by = GoImport::Coworker.new( { :integration_id => "123", :heading => "kalle anka" } )
 
         # when, then
         note.validate.length.should be > 0
     end
 
-    it "will auto convert org to org.ref during assignment" do
+    it "will set organization ref when organization is assinged" do
         # given
         org = GoImport::Organization.new({:integration_id => "123", :name => "Beagle Boys!"})
 
@@ -57,10 +57,11 @@ describe "Note" do
         note.organization = org
 
         # then
-        note.organization.is_a?(GoImport::OrganizationReference).should eq true
+        note.organization.is_a?(GoImport::Organization).should eq true
+        note.instance_variable_get(:@organization_reference).is_a?(GoImport::OrganizationReference).should eq true
     end
 
-    it "will auto convert person to person.ref during assignment" do
+    it "will set person ref when person is assinged" do
         # given
         person = GoImport::Person.new({:integration_id => "123" })
         person.parse_name_to_firstname_lastname_se "Billy Bob"
@@ -69,10 +70,11 @@ describe "Note" do
         note.person = person
 
         # then
-        note.person.is_a?(GoImport::PersonReference).should eq true
+        note.person.is_a?(GoImport::Person).should eq true
+        note.instance_variable_get(:@person_reference).is_a?(GoImport::PersonReference).should eq true
     end
 
-    it "will auto convert coworker to coworker.ref during assignment" do
+    it "will set coworker ref when coworker is assinged" do
         # given
         coworker = GoImport::Coworker.new({:integration_id => "123" })
         coworker.parse_name_to_firstname_lastname_se "Billy Bob"
@@ -81,10 +83,11 @@ describe "Note" do
         note.created_by = coworker
 
         # then
-        note.created_by.is_a?(GoImport::CoworkerReference).should eq true
+        note.created_by.is_a?(GoImport::Coworker).should eq true
+        note.instance_variable_get(:@created_by_reference).is_a?(GoImport::CoworkerReference).should eq true
     end
 
-    it "will auto convert deal to deal.ref during assignment" do
+    it "will set deal ref when deal is assinged" do
         # given
         deal = GoImport::Deal.new({:integration_id => "123" })
         deal.name = "The new deal"
@@ -93,7 +96,8 @@ describe "Note" do
         note.deal = deal
 
         # then
-        note.deal.is_a?(GoImport::DealReference).should eq true
+        note.deal.is_a?(GoImport::Deal).should eq true
+        note.instance_variable_get(:@deal_reference).is_a?(GoImport::DealReference).should eq true
     end
 
     it "should have Comment as default classification" do

data/spec/organization_spec.rb

@@ -33,7 +33,7 @@ describe "Organization" do
         organization.validate.length.should be > 0
     end
 
-    it "will auto convert coworker to coworker.ref during assignment" do
+    it "will set coworker ref when coworker is assigned" do
         # given
         coworker = GoImport::Coworker.new({:integration_id => "456", :first_name => "Billy", :last_name => "Bob"})
 
@@ -41,7 +41,8 @@ describe "Organization" do
         organization.responsible_coworker = coworker
 
         # then
-        organization.responsible_coworker.is_a?(GoImport::CoworkerReference).should eq true
+        organization.responsible_coworker.is_a?(GoImport::Coworker).should eq true
+        organization.instance_variable_get(:@responsible_coworker_reference).is_a?(GoImport::CoworkerReference).should eq true
     end
 
     it "will have a no relation as default" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_import
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes