fruit_to_lime 0.8.2 → 0.9.0

data/lib/fruit_to_lime/model/organization.rb

@@ -1,121 +1,140 @@
-module FruitToLime
-   class OrganizationReference
-        include SerializeHelper
-        attr_accessor :id, :integration_id, :name
-        def serialize_variables
-            [ :id, :integration_id, :name ].map { |prop| {:id=>prop,:type=>:string} }
-        end
-
-        def initalize()
-        end
-        def to_s
-            return "(#{id}, #{integration_id}, #{name})"
-        end
-        def empty?
-            return !@integration_id && !@id && !@name
-        end
-        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 @name
-                return lambda { |org|
-                    org.name == @name
-                }
-            else
-                raise "No reference!"
-            end
-        end
-    end
-
-    class Organization < OrganizationReference
-        include SerializeHelper
-
-        attr_accessor :organization_number, :email, :web_site, :external_link, :postal_address, :visit_address
-        attr_reader :employees, :notes, :custom_fields
-
-        def initialize()
-        end
-
-        def with_postal_address
-            @postal_address = Address.new
-            yield @postal_address
-        end
-
-        def with_visit_address
-            @visit_address = Address.new
-            yield @visit_address
-        end
-
-        def set_custom_field(obj)
-            @custom_fields = [] if @custom_fields==nil
-            @custom_fields.push CustomField.new(obj)
-        end
-
-        def with_source
-            @source = ReferenceToSource.new
-            yield @source
-        end
-
-        def add_employee(val)
-            @employees = [] if @employees==nil
-            @employees.push(if val.is_a? Person then val else Person.new(val) end)
-        end
-
-        def tags
-            @tags
-        end
-
-        def add_tag(str)
-            @tags = [] if @tags == nil
-            @tags.push(Tag.new(str))
-        end
-
-        def serialize_variables
-            [
-             :id, :integration_id, :name, :organization_number, :external_link, :email, :web_site ].map {
-                |prop| { :id => prop, :type => :string }
-            } +
-                [
-                 { :id => :postal_address, :type => :address},
-                 { :id => :visit_address, :type => :address},
-                 { :id => :employees, :type => :persons},
-                 { :id => :tags, :type => :tags},
-                 { :id => :custom_fields, :type => :custom_fields},
-                 { :id => :source, :type => :source_ref}
-                ]
-        end
-
-        def serialize_name
-            "Organization"
-        end
-
-        def to_s
-            return "#{name}"
-        end
-
-        def validate
-            error = String.new
-
-            if @name.nil? || @name.empty?
-                error = "A name is required for organization.\n#{serialize()}"
-            end
-
-            if @employees != nil
-                @employees.each do |person|
-                    validation_message = person.validate()
-                    if !validation_message.empty?
-                        error = "#{error}\n#{validation_message}"
-                    end
-                end
-            end
-
-            return error
-        end
-    end
-end
+module FruitToLime
+   class OrganizationReference
+        include SerializeHelper
+        attr_accessor :id, :integration_id, :heading
+        def serialize_variables
+            [ :id, :integration_id, :heading ].map { |prop| {
+                    :id => prop, :type => :string
+                }
+            }
+        end
+
+        def initalize()
+        end
+
+        def to_s
+            return "(#{id}, #{integration_id}, #{heading})"
+        end
+
+        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
+        include SerializeHelper, ModelHasCustomFields, ModelHasTags
+
+        attr_accessor :id, :integration_id, :name, :organization_number, :email, :web_site, :external_link,
+        :postal_address, :visit_address, :central_phone_number, :responsible_coworker, :source_data
+
+        attr_reader :employees
+
+        def initialize()
+        end
+
+        def to_reference()
+            reference = OrganizationReference.new
+            reference.id = @id
+            reference.integration_id = @integration_id
+            reference.heading = @name
+            return reference
+        end
+
+        def ==(that)
+            if that.nil?
+                return false
+            end
+
+            if that.is_a? Organization
+                return @integration_id == that.integration_id
+            elsif that.is_a? String
+                return @integration_id == that
+            end
+
+            return false
+        end
+
+        def with_postal_address
+            @postal_address = Address.new
+            yield @postal_address
+        end
+
+        def with_visit_address
+            @visit_address = Address.new
+            yield @visit_address
+        end
+
+        def with_source
+            @source = ReferenceToSource.new
+            yield @source
+        end
+
+        def add_employee(val)
+            @employees = [] if @employees==nil
+            @employees.push(if val.is_a? Person then val else Person.new(val) end)
+        end
+
+        def serialize_variables
+            [
+             :id, :integration_id, :name, :organization_number, :external_link,
+             :email, :web_site, :central_phone_number ].map {
+                |prop| { :id => prop, :type => :string }
+            } +
+                [
+                 { :id => :postal_address, :type => :address },
+                 { :id => :visit_address, :type => :address },
+                 { :id => :employees, :type => :persons },
+                 { :id => :tags, :type => :tags },
+                 { :id => :custom_fields, :type => :custom_fields },
+                 { :id => :source, :type => :source_ref },
+                 { :id => :responsible_coworker, :type => :coworker_reference}
+                ]
+        end
+
+        def serialize_name
+            "Organization"
+        end
+
+        def to_s
+            return "#{name}"
+        end
+
+        def validate
+            error = String.new
+
+            if @name.nil? || @name.empty?
+                error = "A name is required for organization.\n#{serialize()}"
+            end
+
+            if @employees != nil
+                @employees.each do |person|
+                    validation_message = person.validate()
+                    if !validation_message.empty?
+                        error = "#{error}\n#{validation_message}"
+                    end
+                end
+            end
+
+            return error
+        end
+    end
+end

