fruit_to_lime 0.7.3 → 0.8.0

data/lib/fruit_to_lime/model/organization.rb

@@ -17,7 +17,7 @@ module FruitToLime
         def same_as_this_method()
             if @integration_id
                 return lambda { |org|
-                    org.integration_id == @integration_id 
+                    org.integration_id == @integration_id
                 }
             elsif @id
                 return lambda { |org|
@@ -32,7 +32,7 @@ module FruitToLime
             end
         end
     end
-    
+
     class Organization < OrganizationReference
         include SerializeHelper
 
@@ -62,10 +62,9 @@ module FruitToLime
             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) 
+            @employees.push(if val.is_a? Person then val else Person.new(val) end)
         end
 
         def tags
@@ -78,15 +77,18 @@ module FruitToLime
         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}
-            ]
+             :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
@@ -96,5 +98,24 @@ module FruitToLime
         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
+end

data/lib/fruit_to_lime/model/person.rb

@@ -17,7 +17,7 @@ module FruitToLime
         def same_as_this_method()
             if @integration_id
                 return lambda { |person|
-                    person.integration_id == @integration_id 
+                    person.integration_id == @integration_id
                 }
             elsif @id
                 return lambda { |person|
@@ -31,7 +31,7 @@ module FruitToLime
 
     class Person < PersonReference
         include SerializeHelper
-        attr_accessor :first_name, :last_name, 
+        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
@@ -75,7 +75,7 @@ module FruitToLime
         end
 
         def serialize_variables
-            [ :id, :integration_id, :first_name, :last_name, 
+            [ :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},
@@ -85,16 +85,27 @@ module FruitToLime
              {:id=>:custom_fields,:type=>:custom_fields},
              {:id=>:source, :type=> :source_ref}
             ]
-        end        
+        end
 
         def get_import_rows
             (serialize_variables+[{:id=>:organization, :type=>:organization_reference}]).map do |p|
                 map_to_row p
-            end            
+            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
+end

data/lib/fruit_to_lime/model/rootmodel.rb

@@ -21,5 +21,19 @@ module FruitToLime
                 same_as_this.call(org)
             end
         end
+
+        def validate()
+            error = String.new
+
+            @organizations.each do |o|
+                validation_message = o.validate()
+
+                if !validation_message.empty?
+                    error = "#{error}\n#{validation_message}"
+                end
+            end
+
+            return error
+        end
     end
-end
+end

data/lib/fruit_to_lime/serialize_helper.rb

@@ -13,11 +13,11 @@ module SerializeHelper
     def self.serialize_variables(obj)
         if (obj.respond_to?(:serialize_variables))
             return obj.serialize_variables.map do |ivar|
-                varn = ivar[:id].to_s.gsub(/^\@/,'').split('_').map do |m| 
-                    m.capitalize 
+                varn = ivar[:id].to_s.gsub(/^\@/,'').split('_').map do |m|
+                    m.capitalize
                 end.join('')
                 varv = obj.instance_variable_get("@#{ivar[:id].to_s}")
-                if (varv.respond_to?(:serialize_variables)) 
+                if (varv.respond_to?(:serialize_variables))
                     varv = serialize_variables(varv)
                 elsif (varv.is_a?(Array))
                     varv = varv.map { |elem| SerializeHelper::serialize(elem) }.join("\n")
@@ -27,13 +27,14 @@ module SerializeHelper
                     varv = varv.to_s.encode('UTF-8').encode(:xml => :text)
                 end
                 if varv != nil then "<#{varn}>#{ varv }</#{varn}>" else "" end
+                if varv != nil then "<#{varn}>#{ varv }</#{varn}>" end
             end.join("\n")
         end
         raise "!!#{obj.class}"
     end
 
     def self.serialize(obj)
-        if (obj.respond_to?(:serialize_variables)) 
+        if (obj.respond_to?(:serialize_variables))
             varn = obj.serialize_name
             "<#{varn}>#{ SerializeHelper::serialize_variables(obj) }</#{varn}>"
         elsif obj.respond_to?(:to_xml)
@@ -114,7 +115,7 @@ module SerializeHelper
 
     def self.get_import_rows(type)
         case type
-        when :person then 
+        when :person then
             Person.new
         when :source_ref then
             ReferenceToSource.new
@@ -135,4 +136,4 @@ module SerializeHelper
         end.get_import_rows
     end
 end
-end
+end

data/spec/person_spec.rb

@@ -3,17 +3,42 @@ require 'fruit_to_lime'
 
 describe "Person" do
     before (:all) do
-    	@person = FruitToLime::Person.new
+        @person = FruitToLime::Person.new
     end
+
     it "can set a customfield" do
-    	@person.set_custom_field({:integration_id=>'the key',
+        @person.set_custom_field({:integration_id=>'the key',
             :title=> 'the title',
             :value=> 'the value'})
-        
+
         field = @person.custom_fields[0]
         field.integration_id.should eq 'the key'
         field.title.should eq 'the title'
         field.value.should eq 'the value'
     end
+
+    it "should have a firstname if no lastname" do
+        @person.first_name = "Vincent"
+        @person.last_name = nil
+
+        error = @person.validate
+        error.should be_empty
+    end
+
+    it "should have a lastname if no firstname" do
+        @person.first_name = String.new
+        @person.last_name = "Vega"
+
+        error = @person.validate
+        error.should be_empty
+    end
+
+    it "shouldnt pass validation with no firstname and lastname" do
+        @person.first_name = String.new
+        @person.last_name = nil
+
+        error = @person.validate
+        error.should start_with("A firstname or lastname is required for person")
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes