fruit_to_lime 0.9.2 → 0.9.3

data/lib/fruit_to_lime/model/coworker.rb

@@ -4,7 +4,13 @@ module FruitToLime
         attr_accessor :id, :integration_id, :first_name, :last_name, :email, :direct_phone_number,
         :mobile_phone_number, :home_phone_number
 
-        def initialize()
+        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 serialize_variables

data/lib/fruit_to_lime/model/coworker_reference.rb

@@ -3,7 +3,13 @@ module FruitToLime
         include SerializeHelper
         attr_accessor :id, :heading, :integration_id
 
-        def initialize()
+        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 serialize_variables

data/lib/fruit_to_lime/model/customfield.rb

@@ -1,6 +1,6 @@
 module FruitToLime
     class CustomField
-        include SerializeHelper
+        include SerializeHelper, ModelWithIntegrationIdSameAs
 
         attr_accessor :id, :integration_id, :title, :value
 

data/lib/fruit_to_lime/model/organization.rb

@@ -90,22 +90,32 @@ module FruitToLime
 
         def add_employee(val)
             @employees = [] if @employees==nil
-            @employees.push(if val.is_a? Person then val else Person.new(val) end)
+            person = if val.is_a? Person then val else Person.new(val) end
+            @employees.push(person)
+            person
+        end
+
+        def add_responsible_coworker(val)
+            coworker = if val.is_a? CoworkerReference then val else CoworkerReference.new(val) end
+            @responsible_coworker = coworker
+            coworker
         end
 
         def serialize_variables
-            [
-             :id, :integration_id, :name, :organization_number,
-             :email, :web_site, :central_phone_number ].map {
-                |prop| { :id => prop, :type => :string }
-            } +
                 [
+                 { :id => :id, :type => :string },
+                 { :id => :integration_id, :type => :string },
+                 { :id => :source, :type => :source_ref },
+                 { :id => :name, :type => :string },
+                 { :id => :organization_number, :type => :string },
                  { :id => :postal_address, :type => :address },
                  { :id => :visit_address, :type => :address },
+                 { :id => :central_phone_number, :type => :string },
+                 { :id => :email, :type => :string },
+                 { :id => :web_site, :type => :string },
                  { :id => :employees, :type => :persons },
-                 { :id => :tags, :type => :tags },
                  { :id => :custom_fields, :type => :custom_fields },
-                 { :id => :source, :type => :source_ref },
+                 { :id => :tags, :type => :tags },
                  { :id => :responsible_coworker, :type => :coworker_reference}
                 ]
         end

data/lib/fruit_to_lime/model/person.rb

@@ -30,7 +30,7 @@ module FruitToLime
     end
 
     class Person < PersonReference
-        include SerializeHelper
+        include SerializeHelper, ModelHasCustomFields, ModelHasTags
         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,
@@ -38,6 +38,7 @@ module FruitToLime
         attr_reader :custom_fields
 
         def initialize(opt = nil)
+            @currently_employed = true
             if opt != nil
                 serialize_variables.each do |myattr|
                     val = opt[myattr[:id]]
@@ -51,11 +52,6 @@ module FruitToLime
             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
@@ -65,29 +61,35 @@ module FruitToLime
             @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 => :id, :type => :string},
+             {:id => :integration_id, :type => :string},
+             {:id => :source, :type => :source_ref},
+             {:id => :first_name, :type => :string},
+             {:id => :last_name, :type => :string},
+
+             {:id => :direct_phone_number, :type => :string},
+             {:id => :fax_phone_number, :type => :string},
+             {:id => :mobile_phone_number, :type => :string},
+             {:id => :home_phone_number, :type => :string},
+
+             {:id => :position, :type => :string},
+             
              {:id => :tags, :type => :tags},
+             
+             {:id => :email, :type => :string},
+             {:id => :alternative_email, :type => :string},
+
+             {:id => :postal_address, :type => :address},
              {:id => :custom_fields, :type => :custom_fields},
-             {:id => :source, :type => :source_ref},
-             {:id => :organization, :type => :organization_reference}
+             {:id => :currently_employed, :type => :bool},
+             {:id => :organization, :type => :organization_reference},
+             
             ]
         end
 

