fruit_to_lime 2.4.1 → 2.5.0

data/lib/fruit_to_lime/errors.rb

@@ -4,4 +4,7 @@ module FruitToLime
 
     class InvalidCustomFieldError < StandardError
     end
+
+    class InvalidRelationError < StandardError
+    end
 end

data/lib/fruit_to_lime/model/coworker_reference.rb

@@ -13,7 +13,7 @@ module FruitToLime
         end
 
         def serialize_variables
-            [:id, :heading, :integration_id].map {|p| {:id => p, :type => :string} }
+            [:id, :integration_id, :heading].map {|p| {:id => p, :type => :string} }
         end
 
         def serialize_name

data/lib/fruit_to_lime/model/organization.rb

@@ -41,9 +41,9 @@ module FruitToLime
         include SerializeHelper, ModelHasCustomFields, ModelHasTags
 
         attr_accessor :id, :integration_id, :name, :organization_number, :email, :web_site,
-        :postal_address, :visit_address, :central_phone_number, :responsible_coworker, :source_data
+        :postal_address, :visit_address, :central_phone_number, :source_data
 
-        attr_reader :employees
+        attr_reader :employees, :responsible_coworker, :relation
         # you add custom values by using {#set_custom_value}
         attr_reader :custom_values
 
@@ -54,6 +54,8 @@ module FruitToLime
                     instance_variable_set("@" + myattr[:id].to_s, val) if val != nil
                 end
             end
+
+            @relation = Relation::NoRelation if @relation.nil?
         end
 
         def to_reference()
@@ -106,16 +108,6 @@ module FruitToLime
             yield @source
         end
 
-        # @example Set the responsible coworker of the organization to the coworker with integration id 943
-        #     o.with_responsible_coworker do |responsible_coworker|
-        #          responsible_coworker.integration_id = "943"
-        #     end
-        # @see CoworkerReference responsible_coworker
-        def with_responsible_coworker
-            @responsible_coworker = CoworkerReference.new if @responsible_coworker==nil
-            yield @responsible_coworker
-        end
-
         # @example Add an employee and then add additional info to that employee
         #    employee = o.add_employee({
         #        :integration_id => "79654",
@@ -132,12 +124,20 @@ module FruitToLime
             person
         end
 
-        # TODO! Remove, it's obsolete
-        # @!visibility private
-        def add_responsible_coworker(val)
-            coworker = if val.is_a? CoworkerReference then val else CoworkerReference.new(val) end
-            @responsible_coworker = coworker
-            coworker
+        def responsible_coworker=(coworker)
+            @responsible_coworker = CoworkerReference.from_coworker(coworker)
+        end
+
+        # Sets the organization's relation to the specified value. The
+        # relation must be a valid value from the Relation module
+        # otherwise an InvalidRelationError error will be thrown.
+        def relation=(relation)
+            if relation == Relation::NoRelation || relation == Relation::WorkingOnIt ||
+                    relation == Relation::IsACustomer || relation == Relation::WasACustomer || relation == Relation::BeenInTouch
+                @relation = relation
+            else
+                raise InvalidRelationError
+            end
         end
 
         def find_employee_by_integration_id(integration_id)
@@ -162,7 +162,8 @@ module FruitToLime
              { :id => :employees, :type => :persons },
              { :id => :custom_values, :type => :custom_values },
              { :id => :tags, :type => :tags },
-             { :id => :responsible_coworker, :type => :coworker_reference}
+             { :id => :responsible_coworker, :type => :coworker_reference},
+             { :id => :relation, :type => :string }
             ]
         end
 

data/lib/fruit_to_lime/model/person.rb

@@ -22,7 +22,7 @@ module FruitToLime
                 return nil
             elsif person.is_a?(Person)
                 return person.to_reference
-            elsif coworker.is?(PersonReference)
+            elsif person.is_a?(PersonReference)
                 return person
             end
         end

data/lib/fruit_to_lime/model/relation.rb

@@ -0,0 +1,23 @@
+module FruitToLime
+    module Relation
+        # This is the default, we have not been in contact with this
+        # organization in any way.
+        NoRelation = 0
+
+        # Something is happening with this organization, we might have
+        # booked a meeting with them or created a deal, etc.
+        WorkingOnIt = 1
+
+        # We have made a deal with this organization.
+        IsACustomer = 2
+
+        # We have made a deal with this organization but it was some
+        # time ago and we don't consider them a customer any more.
+        WasACustomer = 3
+
+        # We had something going with this organization but we
+        # couldn't close the deal and we don't think they will be a
+        # customer to us in the foreseeable future.
+        BeenInTouch = 4
+    end
+end

data/spec/helpers/xsd_validate_spec.rb

@@ -33,9 +33,9 @@ describe FruitToLime::SerializeHelper do
             o.with_visit_address do |addr|
                 addr.city = "Gaaseborg"
             end
-            o.with_responsible_coworker do |coworker|
-                coworker.integration_id = "1"
-            end
+            coworker = FruitToLime::Coworker.new({:integration_id => "1", :first_name => "Vincent", :last_name => "Vega"})
+            o.responsible_coworker = coworker
+
             emp = o.add_employee({
                 :integration_id => "1",
                 :first_name => "Kalle",
@@ -45,15 +45,14 @@ describe FruitToLime::SerializeHelper do
             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
+end

data/spec/organization_spec.rb

@@ -17,6 +17,38 @@ describe "Organization" do
 
         organization.validate.length > 0
     end
+
+    it "will auto convert coworker to coworker.ref during assignment" do
+        # given
+        coworker = FruitToLime::Coworker.new({:integration_id => "456", :first_name => "Billy", :last_name => "Bob"})
+
+        # when
+        organization.responsible_coworker = coworker
+
+        # then
+        organization.responsible_coworker.is_a?(FruitToLime::CoworkerReference).should eq true
+    end
+
+    it "will have a no relation as default" do
+        # given, when, then
+        organization.relation.should eq FruitToLime::Relation::NoRelation
+    end
+
+    it "should only accept relations from Relations enum" do
+        # given, when
+        organization.relation = FruitToLime::Relation::IsACustomer
+
+        # then
+        organization.relation.should eq FruitToLime::Relation::IsACustomer
+    end
+
+    it "should not accept invalid relations" do
+        # when, then
+        expect {
+            organization.relation = "hubbabubba"
+        }.to raise_error(FruitToLime::InvalidRelationError)
+    end
+
 end
 
 describe "OrganizationReference" do

data/templates/excel/lib/tomodel.rb

@@ -75,6 +75,10 @@ class Converter
         # same file more than once without creating duplicates
         organization.integration_id = row['ID']
 
+        # Sets the organization's relation. Relation must be a value
+        # from FruitToLime::Relation.
+        organization.relation = FruitToLime::Relation::IsACustomer
+
         # *** TODO:
         #
         # Set organization properties from the row.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -182,6 +182,7 @@ files:
 - lib/fruit_to_lime/model/organization.rb
 - lib/fruit_to_lime/model/person.rb
 - lib/fruit_to_lime/model/referencetosource.rb
+- lib/fruit_to_lime/model/relation.rb
 - lib/fruit_to_lime/model/rootmodel.rb
 - lib/fruit_to_lime/model/settings.rb
 - lib/fruit_to_lime/model/tag.rb