fruit_to_lime 2.6.1 → 2.6.2

data/lib/fruit_to_lime/model/customfield.rb

@@ -2,7 +2,7 @@ module FruitToLime
     class CustomFieldReference
         include SerializeHelper, ModelWithIntegrationIdSameAs
 
-        attr_accessor :id, :integration_id
+        attr_accessor :integration_id
 
         def initialize(opt=nil)
             if opt != nil
@@ -14,7 +14,7 @@ module FruitToLime
         end
 
         def serialize_variables
-            [:id, :integration_id].map {|p| { :id => p, :type => :string } }
+            [:integration_id].map {|p| { :id => p, :type => :string } }
         end
 
         def get_import_rows

data/lib/fruit_to_lime/model/deal_class_settings.rb

@@ -47,7 +47,7 @@ module FruitToLime
         end
 
         def find_status_by_label(label)
-            return nil if @statuses.nil?
+            return nil if @statuses.nil? || label.nil?
 
             return @statuses.find do |status|
                 !status.label.nil? && status.label.casecmp(label) == 0
@@ -55,7 +55,7 @@ module FruitToLime
         end
 
         def find_status_by_integration_id(integration_id)
-            return nil if @statuses.nil?
+            return nil if @statuses.nil? || integration_id.nil?
 
             return @statuses.find do |status|
                 !status.integration_id.nil? && status.integration_id.casecmp(integration_id) == 0

data/lib/fruit_to_lime/model/deal_status_reference.rb

@@ -2,7 +2,7 @@ module FruitToLime
     class DealStatusReference
         include SerializeHelper
 
-        attr_accessor :id, :label, :integration_id
+        attr_accessor :label, :integration_id
 
         def initialize(opt = nil)
             if opt != nil
@@ -14,7 +14,7 @@ module FruitToLime
         end
 
         def serialize_variables
-            [:id, :integration_id, :label].map {|p| {:id => p, :type => :string} }
+            [:integration_id, :label].map {|p| {:id => p, :type => :string} }
         end
 
         def serialize_name
@@ -29,8 +29,6 @@ module FruitToLime
                 return deal_status.to_reference
             elsif deal_status.is_a?(String)
                 return DealStatusReference.new({:label => deal_status, :integration_id => deal_status})
-            elsif deal_status.is_a?(Integer)
-                return DealStatusReference.new({:id => deal_status.to_s })
             end
 
             raise InvalidDealStatusError
@@ -39,8 +37,8 @@ module FruitToLime
         def validate
             error = ""
 
-            if (@id.nil? || @id.empty?) && (@label.nil? || @label.empty?) && (@integration_id.nil? || @integration_id.empty?)
-                error = "id, label and integration_id can't all be nil or empty"
+            if (@label.nil? || @label.empty?) && (@integration_id.nil? || @integration_id.empty?)
+                error = "label and integration_id can't all be nil or empty"
             end
 
             return error

data/lib/fruit_to_lime/model/deal_status_setting.rb

@@ -24,7 +24,6 @@ module FruitToLime
 
         def to_reference()
             reference = DealStatusReference.new
-            reference.id = @id
             reference.label = @label
             reference.integration_id = @integration_id
 

data/lib/fruit_to_lime/model_helpers.rb

@@ -31,7 +31,7 @@ module FruitToLime
     module ModelWithIntegrationIdSameAs
         # check if other is same as regarding integration_id or id
         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

data/spec/deal_class_settings_spec.rb

@@ -68,6 +68,18 @@ describe "DealClassSettings" do
         status.should eq nil
     end
 
+    it "should find nil by label if label is nil" do
+        # given
+        deal_class_settings.add_status({:label => "1. Kvalificering", :integration_id => "qualify"})
+        deal_class_settings.add_status({:label => "2. Skickat offert", :integration_id => "tender sent"})
+
+        # when
+        status = deal_class_settings.find_status_by_label(nil)
+
+        # then
+        status.should eq nil
+    end
+
     it "should find nil by integration id if no statuses are defined" do
         # given, when
         status = deal_class_settings.find_status_by_integration_id("3. Won")
@@ -76,6 +88,17 @@ describe "DealClassSettings" do
         status.should eq nil
     end
 
+    it "should find nil by integration id if integration id is nil" do
+        # given
+        deal_class_settings.add_status({:label => "1. Kvalificering", :integration_id => "qualify"})
+        deal_class_settings.add_status({:label => "2. Skickat offert", :integration_id => "tender sent"})
+
+        # when
+        status = deal_class_settings.find_status_by_integration_id(nil)
+
+        # then
+        status.should eq nil
+    end
 end
 
 

data/spec/deal_spec.rb

@@ -152,7 +152,7 @@ describe "Deal" do
         deal.status.status_reference.integration_id.should eq "123"
     end
 
-    it "should set status_reference from label if status is a string" do
+    it "should set status_reference from label and integrationid if status is a string" do
         # This case should be used when the status is already defined
         # in the appliation and is referenced by label
 
@@ -166,24 +166,7 @@ describe "Deal" do
         deal.status.is_a?(FruitToLime::DealStatus).should eq true
         deal.status.status_reference.is_a?(FruitToLime::DealStatusReference).should eq true
         deal.status.status_reference.label.should eq "Driv"
