fruit_to_lime 2.0.1 → 2.1.0

data/lib/fruit_to_lime.rb

@@ -1,10 +1,10 @@
 module FruitToLime
+    private
     def self.require_all_in(folder)
         Dir.glob(File.join( File.dirname(File.absolute_path(__FILE__)),folder), &method(:require))
     end
 
     require 'fruit_to_lime/serialize_helper'
-    require 'fruit_to_lime/address_helper'
     require 'fruit_to_lime/model_helpers'
     FruitToLime::require_all_in 'fruit_to_lime/model/*.rb'
     require 'fruit_to_lime/csv_helper'

data/lib/fruit_to_lime/model/address.rb

@@ -9,11 +9,14 @@ module FruitToLime
         def initialize()
         end
 
+        # What fields/rows on the class is supposed to be used by the Gem to generate the xml
+        # This method uses {#serialize_variables}. It also adds {#country_name} to be serialized
         def get_import_rows
             (serialize_variables+[{:id=>:country_name, :type=>:string}]).map do |p|
                 map_to_row p
             end
         end
+        # Used as a convenience in order to get country code from internally used {#country_code}
         def country_name
             if @country_code
                 IsoCountryCodes.find(@country_code).name
@@ -21,6 +24,8 @@ module FruitToLime
                 nil
             end
         end
+
+        # Used as a convenience in order to map country name to the internal {#country_code}
         def country_name=(name)
             @country_code = case name
             when nil
@@ -31,8 +36,26 @@ module FruitToLime
                  IsoCountryCodes.search_by_name(name).first.alpha2
             end
         end
+        # parses a line like "226 48 LUND" into its corresponding
+        # zipcode and city properties on the address
         def parse_zip_and_address_se(line)
-            FruitToLime::AddressHelper::parse_line_to_zip_and_address_se(line, self)
+            Address.parse_line_to_zip_and_address_se(line, self)
+        end
+
+        private
+        def self.parse_line_to_zip_and_address_se(line, address)
+            matched_zipcode = /^\d{3}\s?\d{2}/.match(line)
+            if matched_zipcode && matched_zipcode.length == 1
+                address.zip_code = matched_zipcode[0].strip()
+                matched_city = /\D*$/.match(line)
+                if matched_city && matched_city.length == 1
+                    address.city = matched_city[0].strip()
+                    return address
+                end
+            end
+            return nil
         end
+
+
     end
 end

data/lib/fruit_to_lime/model/deal.rb

@@ -5,7 +5,7 @@ module FruitToLime
 
         attr_accessor :id, :integration_id, :name, :description, :probability, :value, :order_date, :offer_date, :customer,
         :responsible_coworker, :customer_contact, :status
-
+        # you add custom values by using {#set_custom_value}
         attr_reader :custom_values
 
         def serialize_variables

data/lib/fruit_to_lime/model/organization.rb

@@ -19,25 +19,6 @@ module FruitToLime
         def empty?
             return !@integration_id && !@id && !@heading
         end
-
-        # *** TODO: delete this?
-        def same_as_this_method()
-            if @integration_id
-                return lambda { |org|
-                    org.integration_id == @integration_id
-                }
-            elsif @id
-                return lambda { |org|
-                    org.id == @id
-                }
-            elsif @heading
-                return lambda { |org|
-                    org.heading == @heading
-                }
-            else
-                raise "No reference!"
-            end
-        end
     end
 
     class Organization
@@ -89,7 +70,7 @@ module FruitToLime
         end
 
         def add_employee(val)
-            @employees = [] if @employees==nil
+            @employees = [] if @employees == nil
             person = if val.is_a? Person then val else Person.new(val) end
             @employees.push(person)
             person
@@ -101,6 +82,12 @@ module FruitToLime
             coworker
         end
 
