fruit_to_lime 2.2.4 → 2.3.0

data/lib/fruit_to_lime/model/coworker.rb

@@ -46,7 +46,12 @@ module FruitToLime
             return false
         end
 
-        def parse_name_to_firstname_lastname_se(name)
+        def parse_name_to_firstname_lastname_se(name, when_missing = '')
+            if name.nil? or name.empty?
+                @first_name = when_missing
+                return
+            end
+
             splitted = name.split(' ')
             @first_name = splitted[0]
             if splitted.length > 1                

data/lib/fruit_to_lime/model/deal.rb

@@ -3,13 +3,13 @@ module FruitToLime
     class Deal
         include SerializeHelper, ModelHasCustomFields, ModelHasTags
 
-        attr_accessor :id, :integration_id, :name, :description, :probability, :value, :order_date, :offer_date, :customer,
+        attr_accessor :id, :integration_id, :name, :description, :probability, :value, :order_date, :customer,
         :responsible_coworker, :customer_contact, :status
         # you add custom values by using {#set_custom_value}
         attr_reader :custom_values
 
         def serialize_variables
-            [ :id, :integration_id, :name, :description, :probability, :value, :offer_date, :order_date ].map {
+            [ :id, :integration_id, :name, :description, :probability, :value, :order_date ].map {
                 |p| {
                     :id => p,
                     :type => :string
@@ -46,5 +46,10 @@ module FruitToLime
             return error
         end
 
+        def with_status
+            @status = DealStatus.new
+            yield @status
+        end
+
     end
 end

data/lib/fruit_to_lime/model/deal_status.rb

@@ -2,10 +2,11 @@ module FruitToLime
     class DealStatus
         include SerializeHelper
 
-        attr_accessor :id, :label
+        attr_accessor :id, :label, :date, :note
 
         def serialize_variables
-            [ :id, :label ].map{ |p| { :id => p, :type => :string } }
+            [ :id, :label, :note ].map{ |p| { :id => p, :type => :string } } +
+            [ :date ].map { |p| { :id => p, :type => :date } }
         end
     end
 end

data/lib/fruit_to_lime/model/organization.rb

@@ -119,6 +119,7 @@ module FruitToLime
         end
 
         def find_employee_by_integration_id(integration_id)
+            return nil if @employees.nil?
             return @employees.find do |e|
                 e.integration_id == integration_id
             end

data/lib/fruit_to_lime/model/person.rb

@@ -118,7 +118,12 @@ module FruitToLime
             return error
         end
 
-        def parse_name_to_firstname_lastname_se(name)
+        def parse_name_to_firstname_lastname_se(name, when_missing = '')
+            if name.nil? or name.empty?
+                @first_name = when_missing
+                return
+            end
+
             splitted = name.split(' ')
             @first_name = splitted[0]
             if splitted.length > 1                

data/lib/fruit_to_lime/model/rootmodel.rb

@@ -135,6 +135,13 @@ module FruitToLime
                 error = "#{error}\nDuplicate deal integration_id: #{dups_error_items.join(", ")}."
             end
 
+            persons = @organizations.collect{|o| o.employees}.flatten.compact
+            dups = get_integration_id_duplicates(with_non_empty_integration_id(persons))
+            dups_error_items = (dups.collect{|person| person.integration_id}).compact
+            if dups_error_items.length > 0
+                error = "#{error}\nDuplicate person integration_id: #{dups_error_items.join(", ")}."
+            end
+
             return error.strip
         end
 

data/spec/coworker_spec.rb

@@ -22,6 +22,18 @@ describe "Coworker" do
             coworker.first_name.should eq 'Kalle'
             coworker.last_name.should eq 'Svensson Nilsson'
         end
+
+        it "sets default name when name is empty" do
+            coworker.parse_name_to_firstname_lastname_se '', 'a default'
+
+            coworker.first_name.should eq 'a default'
+        end
+
+        it "sets default name when name is nil" do
+            coworker.parse_name_to_firstname_lastname_se nil, 'a default'
+
+            coworker.first_name.should eq 'a default'
+        end        
     end
 
     describe "gues_email" do

data/spec/deal_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+require 'fruit_to_lime'
+
+describe "Deal" do
+	let(:deal){
+		FruitToLime::Deal.new
+	}
+
+	it "can attach a current status" do
+		deal.with_status do |status|
+			status.label = 'xyz'
+			status.id = '123'
+			status.date = DateTime.now
+			status.note = 'ho ho'
+		end
+	end
+
+end

data/spec/person_spec.rb

@@ -95,6 +95,18 @@ describe "Person" do
             person.first_name.should eq 'Kalle'
             person.last_name.should eq 'Svensson Nilsson'
         end
+
+        it "sets default name when name is empty" do
+            person.parse_name_to_firstname_lastname_se '', 'a default'
+
+            person.first_name.should eq 'a default'
+        end
+
+        it "sets default name when name is nil" do
+            person.parse_name_to_firstname_lastname_se nil, 'a default'
+
+            person.first_name.should eq 'a default'
+        end
     end
 end
 

data/spec/rootmodel_spec.rb

@@ -79,4 +79,26 @@ describe "RootModel" do
 
         rootmodel.sanity_check.should eq "Duplicate organization integration_id: 1."
     end
+
+    it "will report when the same integrationid on person is used during sanity check" do
+        org1 = FruitToLime::Organization.new
+        org1.integration_id = "1"
+        org1.name = "company 1"
+        person1 = FruitToLime::Person.new
+        person1.integration_id = '1'
+        org1.add_employee person1
+
+        rootmodel.organizations.push org1
+
+        org2 = FruitToLime::Organization.new
+        org2.integration_id = "2"
+        org2.name = "company 2"
+        person2 = FruitToLime::Person.new
+        person2.integration_id = '1'
+        org2.add_employee person2
+        rootmodel.organizations.push org2
+
+        rootmodel.sanity_check.should eq "Duplicate person integration_id: 1."
+
+    end
 end

data/templates/csv/lib/tomodel.rb

@@ -121,7 +121,6 @@ class Exporter
         # other optional attributes
         deal.probability = 50           # should be between 0 - 100
         deal.order_date = '2014-01-05'  # Format ?
-        deal.offer_date = '2013-12-01'  # Format ?
 
         # status, how do we set this ?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -185,6 +185,7 @@ files:
 - spec/class_settings_spec.rb
 - spec/coworker_spec.rb
 - spec/custom_field_spec.rb
+- spec/deal_spec.rb
 - spec/helpers/csv_helper_spec.rb
 - spec/helpers/roo_helper_spec.rb
 - spec/helpers/serialize_helper_spec.rb
@@ -222,6 +223,7 @@ test_files:
 - spec/class_settings_spec.rb
 - spec/coworker_spec.rb
 - spec/custom_field_spec.rb
+- spec/deal_spec.rb
 - spec/helpers/csv_helper_spec.rb
 - spec/helpers/roo_helper_spec.rb
 - spec/helpers/serialize_helper_spec.rb