-        deal.status.status_reference.id.nil?.should eq true
-    end
-
-    it "should set status_reference from id if status is an integer" do
-        # This case should be used when the status is already defined
-        # in the application and is referenced by id
-
-        # given
-        deal.name = "Deal with status from id"
-
-        # when
-        deal.status = 123
-
-        # then
-        deal.status.is_a?(FruitToLime::DealStatus).should eq true
-        deal.status.status_reference.is_a?(FruitToLime::DealStatusReference).should eq true
-        deal.status.status_reference.label.nil?.should eq true
-        deal.status.status_reference.id.should eq "123"
+        deal.status.status_reference.integration_id.should eq "Driv"
     end
 
     it "should raise error if status reference cant be created" do

data/spec/helpers/serialize_helper_spec.rb

@@ -36,7 +36,7 @@ describe FruitToLime::SerializeHelper do
             v = FruitToLime::CustomValue.new
             v.value = "<text>"
             v.field = FruitToLime::CustomFieldReference.new()
-            v.field.id = "1"
+            v.field.integration_id = "1"
             FruitToLime::SerializeHelper::serialize(v,-1)
         }
         it "should contain encoded text" do

data/spec/person_spec.rb

@@ -31,23 +31,21 @@ describe "Person" do
     end
 
     it "will set custom field with same id to the last value" do
-        person.set_custom_field({:id=>'the id',
-            :value=> 'the value'})
+        person.set_custom_field({ :integration_id => 'the id', :value=> 'the value' })
 
-        person.set_custom_field({:id=>'the id',
-            :value=> 'the value 2'})
+        person.set_custom_field({ :integration_id => 'the id', :value=> 'the value 2'})
         value = person.custom_values[0]
         field = value.field
 
         person.custom_values.length.should eq 1
-        field.id.should eq 'the id'
+        field.integration_id.should eq 'the id'
         value.value.should eq 'the value 2'
     end
 
     it "will set custom field (using set_custom_value) with same integration_id to the last value" do
-        person.set_custom_value('the id','the value')
+        person.set_custom_value('the id', 'the value')
 
-        person.set_custom_value('the id','the value 2')
+        person.set_custom_value('the id', 'the value 2')
         value = person.custom_values[0]
         field = value.field
 

data/templates/csv/spec/sample_data/deals.csv

@@ -1,2 +1,2 @@
-id;name;value;responsible_id;customer_id;customer_contact_id
-333;Feta affären;10000;666;6;123
+id;name;value;responsible_id;customer_id;customer_contact_id;status
+333;Feta affären;10000;666;6;123;Vunnen

data/templates/csv/spec/spec_helper.rb

@@ -1,24 +1,30 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 #require File.expand_path("../../config/environment", __FILE__)
 #require 'rspec/rails'
-require 'rspec/autorun'
+#require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 #Dir[File.join(File.dirname(File.absolute_path(__FILE__)),"support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
+    # ## Mock Framework
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # config.mock_with :mocha
+    # config.mock_with :flexmock
+    # config.mock_with :rr
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
+    # Run specs in random order to surface order dependencies. If you find an
+    # order dependency and want to debug it, you can fix the order by providing
+    # the seed, which is printed after each run.
+    #     --seed 1234
+    config.order = "random"
+
+    # Allow both should and expect syntax
+    # http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    config.expect_with :rspec do |c|
+        c.syntax = [:should, :expect]
+    end
 end

data/templates/easy/spec/spec_helper.rb

@@ -1,24 +1,30 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 #require File.expand_path("../../config/environment", __FILE__)
 #require 'rspec/rails'
-require 'rspec/autorun'
+#require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 #Dir[File.join(File.dirname(File.absolute_path(__FILE__)),"support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
+    # ## Mock Framework
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # config.mock_with :mocha
+    # config.mock_with :flexmock
+    # config.mock_with :rr
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
+    # Run specs in random order to surface order dependencies. If you find an
+    # order dependency and want to debug it, you can fix the order by providing
+    # the seed, which is printed after each run.
+    #     --seed 1234
+    config.order = "random"
+
+    # Allow both should and expect syntax
+    # http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    config.expect_with :rspec do |c|
+        c.syntax = [:should, :expect]
+    end
 end

data/templates/excel/spec/spec_helper.rb

@@ -1,20 +1,26 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 #require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/autorun'
+#require 'rspec/autorun'
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
+    # ## Mock Framework
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # config.mock_with :mocha
+    # config.mock_with :flexmock
+    # config.mock_with :rr
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
+    # Run specs in random order to surface order dependencies. If you find an
+    # order dependency and want to debug it, you can fix the order by providing
+    # the seed, which is printed after each run.
+    #     --seed 1234
+    config.order = "random"
+
+    # Allow both should and expect syntax
+    # http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    config.expect_with :rspec do |c|
+        c.syntax = [:should, :expect]
+    end
 end
 

data/templates/sqlserver/spec/spec_helper.rb

@@ -1,20 +1,26 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 #require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/autorun'
+#require 'rspec/autorun'
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
+    # ## Mock Framework
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # config.mock_with :mocha
+    # config.mock_with :flexmock
+    # config.mock_with :rr
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
+    # Run specs in random order to surface order dependencies. If you find an
+    # order dependency and want to debug it, you can fix the order by providing
+    # the seed, which is printed after each run.
+    #     --seed 1234
+    config.order = "random"
+
+    # Allow both should and expect syntax
+    # http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    config.expect_with :rspec do |c|
+        c.syntax = [:should, :expect]
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes