fruit_to_lime 0.9.3 → 2.0.0

data/lib/fruit_to_lime/model/class_settings.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+module FruitToLime
+    class ClassSettings
+        include SerializeHelper
+        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 serialize_variables
+            [{:id => :custom_fields, :type => :custom_fields} ]
+        end
+
+        def serialize_name
+            "ClassSettings"
+        end
+
+        def set_custom_field(obj)
+            @custom_fields = [] if @custom_fields==nil
+
+            field = CustomField.new(obj)
+
+            index = @custom_fields.find_index do |custom_field| 
+                custom_field.same_as?(field)
+            end
+            if index
+                @custom_fields.delete_at index
+            end
+
+            @custom_fields.push field
+
+            return field
+        end
+
+        def add_custom_field(obj)
+            @custom_fields = [] if @custom_fields==nil
+
+            field = CustomField.new(obj)
+            @custom_fields.push field
+
+            return field
+        end
+    end
+end

data/lib/fruit_to_lime/model/customfield.rb

@@ -1,8 +1,8 @@
 module FruitToLime
-    class CustomField
+    class CustomFieldReference
         include SerializeHelper, ModelWithIntegrationIdSameAs
 
-        attr_accessor :id, :integration_id, :title, :value
+        attr_accessor :id, :integration_id
 
         def initialize(opt=nil)
             if opt != nil
@@ -14,7 +14,35 @@ module FruitToLime
         end
 
         def serialize_variables
-            [:id, :integration_id, :title, :value].map {|p| { :id => p, :type => :string } }
+            [:id, :integration_id].map {|p| { :id => p, :type => :string } }
+        end
+
+        def get_import_rows
+            serialize_variables.map do |p|
+                map_to_row p
+            end
+        end
+
+        def serialize_name
+            "CustomFieldReference"
+        end
+    end
+
+    class CustomField
+        include SerializeHelper, ModelWithIntegrationIdSameAs
+        attr_accessor :id, :integration_id, :title, :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
+
+        def serialize_variables
+            [:id, :integration_id, :title, :type].map {|p| { :id => p, :type => :string } }
         end
 
         def get_import_rows
@@ -27,4 +55,33 @@ module FruitToLime
             "CustomField"
         end
     end
+
+    class CustomValue
+        include SerializeHelper
+        attr_accessor :field, :value
+
+        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
+            [ { :id =>:field, :type => :custom_field_reference },
+                { :id =>:value, :type => :string }]
+        end
+
+        def get_import_rows
+            serialize_variables.map do |p|
+                map_to_row p
+            end
+        end
+
+        def serialize_name
+            "CustomValue"
+        end
+    end
 end

data/lib/fruit_to_lime/model/deal.rb

@@ -6,7 +6,7 @@ module FruitToLime
         attr_accessor :id, :integration_id, :name, :description, :probability, :value, :order_date, :offer_date, :customer,
         :responsible_coworker, :customer_contact, :status
 
-        attr_reader :custom_fields
+        attr_reader :custom_values
 
         def serialize_variables
             [ :id, :integration_id, :name, :description, :probability, :value, :offer_date, :order_date ].map {
@@ -19,7 +19,7 @@ module FruitToLime
                  { :id => :customer, :type => :organization_reference },
                  { :id => :responsible_coworker, :type => :coworker_reference },
                  { :id => :customer_contact, :type => :person_reference },
-                 { :id => :custom_fields, :type => :custom_fields },
+                 { :id => :custom_values, :type => :custom_values },
                  { :id => :tags, :type => :tags },
                  { :id => :status, :type => :deal_status }
                 ]

data/lib/fruit_to_lime/model/organization.rb

@@ -102,22 +102,22 @@ module FruitToLime
         end
 
         def serialize_variables
-                [
-                 { :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 => :custom_fields, :type => :custom_fields },
-                 { :id => :tags, :type => :tags },
-                 { :id => :responsible_coworker, :type => :coworker_reference}
-                ]
+            [
+             { :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 => :custom_values, :type => :custom_values },
+             { :id => :tags, :type => :tags },
+             { :id => :responsible_coworker, :type => :coworker_reference}
+            ]
         end
 
         def serialize_name