data/lib/fruit_to_lime/model/person.rb

@@ -1,111 +1,115 @@
-module FruitToLime
-    class PersonReference
-        include SerializeHelper
-        attr_accessor :id, :integration_id
-        def serialize_variables
-            [ :id, :integration_id ].map { |prop| {:id=>prop,:type=>:string} }
-        end
-
-        def initalize()
-        end
-        def to_s
-            return "(#{id}, #{integration_id})"
-        end
-        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
-        include SerializeHelper
-        attr_accessor :first_name, :last_name,
-            :direct_phone_number, :fax_phone_number, :mobile_phone_number, :home_phone_number,
-            :position, :email, :alternative_email, :postal_address, :currently_employed,
-            :notes, :organization
-        attr_reader :custom_fields
-
-        def initialize(opt=nil)
-            if opt!=nil
-                serialize_variables.each do |myattr|
-                    val = opt[myattr[:id]]
-                    instance_variable_set("@"+myattr[:id].to_s,val) if val!=nil
-                end
-            end
-        end
-
-        def with_postal_address
-            @postal_address = Address.new
-            yield @postal_address
-        end
-
-        def set_custom_field(obj)
-            @custom_fields = [] if @custom_fields==nil
-            @custom_fields.push CustomField.new(obj)
-        end
-
-        def with_source
-            @source = ReferenceToSource.new
-            yield @source
-        end
-
-        def tags
-            @tags
-        end
-
-        def add_tag(str)
-            @tags = [] if @tags == nil
-            @tags.push(Tag.new(str))
-        end
-
-        def serialize_name
-            "Person"
-        end
-
-        def serialize_variables
-            [ :id, :integration_id, :first_name, :last_name,
-        :direct_phone_number, :fax_phone_number, :mobile_phone_number, :home_phone_number,
-        :position, :email, :alternative_email].map { |prop| {:id=>prop,:type=>:string} } +
-            [{:id=>:postal_address,:type=>:address},
-             {:id=>:currently_employed,:type=>:bool},
-             #{:id=>:notes,:type=>:notes},
-             {:id=>:tags,:type=>:tags},
-             {:id=>:custom_fields,:type=>:custom_fields},
-             {:id=>:source, :type=> :source_ref}
-            ]
-        end
-
-        def get_import_rows
-            (serialize_variables+[{:id=>:organization, :type=>:organization_reference}]).map do |p|
-                map_to_row p
-            end
-        end
-
-        def to_s
-            return "#{first_name} #{last_name}"
-        end
-
-        def validate
-            error = String.new
-
-            if (@first_name.nil? || @first_name.empty?) &&
-                    (@last_name.nil? || @last_name.empty?)
-                error = "A firstname or lastname is required for person.\n#{serialize()}"
-            end
-
-            return error
-        end
-    end
-end
+module FruitToLime
+    class PersonReference
+        include SerializeHelper
+        attr_accessor :id, :integration_id
+        def serialize_variables
+            [ :id, :integration_id ].map { |prop| {:id=>prop,:type=>:string} }
+        end
+
+        def initalize()
+        end
+        def to_s
+            return "(#{id}, #{integration_id})"
+        end
+        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
+        include SerializeHelper
+        attr_accessor :first_name, :last_name,
+            :direct_phone_number, :fax_phone_number, :mobile_phone_number, :home_phone_number,
+            :position, :email, :alternative_email, :postal_address, :currently_employed,
+            :organization
+        attr_reader :custom_fields
+
+        def initialize(opt = nil)
+            if opt != nil
+                serialize_variables.each do |myattr|
+                    val = opt[myattr[:id]]
+                    instance_variable_set("@" + myattr[:id].to_s, val) if val != nil
+                end
+            end
+        end
+
+        def with_postal_address
+            @postal_address = Address.new
+            yield @postal_address
+        end
+
+        def set_custom_field(obj)
+            @custom_fields = [] if @custom_fields==nil
+            @custom_fields.push CustomField.new(obj)
+        end
+
+        def with_source
+            @source = ReferenceToSource.new
+            yield @source
+        end
+
+        def tags
+            @tags
+        end
+
+        def add_tag(str)
+            @tags = [] if @tags == nil
+            @tags.push(Tag.new(str))
+        end
+
+        def serialize_name
+            "Person"
+        end
+
+        def serialize_variables
+            [
+             :id, :integration_id, :first_name, :last_name,
+             :direct_phone_number, :fax_phone_number, :mobile_phone_number, :home_phone_number,
+             :position, :email, :alternative_email
+            ].map {
+                |prop| {:id => prop, :type => :string}
+            }+[
+             {:id => :postal_address, :type => :address},
+             {:id => :currently_employed, :type => :bool},
+             {:id => :tags, :type => :tags},
+             {:id => :custom_fields, :type => :custom_fields},
+             {:id => :source, :type => :source_ref},
+             {:id => :organization, :type => :organization_reference}
+            ]
+        end
+
+        def get_import_rows
+            (serialize_variables + [ { :id => :organization, :type => :organization_reference } ]).map do |p|
+                map_to_row p
+            end
+        end
+
+        def to_s
+            return "#{first_name} #{last_name}"
+        end
+
+        def validate
+            error = String.new
+
+            if (@first_name.nil? || @first_name.empty?) &&
+                    (@last_name.nil? || @last_name.empty?)
+                error = "A firstname or lastname is required for person.\n#{serialize()}"
+            end
+
+            return error
+        end
+    end
+end