+        def find_employee_by_integration_id(integration_id)
+            return @employees.find do |e|
+                e.integration_id == integration_id
+            end
+        end
+
         def serialize_variables
             [
              { :id => :id, :type => :string },
@@ -127,7 +114,7 @@ module FruitToLime
         def to_s
             return "#{name}"
         end
-
+        
         def validate
             error = String.new
 

data/lib/fruit_to_lime/model/person.rb

@@ -14,19 +14,6 @@ module FruitToLime
         def empty?
             return !@integration_id && !@id
         end
-        def same_as_this_method()
-            if @integration_id
-                return lambda { |person|
-                    person.integration_id == @integration_id
-                }
-            elsif @id
-                return lambda { |person|
-                    person.id == @id
-                }
-            else
-                raise "No reference!"
-            end
-        end
     end
 
     class Person < PersonReference
@@ -35,6 +22,7 @@ module FruitToLime
             :direct_phone_number, :fax_phone_number, :mobile_phone_number, :home_phone_number,
             :position, :email, :alternative_email, :postal_address, :currently_employed,
             :organization
+        # you add custom values by using {#set_custom_value}
         attr_reader :custom_values
 
         def initialize(opt = nil)
@@ -93,6 +81,13 @@ module FruitToLime
             ]
         end
 
+        def to_reference()
+            reference = PersonReference.new
+            reference.id = @id
+            reference.integration_id = @integration_id
+            return reference
+        end
+
         def get_import_rows
             (serialize_variables + [ { :id => :organization, :type => :organization_reference } ]).map do |p|
                 map_to_row p

data/lib/fruit_to_lime/model/referencetosource.rb

@@ -36,7 +36,7 @@ module FruitToLime
             end
             return @name == other.name && @id == other.id && @format== other.format
         end
-
+        # Sets the id of this instance to the parameter supplied. Will also set {#name} and {#format} so that this reference is identified as a PAR identifier by Go.
         def par_se(id)
             @name = 'pase'
             @format = 'External'

data/lib/fruit_to_lime/model/rootmodel.rb

@@ -1,9 +1,12 @@
 # encoding: utf-8
 module FruitToLime
+    # The root model for Go import. This class is the container for everything else.  
     class RootModel
         # the import_coworker is a special coworker that is set as
         # responsible for objects that requires a coworker, eg a note.