data/lib/fruit_to_lime/model/person.rb

@@ -35,7 +35,7 @@ module FruitToLime
             :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
+        attr_reader :custom_values
 
         def initialize(opt = nil)
             @currently_employed = true
@@ -86,7 +86,7 @@ module FruitToLime
              {:id => :alternative_email, :type => :string},
 
              {:id => :postal_address, :type => :address},
-             {:id => :custom_fields, :type => :custom_fields},
+             {:id => :custom_values, :type => :custom_values},
              {:id => :currently_employed, :type => :bool},
              {:id => :organization, :type => :organization_reference},
              

data/lib/fruit_to_lime/model/rootmodel.rb

@@ -3,11 +3,12 @@ module FruitToLime
     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 :organizations, :coworkers, :deals, :notes, :import_coworker
+        attr_accessor :settings, :organizations, :coworkers, :deals, :notes, :import_coworker
         def serialize_variables
             [
-             {:id => :organizations, :type => :organizations},
+             {:id => :settings, :type => :settings},
              {:id => :coworkers, :type => :coworkers},
+             {:id => :organizations, :type => :organizations},
              {:id => :deals, :type => :deals},
              {:id => :notes, :type => :notes},
             ]
@@ -20,6 +21,7 @@ module FruitToLime
         include SerializeHelper
 
         def initialize()
+            @settings = Settings.new
             @organizations = []
             @coworkers = []
             @import_coworker = Coworker.new
@@ -142,7 +144,7 @@ module FruitToLime
 
         def to_rexml(doc)
             element_name = serialize_name
-            elem = doc.add_element(element_name,{"Version"=>"v1_0"})
+            elem = doc.add_element(element_name,{"Version"=>"v2_0"})
             SerializeHelper::serialize_variables_rexml(elem, self)
         end
     end

data/lib/fruit_to_lime/model/settings.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+module FruitToLime
+    class Settings
+        include SerializeHelper
+        attr_reader :organization, :person, :deal
+        def with_organization
+            @organization = ClassSettings.new if @organization ==nil
+            yield @organization
+        end
+        def with_person
+            @person = ClassSettings.new if @person ==nil
+            yield @person
+        end
+        def with_deal
+            @deal = ClassSettings.new if @deal ==nil
+            yield @deal
+        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 serialize_variables
+            [:organization, :person, :deal].map {|p| {:id => p, :type => :class_settings} }
+        end
+
+        def serialize_name
+            "Settings"
+        end
+    end
+end

data/lib/fruit_to_lime/model_helpers.rb

@@ -1,29 +1,30 @@
 module FruitToLime
     module ModelHasCustomFields
-        def set_custom_field(obj)
-            @custom_fields = [] if @custom_fields==nil
-            new_custom_field = CustomField.new(obj)
-            index = @custom_fields.find_index do |custom_field| 
-                custom_field.same_as?(new_custom_field)
+        def set_custom_value(value, field)
+            @custom_values = [] if @custom_values==nil
+            custom_value = CustomValue.new()
+            custom_value.value = value
+            custom_value.field = field
+            index = @custom_values.find_index do |custom_value|
+                custom_value.field.same_as?(field)
             end
             if index
-                @custom_fields.delete_at index
+                @custom_values.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
+            @custom_values.push custom_value
+            return custom_value
+        end
+        def set_custom_field(obj)
+            value = obj[:value]
+            ref = CustomFieldReference.new(obj)
+            return set_custom_value(value, ref)
         end
     end
 
     module ModelWithIntegrationIdSameAs
         def same_as?(other)
-            if @integration_id!=nil && @integration_id == other.integration_id 
+            if @integration_id!=nil && @integration_id == other.integration_id
                 return true
             end
             if @id != nil && @id == other.id
@@ -40,7 +41,7 @@ module FruitToLime
         end
         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

@@ -119,6 +119,13 @@ module FruitToLime
                     :name => symbol_to_name(p[:id]),
                     :models => SerializeHelper.get_import_rows(:custom_field)
                 }