data/lib/fruit_to_lime/model/referencetosource.rb

@@ -1,43 +1,43 @@
-module FruitToLime
-    class ReferenceToSource
-        include SerializeHelper
-        attr_accessor :name, :id, :format
-
-        def serialize_variables
-            [:name, :id, :format].map { |prop| { :id => prop, :type => :string } }
-        end
-
-        def serialize_name
-            "ReferenceToSource"
-        end
-
-        def get_import_rows
-            (serialize_variables + [{ :id => :value, :type => :string }]).map do |p|
-                map_to_row p
-            end
-        end
-
-        def initialize(opt = nil)
-            if opt != nil
-                serialize_variables.each do |myattr|
-                    val = opt[myattr[:id]]
-                    instance_variable_set("@" + myattr[:id].to_s,val) if val != nil
-                end
-            end
-        end
-
-        def to_s
-            return "#{@name}_#{@format}_#{@id}"
-        end
-
-        def ==(other)
-            return @name == other.name && @id == other.id && @format== other.format
-        end
-
-        def par_se(id)
-            @name = 'pase'
-            @format = 'External'
-            @id = id
-        end
-    end
+module FruitToLime
+    class ReferenceToSource
+        include SerializeHelper
+        attr_accessor :name, :id, :format
+
+        def serialize_variables
+            [:name, :id, :format].map { |prop| { :id => prop, :type => :string } }
+        end
+
+        def serialize_name
+            "ReferenceToSource"
+        end
+
+        def get_import_rows
+            (serialize_variables + [{ :id => :value, :type => :string }]).map do |p|
+                map_to_row p
+            end
+        end
+
+        def initialize(opt = nil)
+            if opt != nil
+                serialize_variables.each do |myattr|
+                    val = opt[myattr[:id]]
+                    instance_variable_set("@" + myattr[:id].to_s,val) if val != nil
+                end
+            end
+        end
+
+        def to_s
+            return "#{@name}_#{@format}_#{@id}"
+        end
+
+        def ==(other)
+            return @name == other.name && @id == other.id && @format== other.format
+        end
+
+        def par_se(id)
+            @name = 'pase'
+            @format = 'External'
+            @id = id
+        end
+    end
 end