data/lib/fruit_to_lime/model/referencetosource.rb

@@ -4,7 +4,7 @@ module FruitToLime
         attr_accessor :name, :id, :format
 
         def serialize_variables
-            [:name, :id, :format].map { |prop| { :id => prop, :type => :string } }
+            [:name, :format, :id].map { |prop| { :id => prop, :type => :string } }
         end
 
         def serialize_name
@@ -31,6 +31,9 @@ module FruitToLime
         end
 
         def ==(other)
+            if other==nil 
+                return false
+            end
             return @name == other.name && @id == other.id && @format== other.format
         end
 

data/lib/fruit_to_lime/model/rootmodel.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module FruitToLime
     class RootModel
         # the import_coworker is a special coworker that is set as
@@ -5,8 +6,8 @@ module FruitToLime
         attr_accessor :organizations, :coworkers, :deals, :notes, :import_coworker
         def serialize_variables
             [
-             {:id => :coworkers, :type => :coworkers},
              {:id => :organizations, :type => :organizations},
+             {:id => :coworkers, :type => :coworkers},
              {:id => :deals, :type => :deals},
              {:id => :notes, :type => :notes},
             ]
@@ -138,5 +139,11 @@ module FruitToLime
 
             return error.strip
         end
+
+        def to_rexml(doc)
+            element_name = serialize_name
+            elem = doc.add_element(element_name,{"Version"=>"v1_0"})
+            SerializeHelper::serialize_variables_rexml(elem, self)
+        end
     end
 end

data/lib/fruit_to_lime/model/tag.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module FruitToLime
     class Tag
         def serialize_name
@@ -13,9 +14,9 @@ module FruitToLime
             end
         end
 
-        def to_xml
-            varn = serialize_name
-            "<#{varn}>#{ @value.to_s.encode('utf-8').encode(:xml => :text) }</#{varn}>"
+        def to_rexml(elem)
+            element_name = serialize_name
+            elem.add_element(element_name).text = @value.to_s.encode('utf-8')
         end
 
         def to_s

data/lib/fruit_to_lime/model_helpers.rb

@@ -1,12 +1,35 @@
 module FruitToLime
     module ModelHasCustomFields
-        #        attr_reader :custom_fields
-
-        #@custom_fields = []
-
         def set_custom_field(obj)
             @custom_fields = [] if @custom_fields==nil
-            @custom_fields.push CustomField.new(obj)
+            new_custom_field = CustomField.new(obj)
+            index = @custom_fields.find_index do |custom_field| 
+                custom_field.same_as?(new_custom_field)
+            end
+            if index
+                @custom_fields.delete_at index
+            end
+            @custom_fields.push new_custom_field
+            return new_custom_field
+        end
+
+        def add_custom_field(obj)
+            @custom_fields = [] if @custom_fields==nil
+            custom_field = CustomField.new(obj)
+            @custom_fields.push custom_field
+            return custom_field
+        end
+    end
+
+    module ModelWithIntegrationIdSameAs
+        def same_as?(other)
+            if @integration_id!=nil && @integration_id == other.integration_id 
+                return true
+            end
+            if @id != nil && @id == other.id
+                return true
+            end
+            return false
         end
     end
 
@@ -15,5 +38,11 @@ module FruitToLime
             @tags = [] if @tags == nil
             @tags.push(Tag.new(str))
         end
+        def set_tag(str)
+            @tags = [] if @tags == nil
+            if ! @tags.any? {|tag| tag.value = str }  
+                @tags.push(Tag.new(str))
+            end
+        end
     end
 end

data/lib/fruit_to_lime/serialize_helper.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require "rexml/document"
+
 module FruitToLime
     module SerializeHelper
         def serialize()
@@ -9,36 +11,56 @@ module FruitToLime
             SerializeHelper::serialize_to_file(file, self)
         end
 
-        def self.serialize_variables(obj)
+        def self.serialize_variables_rexml(elem, obj)
             if (obj.respond_to?(:serialize_variables))