+            when :custom_values then
+                {
+                    :id => p[:id].to_s,
+                    :type => p[:type],
+                    :name => symbol_to_name(p[:id]),
+                    :models => SerializeHelper.get_import_rows(:custom_value)
+                }
             else
                 {
                     :id => p[:id].to_s,
@@ -153,6 +160,14 @@ module FruitToLime
                 OrganizationReference.new
             when :custom_field then
                 CustomField.new
+            when :custom_value then
+                CustomValue.new
+            when :custom_field_reference then
+                CustomFieldReference.new
+            when :settings then
+                Settings.new
+            when :class_settings then
+                ClassSettings.new
             else
                 raise "Unknown type: #{type}"
             end.get_import_rows

data/spec/custom_field_spec.rb

@@ -5,19 +5,16 @@ 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
 

data/spec/helpers/serialize_helper_spec.rb

@@ -31,6 +31,20 @@ describe FruitToLime::SerializeHelper do
         end
     end
 
+    describe "Serialize custom value with xml inside" do
+        let(:serialized) {
+            v = FruitToLime::CustomValue.new
+            v.value = "<text>"
+            v.field = FruitToLime::CustomFieldReference.new()
+            v.field.id = "1"
+            FruitToLime::SerializeHelper::serialize(v,-1)
+        }
+        it "should contain encoded text" do
+            serialized.should match(/<Value>[\n ]*&lt;text&gt;[\n ]*<\/Value>/)
+        end
+
+    end
+
     describe "Serialize without data" do
         let(:serialized) {
             p = FruitToLime::Person.new
@@ -41,7 +55,7 @@ describe FruitToLime::SerializeHelper do
             serialized.should_not match(/<Position>/)
             serialized.should_not match(/<AlternativeEmail>/)
             serialized.should_not match(/<Tags>/)
-            serialized.should_not match(/<CustomFields>/)
+            serialized.should_not match(/<CustomValues>/)
         end
         it "should be utf-8" do
             serialized.encoding.should equal Encoding::UTF_8
@@ -65,9 +79,9 @@ describe FruitToLime::SerializeHelper do
             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"})
-            p.set_custom_field({:id=>"4", :title=>"cf <title3>", :value=>"cf <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>"})
             FruitToLime::SerializeHelper::serialize(p,-1)
         }
         it "should contain first and last name" do
@@ -84,7 +98,6 @@ describe FruitToLime::SerializeHelper do
             serialized.should match(/Ankeborg/)
         end
         it "should contain custom field" do
-            serialized.should match(/cf title/)
             serialized.should match(/cf value/)
         end
         it "should contain reference to source" do
@@ -116,8 +129,8 @@ describe FruitToLime::SerializeHelper do
             #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.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|
                 addr.city = "Ankeborg"
             end
@@ -125,7 +138,7 @@ describe FruitToLime::SerializeHelper do
                 addr.city = "Gaaseborg"
             end
             o.add_employee({
-                :id => "1",
+                :integration_id => "1",
                 :first_name => "Kalle",
                 :last_name => "Anka"
             })
@@ -146,7 +159,6 @@ describe FruitToLime::SerializeHelper do
             serialized.should match(/<Tag>[\n ]*tag:bibliotek[\n ]*<\/Tag>/)
         end
         it "should contain custom field" do
-            serialized.should match(/cf title/)
             serialized.should match(/cf value/)
             #puts serialized
         end
@@ -175,6 +187,9 @@ describe FruitToLime::SerializeHelper do
         it "should contain name" do
             serialized.should match(/Ankeborgs bibliotek/)
         end
+        it "should have version" do
+            serialized.should match(/<GoImport Version='v2_0'/)
+        end
         it "should be utf-8" do
             serialized.encoding.should equal Encoding::UTF_8
         end

data/spec/helpers/xsd_validate_spec.rb

@@ -7,6 +7,10 @@ describe FruitToLime::SerializeHelper do
     describe "Validate according to xsd" do
         let(:validate_result) {
             i = FruitToLime::RootModel.new
+            i.settings.with_organization do |s|
+                s.set_custom_field({:integration_id=>"2", :title=>"cf title"})
+                s.set_custom_field({:integration_id=>"3", :title=>"cf title2"})
+            end
             o = FruitToLime::Organization.new
             o.name = "Ankeborgs bibliotek"
             o.with_source do |source|
@@ -15,8 +19,8 @@ describe FruitToLime::SerializeHelper do
             #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.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|
                 addr.city = "Ankeborg"
             end
@@ -24,10 +28,10 @@ describe FruitToLime::SerializeHelper do
                 addr.city = "Gaaseborg"
             end
             o.add_responsible_coworker({
-                :id => "1"
+                :integration_id => "1"
             })
             emp = o.add_employee({
-                :id => "1",
+                :integration_id => "1",
                 :first_name => "Kalle",
                 :last_name => "Anka"
             })

data/spec/person_spec.rb

@@ -8,43 +8,48 @@ describe "Person" do
 
     it "can set a customfield" do
         person.set_custom_field({:integration_id=>'the key',
-            :title=> 'the title',
             :value=> 'the value'})
 
-        field = person.custom_fields[0]
+        value = person.custom_values[0]
+        field = value.field
         field.integration_id.should eq 'the key'
-        field.title.should eq 'the title'
-        field.value.should eq 'the value'
+        value.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]
+        value = person.custom_values[0]
+        field = value.field
+
+        person.custom_values.length.should eq 1 
         field.integration_id.should eq 'the key'
-        field.title.should eq 'the title 2'
-        field.value.should eq 'the value 2'
+        value.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]
+        value = person.custom_values[0]
+        field = value.field
+
+        person.custom_values.length.should eq 1 
         field.id.should eq 'the id'
