capsule_crm 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6d24bb7037a3d119bccf9122b99dcc4c637a76
-  data.tar.gz: d3963ea029b318ad0e730ef6d7fd8d37fe42a758
+  metadata.gz: 3a971137b1c0c66a676abb680757dd95d181483a
+  data.tar.gz: 9df7cb48de8496c48b9201afa44558e786433ffe
 SHA512:
-  metadata.gz: d7e0f36ec559f8d5473f50050c2751b5ec4e3c91cbd0cd210ba1e65ab2342dc15e961ff3a2792baa346b2e249931a2601bdd96588e234e355cf875614b10a324
-  data.tar.gz: 2afd21361071265d65f897c386dd83d845d835e45edb5be1e9e6ec283486ca1ec10e81764a3ff63a33ada828ec4ba86de2d0cb261a7a9d06861867337e45f731
+  metadata.gz: 870dfbbc6202b575235e02ba4a8902dea7bca317b70d2bd7a79fa6e563da3582071133a97b21ef1718556d0e8b4ef196430a7f68d1ff4dc3151dc042084c6264
+  data.tar.gz: bb6fe469ff5993c9e12bcb33444548402bda97112a3ff44fc632e9ba7810bfa2784f4cbd923fd3d500b6d265eac9987547a49b1c9923a36665652185f467c5c7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.5.1
+
+- Add ID to email, website, address and phone models to fix bug where they were
+  being duplicated every time a contactable model was saved
+
 ## 1.5.0
 
 - Add TaskCategory

data/lib/capsule_crm/address.rb

@@ -6,13 +6,15 @@ module CapsuleCRM
 
     serializable_config do |config|
       config.include_root = false
+      config.exclude_id   = false
     end
 
-    attribute :type
-    attribute :street
-    attribute :city
-    attribute :state
-    attribute :zip
-    attribute :country
+    attribute :id, Integer
+    attribute :type, String
+    attribute :street, String
+    attribute :city, String
+    attribute :state, String
+    attribute :zip, String
+    attribute :country, String
   end
 end

data/lib/capsule_crm/email.rb

@@ -6,8 +6,10 @@ module CapsuleCRM
 
     serializable_config do |config|
       config.include_root = false
+      config.exclude_id   = false
     end
 
+    attribute :id, Integer
     attribute :type
     attribute :email_address
 

data/lib/capsule_crm/phone.rb

@@ -6,10 +6,12 @@ module CapsuleCRM
 
     serializable_config do |config|
       config.include_root = false
+      config.exclude_id   = false
     end
 
-    attribute :type
-    attribute :phone_number
+    attribute :id, Integer
+    attribute :type, String
+    attribute :phone_number, String
 
     def initialize(attributes = {})
       CapsuleCRM::HashHelper.underscore_keys!(attributes)

data/lib/capsule_crm/serializer.rb

@@ -73,11 +73,16 @@ module CapsuleCRM
 
     def cleaned_attributes
       attributes.delete_if do |key, value|
-        value.blank? || key.to_s == 'id' || excluded_keys.include?(key) ||
+        value.blank? || (key.to_s == 'id' && exclude_id?) ||
+          excluded_keys.include?(key) ||
           excluded_association_keys.include?(key.to_s)
       end
     end
 
+    def exclude_id?
+      @exclude_id ||= true unless options[:exclude_id] == false
+    end
+
     # TODO OMG, clean this up!
     def attributes
       object.attributes.dup.tap do |attrs|

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/lib/capsule_crm/website.rb

@@ -8,11 +8,13 @@ module CapsuleCRM
 
     serializable_config do |config|
       config.include_root = false
+      config.exclude_id   = false
     end
 
-    attribute :type
-    attribute :web_service
-    attribute :web_address
+    attribute :id, Integer
+    attribute :type, String
+    attribute :web_service, String
+    attribute :web_address, String
 
     validates :web_service, :web_address, presence: true
 

data/spec/lib/capsule_crm/address_spec.rb

@@ -1,4 +1,9 @@
 require 'spec_helper'
 
 describe CapsuleCRM::Address do
+  it_behaves_like 'capsule jsonable' do
+    let(:object) do
+      CapsuleCRM::Address.new(street: Faker::Address.street_address)
+    end
+  end
 end

data/spec/lib/capsule_crm/email_spec.rb