-        attr_accessor :settings, :organizations, :coworkers, :deals, :notes, :import_coworker
+        attr_accessor :import_coworker
+        
+        attr_accessor :settings, :organizations, :coworkers, :deals, :notes
         def serialize_variables
             [
              {:id => :settings, :type => :settings},
@@ -54,17 +57,6 @@ module FruitToLime
             yield note
         end
 
-        # *** TODO:
-        #
-        # delete find_organization_by_reference and
-        #same_as_this_method from organization?
-        def find_organization_by_reference(organization_reference)
-            same_as_this = organization_reference.same_as_this_method
-            return @organizations.find do |org|
-                same_as_this.call(org)
-            end
-        end
-
         def find_coworker_by_integration_id(integration_id)
             return @coworkers.find do |coworker|
                 coworker == integration_id
@@ -77,6 +69,7 @@ module FruitToLime
             end
         end
 
+        # find deals for organization using {Organization#integration_id}
         def find_deals_for_organization(organization)
             deals = []
 
@@ -87,6 +80,7 @@ module FruitToLime
             return deals
         end
 
+        # 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
 
@@ -113,7 +107,7 @@ module FruitToLime
 
         # returns all items from the object array with duplicate keys.
         # To get all organizations with the same integration_id use
-        # get_duplicates(organizations, {|org| org.integration_id})
+        # `get_duplicates(organizations, {|org| org.integration_id})`
         def get_duplicates(objects, &key)
             uniq_items = objects.uniq {|item| key.call(item)}.compact
 
@@ -142,6 +136,7 @@ module FruitToLime
             return error.strip
         end
 
+        # @!visibility private
         def to_rexml(doc)
             element_name = serialize_name
             elem = doc.add_element(element_name,{"Version"=>"v2_0"})

data/lib/fruit_to_lime/model/settings.rb

@@ -3,6 +3,7 @@ module FruitToLime
     class Settings
         include SerializeHelper
         attr_reader :organization, :person, :deal
+        
         def with_organization
             @organization = ClassSettings.new if @organization ==nil
             yield @organization
@@ -15,6 +16,7 @@ module FruitToLime
             @deal = ClassSettings.new if @deal ==nil
             yield @deal
         end
+
         def initialize(opt = nil)
             if opt != nil
                 serialize_variables.each do |myattr|

data/lib/fruit_to_lime/model/tag.rb

@@ -13,7 +13,8 @@ module FruitToLime
                 @value = val
             end
         end
-
+        
+        # @!visibility private
         def to_rexml(elem)
             element_name = serialize_name
             elem.add_element(element_name).text = @value.to_s.encode('utf-8')

data/lib/fruit_to_lime/model_helpers.rb

@@ -1,7 +1,7 @@
 module FruitToLime
     module ModelHasCustomFields
         def set_custom_value(value, field)
-            @custom_values = [] if @custom_values==nil
+            @custom_values = [] if @custom_values == nil
             custom_value = CustomValue.new()
             custom_value.value = value
             custom_value.field = field
@@ -15,6 +15,7 @@ module FruitToLime
             @custom_values.push custom_value
             return custom_value
         end
+        # Note that this method is obsolete and will be removed later on. Please use {#set_custom_value}
         def set_custom_field(obj)
             value = obj[:value]
             ref = CustomFieldReference.new(obj)
@@ -23,6 +24,7 @@ module FruitToLime
     end
 
     module ModelWithIntegrationIdSameAs
+        # check if other is same as regarding integration_id or id
         def same_as?(other)
             if @integration_id!=nil && @integration_id == other.integration_id
                 return true
@@ -34,14 +36,10 @@ module FruitToLime
         end
     end
 
-    module ModelHasTags
-        def add_tag(str)
-            @tags = [] if @tags == nil
-            @tags.push(Tag.new(str))
-        end
+    module ModelHasTags        
         def set_tag(str)
             @tags = [] if @tags == nil
-            if ! @tags.any? {|tag| tag.value = str }
+            if ! @tags.any? {|tag| tag.value == str }
                 @tags.push(Tag.new(str))
             end
         end

data/lib/fruit_to_lime/serialize_helper.rb

@@ -11,6 +11,7 @@ module FruitToLime
             SerializeHelper::serialize_to_file(file, self)
         end
 
+        # @!visibility private
         def self.serialize_variables_rexml(elem, obj)
             if (obj.respond_to?(:serialize_variables))
                 obj.serialize_variables.each do |serialize_variable|
@@ -37,6 +38,7 @@ module FruitToLime
             raise "Do not know how to handle #{obj.class} !!"
         end
 
+        # @!visibility private
         def self.serialize_rexml(elem, obj)
             if obj.respond_to?(:to_rexml)
                 obj.to_rexml(elem)
@@ -48,6 +50,7 @@ module FruitToLime
             end
         end
 
+        # @!visibility private
         def self.serialize(obj, indent= 2)
             # indent -1 to avoid indent
             if obj.respond_to?(:to_rexml)
@@ -66,16 +69,19 @@ module FruitToLime
             end
         end
 
+        # @!visibility private
         def self.serialize_to_file(file, obj)
             File.open(file, 'w') do |f|
                 f.write(SerializeHelper::serialize(obj))
             end
         end
 
+        # @!visibility private
         def symbol_to_name(symbol)
             symbol.to_s.split('_').join(' ').capitalize
         end
 
+        # @!visibility private
         def map_symbol_to_row(symbol,type)
             {
                 :id => symbol.to_s,
@@ -84,6 +90,7 @@ module FruitToLime
             }
         end
 
+        # @!visibility private
         def map_to_row(p)
             case p[:type]
             when :string then
@@ -136,12 +143,15 @@ module FruitToLime
             end
         end
 
+        # What fields/rows on the class is supposed to be used by the Gem to generate the xml
+        # This method uses #serialize_variables.
         def get_import_rows
             serialize_variables.map do |p|
                 map_to_row p
             end
         end
 
+        # @!visibility private
         def self.get_import_rows(type)
             case type
             when :person then

data/spec/{helpers/address_helper_spec.rb → address_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'fruit_to_lime'
 
-describe FruitToLime::AddressHelper do
+describe FruitToLime::Address do
 	describe "Parse line with swedish zip and city into zipcode" do
 		let (:zip_code) {
 			address = FruitToLime::Address.new

data/spec/helpers/serialize_helper_spec.rb

@@ -76,9 +76,9 @@ describe FruitToLime::SerializeHelper do
                 addr.city = "Ankeborg"
             end
             p.currently_employed=true
-            p.add_tag("tag:anka")
-            p.add_tag("tag:Bj\u{00F6}rk")
-            p.add_tag("tag:<Bj\u{00F6}rk>")
+            p.set_tag("tag:anka")
+            p.set_tag("tag:Bj\u{00F6}rk")
+            p.set_tag("tag:<Bj\u{00F6}rk>")
             p.set_custom_field({:integration_id=>"2", :value=>"cf value"})
             p.set_custom_field({:integration_id=>"3", :value=>"cf Bj\u{00F6}rk"})
             p.set_custom_field({:integration_id=>"4", :value=>"cf <Bj\u{00F6}rk>"})
@@ -127,8 +127,8 @@ describe FruitToLime::SerializeHelper do
                 source.par_se('122345')
             end
             #o.source_ref = {:name=>'Go',:id=>"PASE122345"}
-            o.add_tag("tag:bibliotek")
-            o.add_tag("tag:Bj\u{00F6}rk")
+            o.set_tag("tag:bibliotek")
+            o.set_tag("tag:Bj\u{00F6}rk")
             o.set_custom_field({:integration_id=>"2", :value=>"cf value"})
             o.set_custom_field({:integration_id=>"3", :value=>"cf Bj\u{00F6}rk"})
             o.with_postal_address do |addr|

data/spec/helpers/xsd_validate_spec.rb

@@ -17,8 +17,8 @@ describe FruitToLime::SerializeHelper do
                 source.par_se('122345')
             end
             #o.source_ref = {:name=>'Go',:id=>"PASE122345"}
-            o.add_tag("tag:bibliotek")
-            o.add_tag("tag:Bj\u{00F6}rk")
+            o.set_tag("tag:bibliotek")
+            o.set_tag("tag:Bj\u{00F6}rk")
             o.set_custom_field({:integration_id=>"2", :value=>"cf value"})
             o.set_custom_field({:integration_id=>"3", :value=>"cf Bj\u{00F6}rk"})
             o.with_postal_address do |addr|

data/templates/csv/export.xml

@@ -0,0 +1,152 @@
+<GoImport Version='v2_0'
+><Settings
+  ><Organization
+    ><CustomFields
+      ><CustomField
+        ><Title
+          >Link to external system</Title
+          ><Type
+          >Link</Type
+          ></CustomField
+        ></CustomFields
+      ></Organization
+    ></Settings
+  ><Coworkers
+  ><Coworker
+    ><IntegrationId
+      >import</IntegrationId
+      ><FirstName
+      >Import</FirstName
+      ></Coworker
+    ><Coworker
+    ><IntegrationId
+      >666</IntegrationId
+      ><FirstName
+      >Evil</FirstName
+      ><LastName
+      >Elvis</LastName
+      ><Email
+      >t@e.com</Email
+      ><DirectPhoneNumber
+      >+46121212</DirectPhoneNumber
+      ><MobilePhoneNumber
+      >+46324234</MobilePhoneNumber
+      ><HomePhoneNumber
+      >+46234234</HomePhoneNumber
+      ></Coworker
+    ></Coworkers
+  ><Organizations
+  ><Organization
+    ><IntegrationId
+      >6</IntegrationId
+      ><Name
+      >Alfs Mjukvaruutveckling</Name
+      ><OrganizationNumber
+      >a number</OrganizationNumber
+      ><PostalAddress
+      ><Street
+        >postal street</Street
+        ><ZipCode
+        >226 48</ZipCode
+        ><City
+        >LUND</City
+        ></PostalAddress
+      ><VisitAddress
+      ><Street
+        >visit street</Street
+        ><ZipCode
+        >visit zip</ZipCode
+        ><City
+        >visit city</City
+        ></VisitAddress
+      ><CentralPhoneNumber
+      >0000</CentralPhoneNumber
+      ><Email
+      >email to organizaiton, not the person</Email
+      ><WebSite
+      >www.whatever.com</WebSite
+      ><Employees
+      ><Person
+        ><IntegrationId
+          >123</IntegrationId
+          ><FirstName
+          >Rune</FirstName
+          ><LastName
+          >Rebellion</LastName
+          ><DirectPhoneNumber
+          >+4611111</DirectPhoneNumber
+          ><FaxPhoneNumber
+          >+4623234234234</FaxPhoneNumber
+          ><MobilePhoneNumber
+          >+462321212</MobilePhoneNumber
+          ><Email
+          >x@y.com</Email
+          ><AlternativeEmail
+          >y@x.com</AlternativeEmail
+          ><PostalAddress
+          ><Street
+            >postal street</Street
+            ><ZipCode
+            >226 48</ZipCode
+            ><City
+            >LUND</City
+            ></PostalAddress
+          ><CurrentlyEmployed
+          >true</CurrentlyEmployed
+          ></Person
+        ></Employees
+      ><CustomValues
+      ><CustomValue
+        ><Field
+          >external_url</Field
+          ><Value
+          >http://something.com?key=6</Value
+          ></CustomValue
+        ></CustomValues
+      ><Tags
+      ><Tag
+        >Imported</Tag
+        ></Tags
+      ><ResponsibleCoworker
+      ><Heading
+        >Evil Elvis</Heading
+        ><IntegrationId
+        >666</IntegrationId
+        ></ResponsibleCoworker
+      ></Organization
+    ></Organizations
+  ><Deals
+  ><Deal
+    ><IntegrationId
+      >333</IntegrationId
+      ><Name
+      >Feta affären</Name
+      ><Probability
+      >50</Probability
+      ><Value
+      >10000</Value
+      ><OfferDate
+      >2013-12-01</OfferDate
+      ><OrderDate
+      >2014-01-05</OrderDate
+      ><Customer
+      ><IntegrationId
+        >6</IntegrationId
+        ><Heading
+        >Alfs Mjukvaruutveckling</Heading
+        ></Customer
+      ><ResponsibleCoworker
+      ><Heading
+        >Evil Elvis</Heading
+        ><IntegrationId
+        >666</IntegrationId
+        ></ResponsibleCoworker
+      ><CustomerContact
+      ><IntegrationId
+        >123</IntegrationId
+        ></CustomerContact
+      ></Deal
+    ></Deals
+  ><Notes
+  /></GoImport
+>

data/templates/csv/lib/tomodel.rb

@@ -1,34 +1,192 @@
 require 'fruit_to_lime'
 
-class ToModel
-    def to_organization(row)
+class Exporter
+    # turns a row from the organization cssv file into
+    # a fruit_to_lime model that is used to generate xml
+    # Uses rootmodel to locate other related stuff such
+    # coworker
+    def to_organization(row, rootmodel)
         organization = FruitToLime::Organization.new
+        # Integrationid is typically the id in the system that 
+        # we are getting the csv from. Must be set to be able
+        # to import the same file more than once without 
+        # creating duplicates
         organization.integration_id = row['id']
         organization.name = row['name']
+        # Just setting all basic properties to show whats available
+        # Remove or fix...
+        organization.organization_number = 'a number'   # needs clean up, should have helpers for that in lib. Swedish format.
+        organization.email = 'email to organizaiton, not the person'
+        organization.web_site = 'www.whatever.com'
+        organization.central_phone_number = '0000'      # needs clean up, should have helpers for that in lib. Default swedish format, convert to global format
+
+        # Addresses consists of several parts in Go.
+        # Lots of other systems have the address all in one
+        # line, to be able to match when importing it is
+        # way better to split the addresses
+        organization.with_visit_address do |address|
+            address.street = 'visit street'
+            address.zip_code = 'visit zip'
+            address.city = 'visit city'
+        end
+
+        # Another example of setting address using
+        # helper to split '226 48 LUND' into zip and city
+        organization.with_postal_address do |address|
+            address.street = 'postal street'
+            address.parse_zip_and_address_se '226 48 LUND'
+        end
+
+        # Responsible coworker is set by first locating
+        # it in the root model and then setting a reference
+        # to him/her
+        # We need to be able handle missing coworkers here
+        coworker = rootmodel.find_coworker_by_integration_id row['responsible_id']
+        organization.responsible_coworker = coworker.to_reference
+
+        # Tags are set and defined at the same place
+        # Setting a tag: Imported is useful for the user
+        organization.set_tag("Imported")
+
+        # When imported from web based ERP or similair that
+        # client will continue to use it can be useful to be
+        # able to link from Go to the same record in the ERP
+        # FOr instance Lime links
+        organization.set_custom_value("http://something.com?key=#{row['id']}", "external_url")
+
         return organization
     end
 
+    def to_coworker(row)
+        coworker = FruitToLime::Coworker.new
+        coworker.integration_id = row['id']
+        coworker.first_name = row['first_name']
+        coworker.last_name = row['last_name']
+        # Other optional attributes
+        coworker.email = 't@e.com'
+        coworker.direct_phone_number = '+46121212'
+        coworker.mobile_phone_number = '+46324234'
+        coworker.home_phone_number = '+46234234'
+
+        # Tags and custom fields are set the same
+        # way as on organizations
+        
+        return coworker
+    end
+
+    def to_person(row, rootmodel)
+        person = FruitToLime::Person.new
+        person.integration_id = row['id']
+        # Note that Go has separate first and last names
+        # Some splitting might be necessary
+        person.first_name = row['first_name']
+        person.last_name = row['last_name']
+        # other optional attributes
+        person.direct_phone_number = '+4611111'
+        person.fax_phone_number = '+4623234234234'
+        person.mobile_phone_number = '+462321212'
+        person.email = 'x@y.com'
+        person.alternative_email = 'y@x.com'
+        person.with_postal_address do |address|
+            address.street = 'postal street'
+            address.parse_zip_and_address_se '226 48 LUND'
+        end
+
+        # Tags and custom fields are set the same
+        # way as on organizations
+
+        # set employer connection
+        employer_id = row['employer_id']
+        employer = rootmodel.find_organization_by_integration_id employer_id
+        employer.add_employee person
+    end
+
+    def to_deal(row, rootmodel)
+        deal = FruitToLime::Deal.new
+        deal.integration_id = row['id']
+        deal.name = row['name']
+        # should be integer, same currency should be used in
+        # the system
+        deal.value = row['value']
+
+        # find stuff connected to deal
+        responsible = rootmodel.find_coworker_by_integration_id row['responsible_id']
+        organization = rootmodel.find_organization_by_integration_id row['customer_id']
+        person = organization.find_employee_by_integration_id row['customer_contact_id']
+        # connect the deal by references
+        deal.responsible_coworker = responsible.to_reference
+        deal.customer = organization.to_reference
+        deal.customer_contact = person.to_reference
+
+        # other optional attributes
+        deal.probability = 50           # should be between 0 - 100
+        deal.order_date = '2014-01-05'  # Format ?
+        deal.offer_date = '2013-12-01'  # Format ?
+
+        # status, how do we set this ?
+
+        return deal
+    end
+
     def configure(model)
         # add custom field to your model here. Custom fields can be
         # added to organization, deal and person. Valid types are
         # :String and :Link. If no type is specified :String is used
         # as default.
+        model.settings.with_organization do |organization|
+            organization.set_custom_field( { :integrationid => 'external_url', :title => 'Link to external system', :type => :Link } )
+        end
+    end
 
-        model.settings.with_deal do |deal|
-            deal.set_custom_field( { :integrationid => 'discount_url', :title => 'Rabatt url', :type => :Link } )
+    def process_rows(file_name)
+        data = File.open(file_name, 'r').read.encode('UTF-8',"ISO-8859-1")
+        rows = FruitToLime::CsvHelper::text_to_hashes(data)
+        rows.each do |row|
+            yield row
         end
     end
 
-    def to_model(organization_file_name)
+    def to_model(coworkers_filename, organization_filename, persons_filename, deals_filename)
+        # A rootmodel is used to represent all entitite/models
+        # that is exported
         rootmodel = FruitToLime::RootModel.new
+
         configure rootmodel
-        if organization_file_name != nil
-            organization_file_data = File.open(organization_file_name, 'r').read.encode('UTF-8',"ISO-8859-1")
-            rows = FruitToLime::CsvHelper::text_to_hashes(organization_file_data)
-            rows.each do |row|
-                rootmodel.organizations.push(to_organization(row))
+
+        # coworkers
+        # start with these since they are referenced
+        # from everywhere....
+        if coworkers_filename != nil
+            process_rows coworkers_filename do |row|
+                rootmodel.add_coworker(to_coworker(row))
+            end
+        end
+
+        # organizations
+        if organization_filename != nil
+            process_rows organization_filename do |row|
+                rootmodel.organizations.push(to_organization(row, rootmodel))
+            end
+        end
+
+        # persons
+        # depends on organizations
+        if persons_filename != nil
+            process_rows persons_filename do |row|
+                # adds it self to the employer
+                to_person(row, rootmodel)
             end
         end
+
+        # deals
+        # deals can reference coworkers (responsible), organizations
+        # and persons (contact)
+        if deals_filename != nil
+            process_rows deals_filename do |row|
+                rootmodel.deals.push(to_deal(row, rootmodel))
+            end
+        end
+
         return rootmodel
     end
 
@@ -44,24 +202,29 @@ require "fileutils"
 require 'pathname'
 
 class Cli < Thor
-    desc "to_go ORGANIZATIONS FILE", "Exports xml to FILE using for ORGANIZATIONS csv file."
-    def to_go(organizations, file = nil)
-        file = 'export.xml' if file == nil
-        toModel = ToModel.new()
-        model = toModel.to_model(organizations)
+    desc "to_go", "Generates a Go XML file"
+    method_option :output, :desc => "Path to file where xml will be output", :default => "export.xml", :type => :string
+    method_option :organizations, :desc => "Path to organization csv file", :type => :string
+    method_option :persons, :desc => "Path to persons csv file", :type => :string
+    method_option :coworkers, :desc => "Path to coworkers csv file", :type => :string
+    method_option :deals, :desc => "Path to deals csv file", :type => :string
+    def to_go
+        output = options.output
+        exporter = Exporter.new()
+        model = exporter.to_model(options.coworkers, options.organizations, options.persons, options.deals)
         error = model.sanity_check
         if error.empty?
             validation_errors = model.validate
 
             if validation_errors.empty?
-                model.serialize_to_file(file)
-                puts "'#{organizations}' has been converted into '#{file}'."
+                model.serialize_to_file(output)
+                puts "Generated Go XML file: '#{output}'."
             else
-                puts "'#{organizations}' could not be converted due to"
+                puts "Could not generate file due to"
                 puts validation_errors
             end
         else
-            puts "'#{organizations}' could not be converted due to"
+            puts "Could not generate file due to"
             puts error
         end
     end

data/templates/csv/spec/exporter_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'tomodel'
+
+describe 'Exporter' do
+    before(:all) do
+        exporter = Exporter.new
+        organizations_file = File.join(File.dirname(__FILE__), 'sample_data', 'organizations.csv')
+        coworkers_file = File.join(File.dirname(__FILE__), 'sample_data', 'coworkers.csv')
+        persons_file = File.join(File.dirname(__FILE__), 'sample_data', 'persons.csv')
+        deals_file = File.join(File.dirname(__FILE__), 'sample_data', 'deals.csv')
+        @model = exporter.to_model(coworkers_file, organizations_file, persons_file, deals_file)
+    end
+    it "will find something with a name" do
+        organization = @model.organizations[0]
+        organization.name.length.should > 0
+    end
+end

data/templates/csv/spec/sample_data/coworkers.csv

@@ -0,0 +1,2 @@
+id;first_name;last_name
+666;Evil;Elvis

data/templates/csv/spec/sample_data/deals.csv

@@ -0,0 +1,2 @@
+id;name;value;responsible_id;customer_id;customer_contact_id
+333;Feta affären;10000;666;6;123

data/templates/csv/spec/sample_data/organizations.csv

@@ -1,2 +1,2 @@
-id;name;
-6;Alfs Mjukvaruutveckling
+id;name;responsible_id
+6;Alfs Mjukvaruutveckling;666

data/templates/csv/spec/sample_data/persons.csv

@@ -0,0 +1,2 @@
+id;employer_id;first_name;last_name
+123;6;Rune;Rebellion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -135,7 +135,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fruit_to_lime/address_helper.rb
 - lib/fruit_to_lime/csv_helper.rb
 - lib/fruit_to_lime/model/address.rb
 - lib/fruit_to_lime/model/class_settings.rb
@@ -158,12 +157,16 @@ files:
 - lib/fruit_to_lime.rb
 - bin/fruit_to_lime
 - templates/csv/convert.rb
+- templates/csv/export.xml
 - templates/csv/Gemfile
 - templates/csv/lib/tomodel.rb
 - templates/csv/Rakefile.rb
+- templates/csv/spec/exporter_spec.rb
+- templates/csv/spec/sample_data/coworkers.csv
+- templates/csv/spec/sample_data/deals.csv
 - templates/csv/spec/sample_data/organizations.csv
+- templates/csv/spec/sample_data/persons.csv
 - templates/csv/spec/spec_helper.rb
-- templates/csv/spec/tomodel_spec.rb
 - templates/excel/convert.rb
 - templates/excel/Gemfile
 - templates/excel/lib/tomodel.rb
@@ -177,8 +180,8 @@ files:
 - templates/sqlserver/Rakefile.rb
 - templates/sqlserver/spec/spec_helper.rb
 - templates/sqlserver/spec/tomodel_spec.rb
+- spec/address_spec.rb
 - spec/custom_field_spec.rb
-- spec/helpers/address_helper_spec.rb
 - spec/helpers/csv_helper_spec.rb
 - spec/helpers/roo_helper_spec.rb
 - spec/helpers/serialize_helper_spec.rb
@@ -211,8 +214,8 @@ signing_key:
 specification_version: 3
 summary: Library to generate Lime Go xml import format
 test_files:
+- spec/address_spec.rb
 - spec/custom_field_spec.rb
-- spec/helpers/address_helper_spec.rb
 - spec/helpers/csv_helper_spec.rb
 - spec/helpers/roo_helper_spec.rb
 - spec/helpers/serialize_helper_spec.rb

data/lib/fruit_to_lime/address_helper.rb

@@ -1,18 +0,0 @@
-module FruitToLime
-module AddressHelper
-	# parses a line like "226 48 LUND" into its corresponding
-	# zipcode and city properties on the address
-	def self.parse_line_to_zip_and_address_se(line, address)
-		matched_zipcode = /^\d{3}\s?\d{2}/.match(line)
-		if matched_zipcode && matched_zipcode.length == 1
-			address.zip_code = matched_zipcode[0].strip()
-			matched_city = /\D*$/.match(line)
-			if matched_city && matched_city.length == 1
-				address.city = matched_city[0].strip()
-				return address
-			end
-		end
-		return nil
-	end
-end
-end

data/templates/csv/spec/tomodel_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-require 'tomodel'
-
-describe 'ToModel' do
-    before(:all) do
-        toModel = ToModel.new
-        organizations_file =File.join(File.dirname(__FILE__), 'sample_data', 'organizations.csv')
-        @model = toModel.to_model(organizations_file)        
-    end
-    it "will find something with a name" do
-        organization = @model.organizations[0]
-        organization.name.length.should > 0
-    end
-end