-                return obj.serialize_variables.map do |ivar|
-                    varn = ivar[:id].to_s.gsub(/^\@/,'').split('_').map do |m|
+                obj.serialize_variables.each do |serialize_variable|
+                    element_name = serialize_variable[: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))
-                        varv = serialize_variables(varv)
-                    elsif (varv.is_a?(Array))
-                        varv = varv.map { |elem| SerializeHelper::serialize(elem) }.join("\n")
-                    elsif (varv == nil)
-                        varv = nil
-                    else
-                        varv = varv.to_s.encode('UTF-8').encode(:xml => :text)
+                    raw_var = obj.instance_variable_get("@#{serialize_variable[:id].to_s}")
+                    if raw_var != nil
+                        element = elem.add_element(element_name)
+                        if (raw_var.respond_to?(:serialize_variables))
+                            SerializeHelper::serialize_variables_rexml(element, raw_var)
+                        elsif (raw_var.is_a?(Array))
+                            raw_var.each do |raw_var_elem| 
+                                SerializeHelper::serialize_rexml(element, raw_var_elem) 
+                            end
+                        else
+                            element.text = raw_var.to_s.encode('UTF-8')
+                        end
                     end
-                    if varv != nil then "<#{varn}>#{ varv }</#{varn}>" else "" end
-                    if varv != nil then "<#{varn}>#{ varv }</#{varn}>" end
-                end.join("\n")
+                end
+                return
             end
-            raise "!!#{obj.class}"
+            raise "Do not know how to handle #{obj.class} !!"
         end
 
-        def self.serialize(obj)
-            if (obj.respond_to?(:serialize_variables))
-                varn = obj.serialize_name
-                "<#{varn}>#{ SerializeHelper::serialize_variables(obj) }</#{varn}>"
-            elsif obj.respond_to?(:to_xml)
-                obj.to_xml
+        def self.serialize_rexml(elem, obj)
+            if obj.respond_to?(:to_rexml)
+                obj.to_rexml(elem)
+            elsif (obj.respond_to?(:serialize_variables))
+                element_name = obj.serialize_name
+                SerializeHelper::serialize_variables_rexml(elem.add_element(element_name), obj)
+            else
+                elem.text = obj.to_s
+            end
+        end
+
+        def self.serialize(obj, indent= 2)
+            # indent -1 to avoid indent
+            if obj.respond_to?(:to_rexml)
+                doc = REXML::Document.new()
+                SerializeHelper::serialize_rexml(doc, obj)
+                doc.write( xml_str = "" , indent, true)
+                xml_str
+            elsif (obj.respond_to?(:serialize_variables))
+                element_name = obj.serialize_name
+                doc = REXML::Document.new()
+                SerializeHelper::serialize_variables_rexml(doc.add_element(element_name), obj)
+                doc.write( xml_str = "", indent, true)
+                xml_str
             else
                 obj.to_s.encode(:xml => :text)
             end

data/spec/custom_field_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require 'fruit_to_lime'
+
+describe "CustomField" do
+    before (:all) do
+        @custom_field = FruitToLime::CustomField.new({:id => 'the id',
+            :integration_id=>'the key',
+            :title=> 'the title',
+            :value=> 'the value'})
+    end
+
+    it "is the same as a custom field with the same integration_id" do
+        @custom_field.same_as?(FruitToLime::CustomField.new({:integration_id=>'the key',
+            :title=> 'the title 2',
+            :value=> 'the value 2'})).should eq true
+    end
+
+    it "is the same as a custom field with the same id" do
+        @custom_field.same_as?(FruitToLime::CustomField.new({:id=>'the id',
+            :title=> 'the title 2',
+            :value=> 'the value 2'})).should eq true
+    end
+
+end
+

data/spec/helpers/serialize_helper_spec.rb

@@ -7,10 +7,10 @@ describe FruitToLime::SerializeHelper do
         let(:serialized) {
             n = FruitToLime::Note.new
             n.text = "text"
-            FruitToLime::SerializeHelper::serialize(n)
+            FruitToLime::SerializeHelper::serialize(n,-1)
         }
         it "should contain text" do
-            serialized.should match(/<Text>text<\/Text>/)
+            serialized.should match(/<Text>[\n ]*text[\n ]*<\/Text>/)
         end
         it "should contain start tag" do
             serialized.should match(/<Note>/)