@@ -1,4 +1,7 @@
 require 'spec_helper'
 
 describe CapsuleCRM::Email do
+  it_behaves_like 'capsule jsonable' do
+    let(:object) { CapsuleCRM::Email.new(email_address: Faker::Internet.email) }
+  end
 end

data/spec/lib/capsule_crm/phone_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe CapsuleCRM::Phone do
+  it_behaves_like 'capsule jsonable' do
+    let(:object) { CapsuleCRM::Phone.new(phone_number: '1234') }
+  end
+end

data/spec/lib/capsule_crm/serializer_spec.rb

@@ -35,6 +35,14 @@ describe CapsuleCRM::Serializer do
       end
     end
 
+    context 'when exclude_id is false' do
+      before { options.merge!(exclude_id: false) }
+
+      it 'should include the ID' do
+        expect(subject['serializabletest'].keys).to include('id')
+      end
+    end
+
     context 'when include_root is false' do
       before do
         options.merge!(include_root: false)

data/spec/lib/capsule_crm/website_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe CapsuleCRM::Website do
+  it_behaves_like 'capsule jsonable' do
+    let(:object) do
+      CapsuleCRM::Website.new(web_address: Faker::Internet.domain_name)
+    end
+  end
+end

data/spec/support/shared_examples/capsule_json.rb

@@ -0,0 +1,25 @@
+shared_examples 'capsule jsonable' do
+  subject { object.to_capsule_json }
+  let(:attributes) do
+    object.attributes.delete_if { |key, value| value.blank? }
+  end
+
+  if described_class.serializable_options.exclude_id == false
+    context 'when exclude_id is false' do
+      context "when the #{described_class} has an ID" do
+        before { object.id = Random.rand(1..100) }
+
+        it 'should include the ID' do
+          expect(subject.keys).to include('id')
+        end
+      end
+
+      context "when the #{described_class} has no ID" do
+        it 'should return a capsule compatible hash' do
+          expect(subject).
+            to eql(CapsuleCRM::HashHelper.camelize_keys(attributes))
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Matt Beedle
@@ -339,6 +339,7 @@ files:
 - spec/lib/capsule_crm/organization_spec.rb
 - spec/lib/capsule_crm/party_spec.rb
 - spec/lib/capsule_crm/person_spec.rb
+- spec/lib/capsule_crm/phone_spec.rb
 - spec/lib/capsule_crm/serializer_spec.rb
 - spec/lib/capsule_crm/tag_spec.rb
 - spec/lib/capsule_crm/taggable_spec.rb
@@ -346,6 +347,7 @@ files:
 - spec/lib/capsule_crm/task_spec.rb
 - spec/lib/capsule_crm/track_spec.rb
 - spec/lib/capsule_crm/user_spec.rb
+- spec/lib/capsule_crm/website_spec.rb
 - spec/spec_helper.rb
 - spec/support/all_cases.json
 - spec/support/all_categories.json
@@ -381,6 +383,7 @@ files:
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
+- spec/support/shared_examples/capsule_json.rb
 - spec/support/shared_examples/contactable.rb
 - spec/support/shared_examples/deletable.rb
 - spec/support/shared_examples/find_all.rb
@@ -407,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Gem to communicate with CapsuleCRM
@@ -444,6 +447,7 @@ test_files:
 - spec/lib/capsule_crm/organization_spec.rb
 - spec/lib/capsule_crm/party_spec.rb
 - spec/lib/capsule_crm/person_spec.rb
+- spec/lib/capsule_crm/phone_spec.rb
 - spec/lib/capsule_crm/serializer_spec.rb
 - spec/lib/capsule_crm/tag_spec.rb
 - spec/lib/capsule_crm/taggable_spec.rb
@@ -451,6 +455,7 @@ test_files:
 - spec/lib/capsule_crm/task_spec.rb
 - spec/lib/capsule_crm/track_spec.rb
 - spec/lib/capsule_crm/user_spec.rb
+- spec/lib/capsule_crm/website_spec.rb
 - spec/spec_helper.rb
 - spec/support/all_cases.json
 - spec/support/all_categories.json
@@ -486,6 +491,7 @@ test_files:
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
+- spec/support/shared_examples/capsule_json.rb
 - spec/support/shared_examples/contactable.rb
 - spec/support/shared_examples/deletable.rb
 - spec/support/shared_examples/find_all.rb