-        field.title.should eq 'the title 2'
-        field.value.should eq 'the value 2'
+        value.value.should eq 'the value 2'
+    end
+
+    it "will only set tag once" do
+        person.set_tag('tag1')
+        person.set_tag('tag1')
+        person.tags.length.should eq 1 
+        tag = person.tags[0]
+        tag.value.should eq 'tag1'
     end
 
     it "should have a firstname if no lastname" do

data/templates/csv/lib/tomodel.rb

@@ -8,8 +8,20 @@ class ToModel
         return organization
     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_deal do |deal|
+            deal.set_custom_field( { :integrationid => 'discount_url', :title => 'Rabatt url', :type => :Link } )
+        end
+    end
+
     def to_model(organization_file_name)
         rootmodel = FruitToLime::RootModel.new
+        configure model
         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)

data/templates/excel/lib/tomodel.rb

@@ -11,11 +11,23 @@ class ToModel
         return organization
     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_deal do |deal|
+            deal.set_custom_field( { :integrationid => 'discount_url', :title => 'Rabatt url', :type => :Link } )
+        end
+    end
+
     def to_model(organization_file_name)
         # from excel to csv
         organization_file_data = Roo::Excelx.new(organization_file_name)
 
         model = FruitToLime::RootModel.new
+        configure model
         rows = FruitToLime::RooHelper.new(organization_file_data).rows
         rows.each do |row|
             model.organizations.push(to_organization(row))

data/templates/sqlserver/lib/tomodel.rb

@@ -10,8 +10,20 @@ class ToModel
         return organization
     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_deal do |deal|
+            deal.set_custom_field( { :integrationid => 'discount_url', :title => 'Rabatt url', :type => :Link } )
+        end
+    end
+
     def to_model(organization_rows)
         model = FruitToLime::RootModel.new
+        configure model
 
         organization_rows.each do |row|
             model.organizations.push(to_organization(row))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -138,6 +138,7 @@ 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
 - lib/fruit_to_lime/model/coworker.rb
 - lib/fruit_to_lime/model/coworker_reference.rb
 - lib/fruit_to_lime/model/customfield.rb
@@ -148,6 +149,7 @@ files:
 - lib/fruit_to_lime/model/person.rb
 - lib/fruit_to_lime/model/referencetosource.rb
 - lib/fruit_to_lime/model/rootmodel.rb
+- lib/fruit_to_lime/model/settings.rb
 - lib/fruit_to_lime/model/tag.rb
 - lib/fruit_to_lime/model_helpers.rb
 - lib/fruit_to_lime/roo_helper.rb