fruit_to_lime 0.6.5 → 0.6.6

data/lib/fruit_to_lime/model/address.rb

@@ -7,9 +7,6 @@ module FruitToLime
         end
         include SerializeHelper
         def initialize()
-            serialize_variables.each do |myattr|
-                instance_variable_set("@"+myattr[:id].to_s,get_default(myattr[:type]))
-            end
         end
 
         def get_import_rows

data/lib/fruit_to_lime/model/coworker_reference.rb

@@ -9,9 +9,6 @@ module FruitToLime
         end
         include SerializeHelper
         def initialize()
-            serialize_variables.each do |myattr|
-                instance_variable_set("@"+myattr[:id].to_s,get_default(myattr[:type]))
-            end
         end
     end
 end

data/lib/fruit_to_lime/model/customfield.rb

@@ -16,9 +16,12 @@ module FruitToLime
             "CustomField"
         end
         include SerializeHelper
-        def initialize()
-            serialize_variables.each do |myattr|
-                instance_variable_set("@"+myattr[:id].to_s,get_default(myattr[:type]))
+        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
  

data/lib/fruit_to_lime/model/note.rb

@@ -22,9 +22,6 @@ module FruitToLime
         end
         include SerializeHelper
         def initialize()
-            serialize_variables.each do |myattr|
-                instance_variable_set("@"+myattr[:id].to_s,get_default(myattr[:type]))
-            end
         end
     end
 end

data/lib/fruit_to_lime/model/organization.rb

@@ -35,46 +35,56 @@ module FruitToLime
     
     class Organization < OrganizationReference
         include SerializeHelper
-        attr_accessor :organization_number, :email, :web_site, :source_ref,
-            :postal_address, :visit_address, :employees, :notes, :custom_fields
+
+        attr_accessor :organization_number, :email, :web_site, :postal_address, :visit_address
+        attr_reader :employees, :notes, :custom_fields
 
         def initialize()
-            serialize_variables.each do |myattr|
-                instance_variable_set("@"+myattr[:id].to_s,get_default(myattr[:type]))
-            end
         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(key, title, value)
-            field = CustomField.new
-            field.integration_id = key
-            field.title = title
-            field.value = value
-            custom_fields.push field
+        def set_custom_field(obj)
+            @custom_fields = [] if @custom_fields==nil
+            @custom_fields.push CustomField.new(obj)
+        end
+        def source_ref
+            @source_ref
+        end
+        def source_ref=(val)
+            if !val.is_a? SourceRef
+                @source_ref = SourceRef.new(val)
+            else
+                @source_ref = val
+            end
         end
 
         def tags
             @tags
         end
 
-        def tags=(strOrArray)
-            if strOrArray.kind_of? String
-                @tags = strOrArray.split(",").map do |str|
-                    Tag.new(str)
-                end.to_a
-            else
-                @tags = strOrArray
-            end
+        def add_tag(str)
+            @tags = [] if @tags == nil
+            @tags.push(Tag.new(str))
         end
 
         def serialize_variables
-            [ :id, :integration_id, :name, :organization_number, :email, :web_site ].map { |prop| {:id=>prop,:type=>:string} } +
-            [{:id=>:postal_address,:type=>:address},
-             {:id=>:visit_address,:type=>:address},
-             {:id=>:employees,:type=>:persons},
-             #{:id=>:notes,:type=>:notes},
-             {:id=>:tags,:type=>:tags},
-             {:id=>:custom_fields,:type=>:custom_fields},
-             {:id=>:source_ref,:type=>:source_ref}
+            [ :id, :integration_id, :name, :organization_number, :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_ref, :type => :source_ref}
             ]
         end
 

data/lib/fruit_to_lime/model/person.rb

@@ -34,35 +34,40 @@ module FruitToLime
         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,
-            :source_ref,
-            :notes, :organization, :custom_fields
+            :notes, :organization
+        attr_reader :custom_fields
 
         def initialize()
-            serialize_variables.each do |myattr|
-                instance_variable_set("@"+myattr[:id].to_s, get_default(myattr[:type]))
-            end
         end
 
-        def set_custom_field(key, title, value)
-            field = CustomField.new
-            field.integration_id = key
-            field.title = title
-            field.value = value
-            custom_fields.push field
+        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 source_ref
+            @source_ref
+        end
+        def source_ref=(val)
+            if !val.is_a? SourceRef
+                @source_ref = SourceRef.new(val)
+            else
+                @source_ref = val
+            end
         end
 
+
         def tags
             @tags
         end
 
-        def tags=(strOrArray)
-            if strOrArray.kind_of? String
-                @tags = strOrArray.split(",").map do |str|
-                    Tag.new(str)
-                end.to_a
-            else
-                @tags = strOrArray
-            end
+        def add_tag(str)
+            @tags = [] if @tags == nil
+            @tags.push(Tag.new(str))
         end
 
         def serialize_name

data/lib/fruit_to_lime/model/sourceref.rb

@@ -58,13 +58,10 @@ module FruitToLime
         end
         def initialize(opt=nil)
             if opt!=nil
-                @name = opt[:name]
-                @id = opt[:id]
-                @format = opt[:format]
-            else
-                @name =""
-                @id =""
-                @format = ""
+                serialize_variables.each do |myattr|
+                    val = opt[myattr[:id]]
+                    instance_variable_set("@"+myattr[:id].to_s,val) if val!=nil
+                end
             end
         end
 