@@ -19,13 +19,24 @@ describe FruitToLime::SerializeHelper do
             serialized.encoding.should equal Encoding::UTF_8
         end
     end
+
+    describe "Serialize note with xml inside" do
+        let(:serialized) {
+            n = FruitToLime::Note.new
+            n.text = "<text>"
+            FruitToLime::SerializeHelper::serialize(n,-1)
+        }
+        it "should contain encoded text" do
+            serialized.should match(/<Text>[\n ]*&lt;text&gt;[\n ]*<\/Text>/)
+        end
+    end
+
     describe "Serialize without data" do
         let(:serialized) {
             p = FruitToLime::Person.new
-            FruitToLime::SerializeHelper::serialize(p)
+            FruitToLime::SerializeHelper::serialize(p,-1)
         }
         it "should not contain fields that are not set" do
-            #puts serialized
             serialized.should_not match(/<Email>/)
             serialized.should_not match(/<Position>/)
             serialized.should_not match(/<AlternativeEmail>/)
@@ -50,16 +61,22 @@ describe FruitToLime::SerializeHelper do
             p.with_postal_address do |addr|
                 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_custom_field({:id=>"2", :title=>"cf title", :value=>"cf value"})
             p.set_custom_field({:id=>"3", :title=>"cf title2", :value=>"cf Bj\u{00F6}rk"})
-            FruitToLime::SerializeHelper::serialize(p)
+            p.set_custom_field({:id=>"4", :title=>"cf <title3>", :value=>"cf <Bj\u{00F6}rk>"})
+            FruitToLime::SerializeHelper::serialize(p,-1)
         }
         it "should contain first and last name" do
-            serialized.should match(/<FirstName>Kalle<\/FirstName>/)
+            serialized.should match(/<FirstName>[\n ]*Kalle[\n ]*<\/FirstName>/)
             serialized.should match(/Anka/)
         end
+        it "should contain currently_employed" do
+            serialized.should match(/<CurrentlyEmployed>[\n ]*true[\n ]*<\/CurrentlyEmployed>/)
+        end
         it "should tag name" do
             serialized.should match(/tag:anka/)
         end
@@ -79,6 +96,12 @@ describe FruitToLime::SerializeHelper do
         it "should handle sv chars in custom value" do
             serialized.should match(/cf Bj\u{00F6}rk/)
         end
+        it "should handle xml in tag" do
+            serialized.should match(/tag:&lt;Bj\u{00F6}rk&gt;/)
+        end
+        it "should handle xml in custom value" do
+            serialized.should match(/cf &lt;Bj\u{00F6}rk&gt;/)
+        end
         it "should be utf-8" do
             serialized.encoding.should equal Encoding::UTF_8
         end
@@ -106,7 +129,7 @@ describe FruitToLime::SerializeHelper do
                 :first_name => "Kalle",
                 :last_name => "Anka"
             })
-            FruitToLime::SerializeHelper::serialize(o)
+            FruitToLime::SerializeHelper::serialize(o,-1)
         }
         it "should contain name" do
             serialized.should match(/Ankeborgs bibliotek/)
@@ -120,7 +143,7 @@ describe FruitToLime::SerializeHelper do
             serialized.should match(/Gaaseborg/)
         end
         it "should tag name" do
-            serialized.should match(/<Tag>tag:bibliotek<\/Tag>/)
+            serialized.should match(/<Tag>[\n ]*tag:bibliotek[\n ]*<\/Tag>/)
         end
         it "should contain custom field" do
             serialized.should match(/cf title/)
@@ -147,7 +170,7 @@ describe FruitToLime::SerializeHelper do
             o = FruitToLime::Organization.new
             o.name = "Ankeborgs bibliotek"
             i.organizations.push(o)
-            FruitToLime::SerializeHelper::serialize(i)
+            FruitToLime::SerializeHelper::serialize(i,-1)
         }
         it "should contain name" do
             serialized.should match(/Ankeborgs bibliotek/)

data/spec/helpers/xsd_validate_spec.rb

@@ -0,0 +1,49 @@
+
+require 'spec_helper'
+require 'fruit_to_lime'
+require 'nokogiri'
+describe FruitToLime::SerializeHelper do
+
+    describe "Validate according to xsd" do
+        let(:validate_result) {
+            i = FruitToLime::RootModel.new
+            o = FruitToLime::Organization.new
+            o.name = "Ankeborgs bibliotek"
+            o.with_source do |source|
+                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_custom_field({:id=>"2", :title=>"cf title", :value=>"cf value"})
+            o.set_custom_field({:id=>"3", :title=>"cf title2", :value=>"cf Bj\u{00F6}rk"})
+            o.with_postal_address do |addr|
+                addr.city = "Ankeborg"
+            end
+            o.with_visit_address do |addr|
+                addr.city = "Gaaseborg"
+            end
+            o.add_responsible_coworker({
+                :id => "1"
+            })
+            emp = o.add_employee({
+                :id => "1",
+                :first_name => "Kalle",
+                :last_name => "Anka"
+            })
+            emp.direct_phone_number = '234234234'
+            emp.currently_employed = true
+            i.organizations.push(o)
+            xsd_file = File.join(File.dirname(__FILE__), '..', 'sample_data', 'schema0.xsd')
+            
+            xsd = Nokogiri::XML::Schema(File.read(xsd_file))
+            #puts  FruitToLime::SerializeHelper::serialize(i)
+            doc = Nokogiri::XML(FruitToLime::SerializeHelper::serialize(i,-1))
+            xsd.validate(doc)
+        }
+        it "Should not contain validation errors" do
+            expect(validate_result).to eq([])
+        end
+        
+    end
+end

data/spec/person_spec.rb

@@ -2,42 +2,76 @@ require "spec_helper"
 require 'fruit_to_lime'
 
 describe "Person" do
-    before (:all) do
-        @person = FruitToLime::Person.new
-    end
+    let(:person) {
+        FruitToLime::Person.new
+    }
 
     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 = 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 "will set custom field with same integration_id to the last value" do
+        person.set_custom_field({:integration_id=>'the key',
+            :title=> 'the title',
+            :value=> 'the value'})
+
+        person.set_custom_field({:integration_id=>'the key',
+            :title=> 'the title 2',
+            :value=> 'the value 2'})
+        person.custom_fields.length.should eq 1 
+        field = person.custom_fields[0]
+        field.integration_id.should eq 'the key'
+        field.title.should eq 'the title 2'
+        field.value.should eq 'the value 2'
+    end
+
+    it "will set custom field with same id to the last value" do
+        person.set_custom_field({:id=>'the id',
+            :title=> 'the title',
+            :value=> 'the value'})
+
+        person.set_custom_field({:id=>'the id',
+            :title=> 'the title 2',
+            :value=> 'the value 2'})
+        person.custom_fields.length.should eq 1 
+        field = person.custom_fields[0]
+        field.id.should eq 'the id'
+        field.title.should eq 'the title 2'
+        field.value.should eq 'the value 2'
+    end
+
     it "should have a firstname if no lastname" do
-        @person.first_name = "Vincent"
-        @person.last_name = nil
+        person.first_name = "Vincent"
+        person.last_name = nil
 
-        error = @person.validate
+        error = person.validate
         error.should be_empty
     end
 
+    it "should be currently employed if nothing specified" do
+        expect(person.currently_employed).to eq(true)
+    end
+
     it "should have a lastname if no firstname" do
-        @person.first_name = String.new
-        @person.last_name = "Vega"
+        person.first_name = String.new
+        person.last_name = "Vega"
 
-        error = @person.validate
+        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
+        person.first_name = String.new
+        person.last_name = nil
 
-        error = @person.validate
+        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.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -175,10 +175,12 @@ files:
 - templates/sqlserver/Rakefile.rb
 - templates/sqlserver/spec/spec_helper.rb
 - templates/sqlserver/spec/tomodel_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
+- spec/helpers/xsd_validate_spec.rb
 - spec/person_spec.rb
 - spec/spec_helper.rb
 - spec/templating_spec.rb
@@ -207,10 +209,12 @@ signing_key:
 specification_version: 3
 summary: Library to generate Lime Go xml import format
 test_files:
+- 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
+- spec/helpers/xsd_validate_spec.rb
 - spec/person_spec.rb
 - spec/spec_helper.rb
 - spec/templating_spec.rb