data/lib/fruit_to_lime/serialize_helper.rb

@@ -32,10 +32,12 @@ module SerializeHelper
                     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)
                 end
-                "<#{varn}>#{ varv }</#{varn}>"
+                if varv != nil then "<#{varn}>#{ varv }</#{varn}>" else "" end
             end.join("\n")
         end
         raise "!!#{obj.class}"
@@ -81,7 +83,7 @@ module SerializeHelper
             end
             subval = send(found[:id].to_s)
             if !subval
-                subval = get_default(found[:type])
+                subval = nil
                 send(found[:id].to_s+"=",subval)
             end
             subval.set_attribute(selected.slice(1), value)
@@ -94,35 +96,6 @@ module SerializeHelper
         symbol.to_s.split('_').join(' ').capitalize
     end
 
-    def get_default(type)
-        case type
-        when :string then
-            ""
-        when :bool then
-            false
-        when :source_ref then
-            SourceRef.new
-        when :address then
-            Address.new
-        when :notes then
-            []
-        when :tags then
-            []
-        when :persons then
-            []
-        when :custom_fields then
-            []
-        when :organization_reference then
-            OrganizationReference.new
-        when :date then
-            nil
-        when :coworker_reference then
-            CoworkerReference.new
-        else
-            raise "Dont know how to handle '#{type}'"
-        end
-    end
-
     def map_symbol_to_row(symbol,type)
         {
             :id=>symbol.to_s,

data/spec/helpers/serialize_helper_spec.rb

@@ -6,7 +6,7 @@ describe FruitToLime::SerializeHelper do
     describe "Serialize note" do
         let(:serialized) { 
             n = FruitToLime::Note.new
-                n.text = "text"
+            n.text = "text"
             FruitToLime::SerializeHelper::serialize(n)
         }
         it "should contain text" do
@@ -19,25 +19,38 @@ describe FruitToLime::SerializeHelper do
             serialized.encoding.should equal Encoding::UTF_8
         end
     end
+    describe "Serialize without data" do
+        let(:serialized) { 
+            p = FruitToLime::Person.new
+            FruitToLime::SerializeHelper::serialize(p)
+        }
+        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>/)
+            serialized.should_not match(/<Tags>/)
+            serialized.should_not match(/<CustomFields>/)
+        end
+        it "should be utf-8" do
+            serialized.encoding.should equal Encoding::UTF_8
+        end
+    end
+
     describe "Serialize person" do
         let(:serialized) { 
             p = FruitToLime::Person.new
             p.id = "1"
             p.first_name = "Kalle"
             p.last_name = "Anka"
-            p.source_ref = FruitToLime::SourceRef.new({:name=>'Go',:id=>"PASE122345"})
-            p.postal_address.city = "Ankeborg"
-            p.tags="tag:anka,tag:Bj\u{00F6}rk"
-            cf = FruitToLime::CustomField.new
-            cf.id = "2"
-            cf.title = "cf title"
-            cf.value = "cf value"
-            p.custom_fields.push(cf)
-            cf2 = FruitToLime::CustomField.new
-            cf2.id = "3"
-            cf2.title = "cf title2"
-            cf2.value = "cf Bj\u{00F6}rk"
-            p.custom_fields.push(cf2)
+            p.source_ref = {:name=>'Go',:id=>"PASE122345"}
+            p.with_postal_address do |addr|
+                addr.city = "Ankeborg"
+            end
+            p.add_tag("tag:anka")
+            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)
         }
         it "should contain first and last name" do
@@ -47,6 +60,9 @@ describe FruitToLime::SerializeHelper do
         it "should tag name" do 
             serialized.should match(/tag:anka/)
         end
+        it "should contain address" do 
+            serialized.should match(/Ankeborg/)
+        end
         it "should contain custom field" do
             serialized.should match(/cf title/)
             serialized.should match(/cf value/)
@@ -69,24 +85,26 @@ describe FruitToLime::SerializeHelper do
         let(:serialized) { 
             o = FruitToLime::Organization.new
             o.name = "Ankeborgs bibliotek"
-            o.tags="tag:bibliotek,tag:Bj\u{00F6}rk"
-            o.source_ref = FruitToLime::SourceRef.new({:name=>'Go',:id=>"PASE122345"})
-            cf = FruitToLime::CustomField.new
-            cf.id = "2"
-            cf.title = "cf title"
-            cf.value = "cf value"
-            o.custom_fields.push(cf)
-            cf2 = FruitToLime::CustomField.new
-            cf2.id = "3"
-            cf2.title = "cf title2"
-            cf2.value = "cf Bj\u{00F6}rk"
-            o.custom_fields.push(cf2)
+            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
             FruitToLime::SerializeHelper::serialize(o)
         }
         it "should contain name" do 
             serialized.should match(/Ankeborgs bibliotek/)
         end
-
+        it "should contain address" do 
+            serialized.should match(/Ankeborg/)
+            serialized.should match(/Gaaseborg/)
+        end
         it "should tag name" do
             serialized.should match(/<Tag>tag:bibliotek<\/Tag>/)
         end

data/spec/person_spec.rb

@@ -6,7 +6,9 @@ describe "Person" do
     	@person = FruitToLime::Person.new
     end
     it "can set a customfield" do
-    	@person.set_custom_field('the key', 'the title', 'the value')
+    	@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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes